active_model-better_errors 1.6.3 → 1.6.5

data/config/devtools.yml

@@ -0,0 +1,4 @@
+---
+unit_test_timeout: 0.1
+fail_on_branch:
+- "master"

data/config/flay.yml

@@ -0,0 +1,3 @@
+---
+threshold: 8
+total_score: 100

data/config/flog.yml

@@ -0,0 +1,2 @@
+---
+threshold: 0

data/config/mutant.yml

@@ -0,0 +1,3 @@
+---
+name: active_model/better_errors
+namespace: ActiveModel::BetterErrors

data/config/reek.yml

@@ -0,0 +1,103 @@
+---
+Attribute:
+  enabled: true
+  exclude: []
+BooleanParameter:
+  enabled: true
+  exclude: []
+ClassVariable:
+  enabled: true
+  exclude: []
+ControlParameter:
+  enabled: true
+  exclude: []
+DataClump:
+  enabled: true
+  exclude: []
+  max_copies: 2
+  min_clump_size: 2
+DuplicateMethodCall:
+  enabled: true
+  exclude: []
+  max_calls: 1
+  allow_calls: []
+FeatureEnvy:
+  enabled: true
+  exclude: []
+IrresponsibleModule:
+  enabled: true
+  exclude: []
+LongParameterList:
+  enabled: true
+  exclude: []
+  max_params: 2
+  overrides:
+    initialize:
+      max_params: 3
+LongYieldList:
+  enabled: true
+  exclude: []
+  max_params: 2
+NestedIterators:
+  enabled: true
+  exclude: []
+  max_allowed_nesting: 1
+  ignore_iterators: []
+NilCheck:
+  enabled: true
+  exclude: []
+RepeatedConditional:
+  enabled: true
+  exclude: []
+  max_ifs: 1
+TooManyInstanceVariables:
+  enabled: true
+  exclude: []
+  max_instance_variables: 3
+TooManyMethods:
+  enabled: true
+  exclude: []
+  max_methods: 10
+TooManyStatements:
+  enabled: true
+  exclude:
+  - each
+  max_statements: 2
+UncommunicativeMethodName:
+  enabled: true
+  exclude: []
+  reject:
+  - !ruby/regexp /^[a-z]$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
+  accept: []
+UncommunicativeModuleName:
+  enabled: true
+  exclude: []
+  reject:
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
+  accept: []
+UncommunicativeParameterName:
+  enabled: true
+  exclude: []
+  reject:
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
+  accept: []
+UncommunicativeVariableName:
+  enabled: true
+  exclude: []
+  reject:
+  - !ruby/regexp /^.$/
+  - !ruby/regexp /[0-9]$/
+  - !ruby/regexp /[A-Z]/
+  accept: []
+UnusedParameters:
+  enabled: true
+  exclude: []
+UtilityFunction:
+  enabled: true
+  exclude: []
+  max_helper_calls: 0

data/config/rubocop.yml

@@ -0,0 +1,62 @@
+AllCops:
+  Includes:
+    - '**/*.rake'
+    - 'Gemfile'
+    - 'Gemfile.devtools'
+  Excludes:
+    - '**/vendor/**'
+    - '**/benchmarks/**'
+
+# Avoid parameter lists longer than five parameters.
+ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 3
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    collect:  'map'
+    inject:   'reduce'
+    find:     'detect'
+    find_all: 'select'
+
+# Do not force public/protected/private keyword to be indented at the same
+# level as the def keyword. My personal preference is to outdent these keywords
+# because I think when scanning code it makes it easier to identify the
+# sections of code and visually separate them. When the keyword is at the same
+# level I think it sort of blends in with the def keywords and makes it harder
+# to scan the code and see where the sections are.
+AccessModifierIndentation:
+  Enabled: false
+
+# Limit line length
+LineLength:
+  Max: 79
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Do not favor modifier if/unless usage when you have a single-line body
+IfUnlessModifier:
+  Enabled: false
+
+# Allow case equality operator (in limited use within the specs)
+CaseEquality:
+  Enabled: false
+
+# Constants do not always have to use SCREAMING_SNAKE_CASE
+ConstantName:
+  Enabled: false
+
+# Not all trivial readers/writers can be defined with attr_* methods
+TrivialAccessors:
+  Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/config/yardstick.yml

@@ -0,0 +1,2 @@
+---
+threshold: 100

data/lib/active_model/better_errors.rb

@@ -1,15 +1,75 @@
+# encoding: utf-8
+
 require 'forwardable'
+require 'active_support/all'
+require 'active_model'
+
+require 'active_model/better_errors/error_message'
+require 'active_model/better_errors/error_message_set'
+require 'active_model/better_errors/error_collection'
+
+require 'active_model/better_errors/formatter'
+require 'active_model/better_errors/human_message_formatter'
+
+require 'active_model/better_errors/reporter'
+require 'active_model/better_errors/message_reporter'
+require 'active_model/better_errors/hash_reporter'
+require 'active_model/better_errors/array_reporter'
 
-require 'active_support/core_ext/string/inflections'
+require 'active_model/better_errors/human_message_reporter'
+require 'active_model/better_errors/human_hash_reporter'
+require 'active_model/better_errors/human_array_reporter'
 
-require 'active_model/error_collecting'
+require 'active_model/better_errors/machine_hash_reporter'
+require 'active_model/better_errors/machine_array_reporter'
 
-require 'active_model/validations'
+require 'active_model/better_errors/emulation'
+require 'active_model/better_errors/errors'
 
 module ActiveModel
