globalize-versioning 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 96220edb46d3b08f41a307f982075632f7c56020
-  data.tar.gz: 35a8ee042f5bb66f39aa5d8afcbb7abe9335248f
+SHA256:
+  metadata.gz: 16fc4f108a3053fd7d073d1830f7458d43c27408b245503fb0bfc6a52376de53
+  data.tar.gz: 0ba113a210f11712c097950060bba69f0e4f8d0be9253016791f1bc60ea00f2f
 SHA512:
-  metadata.gz: 5869cb2fa84ae4d1de7b03a9f6d9c0d9c2d93579d54ea92277b60d4bcc8b535b92a3ac953b6b536da6b7d65cbf45aced64e219a077a16f6863c9fc8a29a95e83
-  data.tar.gz: ec8e095a70acaec14c70a7fa01797700094e40ed1e7369240259949e7adf2d0b9149bab0145594d271d6d46726216ee10def4bab66f7bc5627066e81c70ce874
+  metadata.gz: 5929f571d840c7f4f4a41a206b9490ae69936b8be10e5f29605f846b0121fb1f2989321b0d5ad8f5dd1b8871e8b6f58b78eb05844c69c1cac92b53f4e5647316
+  data.tar.gz: 63364c4c347fa820cf8ef0bbd8ab178bb5a98efd5451d06b4d4912064149cafe73172fcfc377f659c99d8ad9af3a81e34f27f9e38574a4a3c23bf429a4be037d

data/Gemfile

@@ -1,20 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
-
-if ENV['RAILS'] == "3.2"
-  gem 'activerecord', '~> 3.2.0'
-  gem 'activemodel', '~> 3.2.0'
-  gem 'globalize', '~> 3.0.4'
-elsif ENV['RAILS'] == "4.0"
-  gem 'activerecord', '~> 4.0.0'
-  gem 'activemodel', '~> 4.0.0'
-  gem 'globalize', '~> 4.0'
-elsif ENV['RAILS'] == "4.1"
-  gem 'activerecord', '~> 4.1.0'
-  gem 'activemodel', '~> 4.1.0'
-  gem 'globalize', '~> 4.0'
-else # Rails 4.2
-  gem 'globalize', '~> 5.0'
-  gem 'paper_trail', '4.0.0.beta2'
-end
+gem 'globalize', '~> 5.1'
+gem 'paper_trail', '~> 10.0.1'

data/Gemfile.lock

@@ -1,46 +1,47 @@
 PATH
   remote: .
   specs:
-    globalize-versioning (0.2.0)
-      activemodel (>= 3.2.0, < 5)
-      activerecord (>= 3.2.0, < 5)
-      globalize (>= 3.0.4, < 6)
-      paper_trail (>= 3.0.0, < 5)
+    globalize-versioning (0.3.0)
+      activemodel (>= 4.2.0, < 6)
+      activerecord (>= 4.2.0, < 6)
+      globalize (>= 5.1.0, < 6)
+      paper_trail (>= 8, < 12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      arel (~> 6.0)
-    activesupport (4.2.5.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activemodel (5.1.6)
+      activesupport (= 5.1.6)
+    activerecord (5.1.6)
+      activemodel (= 5.1.6)
+      activesupport (= 5.1.6)
+      arel (~> 8.0)
+    activesupport (5.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    database_cleaner (1.5.1)
-    globalize (5.0.1)
-      activemodel (>= 4.2.0, < 4.3)
-      activerecord (>= 4.2.0, < 4.3)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.4)
-    paper_trail (4.0.0.beta2)
-      activerecord (>= 3.0, < 6.0)
-      activesupport (>= 3.0, < 6.0)
-    rake (10.5.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    arel (8.0.0)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.7.0)
+    globalize (5.1.0)
+      activemodel (>= 4.2, < 5.2)
+      activerecord (>= 4.2, < 5.2)
+      request_store (~> 1.0)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    paper_trail (10.0.1)
+      activerecord (>= 4.2, < 5.3)
+      request_store (~> 1.1)
+    rack (2.0.5)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -48,13 +49,13 @@ PLATFORMS
 
 DEPENDENCIES
   database_cleaner (>= 1.2.0)
-  globalize (~> 5.0)
+  globalize (~> 5.1)
   globalize-versioning!
   minitest
-  paper_trail (= 4.0.0.beta2)
+  paper_trail (~> 10.0.1)
   rake
   rdoc
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.16.2

data/lib/globalize/versioning.rb

@@ -2,6 +2,7 @@ require 'globalize'
 
 module Globalize::Versioning
   autoload :PaperTrail, 'globalize/versioning/paper_trail'
+  autoload :InstanceMethods, 'globalize/versioning/instance_methods'
 end
 
 Globalize::ActiveRecord::ActMacro.module_eval do
@@ -9,6 +10,7 @@ Globalize::ActiveRecord::ActMacro.module_eval do
     setup_translates_without_versioning!(options)
 
     if options[:versioning]
+      include Globalize::Versioning::InstanceMethods
 
       # hard-coded for now
       class_attribute :versioning_gem, :instance_accessor => false
@@ -23,5 +25,6 @@ Globalize::ActiveRecord::ActMacro.module_eval do
     end
   end
 
-  alias_method_chain :setup_translates!, :versioning
+  alias_method :setup_translates_without_versioning!, :setup_translates!
+  alias_method :setup_translates!, :setup_translates_with_versioning!
 end

data/lib/globalize/versioning/instance_methods.rb

@@ -0,0 +1,9 @@
+module Globalize
+  module Versioning
+    module InstanceMethods
+      def rollback
+        translation_caches[::Globalize.locale] = translation.paper_trail.previous_version
+      end
+    end
+  end
+end

data/lib/globalize/versioning/paper_trail.rb

@@ -18,7 +18,8 @@ ActiveRecord::Base.class_eval do
       has_paper_trail_without_globalize(*args)
       include Globalize::Versioning::PaperTrail
     end
-    alias_method_chain :has_paper_trail, :globalize
+    alias_method :has_paper_trail_without_globalize, :has_paper_trail
+    alias_method :has_paper_trail, :has_paper_trail_with_globalize
   end
 end
 
@@ -38,5 +39,6 @@ version_class.class_eval do
   def sibling_versions_with_locales
     sibling_versions_without_locales.for_this_locale
   end
-  alias_method_chain :sibling_versions, :locales
+  alias_method :sibling_versions_without_locales, :sibling_versions
+  alias_method :sibling_versions, :sibling_versions_with_locales
 end

data/lib/globalize/versioning/version.rb

@@ -1,5 +1,5 @@
 module Globalize
   module Versioning
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: globalize-versioning
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,47 +17,47 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -77,20 +77,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - Rakefile
 - lib/globalize-versioning.rb
 - lib/globalize/versioning.rb
+- lib/globalize/versioning/instance_methods.rb
 - lib/globalize/versioning/paper_trail.rb
 - lib/globalize/versioning/version.rb
 homepage: http://github.com/globalize/globalize-versioning
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: globalize-versioning
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Adapter for using versioning gems with Globalize