decanter 2.1.1 → 3.1.1

data/lib/decanter/exceptions.rb

@@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 module Decanter
-  module Core
-    class Error < StandardError; end
-    class UnhandledKeysError < Error; end
-    class MissingRequiredInputValue < Error; end
-  end
+  class Error < StandardError; end
+  class UnhandledKeysError < Error; end
+  class MissingRequiredInputValue < Error; end
+  class ParseError < Error; end
 end

data/lib/decanter/extensions.rb

@@ -1,19 +1,18 @@
-# frozen_string_literal: true
-
 module Decanter
   module Extensions
+
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     def decant_update(args, **options)
       self.attributes = self.class.decant(args, options)
-      save(context: options[:context])
+      self.save(context: options[:context])
     end
 
     def decant_update!(args, **options)
       self.attributes = self.class.decant(args, options)
-      save!(context: options[:context])
+      self.save!(context: options[:context])
     end
 
     def decant(args, **options)
@@ -21,22 +20,23 @@ module Decanter
     end
 
     module ClassMethods
+
       def decant_create(args, **options)
-        new(decant(args, options))
-          .save(context: options[:context])
+        self.new(decant(args, options))
+            .save(context: options[:context])
       end
 
       def decant_new(args, **options)
-        new(decant(args, options))
+        self.new(decant(args, options))
       end
 
       def decant_create!(args, **options)
-        new(decant(args, options))
-          .save!(context: options[:context])
+        self.new(decant(args, options))
+            .save!(context: options[:context])
       end
 
-      def decant(args, options = {})
-        if (specified_decanter = options[:decanter])
+      def decant(args, options={})
+        if specified_decanter = options[:decanter]
           Decanter.decanter_from(specified_decanter)
         else
           Decanter.decanter_for(self)

data/lib/decanter/parser.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'parser/utils'
 
 module Decanter
@@ -15,6 +13,16 @@ module Decanter
              .flatten
       end
 
+      # Composes multiple parsers into a single parser
+      def compose_parsers(parsers)
+        raise ArgumentError.new('expects an array') unless parsers.is_a? Array
+        composed_parser = Class.new(Decanter::Parser::ComposeParser)
+        composed_parser.parsers(parsers)
+        composed_parser
+      end
+
+      private
+
       # convert from a class or symbol to a string and concat 'Parser'
       def klass_or_sym_to_str(klass_or_sym)
         case klass_or_sym
@@ -23,8 +31,8 @@ module Decanter
         when Symbol
           symbol_to_string(klass_or_sym)
         else
-          raise ArgumentError, "cannot lookup parser for #{klass_or_sym} with class #{klass_or_sym.class}"
-        end + 'Parser'
+          raise ArgumentError.new("cannot lookup parser for #{klass_or_sym} with class #{klass_or_sym.class}")
+        end.concat('Parser')
       end
 
       # convert from a string to a constant
@@ -32,7 +40,7 @@ module Decanter
         # safe_constantize returns nil if match not found
         parser_str.safe_constantize ||
           concat_str(parser_str).safe_constantize ||
-          raise(NameError, "cannot find parser #{parser_str}")
+          raise(NameError.new("cannot find parser #{parser_str}"))
       end
 
       # expand to include preparsers

data/lib/decanter/parser/array_parser.rb

@@ -0,0 +1,28 @@
+module Decanter
+  module Parser
+    class ArrayParser < ValueParser
+
+      DUMMY_VALUE_KEY = '_'.freeze
+
+      parser do |val, options|
+        next if val.nil?
+        raise Decanter::ParseError.new 'Expects an array' unless val.is_a? Array
+        # Fetch parser classes for provided keys
+        parse_each = options.fetch(:parse_each, :pass)
+        item_parsers = Parser.parsers_for(Array.wrap(parse_each))
+        unless item_parsers.all? { |parser| parser <= ValueParser }
+          raise Decanter::ParseError.new 'parser(s) for array items must subclass ValueParser'
+        end
+        # Compose supplied parsers
+        item_parser = Parser.compose_parsers(item_parsers)
+        # Parse all values
+        val.map do |item|
+          # Value parsers will expect a "key" for the value they're parsing,
+          # so we provide a dummy one.
+          result = item_parser.parse(DUMMY_VALUE_KEY, item, options)
+          result[DUMMY_VALUE_KEY]
+        end.compact
+      end
+    end
+  end
+end

