strong_json 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 203acba136e0a5e13955cb71eaf772b437490bf1
-  data.tar.gz: d7e81bffc189686f7d3ea48d5c589456aa30253b
+SHA256:
+  metadata.gz: b38c3654e379c46a4b5567f8c256c72da14ca8efa3bd64deef2b56c4e037957d
+  data.tar.gz: b3b3832aa8b1e76a84c2210234f34b8abcecc02a3d42848ae871e648f41e35f8
 SHA512:
-  metadata.gz: f1d96614ae765a7eb3287b51d83dfbdaf07384c2316e32f41bc38f4ff85beadb3248bd751f814fbe27b1049cf329a5c2365894781c1c398d0e606dbf179b3728
-  data.tar.gz: 6fb5d0c5ed6b24c26994268c72d116bb7d70efd932648437bc644259a5828ec0c34ad1077466ffdb274e31e2805947b6638c76e4a75376efa4d823dc18972cce
+  metadata.gz: c2a949f49b357ffa0496bf1d6646d57190b6c26633ce604ef2cb30f6faf72b9d89de3b88172dac22776914b053eb5081c80a75bbdbf88217d1ff04d3bfdfe3c8
+  data.tar.gz: d74c050d81ee145056978925f475e216692c107536258306857b4379288318930fafecce803d9e02454cd7997ab3b925005019ddad6a098a9750c0db7b0276cf

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - "2.3.3"
   - "2.4.1"
+  - "2.5.1"

data/lib/strong_json/type.rb

@@ -80,7 +80,7 @@ class StrongJSON
       end
 
       def to_s
-        "optinal(#{@type})"
+        "optional(#{@type})"
       end
     end
 
@@ -204,18 +204,14 @@ class StrongJSON
       end
 
       def coerce(value, path: [])
-        result = types.find do |ty|
+        types.each do |ty|
           begin
-            break ty.coerce(value)
+            return ty.coerce(value, path: path)
           rescue UnexpectedFieldError, IllegalTypeError, Error # rubocop:disable Lint/HandleExceptions
           end
         end
 
-        if result
-          result
-        else
-          raise Error.new(path: path, type: self, value: value)
-        end
+        raise Error.new(path: path, type: self, value: value)
       end
     end
 

data/lib/strong_json/version.rb

@@ -1,3 +1,3 @@
 class StrongJSON
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/enum_spec.rb

@@ -26,7 +26,9 @@ describe StrongJSON::Type::Enum do
                                    StrongJSON::Type::Object.new(id: StrongJSON::Type::Literal.new("id1"),
                                                                 value: StrongJSON::Type::Base.new(:string)),
                                    StrongJSON::Type::Object.new(id: StrongJSON::Type::Base.new(:string),
-                                                                value: StrongJSON::Type::Base.new(:symbol))
+                                                                value: StrongJSON::Type::Base.new(:symbol)),
+                                   StrongJSON::Type::Optional.new(StrongJSON::Type::Literal.new(3)),
+                                   StrongJSON::Type::Literal.new(false),
                                  ])
     }
 
@@ -38,6 +40,14 @@ describe StrongJSON::Type::Enum do
       expect(type.coerce({id: "id2", value: "foo" })).to eq({ id: "id2", value: :foo })
     end
 
+    it "accepts false" do
+      expect(type.coerce(false)).to eq(false)
+    end
+
+    it "accepts nil" do
+      expect(type.coerce(nil)).to eq(nil)
+    end
+
     it "raises error" do
       expect { type.coerce(3.14) }.to raise_error(StrongJSON::Type::Error)
     end

data/spec/json_spec.rb

@@ -12,14 +12,14 @@ describe "StrongJSON.new" do
 
   it "tests enums" do
     s = StrongJSON.new do
-      let :enum, object(e1: enum(string, number), e2: enum?(literal(1), literal(2)))
+      let :enum, object(e1: enum(boolean, number), e2: enum?(literal(1), literal(2)))
     end
 
-    expect(s.enum.coerce(e1: "")).to eq(e1: "")
+    expect(s.enum.coerce(e1: false)).to eq(e1: false)
     expect(s.enum.coerce(e1: 0)).to eq(e1: 0)
     expect(s.enum.coerce(e1: 0, e2: 1)).to eq(e1: 0, e2: 1)
     expect(s.enum.coerce(e1: 0, e2: 2)).to eq(e1: 0, e2: 2)
-    expect{ s.enum.coerce(e1: false) }.to raise_error(StrongJSON::Type::Error)
     expect{ s.enum.coerce(e1: "", e2: 3) }.to raise_error(StrongJSON::Type::Error)
+    expect{ s.enum.coerce(e1: false, e2: "") }.to raise_error(StrongJSON::Type::Error)
   end
 end

data/strong_json.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["matsumoto@soutaro.com"]
   spec.summary       = "Type check JSON objects"
   spec.description   = "Type check JSON objects"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/soutaro/strong_json"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ files:
 - spec/object_spec.rb
 - spec/optional_spec.rb
 - strong_json.gemspec
-homepage: ''
+homepage: https://github.com/soutaro/strong_json
 licenses:
 - MIT
 metadata: {}
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Type check JSON objects