data_steroid 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b5bbd206036f4e3f7435df8b3108c04ba47b88
-  data.tar.gz: 793926a6ea2ef60cc1087eaf547cb5bf0efe1067
+  metadata.gz: a1ea709eb2675cbdd294ab7d4e55977e918488d0
+  data.tar.gz: 3eec8d55cdd716cb92de5110b8fe85f8f2d6c59b
 SHA512:
-  metadata.gz: 3a840565696832cb8e22f863355deff1932da017d8bbf05137cb743138aa9e4887b8841e2f48c720f015438e5816d4c9bc932364c9aa9db28e9173aa5d261e6d
-  data.tar.gz: 86ca125f2075cd2645a28c0d4be627092b12fa98b13a2767d8089122e0e6f29091e96d1ac66e57e8a5e193af0b7893946f16f7c23ed59191106c937031e35792
+  metadata.gz: 175d002dac45ff1aa456ee6fe96de540e2dc95f28845287dee63ec9c15ea517a9195e03cb7b0afa821a92280a496601165c29c06d80172f6ab8405e9be474007
+  data.tar.gz: 9cf46386c6b0c24f1bf703d5866a49f2adde8556028d4d0a86c560f4b151382e000b6f2194d1045e0e22be7cca1ebb2d117af1a5e96c7c7eb404caffc800f7a7

data/lib/data_steroid/properties.rb

@@ -45,14 +45,66 @@ module DataSteroid
       def coercer
         @coercer ||= Coercible::Coercer.new
       end
+
+      def coerce(value, type)
+        if value.nil? || !type
+          value
+        else
+          case
+          when Array == type || Array === type then coerce_array(value, type)
+          when Hash  == type || Hash  === type then coerce_hash(value, type)
+          when type == Time  then coerce_time(value)
+          else coerce_other(value, type)
+          end
+        end
+      end
+
+      def coerce_array(value, type)
+        # type: generic Array
+        if type == Array
+          coerce(element, type)
+        # type: Array[Something]
+        elsif value.respond_to?(:map)
+          value.map do |element|
+            coerce(element, type[0])
+          end
+        else
+          raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
+        end
+      end
+
+      def coerce_hash(value, type)
+        # type: generic Hash
+        if type == Hash
+          coerce(element, type)
+        # type: Hash[Something => Other thing]
+        elsif value.is_a?(Hash)
+          k_type, v_type = type.to_a[0]
+          value.map{ |k, v| [ coerce(k, k_type), coerce(v, v_type) ] }.to_h
+        else
+          raise ArgumentError.new "Invalid coercion: #{value.class} => #{type}"
+        end
+      end
+
+      def coerce_time(value)
+        case value
+        when Integer then Time.at(value)
+        when String then Time.parse(value)
+        else value
+        end
+      end
+
+      def coerce_other(value, type)
+        coercer[value.class].send("to_#{type.to_s.downcase}", value)
+      end
     end
 
     class_methods do
       protected
 
       def add_property(name, *args)
-        options = args[-1].is_a?(Hash) ? args.pop : {}
-        options[:type] = args[0] if args[0].is_a?(Class)
+        options = args[-1].is_a?(Hash) ? args[-1].slice(:default) : {}
+        options[:type] = args[0] if args[0]
         properties[name.to_s] = options
         create_accessors(name, options)
         self
@@ -65,13 +117,7 @@ module DataSteroid
         end
 
         define_method("#{name}=") do |value| # Define set method
-          coerced_value =
-            if options[:type] && !value.nil?
-              coercer[value.class].send("to_#{options[:type].to_s.downcase}", value)
-            else
-              value
-            end
-          instance_variable_set("@#{name}", coerced_value)
+          instance_variable_set("@#{name}", coerce(value, options[:type]))
         end
       end
     end

data/lib/data_steroid/version.rb

@@ -1,5 +1,5 @@
 module DataSteroid
   # version string
   # @api public
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_steroid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Fabio Tomio