rschema 3.0.1.pre1 → 3.0.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bf71f16e83556e8bd0ac267c50c3e0bb2b02210
-  data.tar.gz: 44e531a24e345526b22def8a8df44c72f111b636
+  metadata.gz: f19805cfd6ac29a7633c31b7ac0cc66fdf90b3e1
+  data.tar.gz: 1d9f3aa2548b2f2328fa4d061885f944261c32e1
 SHA512:
-  metadata.gz: 414b8192259952378b14ce845e6c333306d18cbee48dc12592d91d3dd7c89fcf6481af96e65d1bcb26d5c07982ea5d1393011b8aaa589f4d76a68bfc1ea444d6
-  data.tar.gz: 6b3f20c7f6d1d89110c4245788a4a42d1556edfaaee3497dfa0c2aee1eb86fe1a96f0b35ddeea628ae9294391f9e2082cd1ffe410b628e470eb3bae9382447f9
+  metadata.gz: 3c210cea14f881ab5777fe8d8da15c05f4034f9e807b291db4e59c64fc345fa56f18cbf72df0eb7121971ce07203f34d18ed1ac4b98c4e5426be58bfa9167652
+  data.tar.gz: 8f6c6df121f4a89813d74187008fa8a563b494412998138c351e1ae4582b8f3d41aa8a47de8d53cbd2c670d6b5b25fb612e3128d84c1a0533fc9154b1a671de9

data/lib/rschema/http_coercer.rb

@@ -33,11 +33,16 @@ module RSchema
       end
 
       def with_wrapped_subschemas(wrapper)
-        raise CanNotBeWrappedError, <<~EOS
-          This schema has already been wrapped by RSchema::HTTPCoercer.
-          Wrapping the schema again will most likely result in a schema that
-          crashes when it is called.
-        EOS
+        # Double wrapping is potentially a problem. Coercers expect their
+        # subschemas to be a particular type. If their subschema gets wrapped
+        # again, the type changes, so if the coercer tries to use its subschema
+        # during coercion, it will crash.
+        #
+        # For this reason, coercers must not rely upon the type of their
+        # subschemas within `#call`. Coercer schemas should store any required
+        # info from their subschemas within `#initialize`.
+
+        self.class.new(wrapper.wrap(subschema))
       end
 
       def invalid!
@@ -113,6 +118,14 @@ module RSchema
     end
 
     class FixedHashCoercer < Coercer
+      attr_reader :hash_attributes
+
+      def initialize(fixed_hash_schema, attributes = nil)
+        super(fixed_hash_schema)
+
+        @hash_attributes = attributes || fixed_hash_schema.attributes.map(&:dup)
+      end
+
       def coerce(value)
         default_bools_to_false(symbolize_keys(value))
       end
@@ -129,18 +142,18 @@ module RSchema
       end
 
       def keys_to_symbolize(hash)
-        # these could be cached if we know for sure that the subschema is immutable
-        symbol_keys = subschema.attributes
+        # some of this could be memoized
+        symbol_keys = hash_attributes
           .map(&:key)
           .select{ |k| k.is_a?(Symbol) }
           .map(&:to_s)
 
-        string_keys = subschema.attributes
+        string_keys = hash_attributes
           .map(&:key)
           .select{ |k| k.is_a?(String) }
 
         hash.keys.select do |k|
-          k.is_a?(String) && symbol_keys.include?(k) && !string_keys.include?(k)
+          symbol_keys.include?(k) && !string_keys.include?(k)
         end
       end
 
@@ -151,19 +164,30 @@ module RSchema
         #
         # This method coerces these missing values into `false`.
 
-        # some of this could be cached if we know for sure that the subschema is immutable
-        keys_to_default = subschema.attributes
-          .select { |attr| attr.value_schema.is_a?(BoolCoercer) }
-          .map(&:key)
+        missing_keys = keys_for_bool_defaulting
           .reject { |key| hash.has_key?(key) }
 
-        if keys_to_default.any?
-          defaults = keys_to_default.map{ |k| [k, false] }.to_h
+        if missing_keys.any?
+          defaults = missing_keys.map{ |k| [k, false] }.to_h
           hash.merge(defaults)
         else
           hash # no coercion necessary
         end
       end
+
+      def with_wrapped_subschemas(wrapper)
+        self.class.new(wrapper.wrap(subschema), hash_attributes)
+      end
+
+      private
+
+        def keys_for_bool_defaulting
+          # this could be memoized
+          hash_attributes
+            .reject(&:optional)
+            .select { |attr| attr.value_schema.is_a?(BoolCoercer) }
+            .map(&:key)
+        end
     end
 
     TYPE_COERCERS = {

data/lib/rschema/version.rb

@@ -1,3 +1,3 @@
 module RSchema
-  VERSION = '3.0.1.pre1'
+  VERSION = '3.0.1.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rschema
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre1
+  version: 3.0.1.pre2
 platform: ruby
 authors:
 - Tom Dalling