globalize 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30dff66a561a7f6e3f79ecffe00afea16dd86ff
-  data.tar.gz: 264b67a3bf456f27ca3ee32e476fe39781402422
+  metadata.gz: d231d24dbd88077635e6a9252927db9581754f9a
+  data.tar.gz: 33f23cc80e09b4d7a31993c729fb1fa5fc6be140
 SHA512:
-  metadata.gz: 1b3670a385e89e159fdac80e336743357a1adea54f124cd023a086970ef0612711b2f7e78a98508ba48b1bea675361934af4726dce868ee582eb2bbac15fd16c
-  data.tar.gz: 7a3f197f7368577e0824ae58072b388993e90e7867c3e24a4a4abb934838625de3cef78410f584e9b0229c149d485c589b10047f0e2352fbda20813074e5e37e
+  metadata.gz: 0fa224e4b6bd57d262c957e48309fd94e46f06cd5b78a9441e4309ba7182b6fff7ed6a98bbae3b41a5662afc18ac6bd727b04827ac94f7a1bc96db39a1b790c9
+  data.tar.gz: d5edeb87b6e85ad499bedeec83c4df6174171897ea8916f109a116f10bb0fad86fefa8205a67acd0d5eb205c0a30b9d617b0a64c9635cb0986faa771465c577e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Globalize Changelog
 
