counter_culture 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 626c6d44c921e9bf854359c6f2360683392c8053
-  data.tar.gz: 171c902ee182fbe717f3fee383b2932bc8e31207
+SHA256:
+  metadata.gz: 64eb9b917d27eb10893760ab26afdb228af051a3c2a49524e081b40c857482a0
+  data.tar.gz: b27d02bf40278eb9a1c311bd74095838235f551ec83cff595c9c465438d34d05
 SHA512:
-  metadata.gz: 34dd015103dc4a1da9c49feeda4009da59662ccfd6dc7d972f7c6c05eb0e4dbd72db452c8dc113dbb50903e854dacd6db112a370890f6572013931742e82b989
-  data.tar.gz: 84fd5aefae33c42919e10dd91a8eb4b747d564b38994702f7dfdae76c1810fd5a1d910a5be9cbcf260095838902fed8005bcb360f4447c5c143c1a0d7bdbf778
+  metadata.gz: 961d64e29863cb4d9e0d6b1a46c1917c4c7bbed7ac42cb9a6cf52d7ad5989f959f35d438379e1353417bb3e98c70dc50aa2a8798e0253771ade979c542900d4a
+  data.tar.gz: f79799eb4a5a0dcf1597538dbf2c86ea1fd8804cf096e8848ff7d2839605f30410420abae1c243d1ee4d3f88090e3f2ad457107e45cfaac95f54eaa30977b7b3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.1 (August 19, 2018)
+
+Bugfixes:
+  - Properly set timestamps of PaperTrail versions (#224, #225, #226)
+
 ## 2.0.0 (June 12, 2018)
 
 Breaking changes:

data/README.md

@@ -14,7 +14,7 @@ Tested against Ruby 2.2.5 and 2.3.1 and against the latest patch releases of Rai
 Add counter_culture to your Gemfile:
 
 ```ruby
-gem 'counter_culture', '~> 1.8'
+gem 'counter_culture', '~> 2.0'
 ```
 
 Then run `bundle install`

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/counter_culture.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 2.0.0 ruby lib
+# stub: counter_culture 2.0.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "counter_culture"
-  s.version = "2.0.0"
+  s.name = "counter_culture".freeze
+  s.version = "2.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Magnus von Koeller"]
-  s.date = "2018-06-18"
-  s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback."
-  s.email = "magnus@vonkoeller.de"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Magnus von Koeller".freeze]
+  s.date = "2018-08-21"
+  s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.".freeze
+  s.email = "magnus@vonkoeller.de".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -118,60 +118,60 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "test_rails_versions.sh"
   ]
-  s.homepage = "http://github.com/magnusvk/counter_culture"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Turbo-charged counter caches for your Rails app."
+  s.homepage = "http://github.com/magnusvk/counter_culture".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.7.6".freeze
+  s.summary = "Turbo-charged counter caches for your Rails app.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit_action>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<discard>, [">= 0"])
-      s.add_development_dependency(%q<paranoia>, [">= 0"])
-      s.add_development_dependency(%q<paper_trail>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.1"])
+      s.add_runtime_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
+      s.add_runtime_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rails>.freeze, [">= 3.1.0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_development_dependency(%q<awesome_print>.freeze, [">= 0"])
+      s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_development_dependency(%q<discard>.freeze, [">= 0"])
+      s.add_development_dependency(%q<paranoia>.freeze, [">= 0"])
+      s.add_development_dependency(%q<paper_trail>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.2.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1"])
     else
-      s.add_dependency(%q<after_commit_action>, ["~> 1.0"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_dependency(%q<rspec>, ["~> 3.0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<discard>, [">= 0"])
-      s.add_dependency(%q<paranoia>, [">= 0"])
-      s.add_dependency(%q<paper_trail>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.2.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.1"])
+      s.add_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
+      s.add_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<rails>.freeze, [">= 3.1.0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+      s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
+      s.add_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_dependency(%q<discard>.freeze, [">= 0"])
+      s.add_dependency(%q<paranoia>.freeze, [">= 0"])
+      s.add_dependency(%q<paper_trail>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
     end
   else
-    s.add_dependency(%q<after_commit_action>, ["~> 1.0"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.1.0"])
-    s.add_dependency(%q<rspec>, ["~> 3.0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<discard>, [">= 0"])
-    s.add_dependency(%q<paranoia>, [">= 0"])
-    s.add_dependency(%q<paper_trail>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.2.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.1"])
+    s.add_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 3.0.0"])
+    s.add_dependency(%q<activesupport>.freeze, [">= 3.0.0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<rails>.freeze, [">= 3.1.0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+    s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
+    s.add_dependency(%q<timecop>.freeze, [">= 0"])
+    s.add_dependency(%q<discard>.freeze, [">= 0"])
+    s.add_dependency(%q<paranoia>.freeze, [">= 0"])
+    s.add_dependency(%q<paper_trail>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
   end
 end
 

data/lib/counter_culture/counter.rb

@@ -74,6 +74,13 @@ module CounterCulture
           if instance
             if instance.paper_trail.respond_to?(:save_with_version)
               # touch_with_version is deprecated starting in PaperTrail 9.0.0
+
+              current_time = obj.send(:current_time_from_proper_timezone)
+              timestamp_columns = obj.send(:timestamp_attributes_for_update_in_model)
+              timestamp_columns.each do |timestamp_column|
+                instance.send("#{timestamp_column}=", current_time)
+              end
+
               instance.paper_trail.save_with_version(validate: false)
             else
               instance.paper_trail.touch_with_version

data/spec/counter_culture_spec.rb

@@ -2015,10 +2015,7 @@ describe "CounterCulture" do
 
   describe "with papertrail support", versioning: true do
     it "creates a papertrail version when changed" do
-      if Rails.version < "5.0.0"
-        skip("Unsupported in this version of Rails")
-      end
-      if RUBY_VERSION < "2.3.0" && Rails.version >= "5.2.0"
+      unless papertrail_supported_here?
         skip("Unsupported in this combination of Ruby and Rails")
       end
 
@@ -2051,11 +2048,36 @@ describe "CounterCulture" do
       expect(attrs_from_versions['reviews_count']).to eq(1)
     end
 
-    it "does not create a papertrail version when papertrail flag not set" do
-      if Rails.version < "5.0.0"
-        skip("Unsupported in this version of Rails")
+    context "counter-cache model versioning" do
+      let!(:main_obj) { SimpleMain.create(created_at: 1.day.ago, updated_at: 1.day.ago) }
+
+      it "updates the updated_at of the parent variant" do
+        unless papertrail_supported_here?
+          skip("Unsupported in this combination of Ruby and Rails")
+        end
+
+        the_time = Time.now.utc
+        Timecop.freeze(the_time) do
+          main_obj.simple_dependents.create!
+          expect(main_obj.reload.updated_at.to_i).to eq(the_time.to_i)
+        end
+      end
+
+      it "sets the created_at time of the new version row to the current time" do
+        unless papertrail_supported_here?
+          skip("Unsupported in this combination of Ruby and Rails")
+        end
+
+        the_time = Time.now.utc
+        Timecop.freeze(the_time) do
+          main_obj.simple_dependents.create!
+          expect(main_obj.versions.last.created_at.to_i).to eq(the_time.to_i)
+        end
       end
-      if RUBY_VERSION < "2.3.0" && Rails.version >= "5.2.0"
+    end
+
+    it "does not create a papertrail version when papertrail flag not set" do
+      unless papertrail_supported_here?
         skip("Unsupported in this combination of Ruby and Rails")
       end
 
@@ -2073,4 +2095,11 @@ describe "CounterCulture" do
       expect(user.versions.count).to eq(1)
     end
   end
+
+  private
+  def papertrail_supported_here?
+    return false if Rails.version < "5.0.0"
+    return false if RUBY_VERSION < "2.3.0" && Rails.version >= "5.2.0"
+    true
+  end
 end

data/spec/models/simple_dependent.rb

@@ -1,5 +1,5 @@
 class SimpleDependent < ActiveRecord::Base
   belongs_to :simple_main
 
-  counter_culture :simple_main
+  counter_culture :simple_main, with_papertrail: Rails.version >= '5.0.0'
 end

data/spec/models/simple_main.rb

@@ -1,3 +1,7 @@
 class SimpleMain < ActiveRecord::Base
   has_many :simple_dependents
+
+  if Rails.version >= "5.0.0"
+    has_paper_trail
+  end
 end

data/spec/rails_app/config/initializers/secret_token.rb

@@ -4,4 +4,9 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsApp::Application.config.secret_token = 'fcc06e5fc19cdbf0f0db6fd634aa5160a9f28ad692528f227e14975da33b0dbd92bb8a9f15e0ef44f0664415a0f6eba003cbb088300865f0058965c104e5abd6'
+secret = 'fcc06e5fc19cdbf0f0db6fd634aa5160a9f28ad692528f227e14975da33b0dbd92bb8a9f15e0ef44f0664415a0f6eba003cbb088300865f0058965c104e5abd6'
+if Rails.version < '5.2.0'
+  RailsApp::Application.config.secret_token = secret
+else
+  RailsApp::Application.config.secret_key_base = secret
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.