decanter 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f6a3fc96c72c84a4c0f4dc8a36b547fbe35378
-  data.tar.gz: fb62e17481aac2f6f281965d0685b7b77658ffc5
+  metadata.gz: 84d61b3aafe9eeae8726af22da2c9fa239321564
+  data.tar.gz: aa12d102ed3c916f3e6c662502c434f3fb5a7a94
 SHA512:
-  metadata.gz: 07d8d145aa83d39a8d04edb5f5aa98bd42b123eee966c08713504ad0ef4336a0771d6df5706d8ac663145571749a80b6dc1804fe30755aa935197e251e3aa1e5
-  data.tar.gz: ea67b48050987acf5b35c016a66e31ed51480eb6a53b09fc7464e8a1329351dae8d6c59e8a4dd7057f0b4d51679430f384bc3f39f24f3b82142cc8776cba02e0
+  metadata.gz: b5e6756d719f3531fcf28f1cabafda30b41f7f186a83882c406d550ed8897a863af65338f1e652abb9c205bb690cde8676f5395eb3f0fe8892750f5a9e41e8da
+  data.tar.gz: 934e9c5fde54466b13828d40921816bed7f2cd65efc3585d7f8d40fff2762aad0082aff6c9da733464ade29921b830baa90f90b2ff5eba66e99bb002ec6fcb90

data/lib/decanter/core.rb

@@ -51,12 +51,12 @@ module Decanter
 
       def has_many_for(key, context)
         (associations[context || :default] || {})
-          .detect { |name, assoc| assoc[:type] == :has_many && assoc[:key] == key}
+          .detect { |name, assoc| assoc[:type] == :has_many && assoc[:key] == key.to_sym}
       end
 
       def has_one_for(key, context)
         (associations[context || :default] || {})
-          .detect { |name, assoc| assoc[:type] == :has_one && assoc[:key] == key}
+          .detect { |name, assoc| assoc[:type] == :has_one && assoc[:key] == key.to_sym}
       end
 
       def set_association(options, assoc)
@@ -78,9 +78,8 @@ module Decanter
       end
 
       def decant(args={}, context=nil)
-        args = args.to_h if args.is_a?(ActionController::Parameters) # i.e. Rails 5
         Hash[
-          args.map { |name, value| handle_arg(name, value, context) }.compact
+          args.keys.map { |key| handle_arg(key, args[key], context) }.compact
         ]
       end
 
@@ -89,9 +88,9 @@ module Decanter
         when input_cfg = input_for(name, context)
           [name, parse(name, input_cfg[:type], value, input_cfg[:options])]
         when assoc = has_one_for(name, context)
-          [assoc.pop[:key], Decanter::decanter_for(assoc.first).decant(value, context)]
+          [assoc.pop[:key], Decanter::decanter_for(assoc[1][:options][:decanter] || assoc.first).decant(value, context)]
         when assoc = has_many_for(name, context)
-          decanter = Decanter::decanter_for(assoc.first)
+          decanter = Decanter::decanter_for(assoc[1][:options][:decanter] || assoc.first)
           [assoc.pop[:key], value.map { |val| decanter.decant(val, context) }]
         else
           context ? nil : [name, value]

data/lib/decanter/extensions.rb

@@ -21,6 +21,10 @@ module Decanter
         self.new(decant(args, context)).save(context: context)
       end
 
+      def decant_new(args={}, context=nil)
+        self.new(decant(args, context))
+      end
+
       def decant_create!(args={}, context=nil)
         self.new(decant(args, context)).save!(context: context)
       end

data/lib/decanter/value_parser/base.rb

@@ -4,6 +4,9 @@ module Decanter
   module ValueParser
     class Base
       include Core
+      def self.inherited(subclass)
+        ValueParser.register(subclass)
+      end
     end
   end
 end

data/lib/decanter/value_parser.rb

@@ -3,11 +3,12 @@ module Decanter
     @@value_parsers = {}
 
     def self.register(value_parser)
-      @@value_parsers[value_parser.name] = value_parser
+      @@value_parsers[value_parser.name.demodulize] = value_parser
     end
 
     def self.value_parser_for(sym)
-      @@value_parsers["#{sym.to_s.capitalize}Parser"] || (raise NameError.new("unknown value parser #{sym.to_s.capitalize}Parser"))
+      p "find parser for #{sym}"
+      @@value_parsers["#{sym.to_s.camelize}Parser"] || (raise NameError.new("unknown value parser #{sym.to_s.capitalize}Parser"))
     end
   end
 end

data/lib/decanter/version.rb

@@ -1,3 +1,3 @@
 module Decanter
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/decanter.rb

@@ -3,15 +3,15 @@ module Decanter
   @@decanters = {}
 
   def self.register(decanter)
-    @@decanters[decanter.name] = decanter
+    @@decanters[decanter.name.demodulize] = decanter
   end
 
   def self.decanter_for(klass_or_sym)
     name = klass_or_sym.is_a?(Class) ?
             klass_or_sym.name :
             klass_or_sym.to_s.singularize.camelize
-
-    @@decanters["#{name}Decanter"] || (raise NameError.new("unknown decanter #{name}Decanter"))
+    full_name = name.include?('Decanter') ? name : "#{name}Decanter"
+    @@decanters[full_name] || (raise NameError.new("unknown decanter #{name}Decanter"))
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decanter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ryan Francis
@@ -83,6 +83,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- decanter-0.5.2.gem
 - decanter.gemspec
 - lib/decanter.rb
 - lib/decanter/base.rb