instructure-active_model-better_errors 1.6.3.rails2.3 → 1.6.3.rails2.4

data/Gemfile

@@ -1,7 +1,6 @@
-source :rubygems
-
-gem "activemodel", "~> 3.0"
+source 'https://rubygems.org'
 
+gem "activerecord", "~> 2.3.11"
 
 group :development, :test do
   gem "rake"
@@ -14,4 +13,6 @@ group :development, :test do
   gem "simplecov"
   gem 'bcrypt-ruby', '~> 3.0.0'
   gem 'mocha', '>= 0.12.1'
+  gem 'sqlite3'
+  gem 'debugger'
 end

data/Rakefile

@@ -14,13 +14,13 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "active_model-better_errors"
-  gem.homepage = "http://github.com/aq1018/active_model-better_errors"
+  gem.name = "instructure-active_model-better_errors"
+  gem.homepage = "http://github.com/codekitchen/active_model-better_errors"
   gem.license = "MIT"
   gem.summary = %Q{API consumable error messages with ActiveModel::Errors drop-in compatibility.}
   gem.description = %Q{ActiveModel::Errors class is not designed for API consumption. This gem allows for that while keeping compatibility with existing rails API.}
-  gem.email = ["aq1018@gmail.com", "byronanderson32@gmail.com"]
-  gem.authors = ["Aaron Qian", "Byron Anderson"]
+  gem.email = ["aq1018@gmail.com", "byronanderson32@gmail.com", "brianp@instructure.com"]
+  gem.authors = ["Aaron Qian", "Byron Anderson", "Brian Palmer"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.3.rails2.4

data/{active_model-better_errors.gemspec → instructure-active_model-better_errors.gemspec}

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "active_model-better_errors"
-  s.version = "1.6.3"
+  s.name = "instructure-active_model-better_errors"
+  s.version = "1.6.3.rails2.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Qian", "Byron Anderson"]
-  s.date = "2013-01-23"
+  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-02"
   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"]
+  s.email = ["aq1018@gmail.com", "byronanderson32@gmail.com", "brianp@instructure.com"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "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/core_ext.rb",
     "lib/active_model/error_collecting/emulation.rb",
     "lib/active_model/error_collecting/error_collection.rb",
     "lib/active_model/error_collecting/error_message.rb",
@@ -62,17 +61,17 @@ Gem::Specification.new do |s|
     "spec/support/models.rb",
     "test/integration.rb"
   ]
-  s.homepage = "http://github.com/aq1018/active_model-better_errors"
+  s.homepage = "http://github.com/codekitchen/active_model-better_errors"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "API consumable error messages with ActiveModel::Errors drop-in compatibility."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0"])
+      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"])
@@ -83,8 +82,10 @@ Gem::Specification.new do |s|
       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<activemodel>, ["~> 3.0"])
+      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"])
@@ -95,9 +96,11 @@ Gem::Specification.new do |s|
       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<activemodel>, ["~> 3.0"])
+    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"])
@@ -108,6 +111,8 @@ Gem::Specification.new do |s|
     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
 end
 

data/lib/active_model/better_errors.rb

@@ -1,15 +1,17 @@
 require 'forwardable'
 
-require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext'
 
 require 'active_model/error_collecting'
 
-require 'active_model/validations'
+require 'active_record'
+require 'active_record/base'
+require 'active_record/validations'
 
-module ActiveModel
+module ActiveRecord
   module Validations
     def errors
-      @errors ||= ErrorCollecting::Errors.new(self)
+      @errors ||= ActiveModel::ErrorCollecting::Errors.new(self)
     end
   end
 end

data/lib/active_model/error_collecting.rb

@@ -18,8 +18,6 @@ require 'active_model/error_collecting/machine_array_reporter'
 require 'active_model/error_collecting/emulation'
 require 'active_model/error_collecting/errors'
 
-require 'active_model/error_collecting/core_ext'
-
 module ActiveModel
   module ErrorCollecting
     class << self

data/lib/active_model/error_collecting/emulation.rb

@@ -30,21 +30,23 @@ module ActiveModel
       end
 
       def add_on_empty(attributes, options = {})
-        [attributes].flatten.each do |attribute|
-          value = @base.send(:read_attribute_for_validation, attribute)
+        [attributes].flatten.each do |attr|
+          value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
           is_empty = value.respond_to?(:empty?) ? value.empty? : false
-          add(attribute, :empty, options) if value.nil? || is_empty
+          add(attr, :empty, options) if value.nil? || is_empty
         end
       end
 
       def add_on_blank(attributes, options = {})
-        [attributes].flatten.each do |attribute|
-          value = @base.send(:read_attribute_for_validation, attribute)
-          add(attribute, :blank, options) if value.blank?
+        [attributes].flatten.each do |attr|
+          value = @base.respond_to?(attr.to_s) ? @base.send(attr.to_s) : @base[attr.to_s]
+          add(attr, :blank, options) if value.blank?
         end
       end
 
