rschema 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bd4da520ac3e5fb967d27652e353cd91bf9d3f6
-  data.tar.gz: d36b77ea5fd9224c85850be67c8af4eb9d1a9f11
+  metadata.gz: 0004e8f7543e3268f043077e5de29acb277b54c2
+  data.tar.gz: b63f12965664d76c537e8abfff9ec51b83eac396
 SHA512:
-  metadata.gz: 18a5ca5072280a91495b6c12040097c7eed60e9722c5ef7395634a16c932568b428d20fff49f95672e3fd063cf3ef4fa4e7c6262909213eb20607940624488af
-  data.tar.gz: 43353ceb29e8959d554eac95e8ed8519af08ccceba308a4b8a15786f8cc5edbbd8d2af205e73ca1397a3235950a0a51380328a786a3e5408c0e57bf48285d95c
+  metadata.gz: 9796286f10fa653137a59fda54d062a0812cc7d87c1fc4caa77aceedc70ef72470a553e03e7756ae8712eef3dafe98c394d7c059fa53d4958af3b6e8be37f569
+  data.tar.gz: 027dd033a77d5200dfe5069c7e5b3f4acc7d3019c079d76c0724f38d4b82542544cd81a27ad68eebfcbd3c3314998acc28a53e8c9862b571b47f5c4ce5f0aa1f

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

@@ -0,0 +1,63 @@
+require 'set'
+
+module RSchema
+module Coercers
+module FixedHash
+
+  # The HTTP standard says that when a form is submitted, all unchecked
+  # check boxes will _not_ be sent to the server. That is, they will not
+  # be present at all in the params hash.
+  #
+  # This class coerces these missing values into an empty array, where an array
+  # is expected.
+  class DefaultArraysToEmpty
+    attr_reader :hash_attributes
+
+    def self.build(schema)
+      new(schema)
+    end
+
+    def initialize(fixed_hash_schema)
+      #TODO: make fixed hash attributes frozen, and eliminate dup
+      @hash_attributes = fixed_hash_schema.attributes.map(&:dup)
+    end
+
+    def call(value)
+      Result.success(default_arrays_to_empty(value))
+    end
+
+    private
+      def default_arrays_to_empty(hash)
+        missing_keys = keys_for_array_defaulting - hash.keys
+
+        if missing_keys.any?
+          defaults = missing_keys.map{ |k| [k, []] }.to_h
+          hash.merge(defaults)
+        else
+          hash # no coercion necessary
+        end
+      end
+
+      def keys_for_array_defaulting
+        @keys_for_array_defaulting ||= Set.new(
+          hash_attributes
+            .reject(&:optional)
+            .select { |attr| is_array_schema?(attr.value_schema) }
+            .map(&:key)
+        )
+      end
+
+      def is_array_schema?(schema)
+        # dig through all the coercers
+        non_coercer = schema
+        while non_coercer.is_a?(Schemas::Coercer)
+          non_coercer = non_coercer.subschema
+        end
+
+        non_coercer.is_a?(Schemas::VariableLengthArray)
+      end
+  end
+
+end
+end
+end

data/lib/rschema/coercers/nil_empty_strings.rb

@@ -0,0 +1,21 @@
+module RSchema
+module Coercers
+
+  module NilEmptyStrings
+    extend self
+
+    def build(schema)
+      self
+    end
+
+    def call(value)
+      if value.is_a?(String) && value.empty?
+        Result.success(nil)
+      else
+        Result.success(value)
+      end
+    end
+  end
+
+end
+end

data/lib/rschema/coercion_wrapper/rack_params.rb

@@ -8,11 +8,13 @@ class CoercionWrapper
     coerce_type Time, with: Coercers::Time
     coerce_type Date, with: Coercers::Date
 
+    coerce Schemas::Maybe, with: Coercers::NilEmptyStrings
     coerce Schemas::Boolean, with: Coercers::Boolean
     coerce Schemas::FixedHash, with: Coercers::Chain[
       Coercers::FixedHash::SymbolizeKeys,
       Coercers::FixedHash::RemoveExtraneousAttributes,
       Coercers::FixedHash::DefaultBooleansToFalse,
+      Coercers::FixedHash::DefaultArraysToEmpty,
     ]
   end
 

data/lib/rschema/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rschema
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Tom Dalling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -125,11 +125,13 @@ files:
 - lib/rschema/coercers/boolean.rb
 - lib/rschema/coercers/chain.rb
 - lib/rschema/coercers/date.rb
+- lib/rschema/coercers/fixed_hash/default_arrays_to_empty.rb
 - lib/rschema/coercers/fixed_hash/default_booleans_to_false.rb
 - lib/rschema/coercers/fixed_hash/remove_extraneous_attributes.rb
 - lib/rschema/coercers/fixed_hash/symbolize_keys.rb
 - lib/rschema/coercers/float.rb
 - lib/rschema/coercers/integer.rb
+- lib/rschema/coercers/nil_empty_strings.rb
 - lib/rschema/coercers/symbol.rb
 - lib/rschema/coercers/time.rb
 - lib/rschema/coercion_wrapper.rb