decanter 1.1.10 → 2.1.0

data/lib/decanter/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Decanter
   module Core
     class Error < StandardError; end

data/lib/decanter/extensions.rb

@@ -1,18 +1,19 @@
+# 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)
-      self.save(context: options[:context])
+      save(context: options[:context])
     end
 
     def decant_update!(args, **options)
       self.attributes = self.class.decant(args, options)
-      self.save!(context: options[:context])
+      save!(context: options[:context])
     end
 
     def decant(args, **options)
@@ -20,23 +21,22 @@ module Decanter
     end
 
     module ClassMethods
-
       def decant_create(args, **options)
-        self.new(decant(args, options))
-            .save(context: options[:context])
+        new(decant(args, options))
+          .save(context: options[:context])
       end
 
       def decant_new(args, **options)
-        self.new(decant(args, options))
+        new(decant(args, options))
       end
 
       def decant_create!(args, **options)
-        self.new(decant(args, options))
-            .save!(context: options[:context])
+        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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'parser/utils'
 
 module Decanter
@@ -21,8 +23,8 @@ module Decanter
         when Symbol
           symbol_to_string(klass_or_sym)
         else
-          raise ArgumentError.new("cannot lookup parser for #{klass_or_sym} with class #{klass_or_sym.class}")
-        end.concat('Parser')
+          raise ArgumentError, "cannot lookup parser for #{klass_or_sym} with class #{klass_or_sym.class}"
+        end + 'Parser'
       end
 
       # convert from a string to a constant
@@ -30,7 +32,7 @@ module Decanter
         # safe_constantize returns nil if match not found
         parser_str.safe_constantize ||
           concat_str(parser_str).safe_constantize ||
-          raise(NameError.new("cannot find parser #{parser_str}"))
+          raise(NameError, "cannot find parser #{parser_str}")
       end
 
       # expand to include preparsers

data/lib/decanter/parser/base.rb

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

data/lib/decanter/parser/boolean_parser.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class BooleanParser < ValueParser
-
       allow TrueClass, FalseClass
 
-      parser do |val, options|
+      parser do |val, _options|
         [1, '1'].include?(val) || !!/true/i.match(val.to_s)
       end
     end

data/lib/decanter/parser/core.rb

@@ -1,22 +1,21 @@
+# 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(name, values, options={})
-          case
-          when empty_values?(values)
-            { name => nil }
-          when allowed?(values)
-            { name => values }
+        def parse(values, options = {})
+          if empty_values?(values)
+            nil
+          elsif allowed?(values)
+            values
           else
-            _parse(name, values, options)
+            _parse(values, options)
           end
         end
 
@@ -48,7 +47,7 @@ module Decanter
         end
 
         def empty_values?(values)
-          return true if Array.wrap(values).all? { |value| value.nil? || value == "" }
+          return true if Array.wrap(values).all? { |value| value.nil? || value == '' }
         end
       end
     end

data/lib/decanter/parser/date_parser.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class DateParser < ValueParser
-
       allow Date
 
       parser do |val, options|
-        parse_format = options.fetch(:parse_format, '%m/%d/%Y')
-        ::Date.strptime(val, parse_format)
+        if (parse_format = options[:parse_format])
+          ::Date.strptime(val, parse_format)
+        else
+          ::Date.parse(val)
+        end
       end
     end
   end
 end
-

data/lib/decanter/parser/date_time_parser.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decanter
+  module Parser
+    # rubocop:disable Style/DateTime
+    class DateTimeParser < ValueParser
+      allow DateTime
+
+      parser do |val, options|
+        if val.is_a?(Time)
+          val.to_datetime
+        elsif (parse_format = options[:parse_format])
+          ::DateTime.strptime(val, parse_format)
+        else
+          ::DateTime.parse(val)
+        end
+      end
+    end
+    # rubocop:enable Style/DateTime
+  end
+end

data/lib/decanter/parser/float_parser.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class FloatParser < ValueParser
-      REGEX = /(\d|[.])/
-
-      allow Float, Integer
+      allow Float
 
-      parser do |val, options|
-        val.scan(REGEX).join.try(:to_f)
+      parser do |val, _options|
+        Float(val)
       end
     end
   end

data/lib/decanter/parser/hash_parser.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 require_relative 'core'
 
 module Decanter
   module Parser
     class HashParser < Base
