counter_culture 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21a580a6873b3d63ccddaf37e9ab42da83665d8
-  data.tar.gz: eb40b01c09c04572acae15638170a54a18ceea70
+  metadata.gz: cf58d3caa98a0fbb9741d974f746a6071a7a28e9
+  data.tar.gz: 38e56a66e6e995ab3df7d9cc0ece39f58bc408b4
 SHA512:
-  metadata.gz: 1415bf5f64587fd1fb7b6c0ab3903b4a6f0da32f7d9570c3b35d11cd4b33c0b8059fb91cd80547c270362872028fdf720b8c87d402928e77e2179059e18916cc
-  data.tar.gz: 0b729a1911b0a38d9acc9ad9f02f22895b1e92a7b1af39f1dd3010c5ec5705ae7eea248b7c07ab236eca255ef277626caaecdb48b5d85deec33e753c82d6cd60
+  metadata.gz: e301243129495b31dc32759c6757aa16ab553f829ebe762e317ff3a59657b62cf9f102b3dbde939e3259c2dd3958fae0eeae9632e53f684bdbe334ba89f16d58
+  data.tar.gz: 4d54dfeb834c6c81d754665f7fb0250c050b4ca8509da255a3546605f91dd5c51ac78ca271af80fd9ecc77e4782878d23375f010b132ecdd2965429d9a2cea37

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.9.0 (November 29, 2017)
+
+Improvements:
+  - Switch generated migration files to use new hash syntax
+  - Support for Rails 5 migration file format for generated migrations
+
 ## 1.8.2 (September 27, 2017)
 
 Bugfixes:

data/README.md

@@ -116,7 +116,7 @@ end
 ```ruby
 class Product < ActiveRecord::Base
   belongs_to :category
-  counter_culture :category, column_name: :weight, delta_magnitude: proc { model.product_type == 'awesome' ? 2 : 1 }
+  counter_culture :category, column_name: :weight, delta_magnitude: proc {|model| model.product_type == 'awesome' ? 2 : 1 }
 end
 
 class Category < ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-1.8.2
+1.9.0

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 1.8.2 ruby lib
+# stub: counter_culture 1.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "1.8.2"
+  s.version = "1.9.0"
 
   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 = "2017-09-27"
+  s.date = "2017-11-29"
   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.extra_rdoc_files = [

data/lib/generators/counter_culture_generator.rb

@@ -11,7 +11,7 @@ class CounterCultureGenerator < ActiveRecord::Generators::Base
   source_root File.expand_path("../templates", __FILE__)
 
   def generate_migration
-    migration_template "counter_culture_migration.rb.erb", "db/migrate/#{migration_file_name}"
+    migration_template "counter_culture_migration.rb.erb", "db/migrate/#{migration_file_name}", migration_version: migration_version
   end
 
   def migration_name
@@ -26,4 +26,10 @@ class CounterCultureGenerator < ActiveRecord::Generators::Base
     migration_name.camelize
   end
 
+  def migration_version
+    if Rails.version.start_with? '5.'
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
+  end
+
 end

data/lib/generators/templates/counter_culture_migration.rb.erb

@@ -1,15 +1,9 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
+  def self.up<% counter_cache_columns.each do |column| %>
+    add_column :<%= table_name %>, :<%= column %>, :integer, null: false, default:  0
+<% end %>  end
 
-  def self.up
-<% counter_cache_columns.each do |column| %>
-    add_column :<%= table_name %>, :<%= column %>, :integer, :null => false, :default => 0
-<% end %>
-  end
-
-  def self.down
-<% counter_cache_columns.each do |column| %>
+  def self.down<% counter_cache_columns.each do |column| %>
     remove_column :<%= table_name %>, :<%= column %>
-<% end %>
-  end
-
+<% end %>  end
 end

data/spec/counter_culture_spec.rb

@@ -1644,6 +1644,7 @@ describe "CounterCulture" do
 
   describe "when using acts_as_paranoia" do
     it "works" do
+      skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
       company = Company.create!
       expect(company.soft_deletes_count).to eq(0)
       sd = SoftDelete.create!(company_id: company.id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action