primalize 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36f2c4e228676c3b667327dd6ac82cb5a35d6eb
-  data.tar.gz: f3787f3ea335597dc61dd7fe3b461c9e7076f3db
+  metadata.gz: 3e7e19ac6dc1dae6887c09d7c6a3388a29532895
+  data.tar.gz: 497da52eccc3c157d0ca413b8cf5ce132a2e5e4d
 SHA512:
-  metadata.gz: feac9b17d4d74fc748c9e1289b9173ec8782fc3b8a31e2a859c3d5c2281e03deddf02acfb173860c8eab36c0aac23a1e7966dd795b8c0cb50339baac7d1f8214
-  data.tar.gz: b04714ce166db915086c6da5905ea69e568780015ce7234d02821128c89bb9893c97407f05e4ed89e0dbe13f50f1ee4971a0d68ddf99ca9e7ae14cb46c287ba4
+  metadata.gz: 29b4efb1d23fd3ccc909b133bd8e18c25e46e770bb0104a5b5e7fab414ebc8545d77b7f7b142513ee15f1823ea3158301f5221c1ab015ec05221e8bba777d567
+  data.tar.gz: 62a1dd9738ccacbd45b723a1b56e360db4a73fd7e3cb4837c78a5de519c785585ff1d14a29c2e00a1d29743f42e1e740efb6e638efa7d4872fd5b92d47e518f1

data/lib/primalize/single.rb

@@ -208,8 +208,6 @@ module Primalize
     end
 
     class Array
-      include Type
-
       def initialize types, &coercion
         @types = types
         @coercion = coercion
@@ -222,6 +220,25 @@ module Primalize
         end
       end
 
+      def coerce array
+        if @coercion
+          return @coercion.call(array)
+        end
+
+        if array.respond_to? :map
+          array.map do |item|
+            type = @types.find { |type| type === item }
+            if type.respond_to? :coerce
+              type.coerce(item)
+            else
+              item
+            end
+          end
+        else
+          array
+        end
+      end
+
       def inspect
         "array(#{@types.map(&:inspect).join(', ')})"
       end
@@ -249,8 +266,6 @@ module Primalize
     end
 
     class Object
-      include Type
-
       def initialize types, &coercion
         @types = types
         @coercion = coercion
@@ -264,6 +279,26 @@ module Primalize
         end
       end
 
+      def coerce hash
+        if @coercion
+          return @coercion.call(hash)
+        end
+
+        if hash.respond_to? :map
+          hash.each_with_object({}) do |(key, value), h|
+            _, type = @types.find { |_, type| type === value }
+
+            h[key] = if type.respond_to? :coerce
+                       type.coerce(value)
+                     else
+                       value
+                     end
+          end
+        else
+          hash
+        end
+      end
+
       def inspect
         "object(#{@types.map { |attr, type| "#{attr}: #{type.inspect}" }.join(', ')})"
       end
@@ -295,7 +330,8 @@ module Primalize
         @coercion = proc do |obj|
           # FIXME: this is dumb
           begin
-            primalizer.new((coercion || DEFAULT_COERCION).call(obj)).call
+            coerced = (coercion || DEFAULT_COERCION).call(obj)
+            primalizer.new(coerced).call
           rescue ArgumentError => e
             raise TypeError.new(e)
           end
@@ -329,8 +365,6 @@ module Primalize
     end
 
     class Any
-      include Type
-
       def initialize types, &coercion
         @types = types
         @coercion = coercion
@@ -340,6 +374,19 @@ module Primalize
         @types.empty? || @types.any? { |type| type === value }
       end
 
+      def coerce value
+        if @coercion
+          return @coercion.call(value)
+        end
+
+        type = @types.find { |type| type === value }
+        if type.respond_to? :coerce
+          type.coerce(value)
+        else
+          value
+        end
+      end
+
       def inspect
         params = "(#{@types.map(&:inspect).join(', ')})"
         "any#{@types.empty? ? nil : params}"

data/lib/primalize/version.rb

@@ -1,3 +1,3 @@
 module Primalize
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: primalize
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler