globalize 4.0.0.alpha.2 → 4.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca26136a9b1c4d772eee00815f732b7025d3b95
-  data.tar.gz: 93b43c38d7a582487fa95042633d2cfc3776a0b4
+  metadata.gz: fd7e2e9e5d23a8dd6696722ddd3dfabc200f07e1
+  data.tar.gz: 340c3919bd3bdb8a5a3f821c12189d29df20e181
 SHA512:
-  metadata.gz: cd0c34e725155990db83147a41fe87df89439655fad2093970543c63773545b2dd72ebb5908ce42b60aa0ac0c5971f4856490df5d6a62d0c44b7563b4e87beb4
-  data.tar.gz: 25c39ad5e9cff3855f782b715d83be94cc44ffe88b87ad4db5aafea7f975808dddb78bc56a7571d6954464f8d9b5013295047d8bf9d2b0eb4dcb7bacf5d82791
+  metadata.gz: 53351f2d7268b5e183410c58331205e9f704a24f6e5e2df95813117c0915d62c5ba9dbca33531bff572c80672a315e1add169bbdc2e2686b68abc51f45815d6e
+  data.tar.gz: c411ea171a017727cf07d2bd6dcc4e83c71f88700f4cde510684a88422e6eda44bf2af10e43d9c87a4b2de54d089d546e334cb81930128bd8259bb1808e337df

data/Gemfile

@@ -7,6 +7,10 @@ gem 'paper_trail', github: 'airblade/paper_trail', branch: 'master'
 # Per https://github.com/bmabey/database_cleaner/issues/224
 gem 'database_cleaner', github: 'bmabey/database_cleaner', branch: 'master'
 
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end
+
 group :test do
   gem 'pry'
   gem 'pry-nav'

data/Gemfile.lock

@@ -1,39 +1,23 @@
-GIT
-  remote: git://github.com/airblade/paper_trail.git
-  revision: 44f2380ec6cd45c15a8b654d5e7d694499c6e11c
-  branch: master
-  specs:
-    paper_trail (3.0.0.beta2)
-      activerecord (>= 3.0, < 5.0)
-
-GIT
-  remote: git://github.com/bmabey/database_cleaner.git
-  revision: 6da38c4c1a565bbcc62ed9b84c2574537c6ebae2
-  branch: master
-  specs:
-    database_cleaner (1.2.0)
-
 PATH
   remote: .
   specs:
-    globalize (4.0.0.alpha.2)
+    globalize (4.0.0.alpha.3)
       activemodel (>= 4.0.0)
       activerecord (>= 4.0.0)
-      paper_trail (~> 3.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.1)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -41,10 +25,10 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.1)
     atomic (1.1.14)
-    atomic (1.1.14-java)
     builder (3.1.4)
     coderay (1.0.9)
-    ffi (1.9.0-java)
+    database_cleaner (1.2.0)
+    ffi (1.9.3-java)
     i18n (0.6.5)
     json (1.8.1)
     json (1.8.1-java)
@@ -73,8 +57,6 @@ GEM
     sqlite3 (1.3.7)
     thread_safe (0.1.3)
       atomic
-    thread_safe (0.1.3-java)
-      atomic
     tzinfo (0.3.38)
 
 PLATFORMS
@@ -82,11 +64,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner!
+  database_cleaner (>= 1.2.0)
   globalize!
   minitest
   minitest-colorize
-  paper_trail!
   pry
   pry-nav
   rake

data/lib/globalize.rb

@@ -2,7 +2,6 @@ require 'active_record'
 require 'patches/active_record/xml_attribute_serializer'
 require 'patches/active_record/query_method'
 require 'patches/active_record/uniqueness_validator'
-require 'patches/active_record/relation'
 
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'

data/lib/globalize/active_record.rb

@@ -8,6 +8,6 @@ module Globalize
     autoload :InstanceMethods, 'globalize/active_record/instance_methods'
     autoload :Migration,       'globalize/active_record/migration'
     autoload :Translation,     'globalize/active_record/translation'
-    autoload :Relation,        'globalize/active_record/relation'
+    autoload :QueryMethods,    'globalize/active_record/query_methods'
   end
 end

data/lib/globalize/active_record/class_methods.rb

@@ -58,16 +58,6 @@ module Globalize
         "#{translation_class.table_name}.#{name}"
       end
 