data/lib/decanter/parser/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative 'core'
 
 module Decanter
@@ -9,3 +7,4 @@ module Decanter
     end
   end
 end
+

data/lib/decanter/parser/boolean_parser.rb

@@ -1,11 +1,12 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class BooleanParser < ValueParser
+
       allow TrueClass, FalseClass
 
-      parser do |val, _options|
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
         [1, '1'].include?(val) || !!/true/i.match(val.to_s)
       end
     end

data/lib/decanter/parser/compose_parser.rb

@@ -0,0 +1,27 @@
+require_relative 'core'
+
+# A parser that composes the results of multiple parsers.
+# Intended for internal use only.
+module Decanter
+  module Parser
+    class ComposeParser < Base
+
+      def self._parse(name, value, options={})
+        raise Decanter::ParseError.new('Must have parsers') unless @parsers
+        # Call each parser on the result of the previous one.
+        initial_result = { name => value }
+        @parsers.reduce(initial_result) do |result, parser|
+          result.keys.reduce({}) do |acc, key| 
+            acc.merge(parser.parse(key, result[key], options)) 
+          end
+        end
+      end
+
+      def self.parsers(parsers)
+        @parsers = parsers
+      end
+
+    end
+  end
+end
+

data/lib/decanter/parser/core.rb

@@ -1,21 +1,19 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     module Core
+
       def self.included(base)
         base.extend(ClassMethods)
       end
 
       module ClassMethods
+
         # Check if allowed, parse if not
-        def parse(values, options = {})
-          if empty_values?(values)
-            nil
-          elsif allowed?(values)
-            values
+        def parse(name, value, options={})
+          if allowed?(value)
+            { name => value }
           else
-            _parse(values, options)
+            _parse(name, value, options)
           end
         end
 
@@ -40,14 +38,8 @@ module Decanter
         end
 
         # Check for allowed classes
-        def allowed?(values)
-          @allowed && Array.wrap(values).all? do |value|
-            @allowed.any? { |allowed| value.is_a? allowed }
-          end
-        end
-
-        def empty_values?(values)
-          return true if Array.wrap(values).all? { |value| value.nil? || value == '' }
+        def allowed?(value)
+          @allowed && @allowed.any? { |allowed| value.is_a? allowed }
         end
       end
     end

data/lib/decanter/parser/date_parser.rb

@@ -1,17 +1,16 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class DateParser < ValueParser
+
       allow Date
 
       parser do |val, options|
-        if (parse_format = options[:parse_format])
-          ::Date.strptime(val, parse_format)
-        else
-          ::Date.parse(val)
-        end
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
+        parse_format = options.fetch(:parse_format, '%m/%d/%Y')
+        ::Date.strptime(val, parse_format)
       end
     end
   end
 end
+

data/lib/decanter/parser/datetime_parser.rb

@@ -0,0 +1,15 @@
+module Decanter
+  module Parser
+    class DateTimeParser < ValueParser
+
+      allow DateTime
+
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
+        parse_format = options.fetch(:parse_format, '%m/%d/%Y %I:%M:%S %p')
+        ::DateTime.strptime(val, parse_format)
+      end
+    end
+  end
+end

data/lib/decanter/parser/float_parser.rb

@@ -1,12 +1,14 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class FloatParser < ValueParser
-      allow Float
+      REGEX = /(\d|[.])/
+
+      allow Float, Integer
 
-      parser do |val, _options|
-        Float(val)
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
+        val.scan(REGEX).join.try(:to_f)
       end
     end
   end

data/lib/decanter/parser/hash_parser.rb

