custom_error_message 1.1.0.pre → 1.1.0.pre2

data/Rakefile

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'active_record'
+require 'rake/gempackagetask'
+require 'rubygems/specification'
+require 'rake/rdoctask'
+require 'rspec/core/rake_task'
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+end
+
+namespace :spec do
+  desc "Run all examples with RCov"
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.rcov = true
+  end
+end
+
+desc 'Default: run unit tests.'
+task :default => 'spec'

data/custom_error_message.gemspec

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = 'custom_error_message'
+  s.version = "1.1.0.pre2"
+  
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["David Easley", "Jeremy Durham"]
+  s.email = %q{jeremydurham@gmail.com}
+  s.homepage = 'http://github.com/jeremydurham/custom-err-msg'
+  s.summary = 'Custom Error Message plugin for Rails'
+  s.description = 'This plugin gives you the option to not have your custom validation error message prefixed with the attribute name'
+
+  s.rubygems_version = '>= 1.3.5'
+  
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+end

data/lib/custom_error_message.rb

@@ -1,57 +1,5 @@
-module ActiveRecord
-  class Errors
-    def full_messages
-      full_messages = []
-
-      @errors.each_key do |attr|
-        @errors[attr].each do |msg|
-          next if msg.nil?
-          msg = msg.respond_to?(:message) ? msg.message : msg
-          if attr == "base"
-            full_messages << msg
-          elsif msg =~ /^\^/
-            full_messages << msg[1..-1]
-          elsif msg.is_a? Proc
-            full_messages << msg.call(@base)
-          else
-            full_messages << @base.class.human_attribute_name(attr) + " " + msg
-          end
-        end
-      end
-
-      full_messages
-    end
-  end
-end
-
-module ActiveModel
-  class Errors < ActiveSupport::OrderedHash
-    def full_messages
-      full_messages = []
-
-      each do |attribute, messages|
-        messages = Array.wrap(messages)
-        next if messages.empty?
-
-        if attribute == :base
-          messages.each {|m| full_messages << m }
-        else          
-          attr_name = attribute.to_s.gsub('.', '_').humanize
-          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
-          options = { :default => "%{attribute} %{message}", :attribute => attr_name }
-
-          
-          messages.each do |m|
-            if m =~ /^\^/
-              full_messages << I18n.t(:"errors.format.full_message", options.merge(:message => m[1..-1], :default => "%{message}"))
-            else        
-              full_messages << I18n.t(:"errors.format", options.merge(:message => m))
-            end
-          end
-        end
-      end
-
-      full_messages
-    end
-  end
-end
+if defined?(ActiveModel)
+  require 'rails/extensions/active_model'
+else
+  require 'rails/extensions/active_record'
+end

data/lib/rails/extensions/active_model.rb

@@ -0,0 +1,31 @@
+module ActiveModel
+  class Errors < ActiveSupport::OrderedHash
+    def full_messages
+      full_messages = []
+
+      each do |attribute, messages|
+        messages = Array.wrap(messages)
+        next if messages.empty?
+
+        if attribute == :base
+          messages.each {|m| full_messages << m }
+        else          
+          attr_name = attribute.to_s.gsub('.', '_').humanize
+          attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+          options = { :default => "%{attribute} %{message}", :attribute => attr_name }
+
+          
+          messages.each do |m|
+            if m =~ /^\^/
+              full_messages << I18n.t(:"errors.format.full_message", options.merge(:message => m[1..-1], :default => "%{message}"))
+            else        
+              full_messages << I18n.t(:"errors.format", options.merge(:message => m))
+            end
+          end
+        end
+      end
+
+      full_messages
+    end
+  end
+end

data/lib/rails/extensions/active_record.rb

@@ -0,0 +1,15 @@
+module ActiveRecord
+  class Error
+
+protected
+
+    def generate_full_message(options = {})
+      if self.message =~ /^\^/
+        keys = ["{{message}}"]
+        options.merge!(:default => self.message[1..-1])
+      end
+
+      I18n.translate(keys.shift, options)
+    end
+  end
+end

data/spec/custom_error_message_spec.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'rspec'
+require 'active_record'
+
+class User < ActiveRecord::Base
+  has_many :user_roles
+  has_many :roles, :through => :user_roles
+  
+  validates_presence_of :email, :message => "^Your email is invalid"
+  
+  accepts_nested_attributes_for :roles 
+end
+
+class Role < ActiveRecord::Base
+  has_many :user_roles
+  has_many :users, :through => :user_roles
+  
+  validates_presence_of :role, :message => "^You must enter a role"
+end
+
+class UserRole < ActiveRecord::Base
+  belongs_to :role
+  belongs_to :user
+end
+
+require 'custom_error_message'
+
+describe "validating attributes" do
+  before do
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+    load File.join(File.dirname(__FILE__), 'db', 'schema.rb')
+  end
+  
+  it "should return the message specified without a prefix" do
+    @user = User.create
+    @user.errors.full_messages.should include "Your email is invalid"
+  end
+  
+  describe "validating nested attributes" do
+    it "should return the message specified without a prefix" do
+      @user = User.create(:roles_attributes => [{}])
+      @user.errors.full_messages.should include "You must enter a role"
+    end
+  end
+end

data/spec/db/schema.rb

@@ -0,0 +1,13 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :users, :force => true do |t|
+    t.string :email, :password, :roles
+  end
+  
+  create_table :roles, :force => true do |t|
+    t.string :role, :name
+  end
+  
+  create_table :user_roles, :force => true do |t|
+    t.belongs_to :user, :role
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: custom_error_message
 version: !ruby/object:Gem::Version 
-  hash: 961915996
+  hash: -1876988167
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - pre
-  version: 1.1.0.pre
+  - pre2
+  version: 1.1.0.pre2
 platform: ruby
 authors: 
 - David Easley
@@ -17,26 +17,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -05:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: |-
-  This plugin gives you the option to not have your custom validation error message
-  prefixed with the attribute name
+description: This plugin gives you the option to not have your custom validation error message prefixed with the attribute name
 email: jeremydurham@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- MIT-LICENSE
+extra_rdoc_files: []
+
 files: 
+- LICENSE
+- README
+- Rakefile
+- custom_error_message.gemspec
 - init.rb
 - lib/custom_error_message.rb
-- README
-- MIT-LICENSE
+- lib/rails/extensions/active_model.rb
+- lib/rails/extensions/active_record.rb
+- spec/custom_error_message_spec.rb
+- spec/db/schema.rb
 has_rdoc: true
 homepage: http://github.com/jeremydurham/custom-err-msg
 licenses: []
@@ -58,12 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -71,5 +76,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Custom Error Message plugin for Rails
-test_files: []
-
+test_files: 
+- spec/custom_error_message_spec.rb
+- spec/db/schema.rb