globalize 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12c925d8338f75e9dfa650c3f12b1305bd6ccfb
-  data.tar.gz: d538a66932ea892300d07134c3198ae7a99a731f
+  metadata.gz: a1a82c5ec81f72d66b09459ad189182db93363f4
+  data.tar.gz: 9d335fdfa855cd4930c6e95d3800cf50ee96ee83
 SHA512:
-  metadata.gz: b3317c480503cc55735336c7d6ac01dcc9e9dc46db171e3f4d8c71da6a6cdb6e2b7323474b5eee5a85c76e1787816308156caf0ff0a812a27d7f66412bf99d19
-  data.tar.gz: 195bddff49e9d4905893697a705e25f9b65d4b1c8eaee548a89a2faa7e168e5e025446bf9d674d16a72477a18367cab65e955d77d54b8b0cc37bcdda0ac14b8b
+  metadata.gz: 40d4c1ea4d89d551b1097a163bb15d9e582b07e52c939552bb8d5c8ad599ad74e929e78d6d7778d103fa5394e8ca30bc110bbcc2e218d00b77b4f0633967139c
+  data.tar.gz: b29d317a8a1eada6caec810ade6cde71a9451a8a6c0528f1da7e5a664d4be254d1c524b563872333b1c39d77f11858ced3166352d2ea2ae4ddba5262497f5764

data/Gemfile.lock

@@ -1,10 +1,11 @@
 GIT
   remote: git://github.com/airblade/paper_trail.git
-  revision: 44f2380ec6cd45c15a8b654d5e7d694499c6e11c
+  revision: 7c9f9b8953f76dd046fbcbfab1a933853f99e87b
   branch: master
   specs:
-    paper_trail (3.0.0.beta2)
+    paper_trail (3.0.0.rc1)
       activerecord (>= 3.0, < 5.0)
+      activesupport (>= 3.0, < 5.0)
 
 GIT
   remote: git://github.com/bmabey/database_cleaner.git
@@ -24,16 +25,16 @@ PATH
 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)
@@ -43,6 +44,13 @@ GEM
     atomic (1.1.14)
     builder (3.1.4)
     coderay (1.0.9)
+    columnize (0.3.6)
+    debugger (1.6.1)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     i18n (0.6.5)
     json (1.8.1)
     method_source (0.8.2)
@@ -54,10 +62,11 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-nav (0.2.3)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
       pry (~> 0.9.10)
     rake (10.1.0)
-    rdoc (4.0.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     slop (3.4.6)
     sqlite3 (1.3.8)
@@ -75,7 +84,7 @@ DEPENDENCIES
   minitest-colorize
   paper_trail!
   pry
-  pry-nav
+  pry-debugger
   rake
   rdoc
   sqlite3

data/lib/globalize/active_record/act_macro.rb

@@ -58,6 +58,11 @@ module Globalize
         self.translation_options        = options
         self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
 
+        # Alias original relation method so we can safely override it in ClassMethods.
+        class << self
+          alias relation_without_globalize relation
+        end
+
         include InstanceMethods
         extend  ClassMethods, Migration
 

data/lib/globalize/active_record/class_methods.rb

@@ -144,7 +144,7 @@ module Globalize
       # of ActiveRecord::Relation with custom finder methods for translated
       # attributes.
       def relation
-        relation = relation_class.new(self, arel_table)
+        relation = globalize_relation_class.new(self, arel_table)
 
         if finder_needs_type_condition?
           relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name)
@@ -153,9 +153,11 @@ module Globalize
         end
       end
 
-      # Use pattern defined in FriendlyId (4.x) to avoid conflict.
-      def relation_class
-        @relation_class ||= Class.new(Relation).tap do |klass|
+      # Use pattern defined in FriendlyId 4.x to avoid conflict with any other
+      # gems (such as FriendlyId) which override relation method.
+      def globalize_relation_class
+        @globalize_relation_class ||= Class.new(relation_without_globalize.class).tap do |klass|
+          klass.send :include, QueryMethods
           const_set('GlobalizeActiveRecordRelation', klass)
         end
       end

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

@@ -1,6 +1,6 @@
 module Globalize
   module ActiveRecord
-    class Relation < ::ActiveRecord::Relation
+    module QueryMethods
 
       if ::ActiveRecord::VERSION::STRING >= "3.2.1"
         def where_values_hash

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/version.rb

@@ -1,3 +1,3 @@
 module Globalize
-  Version = '3.0.1'
+  Version = '3.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -134,30 +134,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/globalize/active_record/act_macro.rb
+- lib/globalize.rb
+- lib/patches/active_record/xml_attribute_serializer.rb
+- lib/patches/active_record/uniqueness_validator.rb
+- lib/patches/active_record/query_method.rb
+- lib/globalize/active_record.rb
+- lib/globalize/versioning/paper_trail.rb
 - lib/globalize/active_record/adapter.rb
-- lib/globalize/active_record/attributes.rb
-- lib/globalize/active_record/class_methods.rb
-- lib/globalize/active_record/exceptions.rb
-- lib/globalize/active_record/instance_methods.rb
+- lib/globalize/active_record/query_methods.rb
 - lib/globalize/active_record/migration.rb
-- lib/globalize/active_record/relation.rb
+- lib/globalize/active_record/act_macro.rb
 - lib/globalize/active_record/translation.rb
-- lib/globalize/active_record.rb
-- lib/globalize/interpolation.rb
-- lib/globalize/version.rb
-- lib/globalize/versioning/paper_trail.rb
+- lib/globalize/active_record/instance_methods.rb
+- lib/globalize/active_record/class_methods.rb
+- lib/globalize/active_record/exceptions.rb
+- lib/globalize/active_record/attributes.rb
 - lib/globalize/versioning.rb
-- lib/globalize.rb
-- lib/i18n/missing_translations_log_handler.rb
+- lib/globalize/version.rb
+- lib/globalize/interpolation.rb
 - lib/i18n/missing_translations_raise_handler.rb
-- lib/patches/active_record/query_method.rb
-- lib/patches/active_record/uniqueness_validator.rb
-- lib/patches/active_record/xml_attribute_serializer.rb
+- lib/i18n/missing_translations_log_handler.rb
+- Rakefile
+- LICENSE
 - Gemfile
 - Gemfile.lock
-- LICENSE
-- Rakefile
 homepage: https://github.com/globalize/globalize
 licenses:
 - MIT