globalize3 0.1.0.beta → 0.1.0.beta2

data/Gemfile.lock

@@ -1,55 +1,57 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.0.10)
+    globalize3 (0.1.0.beta2)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    activesupport (3.0.7)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.2)
     database_cleaner (0.5.2)
     i18n (0.5.0)
-    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     mocha (0.9.10)
       rake
     pathname_local (0.0.2)
     rake (0.8.7)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     sqlite3-ruby (1.3.2)
-    test_declarative (0.0.4)
-    tzinfo (0.3.23)
+    test_declarative (0.0.5)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (>= 3.0.0)
-  activerecord (>= 3.0.0)
   database_cleaner (= 0.5.2)
   globalize3!
   mocha
   pathname_local
-  ruby-debug
+  ruby-debug19
   sqlite3-ruby
   test_declarative
-
-METADATA
-  version: 1.0.6

data/README.textile

@@ -62,7 +62,7 @@ As well as creating a translation table, you can also use @create_translation_ta
 existing data to the default locale. This can also operate in reverse to restore any translations from the default locale
 back to the model when you don't want to use a translation table anymore using @drop_translation_table!@
 
-This feature makes use of @untranslated_fields@ which allows access to the model's attributes as they were before
+This feature makes use of @untranslated_attributes@ which allows access to the model's attributes as they were before
 the translation was applied. Here's an example (which assumes you already have a model called @Post@ and its table exists):
 
 <pre><code>

data/lib/globalize/active_record/act_macro.rb

@@ -7,7 +7,7 @@ module Globalize
         options = attr_names.extract_options!
         options[:table_name] ||= "#{table_name.singularize}_translations"
 
-        class_inheritable_accessor :translated_attribute_names, :translation_options
+        class_attribute :translated_attribute_names, :translation_options
         self.translated_attribute_names = attr_names.map(&:to_sym)
         self.translation_options        = options
 
@@ -19,14 +19,17 @@ module Globalize
                                 :dependent   => :delete_all,
                                 :extend      => HasManyExtensions
 
-        after_save :save_translations!
+        after_create :save_translations!
+        after_update :save_translations!
 
         attr_names.each { |attr_name| translated_attr_accessor(attr_name) }
       end
 
       def class_name
-        class_name = table_name[table_name_prefix.length..-(table_name_suffix.length + 1)].downcase.camelize
-        pluralize_table_names ? class_name.singularize : class_name
+        @class_name ||= begin
+          class_name = table_name[table_name_prefix.length..-(table_name_suffix.length + 1)].downcase.camelize
+          pluralize_table_names ? class_name.singularize : class_name
+        end
       end
 
       def translates?

data/lib/globalize/active_record/adapter.rb

@@ -3,25 +3,36 @@ module Globalize
     class Adapter
       # The cache caches attributes that already were looked up for read access.
       # The stash keeps track of new or changed values that need to be saved.
-      attr_reader :record, :cache, :stash
+      attr_accessor :record, :stash, :translations
+      private :record=, :stash=
 
       delegate :translation_class, :to => :'record.class'
 
       def initialize(record)
-        @record = record
-        @cache = Attributes.new
-        @stash = Attributes.new
+        self.record = record
+        self.stash = Attributes.new
+      end
+
+      def fetch_stash(locale, name)
+        value = stash.read(locale, name)
+        return value if value
+        return nil
       end
 
       def fetch(locale, name)
-        cache.contains?(locale, name) ?
-          type_cast(name, cache.read(locale, name)) :
-          cache.write(locale, name, fetch_attribute(locale, name))
+        Globalize.fallbacks(locale).each do |fallback|
+          value = fetch_stash(fallback, name) || fetch_attribute(fallback, name)
+
+          if value
+            set_metadata(value, :locale => fallback, :requested_locale => locale)
+            return value
+          end
+        end
+        return nil
       end
 
       def write(locale, name, value)
         stash.write(locale, name, value)
-        cache.write(locale, name, value)
       end
 
       def save_translations!
