Serializable, remove version conditions (#6209)

crystal-lang · Jun 19, 2018 · 5c22fb3 · 5c22fb3
1 parent 8959b54
commit 5c22fb3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/spec/std/json/serializable_spec.cr b/spec/std/json/serializable_spec.cr
@@ -1,5 +1,3 @@
-{% if Crystal::VERSION.includes?("0.24.2+") || Crystal::VERSION == "0.25.0" %}
-
 require "spec"
 require "json"
 require "big"
@@ -14,12 +12,14 @@ end
 
 class JSONAttrEmptyClass
   include JSON::Serializable
+
   def initialize; end
 end
 
 class JSONAttrEmptyClassWithUnmapped
   include JSON::Serializable
   include JSON::Serializable::Unmapped
+
   def initialize; end
 end
 
@@ -271,13 +271,20 @@ class JSONAttrModuleTest
   property foo = 15
 
   def initialize; end
-  def to_tuple; {@moo, @foo}; end
+
+  def to_tuple
+    {@moo, @foo}
+  end
 end
 
 class JSONAttrModuleTest2 < JSONAttrModuleTest
   property bar : Int32
+
   def initialize(@bar : Int32); end
-  def to_tuple; {@moo, @foo, @bar}; end
+
+  def to_tuple
+    {@moo, @foo, @bar}
+  end
 end
 
 struct JSONAttrPersonWithYAML
@@ -705,11 +712,11 @@ describe "JSON mapping" do
     end
 
     it "defines query getter with class restriction" do
-      \{% begin %}
-        \{% methods = JSONAttrWithQueryAttributes.methods \%}
-        \{{ methods.find(&.name.==("foo?")).return_type }}.should eq(Bool)
-        \{{ methods.find(&.name.==("bar?")).return_type }}.should eq(Bool)
-      \{% end \%}
+      {% begin %}
+        {% methods = JSONAttrWithQueryAttributes.methods %}
+        {{ methods.find(&.name.==("foo?")).return_type }}.should eq(Bool)
+        {{ methods.find(&.name.==("bar?")).return_type }}.should eq(Bool)
+      {% end %}
     end
 
     it "defines non-query setter and presence methods" do
@@ -788,5 +795,3 @@ describe "JSON mapping" do
     JSONAttrPersonWithYAMLInitializeHook.from_yaml(person.to_yaml).msg.should eq "Hello Vasya"
   end
 end
-
-{% end %}
diff --git a/spec/std/yaml/serializable_spec.cr b/spec/std/yaml/serializable_spec.cr
@@ -1,5 +1,3 @@
-{% if Crystal::VERSION.includes?("0.24.2+") || Crystal::VERSION == "0.25.0" %}
-
 require "spec"
 require "yaml"
 require "../../support/finalize"
@@ -10,12 +8,14 @@ end
 
 class YAMLAttrEmptyClass
   include YAML::Serializable
+
   def initialize; end
 end
 
 class YAMLAttrEmptyClassWithUnmapped
   include YAML::Serializable
   include YAML::Serializable::Unmapped
+
   def initialize; end
 end
 
@@ -730,11 +730,11 @@ describe "YAML::Serializable" do
     end
 
     it "defines query getter with class restriction" do
-      \{% begin \%}
-        \{% methods = YAMLAttrWithQueryAttributes.methods \%}
-        \{{ methods.find(&.name.==("foo?")).return_type }}.should eq(Bool)
-        \{{ methods.find(&.name.==("bar?")).return_type }}.should eq(Bool)
-      \{% end \%}
+      {% begin %}
+        {% methods = YAMLAttrWithQueryAttributes.methods %}
+        {{ methods.find(&.name.==("foo?")).return_type }}.should eq(Bool)
+        {{ methods.find(&.name.==("bar?")).return_type }}.should eq(Bool)
+      {% end %}
     end
 
     it "defines non-query setter and presence methods" do
@@ -772,5 +772,3 @@ describe "YAML::Serializable" do
     it { YAMLAttrModuleTest2.from_yaml(%({"bar": 30, "moo": 40})).to_tuple.should eq({40, 15, 30}) }
   end
 end
-
-{% end %}
diff --git a/src/json.cr b/src/json.cr
@@ -93,8 +93,3 @@ module JSON
 end
 
 require "./json/*"
-
-# TODO: remove conditions after 0.25
-{% if Crystal::VERSION.includes?("0.24.2+") || Crystal::VERSION == "0.25.0" %}
-  require "./json/next/serialization"
-{% end %}
diff --git a/src/json/next/serialization.cr → src/json/serialization.cr b/src/json/next/serialization.cr → src/json/serialization.cr
diff --git a/src/yaml.cr b/src/yaml.cr
@@ -3,11 +3,6 @@ require "./yaml/schema/*"
 require "./yaml/schema/core/*"
 require "./yaml/nodes/*"
 
-# TODO: remove conditions after 0.25
-{% if Crystal::VERSION.includes?("0.24.2+") || Crystal::VERSION == "0.25.0" %}
-  require "./yaml/next/serialization"
-{% end %}
-
 require "base64"
 
 # The YAML module provides serialization and deserialization of YAML

diff --git a/src/yaml/next/serialization.cr → src/yaml/serialization.cr b/src/yaml/next/serialization.cr → src/yaml/serialization.cr