+## 4.0.1 (2014-3-29)
+* Fix bug where `with_translations` only works if called after `where` in relation chain, fixes [#343](https://github.com/globalize/globalize/issues/343).
+* Use `preload` and `joins` instead of `includes` in `with_translations`, fixes [#329](https://github.com/globalize/globalize/issues/329) (thanks [Andrew Volozhanin](https://github.com/scarfacedeb)).
+* Update `database_cleaner` dependency to 1.2.0.
+* Support use of `first`/`take`/`last` with limit on queries with translated attributes, fixes [#322](https://github.com/globalize/globalize/issues/322) (thanks [prusswan](https://github.com/prusswan)).
+* Ensure that options are always extracted from `attr_names` in `Globalize::ActiveRecord::ActMacro#translates`, PR [#319](https://github.com/globalize/globalize/pull/319) (thanks [Marek](https://github.com/keram)).
+
+## 4.0.0 (2014-1-4)
+* Extract all versioning-related code to separate [globalize-versioning](https://github.com/globalize/globalize-versioning) gem.
+
 ## 4.0.0.alpha.5 (2014-1-4)
 * Fix issue where globalize breaks has_many through when model called with `where` (thanks [Paul McMahon](https://github.com/pwim)).
 * Modify dup so that translations are copied, and remove custom clone code to conform to Rails/AR semantics (thanks [Paul McMahon](https://github.com/pwim)).
@@ -41,6 +51,13 @@
 
 * Initial release of Rails 4-compatible gem.
 
+## 3.1.0 (2014-1-25)
+
+* Backport scope support on uniqueness validation from 4.0, drop support for ActiveRecord < 3.1, fixes [#324](https://github.com/globalize/globalize/issues/324).
+
+## 3.0.4 (2014-1-8)
+* Extract all versioning-related code to separate [globalize-versioning](https://github.com/globalize/globalize-versioning) gem.
+
 ## 3.0.3 (2013-12-26)
 
 * Ensure that foreign key is always set when saving translations (thanks [Andrew Feng](https://github.com/mingliangfeng)).

data/Gemfile

@@ -2,9 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-# 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

data/Gemfile.lock

@@ -8,9 +8,9 @@ GIT
 PATH
   remote: .
   specs:
-    globalize (4.0.0.alpha.5)
-      activemodel (>= 4.0.0)
-      activerecord (>= 4.0.0)
+    globalize (4.0.0)
+      activemodel (>= 4.0.0, < 5)
+      activerecord (>= 4.0.0, < 5)
 
 GEM
   remote: https://rubygems.org/
@@ -33,8 +33,18 @@ GEM
     ansi (1.4.3)
     arel (4.0.1)
     atomic (1.1.14)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.1.4)
     coderay (1.1.0)
+    columnize (0.3.6)
+    debug_inspector (0.0.2)
+    debugger (1.6.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.4)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.4)
     ffi2-generators (0.1.1)
     hashie (2.0.5)
     i18n (0.6.9)
@@ -46,7 +56,9 @@ GEM
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
-    multi_json (1.8.2)
+    multi_json (1.8.4)
+    polyamorous (0.6.4)
+      activerecord (>= 3.0)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
@@ -54,10 +66,14 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-nav (0.2.3)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
+    pry-stack_explorer (0.4.9.1)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
     rake (10.1.1)
-    rdoc (4.1.0)
+    rdoc (4.1.1)
       json (~> 1.4)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
@@ -217,7 +233,7 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.5)
+    rubysl-openssl (2.0.6)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
@@ -263,6 +279,10 @@ GEM
     rubysl-zlib (2.0.1)
     slop (3.4.7)
     sqlite3 (1.3.8)
+    squeel (1.1.1)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      polyamorous (~> 0.6.0)
     thread_safe (0.1.3)
       atomic
     tzinfo (0.3.38)
@@ -276,8 +296,10 @@ DEPENDENCIES
   minitest
   minitest-reporters
   pry
-  pry-nav
+  pry-debugger
+  pry-stack_explorer
   rake
   rdoc
   rubysl (~> 2.0)
   sqlite3
+  squeel

data/lib/globalize/active_record/act_macro.rb

@@ -2,8 +2,9 @@ module Globalize
   module ActiveRecord
     module ActMacro
       def translates(*attr_names)
+        options = attr_names.extract_options!
         # Bypass setup_translates! if the initial bootstrapping is done already.
-        setup_translates!(attr_names.extract_options!) unless translates?
+        setup_translates!(options) unless translates?
 
         # Add any extra translatable attributes.
         attr_names = attr_names.map(&:to_sym)

data/lib/globalize/active_record/class_methods.rb

@@ -9,7 +9,7 @@ module Globalize
 
       def with_translations(*locales)
         locales = translated_locales if locales.empty?
-        includes(:translations).with_locales(locales).with_required_attributes.references(:translations)
+        preload(:translations).joins(:translations).readonly(false).with_locales(locales).with_required_attributes
       end
 
       def with_required_attributes

data/lib/globalize/active_record/query_methods.rb

@@ -2,13 +2,10 @@ module Globalize
   module ActiveRecord
     module QueryMethods
 
-      attr_accessor :translations_reload_needed
-
       class WhereChain < ::ActiveRecord::QueryMethods::WhereChain
         def not(opts, *rest)
           if parsed = @scope.parse_translated_conditions(opts)
-            @scope.translations_reload_needed = true
-            @scope.with_translations_in_fallbacks.where.not(parsed, *rest)
+            @scope.join_translations.where.not(parsed, *rest)
           else
             super
           end
@@ -19,8 +16,7 @@ module Globalize
         if opts == :chain
           WhereChain.new(spawn)
         elsif parsed = parse_translated_conditions(opts)
-          self.translations_reload_needed = true
-          super(parsed, *rest).with_translations_in_fallbacks
+          join_translations(super(parsed, *rest))
         else
           super
         end
@@ -34,19 +30,6 @@ module Globalize
         end
       end
 
-      %w[ first last take ].each do |method_name|
-        eval <<-END_RUBY
-          def #{method_name}
-            super.tap do |f|
-              if f && translations_reload_needed
-                f.translations.reload
-                translations_reload_needed = false
-              end
-            end
-          end
-        END_RUBY
-      end
-
       def with_translations_in_fallbacks
         with_translations(Globalize.fallbacks)
       end
@@ -72,6 +55,14 @@ module Globalize
           [name, binds.fetch(name.to_s) { where.right }]
         }])
       end
+
+      def join_translations(relation = self)
+        if relation.joins_values.include?(:translations)
+          relation
+        else
+          relation.with_translations_in_fallbacks
+        end
+      end
     end
   end
 end

data/lib/globalize/version.rb

@@ -1,3 +1,3 @@
 module Globalize
-  Version = '4.0.0'
+  Version = '4.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -60,16 +60,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement