armot 0.2.0 → 0.2.1

data/lib/armot.rb

@@ -5,5 +5,7 @@ end
 require 'armot/railtie' if defined?(Rails)
 
 module Armot
+  mattr_accessor :token
+  @@token = "aXqvyiainsvQWivbpo13/asf/tTG27cbASBFPOQ"
 end
 

data/lib/armot/active_record_extensions.rb

@@ -10,7 +10,7 @@ module Armot
               trans = I18n::Backend::ActiveRecord::Translation.find_by_locale_and_value(I18n.locale, value.to_yaml)
               return send("where", {:"#{attribute}" => value}).first if trans.nil?
 
-              find trans.key.split("_").last
+              find_by_id trans.key.split("_").last
             end
 
             define_method "find_by_#{attribute}!" do |value|
@@ -37,11 +37,19 @@ module Armot
             return armot_attributes[I18n.locale][attribute] if armot_attributes[I18n.locale][attribute]
             return if new_record?
 
-            begin
-              I18n.t "#{attribute}_#{id}", :scope => "armot.#{self.class.to_s.underscore.pluralize}.#{attribute}", :raise => true
-            rescue I18n::MissingTranslationData
-              self[attribute]
+            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
+              break if trans != Armot.token
             end
+
+            trans == Armot.token ? self[attribute] : trans
+          end
+
+          define_method "#{attribute}_changed?" do
+            armot_attributes[I18n.locale][attribute].present?
           end
         end
       end
@@ -67,12 +75,15 @@ module Armot
       # called after save
       def update_translations!
         return if armot_attributes.blank?
+
         armot_attributes.each do |locale, attributes|
           attributes.each do |k, v|
             translation = I18n::Backend::ActiveRecord::Translation.find_or_initialize_by_locale_and_key(locale.to_s, "armot.#{self.class.to_s.underscore.pluralize}.#{k}.#{k}_#{id}")
             translation.update_attribute(:value, v)
           end
         end
+
+        armot_attributes.clear
       end
 
       def remove_i18n_entries

data/lib/armot/version.rb

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

data/test/armot_test.rb

@@ -100,6 +100,16 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal "original title", Post.first.title
   end
 
+  test "should look for translations in other languages before fail" do
+    post = Post.first
+    I18n::Backend::ActiveRecord::Translation.delete_all
+    I18n.locale = :ca
+    post.title = "Catalan title"
+    post.save!
+    I18n.locale = :it
+    assert_equal "Catalan title", post.title
+  end
+
   test "should find by translated title in database as a translation" do
     post = Post.first
     I18n.locale = :ca
@@ -131,6 +141,27 @@ class ArmotTest < ActiveSupport::TestCase
     assert_equal nil, foo
   end
 
+  test "should return nil when finding for an existant value but incompatible with the current scope" do
+    post = Post.first
+    I18n.locale = :ca
+    post.title = "Catalan title"
+    post.save!
+
+    foo = Post.where("title != 'Catalan title'").find_by_title "Catalan title"
+    assert_equal nil, foo
+  end
+
+  test "should raise a RecordNotFound error when finding for an existant value but incompatible with the current scope with bang!" do
+    post = Post.first
+    I18n.locale = :ca
+    post.title = "Catalan title"
+    post.save!
+
+    assert_raise(ActiveRecord::RecordNotFound) do
+      Post.where("title != 'Catalan title'").find_by_title! "Catalan title"
+    end
+  end
+
   test "should raise exception with bang version" do
     assert_raise(ActiveRecord::RecordNotFound) do
       Post.find_by_title! "Non existant"
@@ -173,4 +204,17 @@ class ArmotTest < ActiveSupport::TestCase
       Post.find_by_title! "Non existant"
     end
   end
+
+  test "_changed? method should work as expected" do
+    post = Post.first
+    post.title = "Other title"
+
+    assert_equal true, post.title_changed?
+
+    post.save!
+    assert_equal false, post.title_changed?
+
+    post.title = "Another change"
+    assert_equal true, post.title_changed?
+  end
 end

data/test/puret_migration_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test_helper'
 require 'armot/puret_integration'
 

metadata

@@ -1,108 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: armot
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Roger Campos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n-active_record
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &83553980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *83553980
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &83553730 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *83553730
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &83553500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *83553500
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &83553310 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *83553310
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &83553080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *83553080
 description: translation support for your models with an I18n active-record backend
-email: 
+email:
 - roger@itnig.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -120,36 +90,32 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/rogercampos/armot
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 809272723
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 809272723
 requirements: []
-
 rubyforge_project: armot
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: translation support for your models with an I18n active-record backend
 test_files: []
-