decanter 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88b2e53932e63a9351db615b274f997a829bf40
-  data.tar.gz: 4deade7c29aa9321d62600ba8b2fa7da8a207ace
+  metadata.gz: f0715bf7c746e8f542d5830ff831d01f2082b173
+  data.tar.gz: 4a2a9c5001d035801b7f5c1c86fcf579630e2c61
 SHA512:
-  metadata.gz: 3f7aa0df7b97a57191b74a9c8d46572d35fcbf1e1ab2447bb54fbabcb636e5f8274e32480e478bb21e10be846f82643a416f3e39682ad3eda4e4082f0d11055d
-  data.tar.gz: 6fcdc9bfb48de54cfb710a71137285067144b8d639be4ffb6bf939cfd9c8439aae1c70fb247b26990d5d3ce2621c8301ded78c5dbeb0a74772202b87457a0ed6
+  metadata.gz: b66f3d3a23e34d3f375aec969a6e62d6b1b0a1b8f9b41eebfef6c48872fab0010bb2a952f97c0c3a3d0d9c546fd4686972059182ddc5a3a506122fbae77e2e7f
+  data.tar.gz: 110960e0df21ba1c2512eae1dc77345d4df059a1851f442e9bb8709f761e6d2f23a270a71c01467f7d1dd8090f1e245a10b748b543fa2165791383208916691e

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    decanter (0.5.0)
+    decanter (0.5.2)
       activesupport
 
 GEM

data/lib/decanter.rb

@@ -9,15 +9,16 @@ module Decanter
   def self.decanter_for(klass_or_sym)
     name = klass_or_sym.is_a?(Class) ?
             klass_or_sym.name :
-            klass_or_sym.to_s.singularize.capitalize
+            klass_or_sym.to_s.singularize.camelize
 
     @@decanters["#{name}Decanter"] || (raise NameError.new("unknown decanter #{name}Decanter"))
   end
 end
 
 require 'decanter/version'
-require 'active_support/inflector'
+require 'active_support/all'
 require 'decanter/base'
 require 'decanter/core'
 require 'decanter/extensions'
 require 'decanter/value_parser'
+require 'decanter/railtie' if defined? ::Rails::Railtie

data/lib/decanter/base.rb

@@ -3,5 +3,8 @@ require 'decanter/core'
 module Decanter
   class Base
     include Core
+    def self.inherited(subclass)
+      Decanter.register(subclass)
+    end
   end
 end

data/lib/decanter/core.rb

@@ -3,20 +3,19 @@ module Decanter
 
     def self.included(base)
       base.extend(ClassMethods)
-      Decanter.register(base)
     end
 
     module ClassMethods
 
       def associations
-        @associations ||= {}
+        @associations ||= {}.with_indifferent_access
       end
 
       def inputs
-        @inputs ||= {}
+        @inputs ||= {}.with_indifferent_access
       end
 
-      def input(name, type, **options)
+      def input(name=nil, type, **options)
         set_input options, {
           name:    name,
           options: options.reject { |k| k == :context },
@@ -32,7 +31,7 @@ module Decanter
         (inputs[context || :default] || {})[name]
       end
 
-      def has_many(name, **options)
+      def has_many(name=nil, **options)
         set_association options, {
           key:     options[:key] || "#{name}_attributes".to_sym,
           name:    name,
@@ -41,7 +40,7 @@ module Decanter
         }
       end
 
-      def has_one(name, **options)
+      def has_one(name=nil, **options)
         set_association options, {
           key:     options[:key] || "#{name}_attributes".to_sym,
           name:    name,
@@ -79,6 +78,7 @@ 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
         ]
@@ -87,7 +87,7 @@ module Decanter
       def handle_arg(name, value, context)
         case
         when input_cfg = input_for(name, context)
-          [name, parse(input_cfg[:type], value)]
+          [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)]
         when assoc = has_many_for(name, context)
@@ -98,8 +98,10 @@ module Decanter
         end
       end
 
-      def parse(type, val)
-        ValueParser.value_parser_for(type).parse(val)
+      def parse(name, type, val, options)
+        type ?
+          ValueParser.value_parser_for(type).parse(name, val, options) :
+          val
       end
     end
   end

data/lib/decanter/extensions.rb

@@ -6,12 +6,12 @@ module Decanter
     end
 
     def decant_update(args={}, context=nil)
-      self.attributes = self.decant(args, context)
+      self.attributes = self.class.decant(args, context)
       self.save(context: context)
     end
 
     def decant_update!(args={}, context=nil)
-      self.attributes = self.decant(args, context)
+      self.attributes = self.class.decant(args, context)
       self.save!(context: context)
     end
 
@@ -26,9 +26,8 @@ module Decanter
       end
 
       def decant(args, context)
-        decanter_for(self).decant(args, context)
+        Decanter.decanter_for(self).decant(args, context)
       end
     end
   end
 end
-ActiveRecord::Base.include(Decanter::Extensions) if defined? ActiveRecord

data/lib/decanter/railtie.rb

@@ -0,0 +1,9 @@
+require 'rails'
+require_relative 'extensions'
+
+class Decanter::Railtie < Rails::Railtie
+
+  initializer 'decanter.configure' do
+    ActiveRecord::Base.include(Decanter::Extensions) if defined? ActiveRecord
+  end
+end

data/lib/decanter/value_parser.rb

