strong_json 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d483b7a44d8b5dff5e7fa548376551d458a6e6
-  data.tar.gz: c1156e637dfc48a712dcfa2ccf71864f18918535
+  metadata.gz: a5ae6973c112d772bdc495d5d50d5148f767bc71
+  data.tar.gz: 9c08bcd7842863cd40b727bf05007fec4be82f23
 SHA512:
-  metadata.gz: 615fc0454b7898ea953a67c92386676d4d599a98569e093ffae4350140d733f69a0da0c79cb5fe0c7bf99ec5ad378a004929adbe942e7784fc2a31ea5dcb9fa1
-  data.tar.gz: 3ca93c4ff958334fdd35cf8372c2b1c05a9e8031749df0188a1c612f83b32b15991a5d419038977ecb3269861628a760ca69c1a18ff8f37c62ccee93783174a3
+  metadata.gz: 6da4d4154502cc0bc422b1b5b1ff22c2033972d5cda06cdaeee3241c5d4eaa511151f622a6297e00dbaad632e20591fe67e1b9415cf755bd44ff83f9c77f5cc7
+  data.tar.gz: 50668c460b0ac655c48b6a93b4fd1e8c631474e1b70ab3c2850a4bf54e0ac92419a618d708e36fe3ab420f0189f3a61bd1e009019a4ccc51703bf989d02c8e63

data/lib/strong_json/type.rb

@@ -167,7 +167,7 @@ class StrongJSON
 
       def merge(fields)
         if fields.is_a?(Object)
-          fields = Object.instance_variable_get("@fields")
+          fields = fields.instance_variable_get("@fields")
         end
 
         Object.new(@fields.merge(fields))

data/lib/strong_json/version.rb

@@ -1,3 +1,3 @@
 class StrongJSON
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/object_spec.rb

@@ -65,6 +65,18 @@ describe StrongJSON::Type::Object do
 
       expect{ ty2.coerce(a: 123) }.to raise_error(StrongJSON::Type::Error)
     end
+
+    it "adds field via object" do
+      ty2 = type.merge(StrongJSON::Type::Object.new(b: StrongJSON::Type::Base.new(:string)))
+
+      expect(ty2.coerce(a: 123, b: "test")).to eq(a: 123, b: "test")
+    end
+
+    it "overrides field via object" do
+      ty2 = type.merge(StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:prohibited)))
+
+      expect{ ty2.coerce(a: 123) }.to raise_error(StrongJSON::Type::Error)
+    end
   end
 
   describe "#except" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler