armot 0.3.4 → 0.4.0

data/README.md

@@ -207,6 +207,24 @@ defined, using this syntax:
       define_localized_accessors_for :all, :locales => [:klingon, :pt]
     end
 
+Presence validators
+----------
+
+If you use the standard presence validator from Rails, as in
+
+    validates_presence_of :some_attribute
+
+Only the value for the current locale will be checked. However, you
+might want to check the presence of the value for a specific set of
+locales. If this is your purpose, you can use:
+
+    validates_armotized_presence_of :some_attribute, %w{ en ca es }
+
+where the first parameter is the attribute you want to check presence
+of, and the second is the set of locales for which you want to check the
+presence of the attribute. Note that the locales can either be a string
+or symbol array (as in the example above), or a single string or symbol
+in case you only want to do the check for one locale.
 
 Development with armot
 ----------------------

data/lib/armot/active_record_extensions.rb

@@ -105,8 +105,12 @@ module Armot
               armot_attributes[I18n.locale]["#{attribute}"].present?
             end
 
+            define_method :"#{attribute}_raw" do
+              return armot_attributes[I18n.locale]["#{attribute}"]
+            end
+
             define_method :"#{attribute}" do
-              return armot_attributes[I18n.locale]["#{attribute}"] if armot_attributes[I18n.locale]["#{attribute}"]
+              return send("#{attribute}_raw") if armot_attributes[I18n.locale]["#{attribute}"]
 
               if armot_attributes.any? && I18n.respond_to?(:fallbacks)
                 I18n.fallbacks[I18n.locale].each do |fallback|
@@ -130,6 +134,10 @@ module Armot
         extend self.const_get("ArmotClassMethods") unless self.singleton_class.included_modules.map(&:to_s).include?("#{self}::ArmotClassMethods")
       end
 
+      def validates_armotized_presence_of(attr_name, locales)
+        validates_with Armot::ActiveRecordExtensions::Validations::PresenceValidator, :attr => attr_name, :locales => locales
+      end
+
     private
 
       # configure model
@@ -175,6 +183,23 @@ module Armot
         res
       end
     end
+
+    module Validations
+      class PresenceValidator < ActiveModel::Validator
+        def validate(record)
+          attr_name = options[:attr]
+          locales = options[:locales]
+          locales = [locales] if [ String, Symbol ].include?(locales.class)
+
+          valid = locales.map do |locale|
+            I18n.locale = locale.to_sym
+            record.send("#{attr_name}_raw").present?
+          end.inject(:&)
+
+          record.errors.add(attr_name, "has to be present for locales #{locales.to_sentence}") unless valid
+        end
+      end
+    end
   end
 end
 

data/lib/armot/version.rb

@@ -1,3 +1,3 @@
 module Armot
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/test/armot_test.rb

@@ -1,5 +1,6 @@
-require 'test_helper'
+# encoding: UTF-8
 
+require 'test_helper'
 
 def to_method_name(name)
   if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("1.9")
@@ -45,14 +46,63 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal 'English title', post.title
   end
 
-  test 'validates_presence_of should work' do
-    post = Post.new
+  test 'validates_armotized_presence_of should work' do
+    class ValidatedPost < Post
+      validates_armotized_presence_of :title, %w{ en ca es }
+    end
+
+    post = ValidatedPost.new
     assert_equal false, post.valid?
 
+    I18n.locale = :en
     post.title = 'English title'
+    assert_equal false, post.valid?
+
+    { :ca => 'Títol català', :es => 'Título castellano' }.each do |locale, title|
+      I18n.locale = locale
+      post.title = title
+    end
+
+    assert_equal true, post.valid?
+  end
+
+  test 'validates_armotized_presence_of should work with one locale' do
+    class AnotherValidatedPost < Post
+      validates_armotized_presence_of :title, :ca
+    end
+
+    post = AnotherValidatedPost.new
+    I18n.locale = :ca
+    post.title = 'soc una cucota'
     assert_equal true, post.valid?
   end
 
+  test 'validates_armotized_presence_of fails when no valid locales provided' do
+    class WrongValidatedPost < Post
+      validates_armotized_presence_of :title, 1234
+    end
+
+    post = WrongValidatedPost.new
+    begin
+      post.valid?
+      fail
+    rescue
+    end
+  end
+
+  test 'validates_armotized_presence_of fails when no valid attr provided' do
+    class AnotherWrongValidatedPost < Post
+      validates_armotized_presence_of :invented_title, %w{ en ca es }
+    end
+
+    post = AnotherWrongValidatedPost.new
+    begin
+      post.valid?
+      fail
+    rescue
+    end
+  end
+
   test 'temporary locale switch should not clear changes' do
     I18n.locale = :de
     post = Post.first

data/test/test_helper.rb

@@ -29,7 +29,6 @@ end
 
 class Post < ActiveRecord::Base
   armotize :title, :text
-  validates_presence_of :title
 end
 
 class Product < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: armot
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: translation support for your models with an I18n active-record backend