strong_json 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0361a33f682e9ba1f121b0936ae8fe93f319cba
-  data.tar.gz: c4128c7ed52306c800078de3f5121c2fe9b951a3
+  metadata.gz: 11c5dbfb77d22e1c192653aec8a65425fc89037a
+  data.tar.gz: 4c0a5335c72ee7dbe8197f88d00bf695d8175255
 SHA512:
-  metadata.gz: 255f8a7b8e988dd081cb1ab82d916861b25effdc26bf854acbbaaad0eb3746751cc95756761e0eb8269202fd2ccd3a8160de52bcf99cbcdadd28a06224726cdf
-  data.tar.gz: 04e267544534ec7043132494c13c7cadba63b0e61f303445714bcf5207e85eabae0675eaababc099a5cdd1aa17f73640a0d5914c9de574badb9a203ca7f7809c
+  metadata.gz: 6ad64a761127eafdae6dc349a6afa3940525fac50e7e6300ef8ecb1346b3fef065e9c84646b95853398e137a7c4db183a07bd3ea1c1c28abbd2916ef324144fd
+  data.tar.gz: 937d1ef703bc65838c4d02c357ff5d96ee963f40b1fc22f3f3add66d61b127646df023b8700c504de3630385ac08fe19faa572fdf627fca40a3e300f1447704b

data/README.md

@@ -30,7 +30,7 @@ s = StrongJSON.new do
   let :order, object(customer: customer, items: array(item))
 end
 
-json = s.order.coerce(JSON.parse(input), symbolize_names: true)
+json = s.order.coerce(JSON.parse(input, symbolize_names: true))
 s.order =~ JSON.parse(input, symbolize_names: true)
 
 case JSON.parse(input2, symbolize_names: true)
@@ -57,6 +57,26 @@ If an attribute has a value which does not match with given type, the `coerce` m
 * Fields, `f1`, `f2`, and ..., must be present and its values must be of `type1`, `type2`, ..., respectively
 * Objects with other fields will be rejected
 
+#### Performance hint
+
+Object attributes test is done in order of the keys.
+
+```ruby
+slower_object = enum(
+  object(id: numeric, created_at: string, updated_at: string, type: literal("person"), name: string),
+  object(id: numeric, created_at: string, updated_at: string, type: literal("food"), object: any)
+)
+
+faster_object = enum(
+  object(type: literal("person"), id: numeric, created_at: string, updated_at: string, name: string),
+  object(type: literal("food"), id: numeric, created_at: string, updated_at: string, object: any)
+)
+```
+
+The two enums represents same object, but testing runs faster with `faster_object`.
+Objects in `faster_object` have `type` attribute as their first keys.
+Testing `type` is done first, and it soon determines if the object is `"person"` or `"food"`.
+
 ### array(type)
 
 * The value must be an array

data/lib/strong_json/type.rb

@@ -139,10 +139,14 @@ class StrongJSON
 
         result = {}
 
-        all_keys = (@fields.keys + object.keys).sort.uniq
-        all_keys.each do |key|
-          type = @fields.has_key?(key) ? @fields[key] : NONE
-          value = object.has_key?(key) ? object[key] : NONE
+        object.each do |key, value|
+          unless @fields.key?(key)
+            raise UnexpectedFieldError.new(path: path + [key], value: value)
+          end
+        end
+
+        @fields.each do |key, type|
+          value = object.key?(key) ? object[key] : NONE
 
           test_value_type(path + [key], type, value) do |v|
             result[key] = v
@@ -153,10 +157,6 @@ class StrongJSON
       end
 
       def test_value_type(path, type, value)
-        if NONE.equal?(type) && !NONE.equal?(value)
-          raise UnexpectedFieldError.new(path: path, value: value)
-        end
-
         v = type.coerce(value, path: path)
 
         return if NONE.equal?(v) || NONE.equal?(type)

data/lib/strong_json/version.rb

@@ -1,3 +1,3 @@
 class StrongJSON
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/object_spec.rb

@@ -30,7 +30,7 @@ describe StrongJSON::Type::Object do
     it "rejects objects with missing fields" do
       type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:numeric))
 
-      expect{ type.coerce(b: "test") }.to raise_error(StrongJSON::Type::Error)
+      expect{ type.coerce(b: "test") }.to raise_error(StrongJSON::Type::UnexpectedFieldError)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler