counter_culture 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5355b1fef2ee6bc80493e05f067a467e2aee9655
-  data.tar.gz: d17dc9165689f705528785d33a4f9b42c35f1314
+  metadata.gz: dc367bb995eff4a72895a3a77c93d1e9f97d8daf
+  data.tar.gz: 620b7a24d42f57468189b4ee20564dd90b2d3359
 SHA512:
-  metadata.gz: 18becb6b285ee801e83659721a214444c5a5e3c52cee77d310432a1e52b68a0de4373afe0c4f5854c469c6d431cf03b4ee2f510c4aa5190fe076ab1b2f2b7039
-  data.tar.gz: 09015b5df2ef84c6fb5c42e6316f6016e654586cf4b860be199384bb03db370ff0cdf4c5e1c0d1f01b51fcf8405f135ab5324d8bf4ca04b161a9a585c920b1de
+  metadata.gz: 27145d4edfdec7427e00624849adb265ce80bcb290f5936fcc521e4ac432bcb9c9300a127650cbb272d2445f6da6c7bb3fd20a442cfb2de1ed914aafa44b79c8
+  data.tar.gz: 3edc8b398be0a698225a11ce418434578e61f9e40c35a2c4a7e8643f56533339d1c356c34fa3eb4c752ad4da2d4e9e9067c5e15e1658907bf48eb3fc35926834

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.34 (October 27, 2015)
+
+Bugfixes:
+  - Fixes an issue when using a default scope that adds a join in conjunction with counter_culture
+
 ## 0.1.33 (April 2, 2015)
 
 Bugfixes:

data/Gemfile.lock

@@ -1,59 +1,69 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.3.8)
     after_commit_action (1.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-    arel (5.0.1.20140414130214)
-    awesome_print (1.2.0)
+    arel (6.0.3)
+    awesome_print (1.6.1)
     builder (3.2.2)
-    database_cleaner (1.3.0)
+    database_cleaner (1.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.8)
-    github_api (0.12.2)
+    git (1.2.9.1)
+    github_api (0.12.4)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      nokogiri (~> 1.6.6)
       oauth2
-    hashie (3.3.1)
-    highline (1.6.21)
-    hike (1.2.3)
-    i18n (0.6.11)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    hashie (3.4.3)
+    highline (1.7.8)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -63,17 +73,19 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
+    json (1.8.3)
+    jwt (1.5.1)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.3)
-    multi_json (1.10.1)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.2)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -81,25 +93,34 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.10.0)
@@ -111,19 +132,15 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-extra-formatters (1.0.0)
     rspec-mocks (2.10.1)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -144,3 +161,6 @@ DEPENDENCIES
   rspec (~> 2.10.0)
   rspec-extra-formatters
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -13,10 +13,10 @@ Turbo-charged counter caches for your Rails app. Huge improvements over the Rail
 Add counter_culture to your Gemfile:
 
 ```ruby
-gem 'counter_culture', '~> 0.1.23'
+gem 'counter_culture', '~> 0.1.33'
 ```
 
-Then run ```bundle update ```
+Then run `bundle install`
 
 ## Database Schema
 

data/VERSION

@@ -1 +1 @@
-0.1.33
+0.1.34

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 0.1.33 ruby lib
+# stub: counter_culture 0.1.34 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture"
-  s.version = "0.1.33"
+  s.version = "0.1.34"
 
   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 = "2015-04-02"
+  s.date = "2015-10-27"
   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 = [
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bestvendor/counter_culture"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.2.5"
   s.summary = "Turbo-charged counter caches for your Rails app."
 
   if s.respond_to? :specification_version then

data/lib/counter_culture.rb

@@ -371,7 +371,8 @@ module CounterCulture
       if was
         first = relation.shift
         foreign_key_value = send("#{relation_foreign_key(first)}_was")
-        value = relation_klass(first).where("#{relation_primary_key(first)} = ?", foreign_key_value).first if foreign_key_value
+        klass = relation_klass(first)
+        value = klass.where("#{klass.table_name}.#{relation_primary_key(first)} = ?", foreign_key_value).first if foreign_key_value
       else
         value = self
       end

data/spec/counter_culture_spec.rb

@@ -454,6 +454,27 @@ describe "CounterCulture" do
       user.using_count.should == 0
       user.tried_count.should == 0
     end
+
+    it "should decrement if changing column name to nil without errors using default scope" do
+      User.with_default_scope do
+        user.using_count.should == 0
+        user.tried_count.should == 0
+
+        review = Review.create :user_id => user.id, :product_id => product.id, :review_type => "using"
+        user.reload
+
+        user.using_count.should == 1
+        user.tried_count.should == 0
+
+        review.review_type = nil
+        review.save!
+
+        user.reload
+
+        user.using_count.should == 0
+        user.tried_count.should == 0
+      end
+    end
   end
 
   it "increments third-level counter cache on create" do

data/spec/models/user.rb

@@ -8,4 +8,22 @@ class User < ActiveRecord::Base
 
   has_many :reviews
   accepts_nested_attributes_for :reviews, :allow_destroy => true
+
+  default_scope do
+    if _default_scope_enabled
+      joins("LEFT OUTER JOIN companies").uniq
+    else
+      all
+    end
+  end
+
+  class << self
+    attr_accessor :_default_scope_enabled
+
+    def with_default_scope
+      @_default_scope_enabled = true
+      yield
+      @_default_scope_enabled = false
+    end
+  end
 end

data/spec/rails_app/config/application.rb

@@ -49,5 +49,8 @@ module RailsApp
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    # Avoid deprecation warning
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end

data/spec/rails_app/config/environments/test.rb

@@ -8,7 +8,7 @@ RailsApp::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Turbo-charged counter caches for your Rails app.