custom_error_message 1.1.0.pre2 → 1.1.0.pre3

data/custom_error_message.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'custom_error_message'
-  s.version = "1.1.0.pre2"
+  s.version = "1.1.0.pre3"
   
   s.platform = Gem::Platform::RUBY
   s.authors = ["David Easley", "Jeremy Durham"]
@@ -16,4 +16,4 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-end
+end

data/lib/rails/extensions/active_record.rb

@@ -4,11 +4,21 @@ module ActiveRecord
 protected
 
     def generate_full_message(options = {})
+      keys = [
+        :"full_messages.#{@message}",
+        :'full_messages.format'
+      ]
+      
       if self.message =~ /^\^/
-        keys = ["{{message}}"]
+        keys.push('{{message}}')
+
         options.merge!(:default => self.message[1..-1])
-      end
+      else
+        keys.push('%{attribute} %{message}')
 
+        options.merge!(:default => keys, :message => self.message)        
+      end
+      
       I18n.translate(keys.shift, options)
     end
   end

data/spec/custom_error_message_spec.rb

@@ -6,6 +6,7 @@ class User < ActiveRecord::Base
   has_many :user_roles
   has_many :roles, :through => :user_roles
   
+  validates_presence_of :name
   validates_presence_of :email, :message => "^Your email is invalid"
   
   accepts_nested_attributes_for :roles 
@@ -25,21 +26,30 @@ end
 
 require 'custom_error_message'
 
-describe "validating attributes" do
+describe "error messages" 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"
+  describe "with standard messages" do
+    it "should return a standard error message" do
+      @user = User.create
+      @user.errors.full_messages.should include "Name can't be blank"
+    end
   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"
+  describe "with custom messages" do
+    it "should return the full message specified" do
+      @user = User.create
+      @user.errors.full_messages.should include "Your email is invalid"
     end
-  end
+    
+    describe "on nested attributes" do
+      it "should return the full message specified" do
+        @user = User.create(:roles_attributes => [{}])
+        @user.errors.full_messages.should include "You must enter a role"
+      end
+    end    
+  end  
 end

data/spec/db/schema.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: custom_error_message
 version: !ruby/object:Gem::Version 
-  hash: -1876988167
+  hash: -1876988186
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - pre2
-  version: 1.1.0.pre2
+  - pre3
+  version: 1.1.0.pre3
 platform: ruby
 authors: 
 - David Easley
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2010-12-20 00:00:00 -05:00
 default_executable: 
 dependencies: []