@@ -15,4 +15,9 @@ end
 require_relative 'value_parser/base'
 require_relative 'value_parser/core'
 require_relative 'value_parser/boolean_parser'
+require_relative 'value_parser/date_parser'
+require_relative 'value_parser/datetime_parser'
 require_relative 'value_parser/string_parser'
+require_relative 'value_parser/phone_parser'
+require_relative 'value_parser/float_parser'
+require_relative 'value_parser/integer_parser'

data/lib/decanter/value_parser/base.rb

@@ -1,3 +1,5 @@
+require_relative 'core'
+
 module Decanter
   module ValueParser
     class Base

data/lib/decanter/value_parser/boolean_parser.rb

@@ -1,15 +1,11 @@
 module Decanter
   module ValueParser
     class BooleanParser < Base
-      def self.parse(val)
-        case val
-        when nil
-          nil
-        when 1, '1', true, 'true'
-          true
-        else
-          false
-        end
+
+      allow TrueClass, FalseClass
+
+      parser do |name, val, options|
+        [1, '1'].include?(val) || !!/true/i.match(val.to_s)
       end
     end
   end

data/lib/decanter/value_parser/core.rb

@@ -1,14 +1,41 @@
 module Decanter
   module ValueParser
     module Core
+
       def self.included(base)
         base.extend(ClassMethods)
         ValueParser.register(base)
       end
 
       module ClassMethods
-        def parse(val)
-          val
+
+        def parse(name, val=nil, options={})
+
+          if val.blank?
+            if options[:required]
+              raise ArgumentError.new("No value for required argument: #{name}")
+            else
+              return val
+            end
+          end
+
+          if @allowed && @allowed.include?(val.class)
+            return val
+          end
+
+          unless @parser
+            raise ArgumentError.new("No parser for argument: #{name} with type: #{val.class}")
+          end
+
+          @parser.call(name, val, options)
+        end
+
+        def parser(&block)
+          @parser = block
+        end
+
+        def allow(*args)
+          @allowed = args
         end
       end
     end

data/lib/decanter/value_parser/date_parser.rb

@@ -1,11 +1,12 @@
 module Decanter
   module ValueParser
     class DateParser < Base
-      def self.parse(val, options = {})
+
+      allow Date
+
+      parser do |name, val, options|
         parse_format = options.fetch(:parse_format, '%m/%d/%Y')
-        return input_value unless input_value.present?
-        return input_value if input_value.is_a?(Date)
-        ::Date.strptime(input_value, parse_format)
+        ::Date.strptime(val, parse_format)
       end
     end
   end

data/lib/decanter/value_parser/datetime_parser.rb

@@ -0,0 +1,13 @@
+module Decanter
+  module ValueParser
+    class DateTimeParser < Base
+
+      allow DateTime
+
+      parser do |name, val, options|
+        parse_format = options.fetch(:parse_format, '%m/%d/%Y')
+        ::Date.strptime(val, parse_format)
+      end
+    end
+  end
+end

data/lib/decanter/value_parser/float_parser.rb

@@ -0,0 +1,13 @@
+module Decanter
+  module ValueParser
+    class FloatParser < Base
+      REGEX = /(\d|[.])/
+
+      allow Float, Fixnum
+
+      parser do |name, val, options|
+        val.scan(REGEX).join.try(:to_f)
+      end
+    end
+  end
+end

data/lib/decanter/value_parser/integer_parser.rb

@@ -0,0 +1,15 @@
+module Decanter
+  module ValueParser
+    class IntegerParser < Base
+      REGEX = /(\d|[.])/
+
+      allow Fixnum
+
+      parser do |name, val, options|
+        val.is_a?(Float) ?
+          val.to_i :
+          val.scan(REGEX).join.try(:to_i)
+      end
+    end
+  end
+end

data/lib/decanter/value_parser/phone_parser.rb

@@ -0,0 +1,13 @@
+module Decanter
+  module ValueParser
+    class PhoneParser < Base
+      REGEX = /\d/
+
+      allow Fixnum
+
+      parser do |name, val, options|
+        val.scan(REGEX).join.to_s
+      end
+    end
+  end
+end

data/lib/decanter/value_parser/string_parser.rb

@@ -1,8 +1,11 @@
 module Decanter
   module ValueParser
     class StringParser < Base
-      def self.parse(val)
-        val && val.respond_to?(:to_s) ? val.to_s : nil
+
+      allow String
+
+      parser do |name, val, options|
+        val.to_s
       end
     end
   end

data/lib/decanter/version.rb

@@ -1,3 +1,3 @@
 module Decanter
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decanter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ryan Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -87,11 +88,16 @@ files:
 - lib/decanter/base.rb
 - lib/decanter/core.rb
 - lib/decanter/extensions.rb
+- lib/decanter/railtie.rb
 - lib/decanter/value_parser.rb
 - lib/decanter/value_parser/base.rb
 - lib/decanter/value_parser/boolean_parser.rb
 - lib/decanter/value_parser/core.rb
 - lib/decanter/value_parser/date_parser.rb
+- lib/decanter/value_parser/datetime_parser.rb
+- lib/decanter/value_parser/float_parser.rb
+- lib/decanter/value_parser/integer_parser.rb
+- lib/decanter/value_parser/phone_parser.rb
 - lib/decanter/value_parser/string_parser.rb
 - lib/decanter/version.rb
 homepage: https://github.com/launchpadlab/decanter
@@ -115,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Form Parser for Rails