gourami 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 603c7eab7f67f882417c3d2c3972b8632e50d420
-  data.tar.gz: d9ddbf73b7e29f40443d3f2ff421f434c66ee073
+SHA256:
+  metadata.gz: 98ec9c2d757ec710e65dd5aa0662530f0f92363b72d56edce9fecebe85d0d800
+  data.tar.gz: 80842660cd5e2ed28a244414ef8a8f8f091d111d8fd2ba614bcec52dc0efe807
 SHA512:
-  metadata.gz: 2e98badb6ec80ba426d32da18e915944c7461e9154348efdc5c401cac9053224e4a82ed16ca78d89d81c6506cce4d6c940cf53e84e253e4ea87d1a7008634d1b
-  data.tar.gz: dddd5426e7a1c497ccd0ff57c2536944d51077dd7317637fa3961943605afed939045047043017e2bdfe3bd2b8a8f22b93e11558a3f6e47206477b63cbceb57b
+  metadata.gz: 94897c3b427a7528020c6df8b657c193e88488b52610bf853d2e3fffda962ba1e0ba642ba7c72e2c9bb6ecf234518372910f733bca453d72a2b72c4ee469cb55
+  data.tar.gz: 12d3a6215c2fc337aa03af6d0818b916879aebe77cb96a21aed65d47ca7385a68eb096cc81dc22ff39ca3e187260ffd0a0f55060a4fb38db948eeb5a673a0e87

data/lib/gourami/coercer.rb

@@ -12,9 +12,7 @@ module Gourami
     def setter_filter(attribute_name, value, options)
       type = options[:type]
       coercer_method_name = :"coerce_#{type}"
-      if type
-        value = send(coercer_method_name, value, options)
-      end
+      value = send(coercer_method_name, value, options) if type
 
       super(attribute_name, value, options)
     end
@@ -23,12 +21,17 @@ module Gourami
     #
     # @param value [Object]
     # @option allow_nil [Boolean] (true)
+    # @option nil_when_empty [Boolean] (true)
     # @option upcase [Boolean] (false)
     # @option strip [Boolean] (true)
     #
     # @return [String, nil]
     def coerce_string(value, options = {})
-      return nil if value.nil? && options.fetch(:allow_nil, true)
+      if options.fetch(:allow_nil, true)
+        return if value.nil?
+        value = value.to_s
+        return if value.empty? && options.fetch(:nil_when_empty, false)
+      end
 
       value = value.to_s.dup.force_encoding(Encoding::UTF_8)
       value.strip! if options.fetch(:strip, true)
@@ -44,9 +47,9 @@ module Gourami
     #
     # @return [Boolean, nil]
     def coerce_boolean(value, options = {})
-      return nil if options[:allow_nil] && (value.nil? || value == "")
+      return if options[:allow_nil] && (value.nil? || value == "")
       return false if value.to_s.strip == "false"
-      !!value && !coerce_string(value).strip.empty?
+      !!value && !coerce_string(value, :allow_nil => false).strip.empty?
     end
 
     # Coerce the value into an Array.
@@ -63,31 +66,29 @@ module Gourami
     # @return [Array]
     #   The coerced Array.
     def coerce_array(value, options = {})
+      return if options[:allow_nil] && value.nil?
+
       element_type = options[:element_type]
-      value = value.values if value.kind_of?(Hash)
+      value = value.values if value.is_a?(Hash)
 
-      if options[:split_by] && value.kind_of?(String)
+      if options[:split_by] && value.is_a?(String)
         value = value.split(options[:split_by]).map(&:strip)
       end
 
-      if value.kind_of?(Array)
-        if element_type
-          if element_type.kind_of?(Hash)
-            element_type_options = element_type
-            element_type = element_type[:type]
-          else
-            element_type_options = {}
-          end
-
-          coercer_method_name = :"coerce_#{element_type}"
-          value.map do |array_element|
-            send(coercer_method_name, array_element, element_type_options)
-          end
-        else
-          value
-        end
+      return [] unless value.is_a?(Array)
+      return value unless element_type
+
+      if element_type.is_a?(Hash)
+        element_type_options = element_type
+        element_type = element_type[:type]
       else
