armot 0.2.4 → 0.2.5

data/lib/armot/active_record_extensions.rb

@@ -4,6 +4,8 @@ module Armot
       def armotize(*attributes)
         make_it_armot! unless included_modules.include?(InstanceMethods)
 
+        mixin = Module.new
+
         attributes.each do |attribute|
           self.instance_eval <<-RUBY
             def find_by_#{attribute}(value)
@@ -38,32 +40,35 @@ module Armot
             end
           RUBY
 
-          # attribute setter
-          define_method "#{attribute}=" do |value|
-            armot_attributes[I18n.locale][attribute] = value
-            I18n.backend.reload!
-          end
+          mixin.module_eval <<-STR
+            def #{attribute}=(value)
+              armot_attributes[I18n.locale]['#{attribute}'] = value
+              I18n.backend.reload!
+            end
 
-          # attribute getter
-          define_method attribute do
-            return armot_attributes[I18n.locale][attribute] if armot_attributes[I18n.locale][attribute]
-            return if new_record?
+            def #{attribute}
+              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
-            return trans if trans != 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
-              break if trans != Armot.token
-            end
+              (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
+              trans == Armot.token ? self[:#{attribute}] : trans
+            end
 
-          define_method "#{attribute}_changed?" do
-            armot_attributes[I18n.locale][attribute].present?
-          end
+            def #{attribute}_changed?
+              armot_attributes[I18n.locale]['#{attribute}'].present?
+            end
+          STR
         end
+
+        self.const_set("ArmotInstanceMethods", mixin)
+        include self.const_get("ArmotInstanceMethods") unless self.included_modules.include?("ArmotInstanceMethods")
       end
 
     private

data/lib/armot/version.rb

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

data/test/armot_test.rb

@@ -271,4 +271,24 @@ class ArmotTest < ActiveSupport::TestCase
     foo = Post.methods.include?(to_method_name(:find_by_title))
     assert_equal true, foo
   end
+
+  test "should be able to use super from an overrided setter" do
+    # Product class has 'name' setter redefined
+    a = Product.create
+
+    I18n.locale = :ca
+    a.name = "Catalan foo"
+
+    I18n.locale = :en
+    a.name = "English foo"
+    a.save!
+
+    a.reload
+
+    I18n.locale = :ca
+    assert_equal "Catalan foo customized", a.name
+    I18n.locale = :en
+    assert_equal "English foo customized", a.name
+
+  end
 end

data/test/schema.rb

@@ -5,6 +5,10 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :header
   end
 
+  create_table :products do |t|
+    t.string :name
+  end
+
   create_table :comments do |t|
     t.string :msg
     t.string :title

data/test/test_helper.rb

@@ -32,6 +32,14 @@ class Post < ActiveRecord::Base
   validates_presence_of :title
 end
 
+class Product < ActiveRecord::Base
+  armotize :name
+
+  def name=(value)
+    super(value + " customized")
+  end
+end
+
 # Puret translation model to test migration process
 class PostTranslation < ActiveRecord::Base
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: armot
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-active_record
-  requirement: &82864110 !ruby/object:Gem::Requirement
+  requirement: &76322190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *82864110
+  version_requirements: *76322190
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &82863590 !ruby/object:Gem::Requirement
+  requirement: &76321840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *82863590
+  version_requirements: *76321840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &82863200 !ruby/object:Gem::Requirement
+  requirement: &76321540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *82863200
+  version_requirements: *76321540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82862930 !ruby/object:Gem::Requirement
+  requirement: &76321310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82862930
+  version_requirements: *76321310
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82862580 !ruby/object:Gem::Requirement
+  requirement: &76321020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82862580
+  version_requirements: *76321020
 description: translation support for your models with an I18n active-record backend
 email:
 - roger@itnig.net
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -195419853
+      hash: -304182355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -195419853
+      hash: -304182355
 requirements: []
 rubyforge_project: armot
 rubygems_version: 1.8.10