Merge pull request #70 from jgaskins/patch-1

Let the Crystal compiler assign default values

Author: kostya

spec/serializable_spec.cr

@@ -277,6 +277,28 @@ class MessagePackAttrModuleTest
   end
 end
 
+module MessagePackNamespace
+  struct FooRequest
+    include MessagePack::Serializable
+
+    getter foo : Foo
+    getter bar = Bar.new
+  end
+
+  struct Foo
+    include MessagePack::Serializable
+    getter id = "id:foo"
+  end
+
+  struct Bar
+    include MessagePack::Serializable
+    getter id = "id:bar"
+
+    def initialize # Allow for default value above
+    end
+  end
+end
+
 class MessagePackAttrModuleTest2 < MessagePackAttrModuleTest
   property bar : Int32
 
@@ -933,4 +955,12 @@ describe "MessagePack mapping" do
     created.as(Discriminator::Created).created_at.should eq time
     updated.as(Discriminator::Updated).updated_at.should eq time
   end
+
+  describe "namespaced classes" do
+    it "lets default values use the object's own namespace" do
+      request = MessagePackNamespace::FooRequest.from_msgpack({foo: {} of String => String}.to_msgpack)
+      request.foo.id.should eq "id:foo"
+      request.bar.id.should eq "id:bar"
+    end
+  end
 end

src/message_pack/serializable.cr

@@ -207,12 +207,16 @@ module MessagePack
 
           {% if value[:nilable] %}
             {% if value[:has_default] != nil %}
-              @{{name}} = %found{name} ? %var{name} : {{value[:default]}}
+              if %found{name} && !%var{name}.nil?
+                @{{name}} = %var{name}
+              end
             {% else %}
               @{{name}} = %var{name}
             {% end %}
           {% elsif value[:has_default] %}
-            @{{name}} = %var{name}.nil? ? {{value[:default]}} : %var{name}
+            if %found{name} && !%var{name}.nil?
+              @{{name}} = %var{name}
+            end
           {% else %}
             @{{name}} = (%var{name}).as({{value[:type]}})
           {% end %}