globalize3 0.0.3 → 0.0.4

data/lib/globalize/active_record/act_macro.rb

@@ -11,18 +11,16 @@ module Globalize
         extend  ClassMethods, Migration
 
         class_inheritable_accessor :translated_attribute_names, :translation_options
-        class_inheritable_writer   :required_attributes
-
         self.translated_attribute_names = attr_names.map(&:to_sym)
         self.translation_options        = options
 
-        after_save :save_translations!
-
         has_many :translations, :class_name  => translation_class.name,
                                 :foreign_key => class_name.foreign_key,
                                 :dependent   => :delete_all,
                                 :extend      => HasManyExtensions
 
+        after_save :save_translations!
+
         attr_names.each { |attr_name| translated_attr_accessor(attr_name) }
       end
 

data/lib/globalize/active_record/class_methods.rb

@@ -22,10 +22,14 @@ module Globalize
         locales ||= Globalize.fallbacks
         with_translations.where(
           translated_column_name(name)    => value,
-          translated_column_name(:locale) => locales.map(&:to_s)
+          translated_column_name(:locale) => Array(locales).map(&:to_s)
         )
       end
 
+      def translated?(name)
+        translated_attribute_names.include?(name)
+      end
+
       def required_attributes
         validators.map { |v| v.attributes if v.is_a?(ActiveModel::Validations::PresenceValidator) }.flatten
       end
@@ -52,11 +56,11 @@ module Globalize
       end
 
       def respond_to?(method, *args, &block)
-        method.to_s =~ /^find_by_(\w+)$/ && translated_attribute_names.include?($1.to_sym) || super
+        method.to_s =~ /^find_by_(\w+)$/ && translated?($1.to_sym) || super
       end
 
       def method_missing(method, *args)
-        if method.to_s =~ /^find_(first_|)by_(\w+)$/ && translated_attribute_names.include?($2.to_sym)
+        if method.to_s =~ /^find_(first_|)by_(\w+)$/ && translated?($2.to_sym)
           result = with_translated_attribute($2, args.first)
           $1 == 'first_' ? result.first : result.all
         else
@@ -67,13 +71,12 @@ module Globalize
       protected
 
         def translated_attr_accessor(name)
-          define_method :"#{name}=", lambda { |value|
-            globalize.write(Globalize.locale, name, value)
-            self[name] = value
-          }
-          define_method name, lambda { |*args|
+          define_method(:"#{name}=") do |value|
+            self[name] = globalize.write(Globalize.locale, name, value)
+          end
+          define_method(name) do |*args|
             globalize.fetch(args.first || Globalize.locale, name)
-          }
+          end
           alias_method :"#{name}_before_type_cast", name
         end
     end

data/lib/globalize/version.rb

@@ -1,3 +1,3 @@
 module Globalize
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency