gourami 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3779db38f4b70d32e20dd18a93475ce89bb060d2
-  data.tar.gz: 1782175e4495a98bcdc11a4168daaae3bdc08cd2
+SHA256:
+  metadata.gz: 9aeeb89759c11dd7f9559824ccfd42bc6ab7755aa2d60f11b8a38e5b0db08902
+  data.tar.gz: 80c1968c495c2cff9277b4bd51c0340bd8381874dc864d53dab711091f61443a
 SHA512:
-  metadata.gz: 98147fa182b83285ce9d9fc9a841608b05a4e938338efcccf6867735a1f218fe64864ea5ae66c25772e4511c760b011d89ea5b3b756fb79295a7dba7254ec221
-  data.tar.gz: ca40a30b3db73ffc95d2bdb9c9eeac3ae84c9539258bdc140690f760e145d2f7ed43c6d37e89d8c3dfdbbbfe2b496dfeb63f169f40d85a9055acd28a513895d6
+  metadata.gz: 97af9a59317e79d499c95b7b05f31a5089e9f56c7b7970818c22b36482de075f646f212b12e41ad4b53d9be1e967c34b08b34e55c46a90e033151f46416208dc
+  data.tar.gz: 48979f3194878e519431c3a46deb3da5eea9dc624731483f89e8006370d84c30027445b4ac6b31f0ca91b1d669539ad79edf988c51a2d8b2f56f7877b1659cdd

data/gourami.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "activesupport", ">= 5.1.7"
   spec.add_development_dependency "filewatcher", "~> 1.1.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry", "~>0.10"

data/lib/gourami/coercer.rb

@@ -11,8 +11,7 @@ module Gourami
     # @return [*]
     def setter_filter(attribute_name, value, options)
       type = options[:type]
-      coercer_method_name = :"coerce_#{type}"
-      value = send(coercer_method_name, value, options) if type
+      value = send(:"coerce_#{type}", value, options) if type
 
       super(attribute_name, value, options)
     end
@@ -120,21 +119,38 @@ module Gourami
     #   The type of the hash keys to coerce, no coersion if value is nil.
     # @option options :value_type [Symbol, Callable] (nil)
     #   The type of the hash values to coerce, no coersion if value is nil.
+    # @option options :indifferent_access [Boolean] (false)
+    #   When true, the resulting Hash will be an ActiveSupport::HashWithIndifferentAccess
     #
-    # @return [Hash]
+    # @return [Hash, ActiveSupport::HashWithIndifferentAccess]
     #   The coerced Hash.
     def coerce_hash(value, options = {})
+      return if options[:allow_nil] && value.nil?
+
       hash_key_type = options[:key_type]
       hash_value_type = options[:value_type]
 
-      return {} unless value.is_a?(Hash) || (defined?(Sequel::Postgres::JSONHash) && value.is_a?(Sequel::Postgres::JSONHash))
+      hash_class = options[:indifferent_access] ? ActiveSupport::HashWithIndifferentAccess : Hash
+      hash = hash_class.new
+
+      return hash unless value.is_a?(Hash) || (defined?(Sequel::Postgres::JSONHash) && value.is_a?(Sequel::Postgres::JSONHash))
 
-      value.each_with_object({}) do |(key, value), coerced_hash|
+      value.each_with_object(hash) do |(key, value), coerced_hash|
         key_type = hash_key_type.respond_to?(:call) ? hash_key_type.call(key, value) : hash_key_type
-        key = send("coerce_#{key_type}", key) if key_type
+        key = send(:"coerce_#{key_type}", key) if key_type
 
         value_type = hash_value_type.respond_to?(:call) ? hash_value_type.call(key, value) : hash_value_type
-        value = send("coerce_#{value_type}", value) if value_type
+
+        # TODO: Refactor shared logic here and coerce_array to a method like `type, options = resolve_coercer_type_and_options`
+        if value_type.is_a?(Hash)
+          value_type_options = value_type
+          value_type = value_type[:type]
+        else
+          value_type_options = {}
+        end
+
+        value = send(:"coerce_#{value_type}", value, value_type_options) if value_type
+
         coerced_hash[key] = value
       end
     end

data/lib/gourami/version.rb

@@ -1,3 +1,3 @@
 module Gourami
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.0".freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gourami
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - TSMMark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 5.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 5.1.7
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
@@ -133,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Keep your Routes, Controllers and Models thin.