model_pack 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24e44909763b19456f9080d94fb8a74cde3db9a
-  data.tar.gz: ade097d0da0686cd4397dfb590185dfa1818a69d
+  metadata.gz: dc4201ba6cb9b884ee4fefdcd9aacb0c1dd87788
+  data.tar.gz: e3c63faa6d018537021f723d131e1a53955cbbb6
 SHA512:
-  metadata.gz: 5e99105f1c05100f09690bd3a8d64fa9574557a701515e1cd9e6c10647c56f9d6c04e57ab725abb6c625d0c5018fa498e218c81a01326918f116e2d81f282ea4
-  data.tar.gz: 986d5e52d67e732e4c4d8d96bbe6ab55e805dcb8d97fa6366e6e5a26e2ff5d35ec226ee553b399e2e0f408dc17e617097a8b491ce05156da8e4a2da2b20856c7
+  metadata.gz: 08f774a99e8ae7a4bde8587d737dc1ed60fc17d55f2af435dcdcd9d35b56004c579d004158417dc9c5ad11d666c3a41a2448de7950fa12f3ea00b2766df9319a
+  data.tar.gz: bb1db9adae93f9b6db89739515933698721da24f5685767a26f4afbb0748ebfe771f9cad88d6eaedbd63a62f7aa415b46b02389c4f1b317b32bed78763e37aee

data/README.md

@@ -124,7 +124,7 @@ puts unsecure_hash
 
 ## Contributing
 
-1. Fork it ( https://github.com/chelovekov/model_pack/fork )
+1. Fork it ( https://github.com/inre/model_pack/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/model_pack/class_methods.rb

@@ -14,12 +14,11 @@ module ModelPack
     end
 
     def attribute_reader(name, default: nil, as: nil, serialize: nil, predicate: nil)
-      default_dup = default.dup rescue default
-      default_value = default_dup || as
+      default_value = default.dup rescue default
 
       define_method name do
         instance_variable_defined?("@#{name}") ?
-          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (default_value.is_a?(Class) ? default_value.new : default_value))
+          instance_variable_get("@#{name}") : instance_variable_set("@#{name}", (as ? as.new : default_value))
       end
 
       # define predicate method if required

data/lib/model_pack/constructor.rb

@@ -1,6 +1,8 @@
 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

data/lib/model_pack/version.rb

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

data/model_pack.gemspec

@@ -6,9 +6,9 @@ require 'model_pack/version'
 Gem::Specification.new do |spec|
   spec.name          = "model_pack"
   spec.version       = ModelPack::VERSION
-  spec.authors       = ["che"]
-  spec.email         = ["chelovekov@gmail.com"]
-  spec.summary       = %q{Model Pack – simple model interfaces.}
+  spec.authors       = ["inre"]
+  spec.email         = ["inre.strom@gmail.com"]
+  spec.summary       = %q{Model Pack – simple models}
   #spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
   spec.license       = "MIT"

data/spec/model_pack_spec.rb

@@ -237,26 +237,6 @@ 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
@@ -289,46 +269,17 @@ describe ModelPack::ClassMethods do
     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
+  it "supports boolean as default" do
+    class BooleanData
       include ModelPack::Document
 
-      attribute :required
-
-      attr_accessor :req
-
-      def initialize(req)
-        @req = req
-      end
+      attribute :always_false, default: false
+      attribute :always_true,  default: true
     end
 
-    object1 = ObjectWithCustomConstructor.new('GET', required: false)
-    object2 = ObjectWithCustomConstructor.new('POST')
+    data = BooleanData.new
 
-    expect(object1.req).to eq 'GET'
-    expect(object1.required).to be false
-    expect(object2.req).to eq 'POST'
-    expect(object2.required).to be nil
+    expect(data.always_false).to be false
+    expect(data.always_true).to be true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
-- che
+- inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ dependencies:
         version: 3.0.0
 description: 
 email:
-- chelovekov@gmail.com
+- inre.strom@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -96,10 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Model Pack – simple model interfaces.
+summary: Model Pack – simple models
 test_files:
 - spec/model_pack_spec.rb
 - spec/spec_helper.rb