active_model-better_errors 1.6.3 → 1.6.5

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

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # Errors
+    #
     class Errors
       include Emulation
 
@@ -28,7 +33,9 @@ module ActiveModel
 
       def set_reporter(type, reporter)
         type = type.to_s
-        klass = ::ActiveModel::ErrorCollecting.get_reporter_class(type, reporter)
+        klass = ::ActiveModel::BetterErrors
+          .get_reporter_class(type, reporter)
+
         @reporter_classes[type] = klass
         @reporters.delete type
       end
@@ -40,7 +47,7 @@ module ActiveModel
       end
 
       def reporter_classes
-        ::ActiveModel::ErrorCollecting.reporters
+        ::ActiveModel::BetterErrors.reporters
       end
 
       def get_reporter_class(type)

data/lib/active_model/better_errors/formatter.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+module ActiveModel
+  module BetterErrors
+    #
+    # Abstract Formatter class
+    class Formatter
+      extend Forwardable
+
+      def_delegators :@error_message, :attribute, :message, :options
+
+      attr_reader :base, :error_message
+
+      def initialize(base, error_message)
+        @base, @error_message = base, error_message
+      end
+
+      #
+      # @abstract
+      # Formats the error message into a comsumable string.
+      # see HumanMessageFormatter for more details.
+      def format_message
+      end
+    end
+  end
+end

data/lib/active_model/better_errors/hash_reporter.rb

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

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

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # HumanArrayReporter
+    #
     class HumanArrayReporter < ArrayReporter
       def to_a
         HumanMessageReporter.new(collection).full_messages

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

@@ -1,11 +1,16 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # HumanHashReporter
+    #
     class HumanHashReporter < HashReporter
       def to_hash
-        collection.to_hash.inject({}) do |hash, kv|
+        collection.to_hash.reduce({}) do |hash, kv|
           attribute, error_message_set = kv
           hash[attribute] = error_message_set.map do |error_message|
-            HumanMessageFormatter.new(base, error_message).format_message
+            ::ActiveModel::BetterErrors.format_message(base, error_message)
           end
           hash
         end

data/lib/active_model/better_errors/human_message_formatter.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+module ActiveModel
+  module BetterErrors
+    #
+    # HumanMessageFormatter
+    #
+    class HumanMessageFormatter < Formatter
+      def format_message
+        return message if message && type.nil?
+
+        keys = i18n_keys
+        key  = keys.shift
+
+        options = {
+          default: keys,
+          model: base.class.model_name.human,
+          attribute: base.class.human_attribute_name(attribute),
+          value: value
+        }.merge(self.options)
+
+        I18n.translate key, options
+      end
+
+      private
+
+      def type
+        error_message.type || :invalid
+      end
+
+      def value
+        return if attribute == :base
+        base.send :read_attribute_for_validation, attribute
+      end
+
+      def ancestor_keys
+        return [] unless base.class.respond_to?(:i18n_scope)
+        scope = base.class.i18n_scope
+
+        base.class.lookup_ancestors.map do |klass|
+          key_base = "#{scope}.errors.models.#{klass.model_name.i18n_key}"
+          [
+            :"#{key_base}.attributes.#{attribute}.#{type}",
+            :"#{key_base}.#{type}"
+          ]
+        end
+      end
+
+      def i18n_keys
+        keys = ancestor_keys
+        keys << message
+
+        if base.class.respond_to?(:i18n_scope)
+          keys << :"#{base.class.i18n_scope}.errors.messages.#{type}"
+        end
+
+        keys << :"errors.attributes.#{attribute}.#{type}"
+        keys << :"errors.messages.#{type}"
+
+        keys.compact!
+        keys.flatten!
+        keys
+      end
+    end
+  end
+end

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

@@ -1,31 +1,38 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # HumanMessageReporter
+    #
     class HumanMessageReporter < MessageReporter
       def full_messages
         @collection.map do |attribute, error_message|
-          formatter = HumanMessageFormatter.new(base, error_message)
-          message   = formatter.format_message
+          message = ::ActiveModel::BetterErrors.format_message(
+            base, error_message
+          )
           full_message attribute, message
         end
       end
 
       def full_message(attribute, message)
         return message if attribute == :base
-        attr_name = attribute.to_s.gsub('.', '_').humanize
-        attr_name = base.class.human_attribute_name(attribute, :default => attr_name)
-        I18n.t(:"errors.format", {
-          :default   => "%{attribute} %{message}",
-          :attribute => attr_name,
-          :message   => message
-        })
+        str = attribute.to_s.gsub('.', '_').humanize
+        str = base.class.human_attribute_name(attribute, default: str)
+
+        I18n.t(
+          'errors.format',
+          default:    '%{attribute} %{message}',
+          attribute:  str,
+          message:    message
+        )
       end
 
       # This method is not used internally.
       # This is for API Compatibility with ActiveModel::Errors only
       def generate_message(attribute, type = :invalid, options = {})
         error_message = ErrorMessage.build(base, attribute, type, options)
-        formatter     = HumanMessageFormatter.new(base, error_message)
-        formatter.format_message
+        ::ActiveModel::BetterErrors.format_message(base, error_message)
       end
     end
   end

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

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # MachineArrayReporter
+    #
     class MachineArrayReporter < ArrayReporter
       def to_a
         collection.to_a.map do |error_message|