@@ -30,71 +41,50 @@ module Globalize
           attrs.each { |name, value| translation[name] = value }
           translation.save!
         end
+        record.translations.reset
         stash.clear
       end
 
       def reset
-        cache.clear
+        stash.clear
       end
 
-      protected
-
-        def type_cast(name, value)
-          if value.nil?
-            nil
-          elsif column = column_for_attribute(name)
-            column.type_cast(value)
-          else
-            value
-          end
-        end
-
-        def column_for_attribute(name)
-          translation_class.columns_hash[name.to_s]
-        end
-
-        def unserializable_attribute?(name, column)
-          column.text? && translation_class.serialized_attributes[name.to_s]
-        end
-
-        def fetch_translation(locale)
-          locale = locale.to_sym
-          record.translations.loaded? ? record.translations.detect { |t| t.locale == locale } :
-            record.translations.with_locales(locale)
-        end
+    protected
 
-        def fetch_translations(locale)
-          # only query if not already included with :include => translations
-          record.translations.loaded? ? record.translations :
-            record.translations.with_locales(Globalize.fallbacks(locale))
+      def type_cast(name, value)
+        if value.nil?
+          nil
+        elsif column = column_for_attribute(name)
+          column.type_cast(value)
+        else
+          value
         end
+      end
 
-        def fetch_attribute(locale, name)
-          translations = fetch_translations(locale)
-          value, requested_locale = nil, locale
+      def column_for_attribute(name)
+        translation_class.columns_hash[name.to_s]
+      end
 
-          Globalize.fallbacks(locale).each do |fallback|
-            translation = translations.to_a.detect { |t| t.locale == fallback }
-            value  = translation && translation.send(name)
-            locale = fallback && break if value
-          end
+      def unserializable_attribute?(name, column)
+        column.text? && translation_class.serialized_attributes[name.to_s]
+      end
 
-          set_metadata(value, :locale => locale, :requested_locale => requested_locale)
-          value
-        end
+      def fetch_attribute(locale, name)
+        translations ||= record.translations
+        translation = translations.detect{|t| t.locale == locale}
+        return translation && translation.send(name)
+      end
 
-        def set_metadata(object, metadata)
-          if object.respond_to?(:translation_metadata)
-            object.translation_metadata.merge!(meta_data)
-          end
-        end
+      def set_metadata(object, metadata)
+        object.translation_metadata.merge!(meta_data) if object.respond_to?(:translation_metadata)
+        object
+      end
 
-        def translation_metadata_accessor(object)
-          return if obj.respond_to?(:translation_metadata)
-          class << object; attr_accessor :translation_metadata end
-          object.translation_metadata ||= {}
-        end
+      def translation_metadata_accessor(object)
+        return if obj.respond_to?(:translation_metadata)
+        class << object; attr_accessor :translation_metadata end
+        object.translation_metadata ||= {}
+      end
     end
   end
 end
-

data/lib/globalize/active_record/attributes.rb

@@ -3,7 +3,7 @@
 
 module Globalize
   module ActiveRecord
-    class Attributes < Hash
+    class Attributes < Hash # TODO: Think about using HashWithIndifferentAccess ?
       def [](locale)
         locale = locale.to_sym
         self[locale] = {} unless has_key?(locale)
@@ -19,6 +19,7 @@ module Globalize
       end
 
       def write(locale, name, value)
+        #raise 'z' if value.nil? # TODO
         self[locale][name.to_s] = value
       end
     end

data/lib/globalize/active_record/class_methods.rb

@@ -4,7 +4,7 @@ module Globalize
       delegate :translated_locales, :set_translations_table_name, :to => :translation_class
 
       def with_locales(*locales)
-        scoped & translation_class.with_locales(*locales)
+        scoped.merge(translation_class.with_locales(*locales))
       end
 
       def with_translations(*locales)
@@ -39,16 +39,18 @@ module Globalize
       end
 
       def translation_class
