armot 0.2.5 → 0.3.0

data/.travis.yml

@@ -1,5 +1,3 @@
 rvm:
-  - 1.8.7
-  - ree
   - 1.9.2
   - 1.9.3

data/lib/armot/active_record_extensions.rb

@@ -4,12 +4,20 @@ module Armot
       def armotize(*attributes)
         make_it_armot! unless included_modules.include?(InstanceMethods)
 
-        mixin = Module.new
+        instance_mixin = Module.new
+        class_mixin = Module.new
 
         attributes.each do |attribute|
-          self.instance_eval <<-RUBY
-            def find_by_#{attribute}(value)
-              trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
+          class_mixin.module_eval do
+            define_method :"find_by_#{attribute}" do |value|
+              t = I18n::Backend::ActiveRecord::Translation.arel_table
+              trans = I18n::Backend::ActiveRecord::Translation.where(
+                :locale => I18n.locale,
+                :value => value.to_yaml
+              ).where(
+                t[:key].matches("armot.#{self.to_s.underscore.pluralize}%")
+              ).all
+
               return send("where", {:"#{attribute}" => value}).first if trans.empty?
 
               res = nil
@@ -18,11 +26,17 @@ module Armot
                 break if res
               end
 
-              return res
+              res
             end
 
-            def find_by_#{attribute}!(value)
-              trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
+            define_method :"find_by_#{attribute}!" do |value|
+              t = I18n::Backend::ActiveRecord::Translation.arel_table
+              trans = I18n::Backend::ActiveRecord::Translation.where(
+                :locale => I18n.locale,
+                :value => value.to_yaml
+              ).where(
+                t[:key].matches("armot.#{self.to_s.underscore.pluralize}%")
+              ).all
 
               if trans.empty?
                 original = send("where", {:"#{attribute}" => value}).first
@@ -38,37 +52,39 @@ module Armot
                 res ? res : raise(ActiveRecord::RecordNotFound)
               end
             end
-          RUBY
+          end
 
-          mixin.module_eval <<-STR
-            def #{attribute}=(value)
-              armot_attributes[I18n.locale]['#{attribute}'] = value
+          instance_mixin.module_eval do
+            define_method :"#{attribute}=" do |value|
+              armot_attributes[I18n.locale]["#{attribute}"] = value
               I18n.backend.reload!
             end
 
-            def #{attribute}
-              return armot_attributes[I18n.locale]['#{attribute}'] if armot_attributes[I18n.locale]['#{attribute}']
+            define_method :"#{attribute}_changed?" do
+              armot_attributes[I18n.locale]["#{attribute}"].present?
+            end
+
+            define_method :"#{attribute}" do
+              return armot_attributes[I18n.locale]["#{attribute}"] if armot_attributes[I18n.locale]["#{attribute}"]
               return if new_record?
 
-              trans = I18n.t "#{attribute}_\#{id}", :scope => "armot.\#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token
+              trans = I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token
               return trans if trans != Armot.token
 
               (I18n.available_locales - [I18n.locale]).each do |lang|
-                trans = I18n.t "#{attribute}_\#{id}", :scope => "armot.\#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token, :locale => lang
+                trans = I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :default => Armot.token, :locale => lang
                 break if trans != Armot.token
               end
 
-              trans == Armot.token ? self[:#{attribute}] : trans
+              trans == Armot.token ? self[:"#{attribute}"] : trans
             end
-
-            def #{attribute}_changed?
-              armot_attributes[I18n.locale]['#{attribute}'].present?
-            end
-          STR
+          end
         end
 
-        self.const_set("ArmotInstanceMethods", mixin)
-        include self.const_get("ArmotInstanceMethods") unless self.included_modules.include?("ArmotInstanceMethods")
+        self.const_set("ArmotInstanceMethods", instance_mixin)
+        self.const_set("ArmotClassMethods", class_mixin)
+        include self.const_get("ArmotInstanceMethods") unless self.included_modules.map(&:to_s).include?("#{self}::ArmotInstanceMethods")
+        extend self.const_get("ArmotClassMethods") unless self.singleton_class.included_modules.map(&:to_s).include?("#{self}::ArmotClassMethods")
       end
 
     private

data/lib/armot/version.rb

@@ -1,3 +1,3 @@
 module Armot
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/test/armot_test.rb

@@ -272,7 +272,7 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal true, foo
   end
 
-  test "should be able to use super from an overrided setter" do
+  test "should be able to use super from an overrided setter for instance methods" do
     # Product class has 'name' setter redefined
     a = Product.create
 
@@ -289,6 +289,21 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal "Catalan foo customized", a.name
     I18n.locale = :en
     assert_equal "English foo customized", a.name
+  end
+
+  test "should be able to use super for class methods" do
+    a = Product.create
+    I18n.locale = :ca
+    a.name = "Catalan foo"
+
+    I18n.locale = :en
+    a.name = "English foo"
+    a.save!
+
+    a.reload
+    I18n.locale = :ca
 
+    res = Product.find_by_name("Catalan foo customized")
+    assert_equal "Catalan foo customized_override", res
   end
 end

data/test/test_helper.rb

@@ -38,6 +38,10 @@ class Product < ActiveRecord::Base
   def name=(value)
     super(value + " customized")
   end
+
+  def self.find_by_name(value)
+    "#{super(value).try(:name)}_override"
+  end
 end
 
 # Puret translation model to test migration process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
-  requirement: &76322190 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *76322190
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &76321840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *76321840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76321540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *76321540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76321310 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76321310
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &76321020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76321020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: translation support for your models with an I18n active-record backend
 email:
 - roger@itnig.net
@@ -101,21 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -304182355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -304182355
 requirements: []
 rubyforge_project: armot
-rubygems_version: 1.8.10
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: translation support for your models with an I18n active-record backend