strong_json 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf88492fb72b27293db582e0c533f523ebc9847e
-  data.tar.gz: 6d1fb792714bd945e8d8a587df0ce8f08a7b59a6
+  metadata.gz: e4ebb2da5c4e3d195b5141cff335676d87868bf7
+  data.tar.gz: 8effc10c56e7208a846bbde39a144d2bb03bb91a
 SHA512:
-  metadata.gz: 04dce37728688528ef296cf732d87d4d17785d7d217536298a1ec0788002bd602c4c2ee4ae27621b70ccb197e4c725acf714b5ecdfab58a6bfdc189ab35a455d
-  data.tar.gz: a26a4cb4f300733f2136183fe4044171761fbe15d9611cf6f92ca6ed6b5c4d445a27b2f61212d53ebb115800ca73f463c0fcf2962398ecc677f9c54012d23f61
+  metadata.gz: 377ee5533793e2523b521721dfbb567e63f10077521905a19209b0e71201951fd7a2c9c2a2249fe10bac148df661a696d103ec252f3286cd8b1f672cb9b546a7
+  data.tar.gz: de56ca69657851d241233562be8ec5cc95296639e6991be9121fd49826282b8cc485dcd184c0e6c038236a2c7eac584d8bc029df0464a4528a79f36511cf656e

data/README.md

@@ -67,6 +67,15 @@ If the input JSON contains `prohibited` attributes, `id` of `item` in the exampl
 * `any` Any value except `nil` is accepted
 * `prohibited` Any value will be rejected
 
+### Shortcuts
+
+There are some alias for `optional(base)`, where base is base types, as the following:
+
+* `number?`
+* `string?`
+* `boolean?`
+* `numeric?`
+
 ## Contributing
 
 1. Fork it ( https://github.com/soutaro/strong_json/fork )

data/lib/strong_json/type.rb

@@ -1,14 +1,16 @@
 class StrongJSON
   module Type
+    NONE = ::Object.new
+
     class Base
       def initialize(type)
         @type = type
       end
 
-      def test(value)
+      def test(value, absent = false)
         case @type
         when :prohibited
-          false
+          NONE.equal?(value)
         when :any
           true
         when :number
@@ -40,7 +42,7 @@ class StrongJSON
       end
 
       def coerce(value, path: [])
-        if value != nil
+        unless value == nil || NONE.equal?(value)
           @type.coerce(value, path: path)
         else
           nil
@@ -85,7 +87,7 @@ class StrongJSON
         result = {}
 
         @fields.each do |name, ty|
-          value = ty.coerce(object[name], path: path + [name])
+          value = ty.coerce(object.has_key?(name) ? object[name] : NONE, path: path + [name])
           result[name] = value if object.has_key?(name)
         end
 
@@ -100,6 +102,12 @@ class StrongJSON
         Object.new(@fields.merge(fields))
       end
 
+      def except(*keys)
+        Object.new(keys.each.with_object(@fields.dup) do |key, hash|
+                     hash.delete key
+                   end)
+      end
+
       def to_s
         fields = []
 
@@ -121,7 +129,8 @@ class StrongJSON
       end
 
       def to_s
-        "Expected type of value at #{path.join('.')} (#{value}) is #{type}"
+        position = " at #{path.join('.')}"
+        "Expected type of value #{value}#{position} is #{type}"
       end
     end
   end

data/lib/strong_json/version.rb

@@ -1,3 +1,3 @@
 class StrongJSON
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/object_spec.rb

@@ -15,10 +15,18 @@ describe StrongJSON::Type::Object do
       expect(type.coerce(a: 123, b: true)).to eq(a: 123)
     end
 
-    it "rejects prohibited fields" do
-      type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:prohibited))
+    describe "prohibited" do
+      it "rejects field with any value" do
+        type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:prohibited))
 
-      expect{ type.coerce(a: 123, b: true) }.to raise_error(StrongJSON::Type::Error)
+        expect{ type.coerce(a: 123, b: true) }.to raise_error(StrongJSON::Type::Error)
+      end
+
+      it "accepts if it does not contains the field" do
+        type = StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:prohibited))
+
+        expect(type.coerce(b: true)).to eq({})
+      end
     end
 
     it "rejects objects with missing fields" do
@@ -49,4 +57,14 @@ describe StrongJSON::Type::Object do
       expect{ ty2.coerce(a: 123) }.to raise_error(StrongJSON::Type::Error)
     end
   end
+
+  describe "#except" do
+    let (:type) { StrongJSON::Type::Object.new(a: StrongJSON::Type::Base.new(:numeric), b: StrongJSON::Type::Base.new(:string)) }
+
+    it "return object which ignores given fields but preserve others" do
+      ty2 = type.except(:a)
+
+      expect(ty2.coerce(a: 123, b: "test")).to eq({ b: "test" })
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strong_json
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Soutaro Matsumoto