model_pack 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 131e0a1ec4f533e5168483aed5e35a2348cc2c15
-  data.tar.gz: 88a8b389ea07978a35a751fd17698bfeddacff2e
+  metadata.gz: b24e44909763b19456f9080d94fb8a74cde3db9a
+  data.tar.gz: ade097d0da0686cd4397dfb590185dfa1818a69d
 SHA512:
-  metadata.gz: a5342b2b109ebc0e2ce5c898d3405e0c1463ef4b53071a1d3995f20662e0ffaf61f28146f4c983af1d30ce201bbcd4ccbb13999b717449e14cbadee403ce149a
-  data.tar.gz: 0664cc441a4f835e59d17b426ab3e43343abf21ac8a6a00a48e7b3c71349bd7f1906073d4149273cbe5f9231bf7600337d1bb4e6f3e29cf8aa29ceab16c6a720
+  metadata.gz: 5e99105f1c05100f09690bd3a8d64fa9574557a701515e1cd9e6c10647c56f9d6c04e57ab725abb6c625d0c5018fa498e218c81a01326918f116e2d81f282ea4
+  data.tar.gz: 986d5e52d67e732e4c4d8d96bbe6ab55e805dcb8d97fa6366e6e5a26e2ff5d35ec226ee553b399e2e0f408dc17e617097a8b491ce05156da8e4a2da2b20856c7

data/lib/model_pack/class_methods.rb

@@ -34,10 +34,11 @@ module ModelPack
       end if serialize
     end
 
-    def object(name, class_name: nil, default: nil, serialize: nil)
+    def object(name, class_name: nil, default: nil, serialize: nil, predicate: nil)
       attribute(name,
         default: default,
         serialize: serialize,
+        predicate: predicate,
         writer: lambda { |v| v.is_a?(Hash) && class_name ? class_name.new(v) : v })
     end
 

data/lib/model_pack/constructor.rb

@@ -1,8 +1,7 @@
 module ModelPack
   module Constructor
     def initialize(*a)
-      attributes = a.pop
-      update_attributes(attributes) if attributes
+      update_attributes(a.pop) if a.last.is_a?(Hash)
       super(*a)
     end
   end

data/lib/model_pack/version.rb

@@ -1,3 +1,3 @@
 module ModelPack
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/spec/model_pack_spec.rb

@@ -237,6 +237,26 @@ describe ModelPack::ClassMethods do
     expect(owp.load?).to eq('NO')
   end
 
+  it "should have predicate for nested object" do
+    class TargetObject
+    end
+
+    class ObjectWithPredicateObject
+      include ModelPack::Document
+
+      object :target, class_name: TargetObject, predicate: true
+    end
+
+    object1 = ObjectWithPredicateObject.new(
+      target: TargetObject.new
+    )
+
+    object2 = ObjectWithPredicateObject.new()
+
+    expect(object1.target?).to be true
+    expect(object2.target?).to be false
+  end
+
   it "should boolean type works well" do
     class BooleanData
       include ModelPack::Document
@@ -268,4 +288,47 @@ describe ModelPack::ClassMethods do
     expect(array1.data.size).to be 1
     expect(array2.data.size).to be 0
   end
+
+  it "should have default nested object" do
+    class ObjectDefaults
+      include ModelPack::Document
+
+      attribute :alpha, default: [1,2,3]
+      attribute :beta, default: {a: true}
+    end
+
+    class ObjectWithDefaults
+      include ModelPack::Document
+
+      object :defaults, class_name: ObjectDefaults, default: ObjectDefaults
+    end
+
+    object = ObjectWithDefaults.new
+
+    expect(object.defaults).to be_a(ObjectDefaults)
+    expect(object.defaults.alpha).to contain_exactly(1,2,3)
+    expect(object.defaults.beta).to include(a: true)
+  end
+
+  it "should have constructor with custom params" do
+    class ObjectWithCustomConstructor
+      include ModelPack::Document
+
+      attribute :required
+
+      attr_accessor :req
+
+      def initialize(req)
+        @req = req
+      end
+    end
+
+    object1 = ObjectWithCustomConstructor.new('GET', required: false)
+    object2 = ObjectWithCustomConstructor.new('POST')
+
+    expect(object1.req).to eq 'GET'
+    expect(object1.required).to be false
+    expect(object2.req).to eq 'POST'
+    expect(object2.required).to be nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler