model_pack 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a566b021fe29847c5ec63d781de237c037f693b9
-  data.tar.gz: fd18beaa67efba4dc52f43488c494ecf489f4e2a
+  metadata.gz: dabb01b01889b40d35d86225715aa392b26c9998
+  data.tar.gz: 85c4e83fb4e2fc2af86d31f864c0277e04d0db54
 SHA512:
-  metadata.gz: 512ef1c65902e3e0eeb14f53e4c69152853c9b7c0353a9a58c3a5294edd36fd786e50a8b9b8ad1d657975f5d661356d3954cb124b0cf4d10a70b1586397d52d4
-  data.tar.gz: d9e615aef19f355b001e65a6a5a85527b0330d6805597e5a5ef43bdc5213a22bf762297844737d3fe7b32a1b7a278fe96433c17850a1babc45171f1a3d6b88ff
+  metadata.gz: cf57987290bb914c78f5cfa6d62bb00ebc26f2676cace86713feba5d9ef2a2504a8a2803558e4f1811550daadd9b6c461286aeb49d86c185c98e434e934fabb3
+  data.tar.gz: 7f587c452db113574c71c11612781e0001c1db57f8e0387ade3d3677d3754ce0b10d34a6d57473453d63da0ae82901579af5c12d8326d9ea5f9148162376d98c

data/README.md

@@ -60,9 +60,9 @@ puts line.length
 ```ruby
 class Polygon
 	include ModelPack::Document
-  
+
 	array :points, class_name: Point
-  
+
 	def sides
 		return [] if points.size < 2
 		[[points.first]].tap do |sides|
@@ -73,7 +73,7 @@ class Polygon
       			sides.last.push(points.first)
     		end
  	end
- 
+
 	def perimeter
 		sides.inject(0) { |sum, side| sum + Math.sqrt((side[0].x-side[1].x)**2 + (side[0].y-side[1].y)**2) }
 	end
@@ -86,7 +86,7 @@ puts polygon.perimeter
 
 ```ruby
 polygon = Polygon.new(points: [{x: 0, y: 0}, {x:5, y:0}, {x:5, y:5}])
-json = polygon.as_json()     # same serializable_hash
+json = polygon.as_json     # same serializable_hash
 ```
 
 ### Копирование моделей
@@ -94,7 +94,7 @@ json = polygon.as_json()     # same serializable_hash
 ```ruby
 polygon = Polygon.new(points: [{x: 3, y: 3}, {x:2, y:1}, {x:4, y:2}])
 polygon_copy = polygon.copy   # same polygon_copy = Polygon.new(polygon.serializable_hash)
-puts polygon_copy
+puts polygon_copy.serializable_hash
 ```
 
 ### Выборочная сериализация
@@ -102,9 +102,9 @@ puts polygon_copy
 ```ruby
 class SecureData
 	include ModelPack::Document
-	attribute :hidden_field, writer: lambda { |v| nil }
-	attribute :const_field, writer: lambda { |v| :always_this }
-	attribute :always_string, writer: lambda { |v| v.to_s }
+	attribute :hidden_field, serialize: lambda { |v| nil }
+	attribute :const_field, serialize: lambda { |v| :always_this }
+	attribute :always_string, serialize: lambda { |v| v.to_s }
 end
 secure_data = SecureData.new( hidden_field: "secured text", const_field: :some_value, always_string: 55)
 unsecure_hash = secure_data.serializable_hash

data/lib/model_pack/attribute_methods.rb

@@ -18,14 +18,14 @@ module ModelPack
       self.class.attribute_names.inject({}) { |h, name| h[name] = send(name); h  }
     end
 
-    def update_attributes(*attributes)
+    def update_attributes(attributes)
       attributes.each do |name, attribute|
         key = "#{name}="
         send(key, attribute) if respond_to?(key)
       end
     end
 
-    def update_attributes!(*attributes)
+    def update_attributes!(attributes)
       # check present first
       attributes.each do |name, attribute|
         raise ArgumentError, "undefined attribute `#{name}`" unless attribute_names.include?(method)

data/lib/model_pack/class_methods.rb

@@ -1,8 +1,8 @@
 module ModelPack
   module ClassMethods
 
-    def attribute(name, writer: lambda { |v| v }, default: nil, as: nil, serialize: nil)
-      attribute_reader(name, default: default, as: as, serialize: serialize)
+    def attribute(name, writer: lambda { |v| v }, default: nil, as: nil, serialize: nil, predicate: nil)
+      attribute_reader(name, default: default, as: as, serialize: serialize, predicate: predicate)
       attribute_writer(name, writer: writer)
       register_attribute(name)
     end
@@ -13,7 +13,7 @@ module ModelPack
       end
     end
 
-    def attribute_reader(name, default: nil, as: nil, serialize: nil)
+    def attribute_reader(name, default: nil, as: nil, serialize: nil, predicate: nil)
       default_dup = default.dup rescue default
       default_value = default_dup || (as && as.new)
 
@@ -21,6 +21,12 @@ module ModelPack
         instance_variable_defined?("@#{name}") ? instance_variable_get("@#{name}") : instance_variable_set("@#{name}", default_value)
       end
 
