rschema 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0004e8f7543e3268f043077e5de29acb277b54c2
-  data.tar.gz: b63f12965664d76c537e8abfff9ec51b83eac396
+  metadata.gz: d720955c9a91f41ca082da8683dcf7bed5d10ab6
+  data.tar.gz: 6d374b1df2484fa2ec0957ca3d5943289ecb9714
 SHA512:
-  metadata.gz: 9796286f10fa653137a59fda54d062a0812cc7d87c1fc4caa77aceedc70ef72470a553e03e7756ae8712eef3dafe98c394d7c059fa53d4958af3b6e8be37f569
-  data.tar.gz: 027dd033a77d5200dfe5069c7e5b3f4acc7d3019c079d76c0724f38d4b82542544cd81a27ad68eebfcbd3c3314998acc28a53e8c9862b571b47f5c4ce5f0aa1f
+  metadata.gz: 2152a4189beed6ab21c9fd11afbf668b32cbca48eb58c89820b424473c83ac766e2819f49dc10e456690c4e75a7c2dcb3be1f52cfdc4e89528f34c01c0c45209
+  data.tar.gz: d4ccfbf1529449d6f13633898dde3c5c65f363ba041724503214e68f23720a02c2870c0b0215ed5fd3324e71ff6f49a590ac4eb2bd8c6e4973e9fc2b0ca732cf

data/lib/rschema/coercers/any.rb

@@ -20,6 +20,10 @@ module Coercers
       Result.failure
     end
 
+    def will_affect?(value)
+      subcoercers.any?{ |sc| sc.will_affect?(value) }
+    end
+
     class Builder
       attr_reader :subbuilders
 

data/lib/rschema/coercers/boolean.rb

@@ -24,6 +24,10 @@ module Coercers
       else Result.failure
       end
     end
+
+    def will_affect?(value)
+      true != value && false != value
+    end
   end
 
 end

data/lib/rschema/coercers/chain.rb

@@ -21,6 +21,10 @@ module Coercers
       result
     end
 
+    def will_affect?(value)
+      subcoercers.any? { |sc| sc.will_affect?(value) }
+    end
+
     class Builder
       attr_reader :subbuilders
 

data/lib/rschema/coercers/date.rb

@@ -19,6 +19,10 @@ module Coercers
         Result.failure
       end
     end
+
+    def will_affect?(value)
+      not value.is_a?(::Date)
+    end
   end
 
 end

data/lib/rschema/coercers/fixed_hash/default_arrays_to_empty.rb

@@ -26,9 +26,13 @@ module FixedHash
       Result.success(default_arrays_to_empty(value))
     end
 
+    def will_affect?(value)
+      keys_to_default(value).any?
+    end
+
     private
       def default_arrays_to_empty(hash)
-        missing_keys = keys_for_array_defaulting - hash.keys
+        missing_keys = keys_to_default(hash)
 
         if missing_keys.any?
           defaults = missing_keys.map{ |k| [k, []] }.to_h
@@ -38,6 +42,14 @@ module FixedHash
         end
       end
 