-        []
+        element_type_options = {}
+      end
+
+      coercer_method_name = :"coerce_#{element_type}"
+
+      value.map do |array_element|
+        send(coercer_method_name, array_element, element_type_options)
       end
     end
 
@@ -96,7 +97,7 @@ module Gourami
     # @param value [Object]
     #
     # @return [Float, nil]
-    def coerce_float(value, options = {})
+    def coerce_float(value, _options = {})
       Float(value) rescue nil
     end
 
@@ -107,7 +108,8 @@ module Gourami
     #
     # @return [String, nil]
     def coerce_phone(value, options = {})
-      value ? coerce_string(value).upcase.gsub(/[^+0-9A-Z]/,"") : nil
+      value = coerce_string(value, options)
+      value ? value.upcase.gsub(/[^+0-9A-Z]/, "") : nil
     end
 
     # Coerce the value into a Hash.
@@ -124,17 +126,16 @@ module Gourami
     def coerce_hash(value, options = {})
       hash_key_type = options[:key_type]
       hash_value_type = options[:value_type]
-      if value.kind_of?(Hash) || value.kind_of?(Sequel::Postgres::JSONHash)
-        value.each_with_object({}) 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
-
-          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
-          coerced_hash[key] = value
-        end
-      else
-        {}
+
+      return {} unless value.is_a?(Hash) || (defined?(Sequel::Postgres::JSONHash) && value.is_a?(Sequel::Postgres::JSONHash))
+
+      value.each_with_object({}) 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
+
+        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
+        coerced_hash[key] = value
       end
     end
 
@@ -145,13 +146,11 @@ module Gourami
     #
     # @return [Integer, nil]
     #   An Integer if the value can be coerced or nil otherwise.
-    def coerce_integer(value, options = {})
+    def coerce_integer(value, _options = {})
       value = value.to_s
-      if value.match(/\A0|[1-9]\d*\z/)
-        value.to_i
-      else
-        nil
-      end
+      return unless value =~ /\A0|[1-9]\d*\z/
+
+      value.to_i
     end
 
     # Coerce the value into a Date.
@@ -163,7 +162,7 @@ module Gourami
     #   A Date if the value can be coerced or nil otherwise.
     def coerce_date(value, options = {})
       value = coerce_string(value, options)
-      return nil if value.nil?
+      return if value.nil?
       begin
         Date.strptime(value, "%Y-%m-%d")
       rescue ArgumentError
@@ -180,7 +179,7 @@ module Gourami
     #   A Time if the value can be coerced or nil otherwise.
     def coerce_time(value, options = {})
       value = coerce_string(value, options)
-      return nil if !value || value.empty?
+      return if !value || value.empty?
 
       begin
         Time.parse(value).utc
@@ -198,13 +197,13 @@ module Gourami
     # @return [Hash, nil]
     #   The hash will contain the file String :filename and the File :tempfile,
     #   or nil otherwise.
-    def coerce_file(value, options = {})
-      if value.kind_of?(Hash) && !value[:filename].to_s.empty?
-        tempfile = value[:tempfile]
-        if tempfile.kind_of?(File) || tempfile.kind_of?(Tempfile)
-          value
-        end
-      end
+    def coerce_file(value, _options = {})
+      return unless value.is_a?(Hash) && !value[:filename].to_s.empty?
+
+      tempfile = value[:tempfile]
+      return unless tempfile.is_a?(File) || tempfile.is_a?(Tempfile)
+
+      value
     end
 
   end

data/lib/gourami/version.rb

@@ -1,3 +1,3 @@
 module Gourami
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gourami
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - TSMMark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Keep your Routes, Controllers and Models thin.