-      def self._parse(name, values, options={})
-        validate_hash(@parser.call(name, values, options))
+      def self._parse(values, options = {})
+        validate_hash(@parser.call(values, options))
       end
 
-      private
       def self.validate_hash(parsed)
-        parsed.is_a?(Hash) ? parsed :
-          raise(ArgumentError.new("Result of HashParser #{self.name} was #{parsed} when it must be a hash."))
+        return parsed if parsed.is_a?(Hash)
+
+        raise(ArgumentError, "Result of HashParser 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,14 +1,12 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class IntegerParser < ValueParser
-      REGEX = /(\d|[.])/
-
       allow Integer
 
-      parser do |val, options|
-        val.is_a?(Float) ?
-          val.to_i :
-          val.scan(REGEX).join.try(:to_i)
+      parser do |val, _options|
+        Integer(val)
       end
     end
   end

data/lib/decanter/parser/join_parser.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class JoinParser < ValueParser
-      DELIM = ','
+      ITEM_DELIM = ','
 
       parser do |val, options|
         delimiter = options.fetch(:delimiter, ITEM_DELIM)
-        val.join(DELIM)
+        val.join(delimiter)
       end
     end
   end
 end
-

data/lib/decanter/parser/key_value_splitter_parser.rb

@@ -1,15 +1,18 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class KeyValueSplitterParser < HashParser
       ITEM_DELIM = ','
       PAIR_DELIM = ':'
 
-      parser do |name, val, options|
+      parser do |val, options|
         item_delimiter = options.fetch(:item_delimiter, ITEM_DELIM)
         pair_delimiter = options.fetch(:pair_delimiter, PAIR_DELIM)
-        val.split(item_delimiter).reduce({}) { |memo, pair| memo.merge( Hash[ *pair.split(pair_delimiter) ] ) }
+        val.split(item_delimiter).reduce({}) do |memo, pair|
+          memo.merge(Hash[*pair.split(pair_delimiter)])
+        end
       end
     end
   end
 end
-

data/lib/decanter/parser/pass_parser.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class PassParser < ValueParser
-
       allow Object
     end
   end

data/lib/decanter/parser/phone_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class PhoneParser < ValueParser
@@ -5,7 +7,7 @@ module Decanter
 
       allow Integer
 
-      parser do |val, options|
+      parser do |val, _options|
         val.scan(REGEX).join.to_s
       end
     end

data/lib/decanter/parser/string_parser.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 module Decanter
   module Parser
     class StringParser < ValueParser
-
       allow String
 
-      parser do |val, options|
+      parser do |val, _options|
         val.to_s
       end
     end

data/lib/decanter/parser/time_parser.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decanter
+  module Parser
+    class TimeParser < ValueParser
+      allow Time
+
+      parser do |val, options|
+        if val.is_a?(DateTime)
+          val.to_time
+        elsif (parse_format = options[:parse_format])
+          ::Time.strptime(val, parse_format)
+        else
+          ::Time.parse(val)
+        end
+      end
+    end
+  end
+end

data/lib/decanter/parser/utils.rb

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

data/lib/decanter/parser/value_parser.rb

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

data/lib/decanter/railtie.rb

@@ -1,21 +1,17 @@
-require 'decanter'
+# frozen_string_literal: true
 
-class Decanter::Railtie < Rails::Railtie
+require 'decanter'
 
-  initializer 'decanter.active_record' do
-    ActiveSupport.on_load :active_record do
-      require 'decanter/extensions'
-      Decanter::Extensions::ActiveRecordExtensions.enable!
+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
-  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'
+    generators do |app|
+      Rails::Generators.configure!(app.config.generators)
+      Rails::Generators.hidden_namespaces.uniq!
+      require 'generators/rails/resource_override'
+    end
   end
 end

data/lib/decanter/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Decanter
-  VERSION = '1.1.10'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/generators/decanter/install_generator.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Decanter
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
-      desc "Creates a Decanter initializer in your application."
+      desc 'Creates a Decanter initializer in your application.'
 
       def copy_initializer
-        copy_file "initializer.rb", "config/initializers/decanter.rb"
+        copy_file 'initializer.rb', 'config/initializers/decanter.rb'
       end
     end
   end