instructure-active_model-better_errors 1.6.3.rails2.5 → 1.6.5.rails2.1

data/instructure-active_model-better_errors.gemspec

@@ -1,118 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 
-Gem::Specification.new do |s|
-  s.name = "instructure-active_model-better_errors"
-  s.version = "1.6.3.rails2.5"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'active_model/better_errors/version'
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Qian", "Byron Anderson", "Brian Palmer"]
-  s.date = "2013-12-03"
-  s.description = "ActiveModel::Errors class is not designed for API consumption. This gem allows for that while keeping compatibility with existing rails API."
-  s.email = ["aq1018@gmail.com", "byronanderson32@gmail.com", "brianp@instructure.com"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".gitmodules",
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "instructure-active_model-better_errors.gemspec",
-    "lib/active_model/better_errors.rb",
-    "lib/active_model/error_collecting.rb",
-    "lib/active_model/error_collecting/array_reporter.rb",
-    "lib/active_model/error_collecting/emulation.rb",
-    "lib/active_model/error_collecting/error_collection.rb",
-    "lib/active_model/error_collecting/error_message.rb",
-    "lib/active_model/error_collecting/error_message_set.rb",
-    "lib/active_model/error_collecting/errors.rb",
-    "lib/active_model/error_collecting/hash_reporter.rb",
-    "lib/active_model/error_collecting/human_array_reporter.rb",
-    "lib/active_model/error_collecting/human_hash_reporter.rb",
-    "lib/active_model/error_collecting/human_message_formatter.rb",
-    "lib/active_model/error_collecting/human_message_reporter.rb",
-    "lib/active_model/error_collecting/machine_array_reporter.rb",
-    "lib/active_model/error_collecting/machine_hash_reporter.rb",
-    "lib/active_model/error_collecting/message_reporter.rb",
-    "lib/active_model/error_collecting/reporter.rb",
-    "spec/lib/active_model/better_errors_spec.rb",
-    "spec/lib/active_model/error_collecting/emulation_spec.rb",
-    "spec/lib/active_model/error_collecting/error_collection_spec.rb",
-    "spec/lib/active_model/error_collecting/error_message_set_spec.rb",
-    "spec/lib/active_model/error_collecting/error_message_spec.rb",
-    "spec/lib/active_model/error_collecting/errors_spec.rb",
-    "spec/lib/active_model/error_collecting/human_array_reporter_spec.rb",
-    "spec/lib/active_model/error_collecting/human_hash_reporter_spec.rb",
-    "spec/lib/active_model/error_collecting/human_message_formatter_spec.rb",
-    "spec/lib/active_model/error_collecting/human_message_reporter_spec.rb",
-    "spec/lib/active_model/error_collecting/machine_array_reporter_spec.rb",
-    "spec/lib/active_model/error_collecting/machine_hash_reporter_spec.rb",
-    "spec/lib/active_model/error_collecting_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/models.rb",
-    "test/integration.rb"
-  ]
-  s.homepage = "http://github.com/codekitchen/active_model-better_errors"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "API consumable error messages with ActiveModel::Errors drop-in compatibility."
+Gem::Specification.new do |spec|
+  spec.name          = "instructure-active_model-better_errors"
+  spec.version       = ActiveModel::BetterErrors::VERSION
+  spec.authors       = ["Aaron Qian", "Byron Anderson", "Brian Palmer"]
+  spec.email         = ["aq1018@gmail.com", "byronanderson32@gmail.com", "brianp@instructure.com"]
+  spec.description   = "API consumable error messages with ActiveModel::Errors drop-in compatibility."
+  spec.summary       = "active_model-better_errors is a ActiveModel::Errors compatible library to help you customize the presentation of your error messages."
+  spec.homepage      = "http://github.com/aq1018/active_model-better_errors"
+  spec.license       = "MIT"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<mocha>, [">= 0.12.1"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<debugger>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.12.0"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_dependency(%q<mocha>, [">= 0.12.1"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<debugger>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.12.0"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-    s.add_dependency(%q<mocha>, [">= 0.12.1"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<debugger>, [">= 0"])
-  end
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 2.12.0"
+  spec.add_development_dependency "mocha", '>= 0.12.1'
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "yard"
+  spec.add_development_dependency "rdoc"
 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, :[], :[]=,
@@ -49,17 +55,18 @@ module ActiveModel
         options = { message: options } unless options.is_a?(Hash)
         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

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
 
@@ -76,7 +83,7 @@ module ActiveModel
       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|

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/{error_collecting → better_errors}/human_message_formatter.rb

@@ -1,22 +1,13 @@
-module ActiveModel
-  module ErrorCollecting
-    class HumanMessageFormatter
-      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
-
-      def type
-        @error_message.type || :invalid
-      end
+# encoding: utf-8
 
+module ActiveModel
+  module BetterErrors
+    #
+    # HumanMessageFormatter
+    #
+    class HumanMessageFormatter < Formatter
       def format_message
-        return message if message && error_message.type.nil?
+        return message if message && type.nil?
 
         keys = i18n_keys
         key  = keys.shift
@@ -33,6 +24,10 @@ module ActiveModel
 
       private
 
+      def type
+        error_message.type || :invalid
+      end
+
       def value
         return if attribute == :base
         base.send :read_attribute, attribute
@@ -41,11 +36,12 @@ module ActiveModel
       def ancestor_keys
         return [] unless base.class.respond_to?(:i18n_scope)
         scope = base.class.i18n_scope
+
         base.class.lookup_ancestors.map do |klass|
-          model_key = klass.model_name.i18n_key
+          key_base = "#{scope}.errors.models.#{klass.model_name.i18n_key}"
           [
-            :"#{scope}.errors.models.#{model_key}.attributes.#{attribute}.#{type}",
-            :"#{scope}.errors.models.#{model_key}.#{type}"
+            :"#{key_base}.attributes.#{attribute}.#{type}",
+            :"#{key_base}.#{type}"
           ]
         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.rails2.1'
+  end
+end