@@ -1,21 +1,18 @@
-# frozen_string_literal: true
-
 require_relative 'core'
 
 module Decanter
   module Parser
     class HashParser < Base
-      def self._parse(values, options = {})
-        validate_hash(@parser.call(values, options))
+      def self._parse(name, value, options={})
+        validate_hash(@parser.call(name, value, options))
       end
 
+      private
       def self.validate_hash(parsed)
-        return parsed if parsed.is_a?(Hash)
-
-        raise(ArgumentError, "Result of HashParser was #{parsed} when it must be a hash.")
+        parsed.is_a?(Hash) ? parsed :
+          raise(ArgumentError.new("Result of HashParser #{self.name} was #{parsed} when it must be a hash."))
       end
-
-      private_class_method :validate_hash
     end
   end
 end
+

data/lib/decanter/parser/integer_parser.rb

@@ -1,12 +1,16 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class IntegerParser < ValueParser
+      REGEX = /(\d|[.])/
+
       allow Integer
 
-      parser do |val, _options|
-        Integer(val)
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
+        val.is_a?(Float) ?
+          val.to_i :
+          val.scan(REGEX).join.try(:to_i)
       end
     end
   end

data/lib/decanter/parser/pass_parser.rb

@@ -1,9 +1,11 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class PassParser < ValueParser
-      allow Object
+
+      parser do |val, options|
+        next if (val.nil? || val == '')
+        val
+      end
     end
   end
 end

data/lib/decanter/parser/phone_parser.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class PhoneParser < ValueParser
@@ -7,7 +5,9 @@ module Decanter
 
       allow Integer
 
-      parser do |val, _options|
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
         val.scan(REGEX).join.to_s
       end
     end

data/lib/decanter/parser/string_parser.rb

@@ -1,11 +1,10 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     class StringParser < ValueParser
-      allow String
-
-      parser do |val, _options|
+      parser do |val, options|
+        raise Decanter::ParseError.new 'Expects a single value' if val.is_a? Array
+        next if (val.nil? || val === '')
+        next val if val.is_a? String
         val.to_s
       end
     end

data/lib/decanter/parser/utils.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Decanter
   module Parser
     module Utils
@@ -26,7 +24,7 @@ module Decanter
       end
 
       def concat_str(parser_str)
-        'Decanter::Parser::' + parser_str
+        'Decanter::Parser::'.concat(parser_str)
       end
     end
   end

data/lib/decanter/parser/value_parser.rb

@@ -1,13 +1,12 @@
-# frozen_string_literal: true
-
 require_relative 'core'
 
 module Decanter
   module Parser
     class ValueParser < Base
-      def self._parse(values, options = {})
-        @parser.call(values, options)
+      def self._parse(name, value, options={})
+        { name => @parser.call(value, options) }
       end
     end
   end
 end
+

data/lib/decanter/railtie.rb

@@ -1,17 +1,21 @@
-# frozen_string_literal: true
-
 require 'decanter'
 
-module Decanter
-  class Railtie < Rails::Railtie
-    initializer 'decanter.parser.autoload', before: :set_autoload_paths do |app|
-      app.config.autoload_paths << Rails.root.join('lib/decanter/parsers')
-    end
+class Decanter::Railtie < Rails::Railtie
 
-    generators do |app|
-      Rails::Generators.configure!(app.config.generators)
-      Rails::Generators.hidden_namespaces.uniq!
-      require 'generators/rails/resource_override'
+  initializer 'decanter.active_record' do
+    ActiveSupport.on_load :active_record do
+      require 'decanter/extensions'
+      Decanter::Extensions::ActiveRecordExtensions.enable!
     end
   end
+
+  initializer 'decanter.parser.autoload', :before => :set_autoload_paths do |app|
+    app.config.autoload_paths << Rails.root.join("lib/decanter/parsers")
+  end
+
+  generators do |app|
+    Rails::Generators.configure!(app.config.generators)
+    Rails::Generators.hidden_namespaces.uniq!
+    require 'generators/rails/resource_override'
+  end
 end