modalh 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/h/active_record_extensions.rb

@@ -9,36 +9,57 @@ module H
   module ActiveRecordExtensions
 
     # Generic H field declarator
-    def _h(prefix, attr, *options)
+    def _h(prefix, attr, *args)
 
-      instance_variable_set :"@#{attr}_h_options", options
+      options = args.extract_options!
+      actual_attr = options.delete(:attribute) || attr
+      args << options unless options.empty?
+
+      instance_variable_set :"@#{attr}_h_options", args
 
       class_eval do
 
-        validates_each attr do |record, attr_name, value|
-          record.errors.add attr_name.to_s if record.send(:"#{attr_name}_h_invalid?")
+        validates_each actual_attr do |record, attr_name, value|
+          if attr_name.to_s==actual_attr.to_s && record.send(:"#{attr}_h_invalid?")
+            record.errors.add attr_name.to_s
+          end
+        end
+
+        if attr != actual_attr
+          define_method :"#{attr}" do
+            self.send :"#{actual_attr}"
+          end
+          define_method :"#{attr}=" do |v|
+            self.send :"#{actual_attr}=", v
+          end
         end
 
-        # attr=(v)
-        define_method :"#{attr}=" do |v|
-          write_attribute attr, v
-          instance_variable_set "@#{attr}_h", nil
+        if method_defined?(:"#{actual_attr}=")
+          define_method :"#{actual_attr}_with_#{prefix}_h=" do |v|
+            send :"#{actual_attr}_without_#{prefix}_h=", v
+            instance_variable_set "@#{attr}_h", nil
+          end
+          alias_method_chain :"#{actual_attr}=", :"#{prefix}_h"
+        else
+          define_method :"#{actual_attr}=" do |v|
+            write_attribute actual_attr, v
+            instance_variable_set "@#{attr}_h", nil
+          end
         end
 
         # attr_h
         define_method :"#{attr}_h" do
-          # don't cache it, because the locale may change
-          # unless instance_variable_defined? "@#{attr}_h"
-            instance_variable_set "@#{attr}_h", H.send(:"#{prefix}_to", send(attr), *self.class.instance_variable_get(:"@#{attr}_h_options"))
-          # end
-          instance_variable_get "@#{attr}_h"
+          unless  (instance_variable_defined? "@#{attr}_h") && (h=instance_variable_get("@#{attr}_h")) && instance_variable_get("@#{attr}_h_locale")==I18n.locale
+            h = H.send(:"#{prefix}_to", send(attr), *self.class.instance_variable_get(:"@#{attr}_h_options"))
+            instance_variable_set "@#{attr}_h", h
+            instance_variable_set "@#{attr}_h_locale", I18n.locale
+          end
+          h
         end
 
         # attr_h=(txt)
         define_method :"#{attr}_h=" do |txt|
-          instance_variable_set "@#{attr}_h", txt
           instance_variable_set "@#{attr}_h_invalid", false
-          write_attribute attr, nil
           unless txt.blank?
             begin
                v = H.send(:"#{prefix}_from", txt, *self.class.instance_variable_get(:"@#{attr}_h_options"))
@@ -48,6 +69,8 @@ module H
             instance_variable_set "@#{attr}_h_invalid", true if v.nil?
           end
           send :"#{attr}=", v
+          instance_variable_set "@#{attr}_h", txt
+          instance_variable_set "@#{attr}_h_locale", I18n.locale
         end
 
         # attr_h? (returns true if it is valid and not blank)

data/modalh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalh"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-05-10"
+  s.date = "2012-05-12"
   s.description = "Rails plugin for localization & delocalization of data values"
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalh
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: units-system
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1742349848663810765
+      hash: 2367165293756376042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: