globalize 4.0.0.alpha.1 → 4.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a7277cc277d951acb6abb3155ab2ca669708384
-  data.tar.gz: 3e1d2c05304f27a6e8cafc15720c2b63a919bdd0
+  metadata.gz: 0ca26136a9b1c4d772eee00815f732b7025d3b95
+  data.tar.gz: 93b43c38d7a582487fa95042633d2cfc3776a0b4
 SHA512:
-  metadata.gz: 8cf307368905fe9763cdcb5ef22380574ee9cbeb496439195e92d52ca3ca7dae856d215f7837c9f9446644b291ba0a0d3f846ef3ff99f5d3f3761c6f09ca1ea6
-  data.tar.gz: a52cfb6625bf02643cf985d2468965f17f07dffc8cc6bd197167795b6ddac11f64af8b3de010258a1cff6b0f8c41713f8f52ff314a41ee34d84878e989e03f68
+  metadata.gz: cd0c34e725155990db83147a41fe87df89439655fad2093970543c63773545b2dd72ebb5908ce42b60aa0ac0c5971f4856490df5d6a62d0c44b7563b4e87beb4
+  data.tar.gz: 25c39ad5e9cff3855f782b715d83be94cc44ffe88b87ad4db5aafea7f975808dddb78bc56a7571d6954464f8d9b5013295047d8bf9d2b0eb4dcb7bacf5d82791

data/Gemfile.lock

@@ -1,22 +1,22 @@
 GIT
   remote: git://github.com/airblade/paper_trail.git
-  revision: 41d1b5cd65d7789a9e69e42ae058e71c4747a81d
+  revision: 44f2380ec6cd45c15a8b654d5e7d694499c6e11c
   branch: master
   specs:
-    paper_trail (3.0.0.beta1)
+    paper_trail (3.0.0.beta2)
       activerecord (>= 3.0, < 5.0)
 
 GIT
   remote: git://github.com/bmabey/database_cleaner.git
-  revision: 1ce7c9989acd4815621fe9a007fc4b759a37b239
+  revision: 6da38c4c1a565bbcc62ed9b84c2574537c6ebae2
   branch: master
   specs:
-    database_cleaner (1.1.1)
+    database_cleaner (1.2.0)
 
 PATH
   remote: .
   specs:
-    globalize (4.0.0.alpha.1)
+    globalize (4.0.0.alpha.2)
       activemodel (>= 4.0.0)
       activerecord (>= 4.0.0)
       paper_trail (~> 3.0.0.beta)
@@ -39,20 +39,20 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
+    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)
     i18n (0.6.5)
-    json (1.8.0)
-    json (1.8.0-java)
+    json (1.8.1)
+    json (1.8.1-java)
     method_source (0.8.2)
     minitest (4.7.5)
     minitest-colorize (0.0.5)
       minitest (>= 2.0)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -75,7 +75,7 @@ GEM
       atomic
     thread_safe (0.1.3-java)
       atomic
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
 
 PLATFORMS
   java

data/lib/globalize/active_record/relation.rb

@@ -5,10 +5,10 @@ module Globalize
       attr_accessor :translations_reload_needed
 
       class WhereChain < ::ActiveRecord::QueryMethods::WhereChain
-        def not(*args)
-          if @scope.parse_translated_conditions!(*args)
+        def not(opts, *rest)
+          if parsed = @scope.parse_translated_conditions(opts)
             @scope.translations_reload_needed = true
-            @scope.with_translations_in_this_locale.where.not(*args)
+            @scope.with_translations_in_this_locale.where.not(parsed, *rest)
           else
             super
           end
@@ -18,17 +18,17 @@ module Globalize
       def where(opts = :chain, *rest)
         if opts == :chain
           WhereChain.new(spawn)
-        elsif parse_translated_conditions!(opts, *rest)
+        elsif parsed = parse_translated_conditions(opts)
           self.translations_reload_needed = true
-          super.with_translations_in_this_locale
+          super(parsed, *rest).with_translations_in_this_locale
         else
           super
         end
       end
 
       def exists?(conditions = :none)
-        if parse_translated_conditions!(conditions)
-          with_translations_in_this_locale.exists?(conditions)
+        if parsed = parse_translated_conditions(conditions)
+          with_translations_in_this_locale.exists?(parsed)
         else
           super
         end
@@ -38,7 +38,7 @@ module Globalize
         eval <<-END_RUBY
           def #{method_name}
             super.tap do |f|
-              if translations_reload_needed
+              if f && translations_reload_needed
                 f.translations.reload
                 translations_reload_needed = false
               end
@@ -51,11 +51,11 @@ module Globalize
         with_translations(Globalize.locale)
       end
 
-      def parse_translated_conditions!(opts, *rest)
+      def parse_translated_conditions(opts)
         if opts.is_a?(Hash) && (keys = opts.symbolize_keys.keys & translated_attribute_names).present?
-          keys.each do |key|
-            opts[translated_column_name(key)] = opts.delete(key) || opts.delete(key.to_s)
-          end
+          opts = opts.dup
+          keys.each { |key| opts[translated_column_name(key)] = opts.delete(key) || opts.delete(key.to_s) }
+          opts
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.1
+  version: 4.0.0.alpha.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,7 +142,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation.
+description: Rails I18n de-facto standard library for ActiveRecord model/data translation.
 email: nobody@globalize-rails.org
 executables: []
 extensions: []
@@ -172,7 +172,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - Rakefile
-homepage: http://github.com/svenfuchs/globalize3
+homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
 metadata: {}
@@ -195,6 +195,6 @@ rubyforge_project: '[none]'
 rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
-summary: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation
+summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []
 has_rdoc: