armot 0.2.1 → 0.2.2

data/lib/armot/active_record_extensions.rb

@@ -7,21 +7,31 @@ module Armot
         attributes.each do |attribute|
           self.class.instance_eval do
             define_method "find_by_#{attribute}" do |value|
-              trans = I18n::Backend::ActiveRecord::Translation.find_by_locale_and_value(I18n.locale, value.to_yaml)
-              return send("where", {:"#{attribute}" => value}).first if trans.nil?
+              trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
+              return send("where", {:"#{attribute}" => value}).first if trans.empty?
 
-              find_by_id trans.key.split("_").last
+              trans.each do |x|
+                res = find_by_id x.key.split("_").last
+                return res if res
+              end
+
+              nil
             end
 
             define_method "find_by_#{attribute}!" do |value|
-              trans = I18n::Backend::ActiveRecord::Translation.find_by_locale_and_value(I18n.locale, value.to_yaml)
+              trans = I18n::Backend::ActiveRecord::Translation.where(:locale => I18n.locale, :value => value.to_yaml)
 
-              if trans.nil?
+              if trans.empty?
                 original = send("where", {:"#{attribute}" => value}).first
                 raise ActiveRecord::RecordNotFound if original.nil?
                 original
               else
-                find trans.key.split("_").last
+                trans.each do |x|
+                  res = find_by_id x.key.split("_").last
+                  return res if res
+                end
+
+                raise ActiveRecord::RecordNotFound
               end
             end
           end

data/lib/armot/version.rb

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

data/test/armot_test.rb

@@ -217,4 +217,29 @@ class ArmotTest < ActiveSupport::TestCase
     post.title = "Another change"
     assert_equal true, post.title_changed?
   end
+
+  test "should find the correct record when there are conflicting names and scopes" do
+    post = Post.first
+    post.title = "Hola"
+    post.header = "1"
+    post.save!
+
+    post2 = Post.create! :title => "Hola", :header => "2"
+
+    foo = Post.where(:header => "2").find_by_title "Hola"
+    assert_equal post2, foo
+  end
+
+  test "should find the correct record when there are conflicting names and scopes with bang" do
+    post = Post.first
+    post.title = "Hola"
+    post.header = "1"
+    post.save!
+
+    post2 = Post.create! :title => "Hola", :header => "2"
+
+    assert_nothing_raised do
+      Post.where(:header => "2").find_by_title! "Hola"
+    end
+  end
 end

data/test/schema.rb

@@ -2,6 +2,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :posts do |t|
     t.string :title
     t.text   :text
+    t.string :header
 
     t.timestamps
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   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: &83553980 !ruby/object:Gem::Requirement
+  requirement: &76123990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *83553980
+  version_requirements: *76123990
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83553730 !ruby/object:Gem::Requirement
+  requirement: &76123710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *83553730
+  version_requirements: *76123710
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83553500 !ruby/object:Gem::Requirement
+  requirement: &76123480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *83553500
+  version_requirements: *76123480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83553310 !ruby/object:Gem::Requirement
+  requirement: &76123270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83553310
+  version_requirements: *76123270
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83553080 !ruby/object:Gem::Requirement
+  requirement: &76123020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83553080
+  version_requirements: *76123020
 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: 809272723
+      hash: -313670527
 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: 809272723
+      hash: -313670527
 requirements: []
 rubyforge_project: armot
 rubygems_version: 1.8.6