model_pack 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cfeef0bbf2f502e3fbf434242a0b60201777a28
-  data.tar.gz: 1d7a66e4339cdf3abeb7acb200af352c24d56995
+  metadata.gz: 9a7f884f06e518d29fc6644b38ad37813b3c15e3
+  data.tar.gz: c845a60e80628ad55ef0a2e8775a366808238f61
 SHA512:
-  metadata.gz: 427e3427adb70a27846e513e784719a34381a83b1d0c7688475e1db5ddd75b68ddc4fe135bc30fdb2aee303724c105bb502d8f0d27e5d752916a1c121a12eaf0
-  data.tar.gz: 83c85f6789d7a05e3c83826110fe9fcb999ed1832a5fe83022898f4eec4e6818f403d58ac5ca9e03b0e55b8ecd4342af3b7d8379e4c471a8db24ab699f21c599
+  metadata.gz: 6c897776daee8e42b74e9b2264702fc58d843e166f4fdd344bafb52bc511c96ecf71d793b51b15b77a23cd1e0f9a2825ab9ae88930c8eab53392f1497e7d9b27
+  data.tar.gz: fdaeb38967e99dd6849d6acefbb776a5e506072f3ffbfd7677767c4f49c78d52b2ecf58fc7dcb4984257ee82e2d87b694de6a0f27d279e7de0b58d83fb9ccbf7

data/lib/model_pack/attribute_methods.rb

@@ -11,7 +11,9 @@ module ModelPack
       end
 
       def attribute_names
-         class_variable_defined?(:@@attribute_names) ? class_variable_get(:@@attribute_names) : class_variable_set(:@@attribute_names, Array.new)
+         names = instance_variable_defined?(:@attribute_names) ?
+            instance_variable_get(:@attribute_names) :
+            instance_variable_set(:@attribute_names, superclass.respond_to?(:attribute_names) ? superclass.attribute_names.clone : Array.new)
       end
     end
 

data/lib/model_pack/version.rb

@@ -1,3 +1,3 @@
 module ModelPack
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/spec/model_pack_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ModelPack::ClassMethods do
 
-  it "should create model with default fields" do
+  it "should create model with defaults" do
     class Point
       include ModelPack::Document
 
@@ -16,14 +16,14 @@ describe ModelPack::ClassMethods do
     expect(point.attributes).to include({x: 0, y: 0})
   end
 
-  it "should create model and fill it thought initialization" do
+  it "should create filled model" do
     point = Point.new(x: 3, y: 5)
     expect(point.x).to be(3)
     expect(point.y).to be(5)
     expect(point.attributes).to include({x: 3, y: 5})
   end
 
-  it "should update_attributes change values" do
+  it "should change attributes" do
     point = Point.new(x: 4, y: 6)
     point.update_attributes(x:3, y:2)
     expect(point.x).to be(3)
@@ -89,7 +89,7 @@ describe ModelPack::ClassMethods do
     expect(json[:points][2]).to include({x: 5, y:5})
   end
 
-  it "should each attribute use writer" do
+  it "should use each attribute like writer" do
     class SecureData
       include ModelPack::Document
 
@@ -121,7 +121,7 @@ describe ModelPack::ClassMethods do
     expect(unsecure_hash).to include(always_string: "55")
   end
 
-  it "should argument error method with name *method* already exists" do
+  it "should not allow method with name `method`" do
     expect {
       class Request
         include ModelPack::Document
@@ -131,7 +131,7 @@ describe ModelPack::ClassMethods do
     }.to raise_error
   end
 
-  it "should serialize and load back model" do
+  it "should serialize and upload model" do
     polygon = Polygon.new(points: [{x: 3, y: 3}, {x:2, y:1}, {x:4, y:2}])
     polygon_copy = Polygon.new(polygon.serializable_hash) # or as_json
     expect(polygon_copy.points).to be_a(Array)
@@ -140,7 +140,7 @@ describe ModelPack::ClassMethods do
     end
   end
 
-  it "should create copy of model" do
+  it "should copy model" do
     polygon = Polygon.new(points: [{x: 3, y: 3}, {x:2, y:1}, {x:4, y:2}])
     polygon_copy = polygon.copy
     polygon.points.each_with_index do |point, index|
@@ -148,7 +148,7 @@ describe ModelPack::ClassMethods do
     end
   end
 
-  it "should model have nary field" do
+  it "should have nary field" do
     class Options
       include ModelPack::Document
 
@@ -209,7 +209,7 @@ describe ModelPack::ClassMethods do
     expect(buffer.position).to be(11)
   end
 
-  it "should have peredicate method" do
+  it "should have predicate method" do
     class OptionsWithPredicate
       include ModelPack::Document
 
@@ -237,7 +237,7 @@ describe ModelPack::ClassMethods do
     expect(owp.load?).to eq('NO')
   end
 
-  it "should boolean type works well" do
+  it "should boolean type to work too" do
     class BooleanData
       include ModelPack::Document
 
@@ -255,7 +255,7 @@ describe ModelPack::ClassMethods do
     expect(copy_false_data.serializable_hash[:bit]).to be false
   end
 
-  it "should create unique array for each instance" do
+  it "should create unique array for each of instance" do
     class ArrayData
       include ModelPack::Document
 
@@ -263,13 +263,13 @@ describe ModelPack::ClassMethods do
     end
 
     array1 = ArrayData.new
-    array1.data << 1
+    array1.data § 1
     array2 = ArrayData.new
     expect(array1.data.size).to be 1
     expect(array2.data.size).to be 0
   end
 
-  it "supports boolean as default" do
+  it "supports boolean as default values" do
     class BooleanData
       include ModelPack::Document
 
@@ -285,7 +285,7 @@ describe ModelPack::ClassMethods do
     expect(data.dynamic_default).to be 6
   end
 
-  it "as class in model" do
+  it "has a class in the model" do
     class NestedObject
       include ModelPack::Document
       attribute :a, default: 5
@@ -294,9 +294,31 @@ describe ModelPack::ClassMethods do
     class ParentObject
       include ModelPack::Document
       object :nested, class_name: NestedObject, as: NestedObject
+      attribute :b, default: 1
     end
 
     parent = ParentObject.new
     expect(parent.nested.a).to be 5
   end
+
+  it "inherits another document" do
+    class BaseDocument
+      include ModelPack::Document
+      attribute :param, default: 'val'
+    end
+
+    class CustomDocument < BaseDocument
+      include ModelPack::Document
+      attribute :first, default: 'foo'
+    end
+
+    class AnotherDocument < BaseDocument
+      include ModelPack::Document
+      attribute :second, default: 'bar'
+    end
+
+    expect(BaseDocument.new.attributes).to eq(param: 'val');
+    expect(CustomDocument.new.attributes).to eq(param: 'val', first: 'foo');
+    expect(AnotherDocument.new.attributes).to eq(param: 'val', second: 'bar');
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,10 +96,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Model Pack – simple models
 test_files:
 - spec/model_pack_spec.rb
 - spec/spec_helper.rb
+has_rdoc: