globalize 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a82c5ec81f72d66b09459ad189182db93363f4
-  data.tar.gz: 9d335fdfa855cd4930c6e95d3800cf50ee96ee83
+  metadata.gz: 34b357eb2051fae6a0a588bac79f4865412887c7
+  data.tar.gz: 87dcd21c654f413edc206becf2a249433a7128b0
 SHA512:
-  metadata.gz: 40d4c1ea4d89d551b1097a163bb15d9e582b07e52c939552bb8d5c8ad599ad74e929e78d6d7778d103fa5394e8ca30bc110bbcc2e218d00b77b4f0633967139c
-  data.tar.gz: b29d317a8a1eada6caec810ade6cde71a9451a8a6c0528f1da7e5a664d4be254d1c524b563872333b1c39d77f11858ced3166352d2ea2ae4ddba5262497f5764
+  metadata.gz: 934e4cbf69e650b3adc36fe5569007343d91bd6d9d1145e9b01e40e5c0039cebc4ddce55c9d109c46e76f657550f59477a291f86566eb33fdde8d1572596a468
+  data.tar.gz: 432ad39f1c190b723e688170306f94f9b98c6797fd70b73f3cfcee85366629338ded33aaeae0e827ff46535b4f1a8c3c306eacb4903251b6f405835cb2a363d9

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'minitest'
+  gem 'test-unit'
+end

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/airblade/paper_trail.git
-  revision: 7c9f9b8953f76dd046fbcbfab1a933853f99e87b
+  revision: c4e188c27040888515866660bac94740b92a262b
   branch: master
   specs:
-    paper_trail (3.0.0.rc1)
+    paper_trail (3.0.0)
       activerecord (>= 3.0, < 5.0)
       activesupport (>= 3.0, < 5.0)
 
 GIT
   remote: git://github.com/bmabey/database_cleaner.git
-  revision: 6da38c4c1a565bbcc62ed9b84c2574537c6ebae2
+  revision: c0c7885466287dcde3dbac195a5f10df306db098
   branch: master
   specs:
     database_cleaner (1.2.0)
@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    globalize (4.0.0.alpha.2)
+    globalize (4.0.0.alpha.3)
       activemodel (>= 4.0.0)
       activerecord (>= 4.0.0)
       paper_trail (~> 3.0.0.beta)
@@ -25,50 +25,253 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    ansi (1.4.3)
     arel (4.0.1)
     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)
+    coderay (1.1.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-colorize (0.0.5)
-      minitest (>= 2.0)
+    minitest-reporters (0.14.23)
+      ansi
+      builder
+      minitest (>= 2.12, < 5.0)
+      powerbar
     multi_json (1.8.2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    powerbar (1.0.11)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
+    pry (0.9.12.4)
+      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)
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    slop (3.4.6)
+    rubysl (2.0.15)
+      rubysl-abbrev (~> 2.0)
+      rubysl-base64 (~> 2.0)
+      rubysl-benchmark (~> 2.0)
+      rubysl-bigdecimal (~> 2.0)
+      rubysl-cgi (~> 2.0)
+      rubysl-cgi-session (~> 2.0)
+      rubysl-cmath (~> 2.0)
+      rubysl-complex (~> 2.0)
+      rubysl-continuation (~> 2.0)
+      rubysl-coverage (~> 2.0)
+      rubysl-csv (~> 2.0)
+      rubysl-curses (~> 2.0)
+      rubysl-date (~> 2.0)
+      rubysl-delegate (~> 2.0)
+      rubysl-digest (~> 2.0)
+      rubysl-drb (~> 2.0)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-english (~> 2.0)
+      rubysl-enumerator (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-etc (~> 2.0)
+      rubysl-expect (~> 2.0)
+      rubysl-fcntl (~> 2.0)
+      rubysl-fiber (~> 2.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-find (~> 2.0)
+      rubysl-forwardable (~> 2.0)
+      rubysl-getoptlong (~> 2.0)
+      rubysl-gserver (~> 2.0)
+      rubysl-io-console (~> 2.0)
+      rubysl-io-nonblock (~> 2.0)
+      rubysl-io-wait (~> 2.0)
+      rubysl-ipaddr (~> 2.0)
+      rubysl-irb (~> 2.0)
+      rubysl-logger (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-matrix (~> 2.0)
+      rubysl-mkmf (~> 2.0)
+      rubysl-monitor (~> 2.0)
+      rubysl-mutex_m (~> 2.0)
+      rubysl-net-ftp (~> 2.0)
+      rubysl-net-http (~> 2.0)
+      rubysl-net-imap (~> 2.0)
+      rubysl-net-pop (~> 2.0)
+      rubysl-net-protocol (~> 2.0)
+      rubysl-net-smtp (~> 2.0)
+      rubysl-net-telnet (~> 2.0)
+      rubysl-nkf (~> 2.0)
+      rubysl-observer (~> 2.0)
+      rubysl-open-uri (~> 2.0)
+      rubysl-open3 (~> 2.0)
+      rubysl-openssl (~> 2.0)
+      rubysl-optparse (~> 2.0)
+      rubysl-ostruct (~> 2.0)
+      rubysl-pathname (~> 2.0)
+      rubysl-prettyprint (~> 2.0)
+      rubysl-prime (~> 2.0)
+      rubysl-profile (~> 2.0)
+      rubysl-profiler (~> 2.0)
+      rubysl-pstore (~> 2.0)
+      rubysl-pty (~> 2.0)
+      rubysl-rational (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-resolv (~> 2.0)
+      rubysl-rexml (~> 2.0)
+      rubysl-rinda (~> 2.0)
+      rubysl-rss (~> 2.0)
+      rubysl-scanf (~> 2.0)
+      rubysl-securerandom (~> 2.0)
+      rubysl-set (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+      rubysl-singleton (~> 2.0)
+      rubysl-socket (~> 2.0)
+      rubysl-stringio (~> 2.0)
+      rubysl-strscan (~> 2.0)
+      rubysl-sync (~> 2.0)
+      rubysl-syslog (~> 2.0)
+      rubysl-tempfile (~> 2.0)
+      rubysl-thread (~> 2.0)
+      rubysl-thwait (~> 2.0)
+      rubysl-time (~> 2.0)
+      rubysl-timeout (~> 2.0)
+      rubysl-tmpdir (~> 2.0)
+      rubysl-tsort (~> 2.0)
+      rubysl-un (~> 2.0)
+      rubysl-uri (~> 2.0)
+      rubysl-weakref (~> 2.0)
+      rubysl-webrick (~> 2.0)
+      rubysl-xmlrpc (~> 2.0)
+      rubysl-yaml (~> 2.0)
+      rubysl-zlib (~> 2.0)
+    rubysl-abbrev (2.0.4)
+    rubysl-base64 (2.0.0)
+    rubysl-benchmark (2.0.1)
+    rubysl-bigdecimal (2.0.2)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
+    rubysl-cmath (2.0.0)
+    rubysl-complex (2.0.0)
+    rubysl-continuation (2.0.0)
+    rubysl-coverage (2.0.3)
+    rubysl-csv (2.0.2)
+      rubysl-english (~> 2.0)
+    rubysl-curses (2.0.0)
+    rubysl-date (2.0.6)
+    rubysl-delegate (2.0.1)
+    rubysl-digest (2.0.3)
+    rubysl-drb (2.0.1)
+    rubysl-e2mmap (2.0.0)
+    rubysl-english (2.0.0)
+    rubysl-enumerator (2.0.0)
+    rubysl-erb (2.0.1)
+    rubysl-etc (2.0.3)
+      ffi2-generators (~> 0.1)
+    rubysl-expect (2.0.0)
+    rubysl-fcntl (2.0.4)
+      ffi2-generators (~> 0.1)
+    rubysl-fiber (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
+    rubysl-getoptlong (2.0.0)
+    rubysl-gserver (2.0.0)
+      rubysl-socket (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-io-console (2.0.0)
+    rubysl-io-nonblock (2.0.0)
+    rubysl-io-wait (2.0.0)
+    rubysl-ipaddr (2.0.0)
+    rubysl-irb (2.0.4)
+      rubysl-e2mmap (~> 2.0)
+      rubysl-mathn (~> 2.0)
+      rubysl-readline (~> 2.0)
+      rubysl-thread (~> 2.0)
+    rubysl-logger (2.0.0)
+    rubysl-mathn (2.0.0)
+    rubysl-matrix (2.1.0)
+      rubysl-e2mmap (~> 2.0)
+    rubysl-mkmf (2.0.1)
+      rubysl-fileutils (~> 2.0)
+      rubysl-shellwords (~> 2.0)
+    rubysl-monitor (2.0.0)
+    rubysl-mutex_m (2.0.0)
+    rubysl-net-ftp (2.0.1)
+    rubysl-net-http (2.0.4)
+      rubysl-cgi (~> 2.0)
+      rubysl-erb (~> 2.0)
+      rubysl-singleton (~> 2.0)
+    rubysl-net-imap (2.0.1)
+    rubysl-net-pop (2.0.1)
+    rubysl-net-protocol (2.0.1)
+    rubysl-net-smtp (2.0.1)
+    rubysl-net-telnet (2.0.0)
+    rubysl-nkf (2.0.1)
+    rubysl-observer (2.0.0)
+    rubysl-open-uri (2.0.0)
+    rubysl-open3 (2.0.0)
+    rubysl-openssl (2.0.5)
+    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-prime (2.0.1)
+    rubysl-profile (2.0.0)
+    rubysl-profiler (2.0.1)
+    rubysl-pstore (2.0.0)
+    rubysl-pty (2.0.2)
+    rubysl-rational (2.0.1)
+    rubysl-readline (2.0.2)
+    rubysl-resolv (2.0.0)
+    rubysl-rexml (2.0.2)
+    rubysl-rinda (2.0.0)
+    rubysl-rss (2.0.0)
+    rubysl-scanf (2.0.0)
+    rubysl-securerandom (2.0.0)
+    rubysl-set (2.0.1)
+    rubysl-shellwords (2.0.0)
+    rubysl-singleton (2.0.0)
+    rubysl-socket (2.0.1)
+    rubysl-stringio (2.0.0)
+    rubysl-strscan (2.0.0)
+    rubysl-sync (2.0.0)
+    rubysl-syslog (2.0.1)
+      ffi2-generators (~> 0.1)
+    rubysl-tempfile (2.0.1)
+    rubysl-thread (2.0.2)
+    rubysl-thwait (2.0.0)
+    rubysl-time (2.0.3)
+    rubysl-timeout (2.0.0)
+    rubysl-tmpdir (2.0.0)
+    rubysl-tsort (2.0.1)
+    rubysl-un (2.0.0)
+      rubysl-fileutils (~> 2.0)
+      rubysl-optparse (~> 2.0)
+    rubysl-uri (2.0.0)
+    rubysl-weakref (2.0.0)
+    rubysl-webrick (2.0.0)
+    rubysl-xmlrpc (2.0.0)
+    rubysl-yaml (2.0.4)
+    rubysl-zlib (2.0.1)
+    slop (3.4.7)
     sqlite3 (1.3.8)
     thread_safe (0.1.3)
       atomic
@@ -81,10 +284,11 @@ DEPENDENCIES
   database_cleaner!
   globalize!
   minitest
-  minitest-colorize
+  minitest-reporters
   paper_trail!
   pry
-  pry-debugger
+  pry-nav
   rake
   rdoc
+  rubysl (~> 2.0)
   sqlite3

data/lib/globalize.rb

@@ -3,6 +3,11 @@ require 'patches/active_record/xml_attribute_serializer'
 require 'patches/active_record/query_method'
 require 'patches/active_record/uniqueness_validator'
 
+# until https://github.com/svenfuchs/i18n/issues/232 is resolved
+unless I18n.respond_to?(:interpolate)
+  require 'patches/i18n/interpolate'
+end
+
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'
   autoload :Versioning,   'globalize/versioning'

data/lib/globalize/active_record/adapter.rb

@@ -46,14 +46,12 @@ module Globalize
           existing_translations_by_locale[t.locale.to_s] = t
         end
         
-        stash.each do |locale, attrs|
-          if attrs.any?
-            locale_str = locale.to_s
-            translation = existing_translations_by_locale[locale_str] ||
-              record.translations.find_or_initialize_by_locale(locale_str)
-            attrs.each { |name, value| translation[name] = value }
-            translation.save!
-          end
+        stash.reject {|locale, attrs| attrs.empty?}.each do |locale, attrs|
+          translation = existing_translations_by_locale[locale.to_s] ||
+                          record.translations.build(:locale => locale.to_s)
+          attrs.each { |name, value| translation[name] = value }
+          ensure_foreign_key_for(translation)
+          translation.save!
         end
 
         reset
@@ -63,7 +61,12 @@ module Globalize
         stash.clear
       end
 
-    protected
+      protected
+
+      def ensure_foreign_key_for(translation)
+        # Sometimes the translation is initialised before a foreign key can be set.
+        translation[record.class.translation_options[:foreign_key]] = record.id
+      end
 
       def type_cast(name, value)
         if value.nil?

data/lib/globalize/active_record/class_methods.rb

@@ -141,24 +141,26 @@ module Globalize
       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 = globalize_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
+      # of ActiveRecord::Relation with custom where_values_hash method,
+      # for use in find_or_create_by_instantiator (Rails version >= 3.2.1)
+      if ::ActiveRecord::VERSION::STRING >= "3.2.1"
+        def relation
+          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)
+          else
+            relation
+          end
         end
-      end
 
-      # 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)
+        # 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
       end
 

data/lib/globalize/active_record/query_methods.rb

@@ -1,15 +1,12 @@
 module Globalize
   module ActiveRecord
     module QueryMethods
+      def where_values_hash
+        equalities = with_default_scope.where_values.grep(Arel::Nodes::Equality).find_all { |node|
+          node.left.relation.name == translations_table_name
+        }
 
-      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
+        super.merge(Hash[equalities.map { |where| [where.left.name, where.right] }]).with_indifferent_access
       end
     end
   end

data/lib/globalize/version.rb

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

data/lib/patches/i18n/interpolate.rb

@@ -0,0 +1,37 @@
+# heavily based on Masao Mutoh's gettext String interpolation extension
+# http://github.com/mutoh/gettext/blob/f6566738b981fe0952548c421042ad1e0cdfb31e/lib/gettext/core_ext/string.rb
+
+module I18n
+  INTERPOLATION_PATTERN = Regexp.union(
+    /%%/,
+    /%\{(\w+)\}/,                               # matches placeholders like "%{foo}"
+    /%<(\w+)>(.*?\d*\.?\d*[bBdiouxXeEfgGcps])/  # matches placeholders like "%<foo>.d"
+  )
+
+  class << self
+    # Return String or raises MissingInterpolationArgument exception.
+    # Missing argument's logic is handled by I18n.config.missing_interpolation_argument_handler.
+    def interpolate(string, values)
+      raise ReservedInterpolationKey.new($1.to_sym, string) if string =~ Backend::Base::RESERVED_KEYS_PATTERN
+      raise ArgumentError.new('Interpolation values must be a Hash.') unless values.kind_of?(Hash)
+      interpolate_hash(string, values)
+    end
+
+    def interpolate_hash(string, values)
+      string.gsub(INTERPOLATION_PATTERN) do |match|
+        if match == '%%'
+          '%'
+        else
+          key = ($1 || $2).to_sym
+          value = if values.key?(key)
+                    values[key]
+                  else
+                    raise(MissingInterpolationArgument.new(values, string))
+                  end
+          value = value.call(values) if value.respond_to?(:call)
+          $3 ? sprintf("%#{$3}", value) : value
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,6 +114,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +152,7 @@ files:
 - lib/patches/active_record/xml_attribute_serializer.rb
 - lib/patches/active_record/uniqueness_validator.rb
 - lib/patches/active_record/query_method.rb
+- lib/patches/i18n/interpolate.rb
 - lib/globalize/active_record.rb
 - lib/globalize/versioning/paper_trail.rb
 - lib/globalize/active_record/adapter.rb