@@ -11,7 +16,10 @@ module ActiveModel
         result = {}
         result[:attribute] = error_message.attribute.to_s
         result[:type] = error_message.type || :invalid
-        result[:options] = error_message.options unless error_message.options.blank?
+
+        options = error_message.options
+        result[:options] = options unless options.blank?
+
         result
       end
     end

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

@@ -1,8 +1,13 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # MachineHashReporter
+    #
     class MachineHashReporter < HashReporter
       def to_hash
-        collection.to_hash.inject({}) do |hash, kv|
+        collection.to_hash.reduce({}) do |hash, kv|
           attribute, error_message_set = kv
           hash[attribute] = error_message_set.map do |error_message|
             format_error_message(error_message)
@@ -14,7 +19,9 @@ module ActiveModel
       def format_error_message(error_message)
         result = {}
         result[:type] = error_message.type || :invalid
-        result[:options] = error_message.options unless error_message.options.blank?
+
+        options = error_message.options
+        result[:options] = options unless options.blank?
         result
       end
     end

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

@@ -1,17 +1,22 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # MessageReporter
+    #
     class MessageReporter < Reporter
       def full_messages
-        raise "abstract method"
+        fail 'abstract method'
       end
 
       def full_message(attribute, message)
-        raise "abstract method"
+        fail 'abstract method'
       end
 
       def generate_message(attribute, type = :invalid, options = {})
-        raise "abstract method"
+        fail 'abstract method'
       end
     end
   end
-end
+end

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

@@ -1,5 +1,10 @@
+# encoding: utf-8
+
 module ActiveModel
-  module ErrorCollecting
+  module BetterErrors
+    #
+    # Reporter
+    #
     class Reporter
       attr_reader :collection
       def initialize(collection)
@@ -11,4 +16,4 @@ module ActiveModel
       end
     end
   end
-end
+end

data/lib/active_model/better_errors/version.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+
+module ActiveModel
+  #
+  # BetterErrors
+  #
+  module BetterErrors
+    VERSION = '1.6.5'
+  end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,24 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'pry'
+# encoding: utf-8
 
-require 'active_model'
-require 'active_model/better_errors'
+# SimpleCov MUST be started before require 'rom-relation'
+#
+if ENV['COVERAGE'] == 'true'
+  require 'simplecov'
+  require 'coveralls'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
 
-RSpec.configure do |config|
+  SimpleCov.start do
+    command_name 'spec:unit'
 
+    add_filter 'config'
+    add_filter 'lib/rom/support'
+    add_filter 'spec'
+  end
 end
+
+require 'active_model/better_errors'
+require 'devtools/spec_helper'

data/spec/support/i18n_deprecation_silence.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+
+# silence deprecation warnings
+I18n.enforce_available_locales = false

data/spec/support/models.rb

@@ -1,12 +1,15 @@
+# encoding: utf-8
+
+# :nodoc:
 class BasicModel
   extend  ActiveModel::Naming
   extend  ActiveModel::Translation
   include ActiveModel::Validations
   include ActiveModel::Conversion
 
-  def initialize(params={})
+  def initialize(params = {})
     params.each do |attr, value|
-      self.public_send("#{attr}=", value)
+      public_send("#{attr}=", value)
     end
   end
 
@@ -15,14 +18,18 @@ class BasicModel
   end
 end
 
+# :nodoc:
 class User < BasicModel
   attr_accessor :first_name, :last_name, :email
 
-  validates :first_name, :last_name, presence: { message: "plz...?" }
+  validates :first_name, :last_name, presence: { message: 'plz...?' }
 end
 
+# :nodoc:
 class Ruler < BasicModel
   attr_accessor :length
 
-  validates_numericality_of :length, less_than_or_equal_to: 12, greater_than_or_equal_to: 4
+  validates_numericality_of :length,
+                            less_than_or_equal_to: 12,
+                            greater_than_or_equal_to: 4
 end

data/spec/support/string_ext.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+#
+# String
+#
+class String
+  def ==(other)
+    if other.is_a? ActiveModel::BetterErrors::ErrorMessage
+      return super other.to_s
+    else
+      super
+    end
+  end
+end

data/spec/{lib/active_model/error_collecting → unit/lib/active_model/better_errors}/emulation_spec.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
-shared_examples_for "a delegated method" do
-  let(:target_instance) { mock() }
+shared_examples_for 'a delegated method' do
+  let(:target_instance) { double }
   before do
     target_instance.should_receive method
     instance.stub(target).and_return(target_instance)
@@ -10,9 +12,9 @@ shared_examples_for "a delegated method" do
   specify { instance.send method }
 end
 
-describe ActiveModel::ErrorCollecting::Emulation do
+describe ActiveModel::BetterErrors::Emulation do
   subject(:instance) { klass.new }
-  let(:klass) { Class.new { include ActiveModel::ErrorCollecting::Emulation } }
+  let(:klass) { Class.new { include ActiveModel::BetterErrors::Emulation } }
 
   delegation_map = {
     error_collection: [
@@ -38,8 +40,8 @@ describe ActiveModel::ErrorCollecting::Emulation do
       describe "delegating ##{method} to  ##{target}" do
         let(:target) { target }
         let(:method) { method }
-        it_should_behave_like "a delegated method"
+        it_should_behave_like 'a delegated method'
       end
     end
   end
-end
+end