globalize 4.0.1 → 4.0.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Globalize Changelog
 
+## 4.0.2 (2014-6-29)
+* Use `reflections` class method so `ensure_foreign_key_for` works in AR >= 4.1.2, fixes [#353](https://github.com/globalize/globalize/pull/353).
+* Set `touch:true` on `belongs_to` for the globalized model, fixes [#330](https://github.com/globalize/globalize/pull/330) (thanks [shlensky](https://github.com/shlensky)).
+* Accept optional arguments passed to `where_values_hash`, fixes [#354](https://github.com/globalize/globalize/pull/354) (thanks [felixbuenemann](https://github.com/felixbuenemann)).
+
 ## 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)).

data/Gemfile.lock

@@ -1,80 +1,51 @@
-GIT
-  remote: git://github.com/bmabey/database_cleaner.git
-  revision: 072492166e82969136d1abaeccbcadaae4fe6539
-  branch: master
-  specs:
-    database_cleaner (1.2.0)
-
 PATH
   remote: .
   specs:
-    globalize (4.0.0)
-      activemodel (>= 4.0.0, < 5)
-      activerecord (>= 4.0.0, < 5)
+    globalize (4.0.1)
+      activemodel (~> 4.1.0.beta1)
+      activerecord (~> 4.1.0.beta1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
-      builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activemodel (4.1.2)
+      activesupport (= 4.1.2)
+      builder (~> 3.1)
+    activerecord (4.1.2)
+      activemodel (= 4.1.2)
+      activesupport (= 4.1.2)
+      arel (~> 5.0.0)
+    activesupport (4.1.2)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     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)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     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)
+    database_cleaner (1.2.0)
     ffi2-generators (0.1.1)
-    hashie (2.0.5)
     i18n (0.6.9)
     json (1.8.1)
     method_source (0.8.2)
-    minitest (4.7.5)
-    minitest-reporters (0.14.23)
+    minitest (5.3.5)
+    minitest-reporters (1.0.4)
       ansi
       builder
-      minitest (>= 2.12, < 5.0)
-      powerbar
-    multi_json (1.8.4)
-    polyamorous (0.6.4)
-      activerecord (>= 3.0)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.9.12.4)
+      minitest (>= 5.0)
+      ruby-progressbar
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
+    pry-nav (0.2.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)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
+    ruby-progressbar (1.5.1)
     rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
@@ -233,12 +204,12 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.6)
+    rubysl-openssl (2.1.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
     rubysl-pathname (2.0.0)
-    rubysl-prettyprint (2.0.2)
+    rubysl-prettyprint (2.0.3)
     rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
@@ -246,9 +217,9 @@ GEM
     rubysl-pty (2.0.2)
     rubysl-rational (2.0.1)
     rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
+    rubysl-resolv (2.1.0)
     rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
+    rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
     rubysl-securerandom (2.0.0)
@@ -266,7 +237,7 @@ GEM
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
-    rubysl-tmpdir (2.0.0)
+    rubysl-tmpdir (2.0.1)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -277,29 +248,23 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     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)
+    slop (3.5.0)
+    sqlite3 (1.3.9)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner!
+  database_cleaner (~> 1.2.0)
   globalize!
   minitest
   minitest-reporters
   pry
-  pry-debugger
-  pry-stack_explorer
+  pry-nav
   rake
   rdoc
   rubysl (~> 2.0)
   sqlite3
-  squeel

data/LICENSE

@@ -1,6 +1,7 @@
 The MIT License
 
-Copyright (c) 2008, 2009, 2010 Sven Fuchs, Joshua Harvey, Clemens Kofler, John-Paul Bader
+Copyright (c) 2008-2014 Sven Fuchs, Joshua Harvey, Clemens Kofler, John-Paul
+Bader, Tomasz Stachewicz, Philip Arndt, Chris Salzberg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/globalize/active_record/adapter.rb

@@ -51,9 +51,10 @@ module Globalize
 
       protected
 
+      # Sometimes the translation is initialised before a foreign key can be set.
       def ensure_foreign_key_for(translation)
-        # Sometimes the translation is initialised before a foreign key can be set.
-        translation[translation.reflections[:globalized_model].foreign_key] = record.id
+        # AR >= 4.1 reflections renamed to _reflections
+        translation[translation.class.reflections[:globalized_model].foreign_key] = record.id
       end
 
       def type_cast(name, value)

data/lib/globalize/active_record/class_methods.rb

@@ -44,7 +44,7 @@ module Globalize
             klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
           end
 
-          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key]
+          klass.belongs_to :globalized_model, :class_name => self.name, :foreign_key => translation_options[:foreign_key], :touch => true
           klass
         end
       end

data/lib/globalize/active_record/query_methods.rb

@@ -42,7 +42,7 @@ module Globalize
         end
       end
 
-      def where_values_hash
+      def where_values_hash(*args)
         equalities = respond_to?(:with_default_scope) ? with_default_scope.where_values : where_values
         equalities = equalities.grep(Arel::Nodes::Equality).find_all { |node|
           node.left.relation.name == translations_table_name

data/lib/globalize/version.rb

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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,13 +15,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
     - - <
@@ -29,8 +31,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
     - - <
@@ -39,8 +42,9 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
     - - <
@@ -49,8 +53,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
     - - <
@@ -59,6 +64,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,6 +72,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,71 +80,81 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Rails I18n de-facto standard library for ActiveRecord model/data translation.
@@ -146,65 +163,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/globalize/interpolation.rb
-- lib/globalize/version.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/active_record/attributes.rb
-- lib/globalize/active_record/instance_methods.rb
 - lib/globalize/active_record/adapter.rb
-- lib/globalize/active_record/translation.rb
-- lib/globalize/active_record/act_macro.rb
-- lib/globalize/active_record/exceptions.rb
 - lib/globalize/active_record/query_methods.rb
-- lib/globalize/active_record/class_methods.rb
 - lib/globalize/active_record/migration.rb
-- lib/globalize.rb
+- lib/globalize/active_record/act_macro.rb
+- lib/globalize/active_record/translation.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/version.rb
+- lib/globalize/interpolation.rb
 - lib/i18n/missing_translations_raise_handler.rb
 - lib/i18n/missing_translations_log_handler.rb
-- lib/patches/active_record/uniqueness_validator.rb
-- lib/patches/active_record/query_method.rb
-- lib/patches/active_record/xml_attribute_serializer.rb
 - CONTRIBUTING.md
-- Gemfile.lock
-- CHANGELOG.md
-- LICENSE
 - Rakefile
+- LICENSE
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 homepage: http://github.com/globalize/globalize
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2+
+post_install_message: ! '
 
   Globalize has extracted versioning support to a separate gem named
+
   globalize-versioning. If you are using versioning (with paper_trail
+
   or any other versioning gem), please add the line
-  "gem 'globalize-versioning'" to your Gemfile and go to the github
+
+  "gem ''globalize-versioning''" to your Gemfile and go to the github
+
   page at globalize/globalize-versioning if you encounter any problems.
 
+
   Note that the globalize-versioning gem does not delegate versions to
+
   the translation table, so you will have to update your syntax to
+
   the form: `post.translation.versions`. See the globalize-versioning
+
   readme for details.
 
+
+'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: '[none]'
-rubygems_version: 2.0.3
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Rails I18n de-facto standard library for ActiveRecord model/data translation
 test_files: []
-has_rdoc: 

checksums.yaml

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