gate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c3db4ff831be9cbcee9a0fc5c4666cf25e0fd6
-  data.tar.gz: b8fe4ff7b05976382e00b91dca04496b330cd0a0
+  metadata.gz: c1951613a4b68d99db41f71852db4e2b100ded40
+  data.tar.gz: 1112aaf87c2fa1453e31be28aa38149b6ad167ed
 SHA512:
-  metadata.gz: f2e1837f27d8e33f1f73365c9a231f465b3e3abdcca1b036f22b7194dfd1d918341de980d492115b5e1feac1b797450d2b83356e303d4633ccd06414e77d50b1
-  data.tar.gz: 32fd22c8502b461615a89d6fe4b8edf6592218083ead3d796d627593b84b6fa990d1c23926c32eb557b41b8a04eba90eedff0f70446e8f439a060d16a1fa5ac6
+  metadata.gz: 99c9230b9aae1f1cd7bd319ad08d93671423ab4bb11f807118a20139d4578eb420cd9399f147045025565ba3380474a6f362637957c4bc7af0bd227bc100863b
+  data.tar.gz: ad095bcd11b76c9fa802fc8e0b145dd9d0086a0e0f466231809136bbbd7f9da111b817764f0daa5ed5a5689e4a504dd6ab80f516c343a194bbd08750a8d9f596

data/README.md

@@ -47,6 +47,19 @@ result.attributes # => hash with only allowed parameters
 result.errors # => hash { key => error }
 ```
 
+If you need to handle `nil` values you can use `allow_nil` flag:
+
+```ruby
+gate = Gate.rules do
+  required :id, :Integer, allow_nil: true
+  required :message, allow_nil: true do
+    required :title
+    optional :value, :Decimal
+  end
+end
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/gate/coercer.rb

@@ -1,12 +1,13 @@
 module Gate
   class Coercer
-    def initialize(engine, type)
+    def initialize(engine, type, allow_nil: false)
       unless Axiom::Types.const_defined?(type)
         fail CoercionError, "Doesn't know how to coerce into #{type}"
       end
 
       @engine = engine
       @type = type
+      @allow_nil = allow_nil
       @coercion_method = Axiom::Types.const_get(type).coercion_method
     end
 
@@ -16,6 +17,10 @@ module Gate
       raise CoercionError, "Doesn't know how to coerce #{input} into #{type}"
     end
 
+    def allow_nil?
+      @allow_nil
+    end
+
     private
 
     attr_reader :engine, :type, :coercion_method

data/lib/gate/configuration.rb

@@ -8,12 +8,13 @@ module Gate
 
     def_delegator :@rules, :reduce
 
-    def initialize(coercer = Coercible::Coercer.new, &block)
+    def initialize(coercer: Coercible::Coercer.new, allow_nil: false, &block)
       @coercer = coercer
       @required_set = Set.new
       @optional_set = Set.new
       @nested_set = Set.new
       @rules = {}
+      @allow_nil = allow_nil
 
       instance_eval(&block)
     end
@@ -22,28 +23,32 @@ module Gate
       required_set.include?(name)
     end
 
+    def allow_nil?
+      @allow_nil
+    end
+
     private
 
-    def required(name, type = :String, &block)
+    def required(name, type = :String, allow_nil: false, &block)
       required_set.add(name)
-      register(name, type, &block)
+      register(name, type, allow_nil: allow_nil, &block)
     end
 
-    def optional(name, type = :String, &block)
+    def optional(name, type = :String, allow_nil: false,  &block)
       optional_set.add(name)
-      register(name, type, &block)
+      register(name, type, allow_nil: allow_nil, &block)
     end
 
-    def register(name, type, &block)
-      @rules[name] = setup_rule(name, type, &block)
+    def register(name, type, allow_nil:, &block)
+      @rules[name] = setup_rule(name, type, allow_nil: allow_nil, &block)
     end
 
-    def setup_rule(name, type, &block)
+    def setup_rule(name, type, allow_nil:, &block)
       if block_given?
         nested_set.add(name)
-        Configuration.new(coercer, &block)
+        Configuration.new(coercer: coercer, allow_nil: allow_nil, &block)
       else
-        Coercer.new(coercer, type)
+        Coercer.new(coercer, type, allow_nil: allow_nil)
       end
     end
   end

data/lib/gate/guard.rb

@@ -28,10 +28,11 @@ module Gate
     end
 
     def handle(input, name, rule)
-      if rule.is_a?(Gate::Configuration)
-        result = Gate::Guard.new(rule).verify(input)
-        { attributes: { name => result.attributes },
-          errors: { name => result.errors } }
+      case
+      when input.nil?
+        coerce_nil(name, rule)
+      when rule.is_a?(Gate::Configuration)
+        coerce_nested(input, name, rule)
       else
         coerce(input, name, rule)
       end
@@ -44,6 +45,20 @@ module Gate
       { errors: { name => :coercion_error } }
     end
 
+    def coerce_nested(input, name, rule)
+      result = Gate::Guard.new(rule).verify(input)
+      { attributes: { name => result.attributes },
+        errors: { name => result.errors } }
+    end
+
+    def coerce_nil(name, rule)
+      if rule.allow_nil?
+        { attributes: { name => nil } }
+      else
+        { errors: { name => :nil_not_allowed } }
+      end
+    end
+
     def update(result, attributes: {}, errors: {})
       { attributes: result.attributes.merge(attributes),
         errors: result.errors.merge(errors) }

data/lib/gate/version.rb

@@ -1,3 +1,3 @@
 module Gate
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Dudulski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coercible