+  #
+  # BetterErrors
+  #
+  module BetterErrors
+    class << self
+      attr_accessor :formatter
+
+      def set_reporter(name, reporter)
+        name = name.to_s
+        @reporter_maps ||= {}
+        return @reporter_maps.delete(name) unless reporter
+        @reporter_maps[name] = get_reporter_class(name, reporter)
+      end
+
+      def reporters
+        @reporter_maps ||= {}
+        @reporter_maps.clone
+      end
+
+      def get_reporter_class(name, reporter)
+        return reporter if reporter.is_a? Class
+        class_name = "#{reporter}_#{name}_reporter"
+        "active_model/better_errors/#{class_name}".classify.constantize
+      end
+
+      def format_message(base, message)
+        formatter.new(base, message).format_message
+      end
+    end
+
+    set_reporter :message,  :human
+    set_reporter :array,    :human
+    set_reporter :hash,     :human
+
+    self.formatter = HumanMessageFormatter
+  end
+
+  #
+  # ActiveModel::Validations.errors override
+  #
   module Validations
     def errors
-      @errors ||= ErrorCollecting::Errors.new(self)
+      @errors ||= BetterErrors::Errors.new(self)
     end
   end
 end

data/lib/active_model/better_errors/array_reporter.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+module ActiveModel
+  module BetterErrors
+    #
+    # ArrayReporter
+    #
+    class ArrayReporter < Reporter
+      def to_a
+        fail 'abstract method'
+      end
+    end
+  end
+end

data/lib/active_model/{error_collecting → better_errors}/emulation.rb

@@ -1,10 +1,16 @@
+# encoding: utf-8
+
 #
 # Allows included class to emulate ActiveModel::Errors class
 # by defining a set of methods to delegate to facilities
 # in this gem.
 #
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # Emulation
+    # The ActiveModel Emulation Layer
+    #
     module Emulation
       MODEL_METHODS = [
         :clear, :include?, :get, :set, :delete, :[], :[]=,
@@ -44,22 +50,23 @@ module ActiveModel
         end
       end
 
-      def add(attribute, message=nil, options = {})
+      def add(attribute, message = nil, options = {})
         if options[:strict]
           error   = ErrorMessage.build(attribute, message, options)
-          message = HumanMessageFormatter.new(@base, error).format_message
-          raise ActiveModel::StrictValidationFailed, full_message(attribute, message)
+          message = ::ActiveModel::BetterErrors.format_message(@base, error)
+          full_message = full_message(attribute, message)
+          fail ActiveModel::StrictValidationFailed, full_message
         end
         error_collection.add attribute, message, options
       end
 
-      def to_xml(options={})
-        to_a.to_xml options.reverse_merge(:root => "errors", :skip_types => true)
+      def to_xml(options = {})
+        to_a.to_xml options.reverse_merge(root: 'errors', skip_types: true)
       end
 
-      def as_json(options=nil)
+      def as_json(options = nil)
         to_hash
       end
     end
   end
-end
+end

data/lib/active_model/{error_collecting → better_errors}/error_collection.rb

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # ErrorCollection
+    #
     class ErrorCollection
       include Enumerable
 
@@ -14,7 +19,7 @@ module ActiveModel
       end
 
       def include?(attribute)
-        ( v = @collection[attribute] ) && v.any?
+        ( v = @collection[attribute]) && v.any?
       end
 
       def get(attribute)
@@ -40,12 +45,14 @@ module ActiveModel
 
       def each
         @collection.each_key do |attribute|
-          self[attribute].each { |error_message| yield attribute, error_message }
+          self[attribute].each do |error_message|
+            yield attribute, error_message
+          end
         end
       end
 
       def size
-        values.inject(0){ |sum, set| sum += set.size }
+        values.reduce(0) { |a, e| a + e.size }
       end
       alias_method :count, :size
 
@@ -75,11 +82,12 @@ module ActiveModel
       end
 
       def add(attribute, message, options = {})
-        self[attribute] << [ message, options ]
+        self[attribute] << [message, options]
       end
 
       def added?(attribute, message = nil, options = {})
-        self[attribute].include? ErrorMessage.build(base, attribute, message, options)
+        message = ErrorMessage.build(base, attribute, message, options)
+        self[attribute].include? message
       end
     end
   end

data/lib/active_model/{error_collecting → better_errors}/error_message.rb

@@ -1,8 +1,15 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # ErrorMessage
+    #
     class ErrorMessage
       include Comparable
-      CALLBACKS_OPTIONS = [:if, :unless, :on, :allow_nil, :allow_blank, :strict]
+      CALLBACKS_OPTIONS = [
+        :if, :unless, :on, :allow_nil, :allow_blank, :strict
+      ]
 
       # return the message either as nil, symbol, or string
       def self.normalize(message)
@@ -35,7 +42,7 @@ module ActiveModel
         [symbol, string]
       end
 
-      def self.build(base, attribute, message, options=nil)
+      def self.build(base, attribute, message, options = nil)
         options   = options ? options : {}
         options   = options.except(*CALLBACKS_OPTIONS)
 
@@ -54,7 +61,7 @@ module ActiveModel
         @options    = options
       end
 
-      def <=> (other)
+      def <=>(other)
         to_hash <=> other.to_hash
       end
 
@@ -67,12 +74,16 @@ module ActiveModel
         }
       end
 
+      def as_json(*json_args)
+        to_hash
+      end
+
       def hash
         to_hash.hash
       end
 
       def to_s
-        HumanMessageFormatter.new(base, self).format_message
+        ::ActiveModel::BetterErrors.format_message(base, self)
       end
 
       def inspect

data/lib/active_model/{error_collecting → better_errors}/error_message_set.rb

@@ -1,7 +1,12 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # ErrorMessageSet
+    #
     class ErrorMessageSet < Array
-      def initialize(base, attribute, errors=[])
+      def initialize(base, attribute, errors = [])
         @base      = base
         @attribute = attribute
         errors.each do |error|