-        klass = self.const_get(:Translation) rescue nil
-        if(klass.nil? || (klass.class_name != (self.class_name + "Translation")))
-          klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
-        end
+        @translation_class ||= begin
+          klass = self.const_get(:Translation) rescue nil
+          if klass.nil? || klass.class_name != (self.class_name + "Translation")
+            klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
+          end
 
-        if klass.table_name == 'translations'
-          klass.set_table_name(translation_options[:table_name])
-          klass.belongs_to name.underscore.gsub('/', '_')
+          if klass.table_name == 'translations'
+            klass.set_table_name(translation_options[:table_name])
+            klass.belongs_to name.underscore.gsub('/', '_')
+          end
+          klass
         end
-        klass
       end
 
       def translations_table_name
@@ -59,30 +61,64 @@ module Globalize
         "#{translation_class.table_name}.#{name}"
       end
 
-      def respond_to?(method, *args, &block)
-        method.to_s =~ /^find_by_(\w+)$/ && translated?($1.to_sym) || super
+      if RUBY_VERSION < '1.9'
+        def respond_to?(method_id, *args, &block)
+          supported_on_missing?(method_id) || super
+        end
+      else
+        def respond_to_missing?(method_id, include_private = false)
+          supported_on_missing?(method_id) || super
+        end
       end
 
-      def method_missing(method, *args)
-        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
-          super
+      def supported_on_missing?(method_id)
+        return super unless RUBY_VERSION < '1.9' || respond_to?(:translated_attribute_names)
+        match = ::ActiveRecord::DynamicFinderMatch.match(method_id) || ::ActiveRecord::DynamicScopeMatch.match(method_id)
+        return false if match.nil?
+
+        attribute_names = match.attribute_names.map(&:to_sym)
+        translated_attributes = attribute_names & translated_attribute_names
+        return false if translated_attributes.empty?
+
+        untranslated_attributes = attribute_names - translated_attributes
+        return false if untranslated_attributes.any?{|unt| ! respond_to?(:"scoped_by_#{unt}")}
+        return [match, attribute_names, translated_attributes, untranslated_attributes]
+      end
+
+      def method_missing(method_id, *arguments, &block)
+        match, attribute_names, translated_attributes, untranslated_attributes = supported_on_missing?(method_id)
+        return super unless match
+
+        scope = scoped
+
+        translated_attributes.each do |attr|
+          scope = scope.with_translated_attribute(attr, arguments[attribute_names.index(attr)])
         end
+
+        untranslated_attributes.each do |unt|
+          index = attribute_names.index(unt)
+          raise StandarError unless index
+          scope = scope.send(:"scoped_by_#{unt}", arguments[index])
+        end
+
+        return scope.send(match.finder) if match.is_a?(::ActiveRecord::DynamicFinderMatch)
+        return scope
       end
 
-      protected
+    protected
 
-        def translated_attr_accessor(name)
-          define_method(:"#{name}=") do |value|
-            write_attribute(name, value)
-          end
-          define_method(name) do |*args|
-            read_attribute(name, {:locale => args.first})
-          end
-          alias_method :"#{name}_before_type_cast", name
+      def translated_attr_accessor(name)
+        define_method(:"#{name}=") do |value|
+          write_attribute(name, value)
         end
+        define_method(name) do |*args|
+          read_attribute(name, {:locale => args.first})
+        end
+        alias_method :"#{name}_before_type_cast", name
+      end
+
     end
+
   end
-end
+
+end

data/lib/globalize/active_record/instance_methods.rb

@@ -24,9 +24,7 @@ module Globalize
       end
 
       def write_attribute(name, value, options = {})
-        # Make sure that we return some value as some methods might
-        # rely on the data
-        return_value = super(name, value)
+        # raise 'y' if value.nil? # TODO.
 
         if translated?(name)
           # Deprecate old use of locale
@@ -35,9 +33,11 @@ module Globalize
             options = {:locale => options}
           end
           options = {:locale => nil}.merge(options)
-          return_value = globalize.write(options[:locale] || Globalize.locale, name, value)
+          attribute_will_change! name.to_s
+          globalize.write(options[:locale] || Globalize.locale, name, value)
+        else
+          super(name, value)
         end
