Merge pull request #162 from wadetandy/master

Upgrade to dry-types 1.x

Author: richmolj

graphiti.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "jsonapi-serializable", "~> 0.3.0"
   spec.add_dependency "jsonapi-renderer", "0.2.0"
-  spec.add_dependency "dry-types", "~> 0.15"
+  spec.add_dependency "dry-types", ">= 0.15.0", "< 2.0"
   spec.add_dependency "graphiti_errors", "~> 1.1.0"
   spec.add_dependency "concurrent-ruby", "~> 1.0"
   spec.add_dependency "activesupport", ">= 4.1"

lib/graphiti/types.rb

@@ -13,7 +13,7 @@ def self.create(primitive, &blk)
           ::DateTime.parse(input.to_s)
         end
       end
-      input = Dry::Types["json.date_time"][input]
+      input = Dry::Types["json.date_time"][input] if input.is_a?(::String)
       Dry::Types["strict.date_time"][input] if input
     }
 
@@ -25,7 +25,8 @@ def self.create(primitive, &blk)
           ::DateTime.parse(input.to_s)
         end
       end
-      input = Dry::Types["json.date_time"][input]
+
+      input = Dry::Types["json.date_time"][input] if input.is_a?(::String)
       Dry::Types["strict.date_time"][input].iso8601 if input
     }
 
@@ -36,13 +37,13 @@ def self.create(primitive, &blk)
 
     Date = create(::Date) { |input|
       input = ::Date.parse(input.to_s) if input.is_a?(::Time)
-      input = Dry::Types["json.date"][input]
+      input = Dry::Types["json.date"][input] if input.is_a?(::String)
       Dry::Types["strict.date"][input] if input
     }
 
     PresentDate = create(::Date) { |input|
       input = ::Date.parse(input.to_s) if input.is_a?(::Time)
-      input = Dry::Types["json.date"][input]
+      input = Dry::Types["json.date"][input] if input.is_a?(::String)
       Dry::Types["strict.date"][input]
     }