-      def relation
-        relation = Relation.new(self, arel_table)
-
-        if finder_needs_type_condition?
-          relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
-        else
-          relation
-        end
-      end
-
       def respond_to_missing?(method_id, include_private = false)
         supported_on_missing?(method_id) || super
       end
@@ -135,7 +125,16 @@ module Globalize
         record
       end
 
-    protected
+      private
+
+      # Override the default relation method in order to return a subclass
+      # of ActiveRecord::Relation with custom finder methods for translated
+      # attributes.
+      def relation
+        super.extending!(QueryMethods)
+      end
+
+      protected
 
       def translated_attr_accessor(name)
         define_method(:"#{name}=") do |value|

data/lib/globalize/active_record/{relation.rb → query_methods.rb}

@@ -1,6 +1,6 @@
 module Globalize
   module ActiveRecord
-    class Relation < ::ActiveRecord::Relation
+    module QueryMethods
 
       attr_accessor :translations_reload_needed
 
@@ -8,7 +8,7 @@ module Globalize
         def not(opts, *rest)
           if parsed = @scope.parse_translated_conditions(opts)
             @scope.translations_reload_needed = true
-            @scope.with_translations_in_this_locale.where.not(parsed, *rest)
+            @scope.with_translations_in_fallbacks.where.not(parsed, *rest)
           else
             super
           end
@@ -20,7 +20,7 @@ module Globalize
           WhereChain.new(spawn)
         elsif parsed = parse_translated_conditions(opts)
           self.translations_reload_needed = true
-          super(parsed, *rest).with_translations_in_this_locale
+          super(parsed, *rest).with_translations_in_fallbacks
         else
           super
         end
@@ -28,7 +28,7 @@ module Globalize
 
       def exists?(conditions = :none)
         if parsed = parse_translated_conditions(conditions)
-          with_translations_in_this_locale.exists?(parsed)
+          with_translations_in_fallbacks.exists?(parsed)
         else
           super
         end
@@ -47,8 +47,8 @@ module Globalize
         END_RUBY
       end
 
-      def with_translations_in_this_locale
-        with_translations(Globalize.locale)
+      def with_translations_in_fallbacks
+        with_translations(Globalize.fallbacks)
       end
 
       def parse_translated_conditions(opts)
@@ -58,6 +58,19 @@ module Globalize
           opts
         end
       end
+
+      def where_values_hash
+        equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
+          node.left.relation.name == translations_table_name
+        }
+
+        binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+
+        super.merge(Hash[equalities.map { |where|
+          name = where.left.name
+          [name, binds.fetch(name.to_s) { where.right }]
+        }])
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.2
+  version: 4.0.0.alpha.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,7 +155,7 @@ files:
 - lib/globalize/active_record/exceptions.rb
 - lib/globalize/active_record/instance_methods.rb
 - lib/globalize/active_record/migration.rb
-- lib/globalize/active_record/relation.rb
+- lib/globalize/active_record/query_methods.rb
 - lib/globalize/active_record/translation.rb
 - lib/globalize/active_record.rb
 - lib/globalize/interpolation.rb
@@ -165,7 +165,6 @@ files:
 - lib/i18n/missing_translations_log_handler.rb
 - lib/i18n/missing_translations_raise_handler.rb
 - lib/patches/active_record/query_method.rb
-- lib/patches/active_record/relation.rb
 - lib/patches/active_record/uniqueness_validator.rb
 - lib/patches/active_record/xml_attribute_serializer.rb
 - Gemfile
@@ -192,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: '[none]'
-rubygems_version: 2.1.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation

data/lib/patches/active_record/relation.rb

@@ -1,20 +0,0 @@
-module ActiveRecord
-  class Relation
-    if ::ActiveRecord::VERSION::STRING >= "3.2.1"
-      def where_values_hash
-        _translations_table_name = klass.respond_to?(:translations_table_name) ? klass.translations_table_name : nil
-
-        equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
-          [table_name, _translations_table_name].compact.include? node.left.relation.name
-        }
-
-        binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
-
-        Hash[equalities.map { |where|
-          name = where.left.name
-          [name, binds.fetch(name.to_s) { where.right } ]
-        }].with_indifferent_access
-      end
-    end
-  end
-end