attribute_localizer 0.0.2 → 0.0.3

data/lib/attribute_localizer.rb

@@ -16,7 +16,7 @@ module AttributeLocalizer
 
       src = attributes.map do |attribute|
         str = "def #{attribute}\n"
-        str << "@#{attribute} || I18n.t(\"\#{self.class.send :localization_namespace}.\#{localization_hash_key}.#{attribute}\", :locale => locale, :default => '')\n"
+        str << "@#{attribute} || I18n.t(\"\#{self.class.send :localization_namespace}.\#{localization_hash_key}.#{attribute}\", :locale => locale)\n"
         str << "end"
         str
       end.join("\n")
@@ -25,30 +25,15 @@ module AttributeLocalizer
 
       src = <<-end_src
 
-        def as_json(options = {})
-          instance_values
-          super
-        end
-
-        def to_json(options = {})
-          instance_values
-          super
-        end
-
         def locale
           @locale || I18n.locale
         end
 
-        def instance_values
-          values = super
-          values['attributes'].merge!(#{attributes.map { |attribute| "'#{attribute}' => #{attribute}" }.join(', ') })
-          values
-        end
-
       end_src
 
       module_eval src, __FILE__, __LINE__
 
+
       private
 
         klass.send :define_method, 'i18n_file' do |locale|
@@ -58,17 +43,26 @@ module AttributeLocalizer
         klass.send :private, 'i18n_file'
 
         src = <<-end_src
+
           def load_locale_data(locale)
             localized_hash = YAML::load_file(i18n_file(locale))
             localized_hash[locale][localization_namespace]
           rescue
             {}
           end
+
+          def instantiate(record)
+            object = super
+            object.instance_variable_get('@attributes').merge!(#{attributes.map { |attribute| "'#{attribute}' => nil" }.join(', ') })
+            object
+          end
+
         end_src
 
         klass.class_eval src, __FILE__, __LINE__
 
         klass.send :private, 'load_locale_data'
+        klass.send :private, 'instantiate'
 
         klass.send :define_method, 'localization_namespace' do
           to_s.underscore.pluralize
@@ -87,21 +81,27 @@ module AttributeLocalizer
         src = <<-end_src
 
           private
+
+            def attributes_from_column_definition
+              super.merge(#{attributes.map { |attribute| "'#{attribute}' => nil" }.join(', ') })
+            end
+
             def localization_hash_key
               "_\#{id}".to_sym
             end
 
+            def localized_yaml
+              {
+              #{attributes.map { |attribute| ":#{attribute} => #{attribute}"}.join(',')}
+              }
+            end
+
             def serialize_localizations
               localized_hash = self.class.send :load_locale_data, locale
               localized_hash[localization_hash_key] = localized_yaml
               self.class.send :write_locale_data, locale, localized_hash
             end
 
-            def localized_yaml
-              {
-              #{attributes.map { |attribute| ":#{attribute} => #{attribute}"}.join(',')}
-              }
-            end
         end_src
 
         module_eval src, __FILE__, __LINE__

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Deering
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -06:00
+date: 2010-04-22 00:00:00 -06:00
 default_executable: 
 dependencies: []