parametric 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63dc92f4d7d45a1233ee42749f2a6511dfe0de3efa8fbc2f7fc2dd54e2832f70
-  data.tar.gz: c2540792da112e082f610af8801a3f3609f1baee808971cf46ae1c1b0fccb9fc
+  metadata.gz: ef9d011c06f718caa4de95a60589cd858f693a98085a1962c8882e9213effd26
+  data.tar.gz: f759c6f6d051935a36d6a080b15602b628e4967b9b052d9ec3c5f912bf5a9b2e
 SHA512:
-  metadata.gz: 5acd3bb1c560f340f42b82612adf14e8696293c1f053407ee67cdfba991a9745c6c5db770fe499c0a87b94e118e1f13c442d4063d9ffa2ee63a10c358c796573
-  data.tar.gz: 1c56887e85b884dad8211b27faf748b3be1352eda48b15a19c76160e81f3cc359cc3f1cdcc4c1462efdcf778c01ba51bda3bf5f74de5a412aed1c0a7e28168ce
+  metadata.gz: 8f4867518fb179f164983751d2d6143a324eff9a961b91618e02677c74fe8e596f9f8d48a25582e2955c339f8128565b9cfaee95ca73f3a128a6b5861c5638aa
+  data.tar.gz: 87c47b5d47339b543027cff38b2f3a8a343ff27342ddfd1611fe0953c5b3169dee3064ac014a865382eebea0a87caab554312539f279648be43c66651c3a18b0

data/lib/parametric/schema.rb

@@ -44,11 +44,16 @@ module Parametric
       copy_into instance
     end
 
-    def merge(other_schema)
-      instance = self.class.new(options.merge(other_schema.options))
+    def merge(other_schema = nil, &block)
+      raise ArgumentError, '#merge takes either a schema instance or a block' if other_schema.nil? && !block_given?
 
-      copy_into(instance)
-      other_schema.copy_into(instance)
+      if other_schema
+        instance = self.class.new(options.merge(other_schema.options))
+        copy_into(instance)
+        other_schema.copy_into(instance)
+      else
+        merge(self.class.new(&block))
+      end
     end
 
     def copy_into(instance)

data/lib/parametric/version.rb

@@ -1,3 +1,3 @@
 module Parametric
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/schema_spec.rb

@@ -169,6 +169,17 @@ describe Parametric::Schema do
         expect(new_schema.fields[:title].meta_data[:type]).to eq :string
         expect(new_schema.fields[:price].meta_data[:type]).to eq :string
       end
+
+      it 'can merge from a block' do
+        new_schema = schema1.merge do
+          field(:price).policy(:string)
+          field(:description).policy(:string)
+        end
+
+        expect(schema1.fields[:price].meta_data[:type]).to eq :integer
+        expect(new_schema.fields[:title].meta_data[:type]).to eq :string
+        expect(new_schema.fields[:price].meta_data[:type]).to eq :string
+      end
     end
 
     context "with options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parametric
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ismael Celis