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

data/Gemfile

@@ -1,6 +1,7 @@
-source 'https://rubygems.org'
+source :rubygems
+
+gem "activemodel", "~> 3.0"
 
-gem "activerecord", "~> 2.3.11"
 
 group :development, :test do
   gem "rake"
@@ -13,6 +14,4 @@ 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 = "instructure-active_model-better_errors"
-  gem.homepage = "http://github.com/codekitchen/active_model-better_errors"
+  gem.name = "active_model-better_errors"
+  gem.homepage = "http://github.com/aq1018/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", "brianp@instructure.com"]
-  gem.authors = ["Aaron Qian", "Byron Anderson", "Brian Palmer"]
+  gem.email = ["aq1018@gmail.com", "byronanderson32@gmail.com"]
+  gem.authors = ["Aaron Qian", "Byron Anderson"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.6.3.rails2.2
+1.6.3

data/active_model-better_errors.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "instructure-active_model-better_errors"
-  s.version = "1.6.3.rails2"
+  s.name = "active_model-better_errors"
+  s.version = "1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Qian", "Byron Anderson", "Brian Palmer"]
-  s.date = "2013-11-08"
+  s.authors = ["Aaron Qian", "Byron Anderson"]
+  s.date = "2013-01-23"
   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.email = ["aq1018@gmail.com", "byronanderson32@gmail.com"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -30,6 +30,7 @@ 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",
@@ -61,7 +62,7 @@ Gem::Specification.new do |s|
     "spec/support/models.rb",
     "test/integration.rb"
   ]
-  s.homepage = "http://github.com/codekitchen/active_model-better_errors"
+  s.homepage = "http://github.com/aq1018/active_model-better_errors"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
     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_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
@@ -82,6 +84,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.12.1"])
     else
+      s.add_dependency(%q<activemodel>, ["~> 3.0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.12.0"])
       s.add_dependency(%q<pry>, [">= 0"])
@@ -94,6 +97,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0.12.1"])
     end
   else
+    s.add_dependency(%q<activemodel>, ["~> 3.0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.12.0"])
     s.add_dependency(%q<pry>, [">= 0"])

data/lib/active_model/better_errors.rb

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

data/lib/active_model/error_collecting/emulation.rb

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

data/lib/active_model/error_collecting/error_message.rb

@@ -81,7 +81,7 @@ module ActiveModel
 
       def ==(other)
         return type == other if other.is_a?(Symbol)
-        to_hash == other.to_hash
+        to_s == other.to_s
       end
     end
   end

data/lib/active_model/error_collecting/human_message_formatter.rb

@@ -23,7 +23,7 @@ module ActiveModel
 
         options = {
           :default => keys,
-          :model => base.class.human_name,
+          :model => base.class.model_name.human,
           :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, attribute
+        base.send :read_attribute_for_validation, attribute
       end
 
       def ancestor_keys
@@ -59,9 +59,7 @@ 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!
@@ -69,4 +67,4 @@ module ActiveModel
       end
     end
   end
-end
+end

data/lib/active_model/error_collecting.rb

@@ -18,6 +18,8 @@ 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/spec/lib/active_model/error_collecting/error_message_set_spec.rb

@@ -80,4 +80,17 @@ describe ActiveModel::ErrorCollecting::ErrorMessageSet do
       it { should be_false }
     end
   end
+
+  describe "#==" do
+    subject { errors == set }
+    let(:errors) { [:invalid] }
+    let(:expected) { ["is invalid"] }
+    specify do
+      set.should == expected
+    end
+
+    specify do
+      expected.should == set
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,28 +3,13 @@ $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

data/spec/support/models.rb

@@ -1,7 +1,28 @@
-class User < ActiveRecord::Base
-  validates_presence_of :first_name, :last_name, message: "plz...?"
+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...?" }
 end
 
-class Ruler < ActiveRecord::Base
+class Ruler < BasicModel
+  attr_accessor :length
+
   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.2
+  version: 1.6.3.rails2.3
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -291,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -57061475421107857
+      hash: -3191008763557130119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: