strong_json 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8c22cee2e96c616585aab8e4c116daa4e64944a
-  data.tar.gz: 0b52394883010d69ffa7cfc65107f2b7bd381987
+  metadata.gz: 4a009e9385e3e0d6dceed251b6951e533d8d9cae
+  data.tar.gz: 26c8e89826ebe9b88b325c647c662d7b89013ddf
 SHA512:
-  metadata.gz: 553c80f3d3c1941cf154b852662cbc462b523e77e11a2d49c12d98847ec412bf17a200c3756bb31f165c3e1c84759a278e4e65de90bff9f0db1998c693796561
-  data.tar.gz: 55fcd6bbb18191de401fc6aa9d29b23d0c0a07a5d217aebe3db7b477959602d22ae7670f744ae75c686b1ac3eaf25168c957caefc58ad08fcd4ea2f0ce4182da
+  metadata.gz: d597908375f4112ee71f931f60a4c489ead56ae2c56c31fac8f185375aad38539ded3b846e8ce4207d32641f4641cccb244dc28ee8dcf20487f0dfb12108de5b
+  data.tar.gz: 643ca3880954ba6fd3f5ac9654313d604744c50f79142af703364281d1aab35d406b3610fced4b1ef0a79fc5a711d95fb03887c22cb7f77294d687b9d6898c79

data/README.md

@@ -75,6 +75,11 @@ There are some alias for `optional(base)`, where base is base types, as the foll
 * `boolean?`
 * `numeric?`
 
+Shorthands for `optional(array(ty))` and `optional(object(fields))` are also defined as the following:
+
+* `array?(ty)`
+* `object?(fields)`
+
 ## Contributing
 
 1. Fork it ( https://github.com/soutaro/strong_json/fork )

data/lib/strong_json/type.rb

@@ -110,7 +110,7 @@ class StrongJSON
         v = type.coerce(value, path: path)
 
         return if NONE.equal?(v) || NONE.equal?(type)
-        return if type.is_a?(Optional) && v == nil
+        return if type.is_a?(Optional) && NONE.equal?(value)
 
         yield(v)
       end

data/lib/strong_json/types.rb

@@ -55,5 +55,13 @@ class StrongJSON
     def ignored
       StrongJSON::Type::Base.new(:ignored)
     end
+
+    def array?(ty)
+      optional(array(ty))
+    end
+
+    def object?(fields)
+      optional(object(fields))
+    end
   end
 end

data/lib/strong_json/version.rb

@@ -1,3 +1,3 @@
 class StrongJSON
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/object_spec.rb

@@ -32,12 +32,23 @@ describe StrongJSON::Type::Object do
 
       expect{ type.coerce(b: "test") }.to raise_error(StrongJSON::Type::Error)
     end
+  end
 
+  describe "optional" do
     it "accepts missing field if optional" do
       type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Optional.new(StrongJSON::Type::Base.new(:numeric)))
-
       expect(type.coerce({})).to eq({})
     end
+
+    it "preserves if present" do
+      type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Optional.new(StrongJSON::Type::Base.new(:numeric)))
+      expect(type.coerce({ a: "-123" })).to eq({ a: "-123" })
+    end
+
+    it "preserves nil if present" do
+      type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Optional.new(StrongJSON::Type::Base.new(:numeric)))
+      expect(type.coerce({ a: nil })).to eq({ a: nil })
+    end
   end
 
   describe "#merge" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Type check JSON objects