-        return_value
       end
 
       def read_attribute(name, options = {})
@@ -93,20 +93,47 @@ module Globalize
         super(options)
       end
 
-      protected
+      def clone
+        obj = super
+        return obj unless respond_to?(:translated_attribute_names)
 
-        def save_translations!
-          globalize.save_translations!
+        obj.instance_variable_set(:@translations, nil) if new_record? # Reset the collection because of rails bug: http://pastie.org/1521874
+        obj.instance_variable_set(:@globalize, nil )
+        each_locale_and_translated_attribute do |locale, name|
+          obj.globalize.write(locale, name, globalize.fetch(locale, name) )
         end
 
-        def with_given_locale(attributes, &block)
-          attributes.symbolize_keys! if attributes.respond_to?(:symbolize_keys!)
-          if locale = attributes.try(:delete, :locale)
-            Globalize.with_locale(locale, &block)
-          else
-            yield
+        return obj
+      end
+
+    protected
+
+      def each_locale_and_translated_attribute
+        used_locales.each do |locale|
+          translated_attribute_names.each do |name|
+            yield locale, name
           end
         end
+      end
+
+      def used_locales
+        locales = globalize.stash.keys.concat(globalize.stash.keys).concat(translations.translated_locales)
+        locales.uniq!
+        locales
+      end
+
+      def save_translations!
+        globalize.save_translations!
+      end
+
+      def with_given_locale(attributes, &block)
+        attributes.symbolize_keys! if attributes.respond_to?(:symbolize_keys!)
+        if locale = attributes.try(:delete, :locale)
+          Globalize.with_locale(locale, &block)
+        else
+          yield
+        end
+      end
     end
   end
 end

data/lib/globalize/active_record/translation.rb

@@ -3,7 +3,10 @@ module Globalize
     class Translation < ::ActiveRecord::Base
       class << self
         def with_locales(*locales)
-          where(:locale => locales.flatten.map(&:to_s))
+          # Avoid using "IN" with SQL queries when only using one locale.
+          locales = locales.flatten.map(&:to_s)
+          locales = locales.first if locales.one?
+          where(:locale => locales)
         end
         alias with_locale with_locales
 

data/lib/globalize.rb

@@ -18,11 +18,17 @@ module Globalize
     def with_locale(locale, &block)
       previous_locale = read_locale
       set_locale(locale)
-      result = yield
+      result = yield(locale)
       set_locale(previous_locale)
       result
     end
 
+    def with_locales(*locales, &block)
+      locales.flatten.map do |locale|
+        with_locale(locale, &block)
+      end
+    end
+
     def fallbacks?
       I18n.respond_to?(:fallbacks)
     end
@@ -31,15 +37,15 @@ module Globalize
       fallbacks? ? I18n.fallbacks[locale] : [locale.to_sym]
     end
 
-    protected
+  protected
 
-      def read_locale
-        Thread.current[:globalize_locale]
-      end
+    def read_locale
+      Thread.current[:globalize_locale]
+    end
 
-      def set_locale(locale)
-        Thread.current[:globalize_locale] = locale
-      end
+    def set_locale(locale)
+      Thread.current[:globalize_locale] = locale.to_sym rescue nil
+    end
   end
 end
 

data/lib/globalize3/version.rb

@@ -1,3 +1,3 @@
 module Globalize3
-  VERSION = '0.1.0.beta'
+  VERSION = '0.1.0.beta2'
 end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  hash: 31098185
   prerelease: 6
-  segments: 
-  - 0
-  - 1
-  - 0
-  - beta
-  version: 0.1.0.beta
+  version: 0.1.0.beta2
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -19,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
+date: 2011-05-20 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,11 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -46,11 +35,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id002
@@ -62,11 +46,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
         version: 0.5.2
   type: :development
   version_requirements: *id003
@@ -78,9 +57,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -92,9 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -106,23 +79,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: ruby-debug19
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -134,9 +101,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -186,25 +150,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation"