mattmatt-validatable 1.8.3 → 1.8.4

data/lib/validatable.rb

@@ -24,5 +24,13 @@ require 'validatable/validations/validates_each'
 require 'validatable/validations/validates_associated'
 
 module Validatable
-  Version = '1.8.3'
+  Version = '1.8.4'
+  
+  def self.use_i18n=(i18n)
+    @i18n = i18n
+  end
+  
+  def self.use_i18n?
+    @i18n
+  end
 end

data/lib/validatable/errors.rb

@@ -5,6 +5,10 @@ module Validatable
 
     def_delegators :errors, :clear, :each, :each_pair, :empty?, :length, :size
 
+    def initialize(owner = nil)
+      @owner = owner
+    end
+    
     # Returns true if the specified +attribute+ has errors associated with it.
     #
     #   class Company < ActiveRecord::Base
@@ -26,7 +30,7 @@ module Validatable
     # * Returns an array of error messages, if more than one error is associated with the specified +attribute+.
     def on(attribute)
       return nil if errors[attribute.to_sym].nil?
-      errors[attribute.to_sym].size == 1 ? errors[attribute.to_sym].first : errors[attribute.to_sym]
+      error = errors[attribute.to_sym].size == 1 ? errors[attribute.to_sym].first : errors[attribute.to_sym]
     end
 
     # Rails 3 API for errors, always return array.
@@ -36,7 +40,7 @@ module Validatable
 
     def add(attribute, message) #:nodoc:
       errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?
-      errors[attribute.to_sym] << message
+      errors[attribute.to_sym] << (Validatable.use_i18n? ? i18n_message(attribute, message) : message)
     end
 
     def merge!(errors) #:nodoc:
@@ -66,6 +70,24 @@ module Validatable
       errors.values.flatten.size
     end
 
+    def translate_attribute(attribute)
+      I18n.t("validatable.attributes.#{klazz_name}.#{attribute.to_s}", :default => humanize(attribute.to_s))
+    end
+    
+    def klazz_name
+      @owner.class.name.empty? ?
+        'generic' :
+        @owner.class.name.to_s.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+    end
+    
+    def i18n_message(attribute, msg)
+      I18n.t(msg, :attribute => translate_attribute(attribute.to_s))
+    end
+    
     # call-seq: full_messages -> an_array_of_messages
     #
     # Returns an array containing the full list of error messages.
@@ -79,7 +101,7 @@ module Validatable
           if attribute.to_s == "base"
             full_messages << msg
           else
-            full_messages << humanize(attribute.to_s) + " " + msg
+            full_messages << (Validatable.use_i18n? ? msg : humanize(attribute.to_s) + " " + msg)
           end
         end
       end

data/lib/validatable/validatable_instance_methods.rb

@@ -15,7 +15,7 @@ module Validatable
   #
   # Returns the Errors object that holds all information about attribute error messages.
   def errors
-    @errors ||= Validatable::Errors.new
+    @errors ||= Validatable::Errors.new(self)
   end
   
   def valid_for_group?(group) #:nodoc:

data/lib/validatable/validations/validates_acceptance_of.rb

@@ -10,5 +10,9 @@ module Validatable
     def message(instance)
       super || "must be accepted"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.accepted"
+    end
   end
 end

data/lib/validatable/validations/validates_associated.rb

@@ -9,5 +9,9 @@ module Validatable
     def message(instance)
       super || "is invalid"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.associated"
+    end
   end
 end

data/lib/validatable/validations/validates_confirmation_of.rb

@@ -19,5 +19,9 @@ module Validatable
     def message(instance)
       super || "doesn't match confirmation"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.confirmation"
+    end
   end
 end

data/lib/validatable/validations/validates_each.rb

@@ -10,5 +10,9 @@ module Validatable
     def message(instance)
       super || "is invalid"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.invalid"
+    end
   end
 end

data/lib/validatable/validations/validates_exclusion_of.rb

@@ -13,5 +13,10 @@ module Validatable
     def message(instance)
       super || "is reserved"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.exclusion"
+    end
+    
   end
 end

data/lib/validatable/validations/validates_format_of.rb

@@ -12,5 +12,9 @@ module Validatable
     def message(instance)
       super || "is invalid"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.invalid"
+    end
   end
 end

data/lib/validatable/validations/validates_inclusion_of.rb