+      # define predicate method if required
+      define_method "#{name}?" do
+        value = (instance_variable_defined?("@#{name}") ? instance_variable_get("@#{name}") : instance_variable_set("@#{name}", default_value))
+        predicate.is_a?(Proc) ? predicate.call(value)  : !!value  # false for nil or false
+      end if predicate
+
       define_method "#{name}_hash" do
         instance_exec(send(name), &serialize)
       end if serialize
@@ -38,13 +44,14 @@ module ModelPack
           default: default,
           serialize: serialize,
           as: Array,
-          writer: writer || lambda { |array| array.collect { |v| v.is_a?(Hash) && class_name ? class_name.new(v) : v } })
+          writer: writer || lambda { |array| array.is_a?(Array) ? (array.collect { |v| v.is_a?(Hash) && class_name ? class_name.new(v) : v }) : [] })
     end
 
-    def hashable(name, default: nil, serialize: nil)
+    def dictionary(name, class_name: nil, default: nil, serialize: nil, writer: nil)
       attribute(name,
           default: default,
           serialize: serialize,
+          writer: writer || lambda { |dictionary| Hash[dictionary.map { |k,v| [k, v.is_a?(Hash) && class_name ? class_name.new(v) : v]}] },
           as: Hash)
     end
   end

data/lib/model_pack/constructor.rb

@@ -2,7 +2,7 @@ module ModelPack
   module Constructor
     def initialize(*a)
       attributes = a.pop
-      update_attributes(*attributes) if attributes
+      update_attributes(attributes) if attributes
       super(*a)
     end
   end

data/lib/model_pack/serialization.rb

@@ -53,7 +53,8 @@ module ModelPack
         when Hash
           enumerable_value[value, opts, global]
         end
-        hash[n] = data if data
+
+        hash[n] = data unless data.nil?
       end
       hash
     end

data/lib/model_pack/version.rb

@@ -1,3 +1,3 @@
 module ModelPack
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/model_pack_spec.rb

@@ -23,6 +23,13 @@ describe ModelPack::ClassMethods do
     expect(point.attributes).to include({x: 3, y: 5})
   end
 
+  it "should update_attributes change values" do
+    point = Point.new(x: 4, y: 6)
+    point.update_attributes(x:3, y:2)
+    expect(point.x).to be(3)
+    expect(point.y).to be(2)
+  end
+
   it "should create embedded models" do
     class Line
       include ModelPack::Document
@@ -115,25 +122,111 @@ describe ModelPack::ClassMethods do
     end
   end
 
-  it "should model have hashable field" do
+  it "should model have nary field" do
     class Options
       include ModelPack::Document
 
-      hashable :options
+      dictionary :options
+      dictionary :points, class_name: Point
 
       def method_missing(name, *a)
         options[name]
       end
     end
 
-    options = Options.new(options: { a: 5, b: 6 })
+    options = Options.new(
+      options: { a: 5, b: 6 },
+      points: {
+        "a" => {x:0, y:1},
+        "b" => {x:1, y:3},
+        "c" => {x:3, y:2}
+      }
+    )
 
     expect(options.a).to be(5)
     expect(options.b).to be(6)
+    expect(options.points['a'].x).to be(0)
+    expect(options.points['b'].y).to be(3)
+    expect(options.points['c'].y).to be(2)
+  end
+
+  it "should initizalize with string attributes" 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 serialize model with custom serializer" do
+    class IntData
+      include ModelPack::Document
+      attribute :integer, serialize: lambda { |v| 5 }
+    end
+
+    int_data = IntData.new(integer: 13)
+    expect(int_data.serializable_hash[:integer]).to be(5)
+  end
+
+  it "should have initialize" do
+    class StringBuffer
+      include ModelPack::Document
+
+      attribute :buffer, default: ''
+      attribute :position
+
+      def initialize
+        @position = buffer.size
+      end
+    end
 
+    buffer = StringBuffer.new(buffer: 'Lorem Ipsum')
+    expect(buffer.position).to be(11)
   end
 
+  it "should have peredicate method" do
+    class OptionsWithPredicate
+      include ModelPack::Document
+
+      attribute :save, predicate: true
+      attribute :load, predicate: lambda { |v| !!v ? 'YES' : 'NO'  }
+    end
+
+    owp = OptionsWithPredicate.new(
+      save: true,
+      load: true
+    )
+    expect(owp.save?).to be true
+    expect(owp.load?).to eq('YES')
+
+    owp = OptionsWithPredicate.new(
+      save: false,
+      load: false
+    )
+    expect(owp.save?).to be false
+    expect(owp.load?).to eq('NO')
+
+    owp = OptionsWithPredicate.new
+
+    expect(owp.save?).to be false
+    expect(owp.load?).to eq('NO')
+  end
+
+
+  it "should boolean type works well" do
+    class BooleanData
+      include ModelPack::Document
+
+      attribute :bit
+    end
+
+    true_data = BooleanData.new(bit: true)
+    false_data = BooleanData.new(bit: false)
+    copy_true_data = true_data.copy
+    copy_false_data = false_data.copy
+
+    expect(true_data.serializable_hash[:bit]).to be true
+    expect(false_data.serializable_hash[:bit]).to be false
+    expect(copy_true_data.serializable_hash[:bit]).to be true
+    expect(copy_false_data.serializable_hash[:bit]).to be false
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler