armot 0.2.2 → 0.2.3

data/lib/armot/active_record_extensions.rb

@@ -5,20 +5,21 @@ module Armot
         make_it_armot! unless included_modules.include?(InstanceMethods)
 
         attributes.each do |attribute|
-          self.class.instance_eval do
-            define_method "find_by_#{attribute}" do |value|
+          self.instance_eval <<-RUBY
+            def find_by_#{attribute}(value)
               trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
               return send("where", {:"#{attribute}" => value}).first if trans.empty?
 
+              res = nil
               trans.each do |x|
                 res = find_by_id x.key.split("_").last
-                return res if res
+                break if res
               end
 
-              nil
+              return res
             end
 
-            define_method "find_by_#{attribute}!" do |value|
+            def find_by_#{attribute}!(value)
               trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
 
               if trans.empty?
@@ -26,15 +27,16 @@ module Armot
                 raise ActiveRecord::RecordNotFound if original.nil?
                 original
               else
+                res = nil
                 trans.each do |x|
                   res = find_by_id x.key.split("_").last
-                  return res if res
+                  break if res
                 end
 
-                raise ActiveRecord::RecordNotFound
+                res ? res : raise(ActiveRecord::RecordNotFound)
               end
             end
-          end
+          RUBY
 
           # attribute setter
           define_method "#{attribute}=" do |value|

data/lib/armot/version.rb

@@ -1,3 +1,3 @@
 module Armot
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/armot_test.rb

@@ -242,4 +242,24 @@ class ArmotTest < ActiveSupport::TestCase
       Post.where(:header => "2").find_by_title! "Hola"
     end
   end
+
+  test "should not mix armotized class methods" do
+    foo = Comment.methods.include?(:find_by_title)
+    assert_equal false, foo
+  end
+
+  test "should not mix armotized class methods in Post" do
+    foo = Post.methods.include?(:find_by_msg)
+    assert_equal false, foo
+  end
+
+  test "should include the method in Comment" do
+    foo = Comment.methods.include?(:find_by_msg)
+    assert_equal true, foo
+  end
+
+  test "should include the method in Post" do
+    foo = Post.methods.include?(:find_by_title)
+    assert_equal true, foo
+  end
 end

data/test/schema.rb

@@ -3,8 +3,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :title
     t.text   :text
     t.string :header
+  end
 
-    t.timestamps
+  create_table :comments do |t|
+    t.string :msg
+    t.string :title
   end
 
   # I18n ar translations table

data/test/test_helper.rb

@@ -23,6 +23,10 @@ def teardown_db
   end
 end
 
+class Comment < ActiveRecord::Base
+  armotize :msg
+end
+
 class Post < ActiveRecord::Base
   armotize :title, :text
   validates_presence_of :title

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
-  requirement: &76123990 !ruby/object:Gem::Requirement
+  requirement: &87407060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *76123990
+  version_requirements: *87407060
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &76123710 !ruby/object:Gem::Requirement
+  requirement: &87406700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *76123710
+  version_requirements: *87406700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76123480 !ruby/object:Gem::Requirement
+  requirement: &87406470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *76123480
+  version_requirements: *87406470
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &76123270 !ruby/object:Gem::Requirement
+  requirement: &87406240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76123270
+  version_requirements: *87406240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &76123020 !ruby/object:Gem::Requirement
+  requirement: &87405880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76123020
+  version_requirements: *87405880
 description: translation support for your models with an I18n active-record backend
 email:
 - roger@itnig.net
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -313670527
+      hash: -243266093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -313670527
+      hash: -243266093
 requirements: []
 rubyforge_project: armot
 rubygems_version: 1.8.6