-      def add(attribute, message=nil, options = {})
+      def add(attribute, message=nil, options = nil)
+        options ||= {}
+        options = { message: options } unless options.is_a?(Hash)
         if options[:strict]
           error   = ErrorMessage.build(attribute, message, options)
           message = HumanMessageFormatter.new(@base, error).format_message
@@ -62,4 +64,4 @@ module ActiveModel
       end
     end
   end
-end
+end

data/lib/active_model/error_collecting/error_message.rb

@@ -67,6 +67,10 @@ module ActiveModel
         }
       end
 
+      def as_json(*json_args)
+        to_hash
+      end
+
       def hash
         to_hash.hash
       end

data/lib/active_model/error_collecting/human_message_formatter.rb

@@ -23,7 +23,7 @@ module ActiveModel
 
         options = {
           :default => keys,
-          :model => base.class.model_name.human,
+          :model => base.class.human_name,
           :attribute => base.class.human_attribute_name(attribute),
           :value => value
         }.merge(self.options)
@@ -35,7 +35,7 @@ module ActiveModel
 
       def value
         return if attribute == :base
-        base.send :read_attribute_for_validation, attribute
+        base.send :read_attribute, attribute
       end
 
       def ancestor_keys
@@ -59,7 +59,9 @@ module ActiveModel
         end
 
         keys << :"errors.attributes.#{attribute}.#{type}"
+        keys << :"activerecord.errors.attributes.#{attribute}.#{type}"
         keys << :"errors.messages.#{type}"
+        keys << :"activerecord.errors.messages.#{type}"
 
         keys.compact!
         keys.flatten!
@@ -67,4 +69,4 @@ module ActiveModel
       end
     end
   end
-end
+end

data/spec/lib/active_model/error_collecting/error_message_spec.rb

@@ -263,6 +263,22 @@ describe ActiveModel::ErrorCollecting::ErrorMessage do
     its(:attribute) { should == attribute }
   end
 
+  describe '#to_hash' do
+    let(:message) { :invalid }
+    let(:options) { {} }
+
+    its(:to_hash) { should == { attribute: attribute, type: :invalid, message: nil, options: {} } }
+  end
+
+  describe '#as_json' do
+    let(:message) { :invalid }
+    let(:options) { {} }
+
+    it "should respond to as_json taking json arguments" do
+      subject.as_json(test: :arguments).should == { attribute: attribute, type: :invalid, message: nil, options: {} }
+    end
+  end
+
   describe '#<=>' do
     subject { e1 <=> e2 }
 
@@ -290,4 +306,4 @@ describe ActiveModel::ErrorCollecting::ErrorMessage do
       it { should == 0 }
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -3,13 +3,35 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'pry'
 
-require 'active_model'
 require 'active_model/better_errors'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+def migrate_test_db
+  ActiveRecord::Base.connection.create_table(:users) do |t|
+    t.string :first_name
+    t.string :last_name
+    t.string :email
+  end
+  ActiveRecord::Base.connection.create_table(:rulers) do |t|
+    t.int :length
+  end
+end
+
 RSpec.configure do |config|
+  config.before(:all) do
+    ActiveRecord::Base.establish_connection(
+      adapter: 'sqlite3',
+      database: ':memory:')
+    migrate_test_db
+  end
+end
 
+class String
+  def ==(other)
+    return super other.to_s if other.is_a? ActiveModel::ErrorCollecting::ErrorMessage
+    super
+  end
 end

data/spec/support/models.rb

@@ -1,28 +1,7 @@
-class BasicModel
-  extend  ActiveModel::Naming
-  extend  ActiveModel::Translation
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-
-  def initialize(params={})
-    params.each do |attr, value|
-      self.public_send("#{attr}=", value)
-    end
-  end
-
-  def persisted?
-    false
-  end
-end
-
-class User < BasicModel
-  attr_accessor :first_name, :last_name, :email
-
-  validates :first_name, :last_name, presence: { message: "plz...?" }
+class User < ActiveRecord::Base
+  validates_presence_of :first_name, :last_name, message: "plz...?"
 end
 
-class Ruler < BasicModel
-  attr_accessor :length
-
+class Ruler < ActiveRecord::Base
   validates_numericality_of :length, less_than_or_equal_to: 12, greater_than_or_equal_to: 4
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instructure-active_model-better_errors
 version: !ruby/object:Gem::Version
-  version: 1.6.3.rails2.3
+  version: 1.6.3.rails2.4
   prerelease: 6
 platform: ruby
 authors:
@@ -242,7 +242,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- active_model-better_errors.gemspec
+- 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
@@ -291,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191008763557130119
+      hash: -398253952354859811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: