globalize 3.1.0 → 4.0.0.alpha.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7a7277cc277d951acb6abb3155ab2ca669708384
+  data.tar.gz: 3e1d2c05304f27a6e8cafc15720c2b63a919bdd0
+SHA512:
+  metadata.gz: 8cf307368905fe9763cdcb5ef22380574ee9cbeb496439195e92d52ca3ca7dae856d215f7837c9f9446644b291ba0a0d3f846ef3ff99f5d3f3761c6f09ca1ea6
+  data.tar.gz: a52cfb6625bf02643cf985d2468965f17f07dffc8cc6bd197167795b6ddac11f64af8b3de010258a1cff6b0f8c41713f8f52ff314a41ee34d84878e989e03f68

data/Gemfile

@@ -2,8 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'minitest'
-  gem 'test-unit'
+# forking off airblade/paper_trail to use the rails4 branch.
+gem 'paper_trail', github: 'airblade/paper_trail', branch: 'master'
+# Per https://github.com/bmabey/database_cleaner/issues/224
+gem 'database_cleaner', github: 'bmabey/database_cleaner', branch: 'master'
+
+group :test do
+  gem 'pry'
+  gem 'pry-nav'
 end

data/Gemfile.lock

@@ -1,261 +1,94 @@
+GIT
+  remote: git://github.com/airblade/paper_trail.git
+  revision: 41d1b5cd65d7789a9e69e42ae058e71c4747a81d
+  branch: master
+  specs:
+    paper_trail (3.0.0.beta1)
+      activerecord (>= 3.0, < 5.0)
+
+GIT
+  remote: git://github.com/bmabey/database_cleaner.git
+  revision: 1ce7c9989acd4815621fe9a007fc4b759a37b239
+  branch: master
+  specs:
+    database_cleaner (1.1.1)
+
 PATH
   remote: .
   specs:
-    globalize (3.0.4)
-      activemodel (>= 3.0.0, < 4.0.0)
-      activerecord (>= 3.0.0, < 4.0.0)
+    globalize (4.0.0.alpha.1)
+      activemodel (>= 4.0.0)
+      activerecord (>= 4.0.0)
+      paper_trail (~> 3.0.0.beta)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
-      builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.16)
+    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.3)
-    builder (3.0.4)
-    database_cleaner (0.6.7)
-    ffi2-generators (0.1.1)
-    friendly_id (4.0.10.1)
-      activerecord (>= 3.0, < 4.0)
-    i18n (0.6.9)
-    json (1.8.1)
-    metaclass (0.0.1)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    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)
+    method_source (0.8.2)
     minitest (4.7.5)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    pathname_local (0.0.2)
-    rake (10.1.1)
-    rdoc (4.1.0)
+    minitest-colorize (0.0.5)
+      minitest (>= 2.0)
+    multi_json (1.8.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12.2-java)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    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.1)
-    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)
-    sqlite3 (1.3.8)
-    test-unit (2.0.0.0)
-    test_declarative (0.0.5)
-    tzinfo (0.3.38)
+    slop (3.4.6)
+    spoon (0.0.4)
+      ffi
+    sqlite3 (1.3.7)
+    thread_safe (0.1.3)
+      atomic
+    thread_safe (0.1.3-java)
+      atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  database_cleaner (~> 0.6.0)
-  friendly_id
+  database_cleaner!
   globalize!
   minitest
-  mocha
-  pathname_local
+  minitest-colorize
+  paper_trail!
+  pry
+  pry-nav
   rake
   rdoc
-  rubysl (~> 2.0)
   sqlite3
-  test-unit
-  test_declarative

data/lib/globalize.rb

@@ -2,14 +2,11 @@ require 'active_record'
 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
+require 'patches/active_record/relation'
 
 module Globalize
   autoload :ActiveRecord, 'globalize/active_record'
+  autoload :Versioning,   'globalize/versioning'
   autoload :Interpolation,   'globalize/interpolation'
 
   class << self

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 :QueryMethods,    'globalize/active_record/query_methods'
+    autoload :Relation,        'globalize/active_record/relation'
   end
 end

data/lib/globalize/active_record/act_macro.rb

@@ -10,10 +10,6 @@ module Globalize
         attr_names -= translated_attribute_names if defined?(translated_attribute_names)
 
         if attr_names.present?
-          translation_class.instance_eval %{
-            attr_accessible :#{attr_names.join(', :')}
-          }
-
           attr_names.each do |attr_name|
             # Detect and apply serialization.
             serializer = self.serialized_attributes[attr_name.to_s]
@@ -58,11 +54,6 @@ 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
 
@@ -77,7 +68,16 @@ module Globalize
         after_create :save_translations!
         after_update :save_translations!
 
-        translation_class.instance_eval %{ attr_accessible :locale }
+        if options[:versioning]
+          if options[:versioning].is_a?(Hash)
+            translation_class.versioned options[:versioning]
+          else
+            ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+
+            translation_class.has_paper_trail
+            delegate :version, :versions, :to => :translation
+          end
+        end
       end
     end
 

data/lib/globalize/active_record/adapter.rb

@@ -9,19 +9,16 @@ module Globalize
       delegate :translation_class, :to => :'record.class'
 
       def initialize(record)
-        self.record = record
-        self.stash = Attributes.new
+        @record = record
+        @stash = Attributes.new
       end
 
       def fetch_stash(locale, name)
-        value = stash.read(locale, name)
-        return value if value
-        return nil
+        stash.read(locale, name)
       end
 
-      def stash_contains?(locale, name)
-        stash.contains?(locale, name)
-      end
+      delegate :contains?, :to => :stash, :prefix => :stash
+      delegate :write, :to => :stash
 
       def fetch(locale, name)
         record.globalize_fallbacks(locale).each do |fallback|
@@ -36,19 +33,12 @@ module Globalize
         return nil
       end
 
-      def write(locale, name, value)
-        stash.write(locale, name, value)
-      end
-
       def save_translations!
-        existing_translations_by_locale = {}
-        record.translations.each do |t|
-          existing_translations_by_locale[t.locale.to_s] = t
-        end
-        
+        existing_translations_by_locale = Hash[record.translations.map { |t| [ t.locale, t ] }]
+
         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)
+          translation = existing_translations_by_locale[locale] ||
+                          record.translations.build(locale: locale.to_s)
           attrs.each { |name, value| translation[name] = value }
           ensure_foreign_key_for(translation)
           translation.save!
@@ -65,17 +55,13 @@ module Globalize
 
       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
+        translation[translation.reflections[:globalized_model].foreign_key] = record.id
       end
 
       def type_cast(name, value)
-        if value.nil?
-          nil
-        elsif column = column_for_attribute(name)
-          column.type_cast(value)
-        else
-          value
-        end
+        return value.presence unless column = column_for_attribute(name)
+
+        column.type_cast value
       end
 
       def column_for_attribute(name)
@@ -106,9 +92,7 @@ module Globalize
         object.nil? || (fallbacks_for_empty_translations? && object.blank?)
       end
 
-      def fallbacks_for_empty_translations?
-        record.fallbacks_for_empty_translations
-      end
+      delegate :fallbacks_for_empty_translations?, :to => :record, :prefix => false
     end
   end
 end