+      def keys_to_default(value)
+        if value.is_a?(Hash)
+          keys_for_array_defaulting - value.keys
+        else
+          []
+        end
+      end
+
       def keys_for_array_defaulting
         @keys_for_array_defaulting ||= Set.new(
           hash_attributes

data/lib/rschema/coercers/fixed_hash/default_booleans_to_false.rb

@@ -25,9 +25,13 @@ module FixedHash
       Result.success(default_bools_to_false(value))
     end
 
+    def will_affect?(value)
+      keys_to_default(value).any?
+    end
+
     private
       def default_bools_to_false(hash)
-        missing_keys = keys_for_bool_defaulting - hash.keys
+        missing_keys = keys_to_default(hash)
 
         if missing_keys.any?
           defaults = missing_keys.map{ |k| [k, false] }.to_h
@@ -37,6 +41,14 @@ module FixedHash
         end
       end
 
+      def keys_to_default(value)
+        if value.is_a?(Hash)
+          keys_for_bool_defaulting - value.keys
+        else
+          []
+        end
+      end
+
       def keys_for_bool_defaulting
         @keys_for_bool_defaulting ||= Set.new(
           hash_attributes

data/lib/rschema/coercers/fixed_hash/remove_extraneous_attributes.rb

@@ -18,20 +18,32 @@ module FixedHash
       Result.success(remove_extraneous_elements(value))
     end
 
+    def will_affect?(value)
+      keys_to_remove(value).any?
+    end
+
     private
 
       def remove_extraneous_elements(hash)
-        keys_to_remove = hash.keys - valid_keys
+        extra_keys = keys_to_remove(hash)
 
-        if keys_to_remove.any?
+        if extra_keys.any?
           hash.dup.tap do |stripped_hash|
-            keys_to_remove.each { |k| stripped_hash.delete(k) }
+            extra_keys.each { |k| stripped_hash.delete(k) }
           end
         else
           hash
         end
       end
 
+      def keys_to_remove(value)
+        if value.is_a?(Hash)
+          value.keys - valid_keys
+        else
+          []
+        end
+      end
+
       def valid_keys
         @valid_keys ||= hash_attributes.map(&:key)
       end

data/lib/rschema/coercers/fixed_hash/symbolize_keys.rb

@@ -20,6 +20,10 @@ module FixedHash
       Result.success(symbolize_keys(value))
     end
 
+    def will_affect?(value)
+      keys_to_symbolize(hash).any?
+    end
+
     private
 
       def symbolize_keys(hash)
@@ -33,9 +37,13 @@ module FixedHash
         end
       end
 
-      def keys_to_symbolize(hash)
-        non_string_keys = Set.new(hash.keys) - string_keys
-        non_string_keys.intersection(symbol_keys_as_strings)
+      def keys_to_symbolize(value)
+        if value.is_a?(Hash)
+          non_string_keys = Set.new(value.keys) - string_keys
+          non_string_keys.intersection(symbol_keys_as_strings)
+        else
+          []
+        end
       end
 
       def symbol_keys_as_strings

data/lib/rschema/coercers/float.rb

@@ -12,6 +12,10 @@ module Coercers
       flt = Float(value) rescue nil
       flt ? Result.success(flt) : Result.failure
     end
+
+    def will_affect?(value)
+      not value.is_a?(Float)
+    end
   end
 
 end

data/lib/rschema/coercers/integer.rb

@@ -12,6 +12,10 @@ module Coercers
       int = Integer(value) rescue nil
       int ? Result.success(int) : Result.failure
     end
+
+    def will_affect?(value)
+      not value.is_a?(Integer)
+    end
   end
 
 end

data/lib/rschema/coercers/nil_empty_strings.rb

@@ -9,12 +9,16 @@ module Coercers
     end
 
     def call(value)
-      if value.is_a?(String) && value.empty?
+      if "" == value
         Result.success(nil)
       else
         Result.success(value)
       end
     end
+
+    def will_affect?(value)
+      "" == value
+    end
   end
 
 end

data/lib/rschema/coercers/symbol.rb

@@ -15,6 +15,10 @@ module Coercers
       else Result.failure
       end
     end
+
+    def will_affect?(value)
+      not value.is_a?(Symbol)
+    end
   end
 
 end

data/lib/rschema/coercers/time.rb

@@ -19,6 +19,10 @@ module Coercers
         Result.failure
       end
     end
+
+    def will_affect?(value)
+      not value.is_a?(Time)
+    end
   end
 
 end

data/lib/rschema/coercion_wrapper/rack_params.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module RSchema
 class CoercionWrapper
 

data/lib/rschema/schemas/coercer.rb

@@ -18,6 +18,11 @@ class Coercer
   end
 
   def call(value, options)
+    unless coercer.will_affect?(value)
+      # short-circuit the coercer
+      return @subschema.call(value, options)
+    end
+
     result = coercer.call(value)
     if result.valid?
       @subschema.call(result.value, options)

data/lib/rschema/version.rb

@@ -1,3 +1,3 @@
 module RSchema
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rschema
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tom Dalling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -108,6 +108,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       Schema-based validation and coercion for Ruby data structures, inspired
       by Prismatic/schema for Clojure.