@@ -13,5 +13,9 @@ module Validatable
     def message(instance)
       super || "is not in the list"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.inclusion"
+    end
   end
 end

data/lib/validatable/validations/validates_length_of.rb

@@ -6,6 +6,10 @@ module Validatable
       super || "is invalid"
     end
     
+    def i18n
+      super || "#{i18n_prefix}.wrong_length"
+    end
+    
     def valid?(instance)
       valid = true
       value = instance.send(self.attribute)

data/lib/validatable/validations/validates_numericality_of.rb

@@ -15,6 +15,10 @@ module Validatable
     def message(instance)
       super || "must be a number"
     end
+
+    def i18n
+      super || "#{i18n_prefix}.not_a_number"
+    end
     
     private
       def value_for(instance)

data/lib/validatable/validations/validates_presence_of.rb

@@ -12,6 +12,10 @@ module Validatable
     def message(instance)
       super || "can't be empty"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.blank"
+    end
   end
 end
 

data/lib/validatable/validations/validates_true_for.rb

@@ -9,5 +9,9 @@ module Validatable
     def message(instance)
       super || "is invalid"
     end
+    
+    def i18n
+      super || "#{i18n_prefix}.true"
+    end
   end
 end

data/lib/validatable/validations/validation_base.rb

@@ -39,7 +39,7 @@ module Validatable
     include Understandable
     include Requireable
     
-    option :message, :if, :times, :level, :groups, :key, :after_validate, :allow_nil, :allow_blank
+    option :message, :if, :times, :level, :groups, :key, :after_validate, :allow_nil, :allow_blank, :i18n
     default :level => 1, :groups => []
     attr_accessor :attribute
     
@@ -71,9 +71,21 @@ module Validatable
       end
       result
     end
+   
+    def i18n
+      @i18n
+    end
+    
+    def i18n_prefix
+      "validatable"
+    end
     
     def message(instance)
-      @message.respond_to?(:call) ? instance.instance_eval(&@message) : @message
+      if Validatable.use_i18n?
+        i18n
+      else
+        @message.respond_to?(:call) ? instance.instance_eval(&@message) : @message
+      end
     end
     
     def validate_this_time?(instance)

data/test/functional/test_validatable.rb

@@ -1,5 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
+require 'i18n'
+
+I18n.backend.store_translations(:en, {
+  :validatable => {
+    :blank => "{{attribute}} must be specified",
+    :attributes => {:user_address => {:street => "Strasse"}}
+  }
+})
+
 functional_tests do
 
   expect "can't be empty" do
@@ -516,4 +525,34 @@ functional_tests do
     instance.validate_only("presence_of/name")
     instance.errors.on(:address)
   end
+
+  test "should use the i18n key if i18n is enabled" do
+    Validatable.use_i18n = true
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :address
+      attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal "Address must be specified", instance.errors.on(:address)
+    Validatable.use_i18n = false
+  end
+
+  test "should translate the attribute if i18n is enabled" do
+    Validatable.use_i18n = true
+    class UserAddress
+      include Validatable
+      validates_presence_of :street
+      attr_accessor :street
+    end
+    instance = UserAddress.new
+    instance.valid?
+    assert_equal "Strasse must be specified", instance.errors.on(:street)
+  end
+  
+  def teardown
+    Validatable.use_i18n = false
+    
+  end
 end

data/test/unit/test_validatable.rb

@@ -35,4 +35,14 @@ Expectations do
     end
     klass.validation_keys_include?("key")
   end
+  
+  expect true do
+    Validatable.use_i18n = true
+    Validatable.use_i18n?
+  end
+  
+  expect false do
+    Validatable.use_i18n = false
+    Validatable.use_i18n?
+  end
 end

data/test/unit/test_validation_base.rb

@@ -48,5 +48,5 @@ Expectations do
     options = {:message => nil, :if => nil, :times => nil, :level => nil, :groups => nil, :key => nil}
     Validatable::ValidationBase.new(stub_everything, :base).must_understand(options)
   end
-
+  
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mattmatt-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.8.3
+  prerelease: false
+  segments: 
+  - 1
+  - 8
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +02:00
+date: 2010-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +30,6 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - lib/validatable.rb
 - lib/validatable/child_validation.rb
 - lib/validatable/errors.rb
@@ -88,18 +92,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Validatable is a library for adding validations.

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:minor: 8
-:patch: 1
-:major: 1
-:build: