globalize 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7415d0b0223d5ace130c535aaee60e36929a4c7d
-  data.tar.gz: b4b6553f95f6f662aab9036c96b66ad0d7cac875
+  metadata.gz: b12c925d8338f75e9dfa650c3f12b1305bd6ccfb
+  data.tar.gz: d538a66932ea892300d07134c3198ae7a99a731f
 SHA512:
-  metadata.gz: 79141074b2c0943e9af5d02a1cb2c44bee1394f061398fc338d762891799b0d952ebe3e1a0ae25911759e00afb66c52227f20cac4907fe6af472f82d39a21307
-  data.tar.gz: e4d92686bcbd19736730327ef01f478d179fa0c60229dc4b17e038e274e66216f30e69845d6b29d409c091a36ebe4bb29eca08dfb2b00fc1672ae5adf36b34d6
+  metadata.gz: b3317c480503cc55735336c7d6ac01dcc9e9dc46db171e3f4d8c71da6a6cdb6e2b7323474b5eee5a85c76e1787816308156caf0ff0a812a27d7f66412bf99d19
+  data.tar.gz: 195bddff49e9d4905893697a705e25f9b65d4b1c8eaee548a89a2faa7e168e5e025446bf9d674d16a72477a18367cab65e955d77d54b8b0cc37bcdda0ac14b8b

data/Gemfile.lock

@@ -1,87 +1,81 @@
+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 (3.0.0)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      paper_trail (~> 2)
+    globalize (4.0.0.alpha.2)
+      activemodel (>= 4.0.0)
+      activerecord (>= 4.0.0)
+      paper_trail (~> 3.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.15)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    database_cleaner (0.6.7)
-    erubis (2.7.0)
-    hike (1.2.3)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.1)
+    atomic (1.1.14)
+    builder (3.1.4)
+    coderay (1.0.9)
     i18n (0.6.5)
-    journey (1.0.4)
     json (1.8.1)
-    metaclass (0.0.1)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
+    method_source (0.8.2)
+    minitest (4.7.5)
+    minitest-colorize (0.0.5)
+      minitest (>= 2.0)
     multi_json (1.8.2)
-    paper_trail (2.7.2)
-      activerecord (~> 3.0)
-      railties (~> 3.0)
-    pathname_local (0.0.2)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.15)
-      actionpack (= 3.2.15)
-      activesupport (= 3.2.15)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
     rake (10.1.0)
-    rdoc (3.12.2)
+    rdoc (4.0.1)
       json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    test_declarative (0.0.5)
-    thor (0.18.1)
-    tilt (1.4.1)
+    slop (3.4.6)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
+      atomic
     tzinfo (0.3.38)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  database_cleaner (~> 0.6.0)
+  database_cleaner!
   globalize!
-  mocha
-  pathname_local
+  minitest
+  minitest-colorize
+  paper_trail!
+  pry
+  pry-nav
+  rake
+  rdoc
   sqlite3
-  test_declarative

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,5 +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'
   end
 end

data/lib/globalize/active_record/class_methods.rb

@@ -138,7 +138,29 @@ 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
+        relation = relation_class.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
+
+      # Use pattern defined in FriendlyId (4.x) to avoid conflict.
+      def relation_class
+        @relation_class ||= Class.new(Relation).tap do |klass|
+          const_set('GlobalizeActiveRecordRelation', klass)
+        end
+      end
+
+      protected
 
       def translated_attr_accessor(name)
         define_method(:"#{name}=") do |value|

data/lib/globalize/active_record/migration.rb

@@ -68,7 +68,7 @@ module Globalize
 
         def create_translation_table
           connection.create_table(translations_table_name) do |t|
-            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize, :null => false
+            t.references table_name.sub(/^#{table_name_prefix}/, '').singularize
             t.string :locale, :null => false
             t.timestamps
           end

data/lib/globalize/active_record/relation.rb

@@ -0,0 +1,16 @@
+module Globalize
+  module ActiveRecord
+    class Relation < ::ActiveRecord::Relation
+
+      if ::ActiveRecord::VERSION::STRING >= "3.2.1"
+        def where_values_hash
+          equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
+            node.left.relation.name == translations_table_name
+          }
+
+          super.merge(Hash[equalities.map { |where| [where.left.name, where.right] }]).with_indifferent_access
+        end
+      end
+    end
+  end
+end

data/lib/globalize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 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-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -141,6 +141,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/translation.rb
 - lib/globalize/active_record.rb
 - lib/globalize/interpolation.rb
@@ -151,7 +152,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
@@ -178,9 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []
-has_rdoc: 

data/lib/patches/active_record/relation.rb

@@ -1,15 +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
-        }
-
-        Hash[equalities.map { |where| [where.left.name, where.right] }].with_indifferent_access
-      end
-    end
-  end
-end