activerecord-delay_touching 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d58f8a4a53021f8034c2da68790d7648b2b4f3
-  data.tar.gz: 2d975e4e5c14ee8baecaaf762aaa8a8ebb003bef
+  metadata.gz: bf2e396443031e052664ae33fa9abca71b1a1b45
+  data.tar.gz: 0009099d96abdb6f58a1590c5f5c7df699d0382e
 SHA512:
-  metadata.gz: 46209cc3478f9f81e932644e79364bb2ff012d536cabc2e3927cca61c74a641b0b9fc94e6522574c2c0c21281e1a0fda4df0be6db40c0f58b001d73c7ead5008
-  data.tar.gz: 89654bba87280ab7976c0d464d43f4a9e0760643ce614532c12910b4e9b9602b38635815251bde5877bbd24a2c95742ca13ffac0b55bb7461a1786c0e5c077a7
+  metadata.gz: bba9504122174575808beec7d1107e603e434535afe421361dd83ad6341867fbdae957e509653349be3a7ebd16c97050d4c12ca900aa22360a547c61a017d2cd
+  data.tar.gz: 2e822052fb026400b9abd0b9bb25a36220d9eac30acb02267495535b9da99fc3be49e1cd296e6c035ccdd0c97c12c00fe51636d38f3f64664048a4fcb5f6863b

data/README.md

@@ -1,7 +1,5 @@
 # Activerecord::DelayTouching
 
-> **Note:** this version supports ActiveRecord 3.2 through 4.1 only. For ActiveRecord 4.2+, please see the Master branch.
-
 Batch up your ActiveRecord "touch" operations for better performance.
 
 When you want to invalidate a cache in Rails, you use `touch: true`. But when
@@ -15,7 +13,7 @@ round-trips as possible. Instead of N touches you get 1 touch.
 
 Add this line to your application's Gemfile:
 
-    gem 'activerecord-delay_touching', '~> 0.0.3'
+    gem 'activerecord-delay_touching'
 
 And then execute:
 
@@ -23,7 +21,7 @@ And then execute:
 
 Or install it yourself:
 
-    $ gem install activerecord-delay_touching -v 0.0.3
+    $ gem install activerecord-delay_touching
 
 ## Usage
 

data/activerecord-delay_touching.gemspec

@@ -13,14 +13,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 1.9.3"
-
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "activerecord", ">= 3.2", "< 4.2"
+  spec.add_dependency             "activerecord", ">= 4.2"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/activerecord/delay_touching.rb

@@ -6,9 +6,9 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     # Override ActiveRecord::Base#touch.
-    def touch(name = nil)
-      if self.class.delay_touching? && (!respond_to?(:no_touching?) || !try(:no_touching?))
-        DelayTouching.add_record(self, name)
+    def touch(*names)
+      if self.class.delay_touching? && !try(:no_touching?)
+        DelayTouching.add_record(self, *names)
         true
       else
         super
@@ -41,8 +41,8 @@ module ActiveRecord
       Thread.current[:delay_touching_state] ||= State.new
     end
 
-    def self.add_record(record, column)
-      state.add_record(record, column)
+    class << self
+      delegate :add_record, to: :state
     end
 
     # Start delaying all touches. When done, apply them. (Unless nested.)
@@ -86,7 +86,6 @@ module ActiveRecord
           column = column.to_s
           changes[column] = current_time
           records.each do |record|
-            next if record.destroyed?
             record.instance_eval do
               write_attribute column, current_time
               @changed_attributes.except!(*changes.keys)
@@ -102,6 +101,4 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::Base.class_eval do
-  include ActiveRecord::DelayTouching
-end
+ActiveRecord::Base.include ActiveRecord::DelayTouching

data/lib/activerecord/delay_touching/state.rb

@@ -37,14 +37,18 @@ module ActiveRecord
         @records.present?
       end
 
-      def add_record(record, column)
-        @records[column] += [ record ] unless @already_updated_records[column].include?(record)
+      def add_record(record, *columns)
+        columns << nil if columns.empty? #if no arguments are passed, we will use nil to infer default column
+        columns.each do |column|
+          @records[column] += [ record ] unless @already_updated_records[column].include?(record)
+        end
       end
 
       def clear_records
         @records.clear
         @already_updated_records.clear
       end
+
     end
   end
 end

data/lib/activerecord/delay_touching/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module DelayTouching
-    VERSION = "0.0.4"
+    VERSION = "1.0.0"
   end
 end

data/spec/activerecord/delay_touching_spec.rb

@@ -151,28 +151,6 @@ describe Activerecord::DelayTouching do
     end
   end
 
-  context 'dependent deletes' do
-
-    let(:post) { Post.create! }
-    let(:user) { User.create! }
-    let(:comment) { Comment.create! }
-
-    before do
-      post.comments << comment
-      user.comments << comment
-    end
-
-    it 'does not attempt to touch deleted records' do
-      expect do
-        ActiveRecord::Base.delay_touching do
-          post.destroy
-        end
-      end.not_to raise_error
-      expect(post.destroyed?).to eq true
-    end
-
-  end
-
   def expect_updates(tables)
     expected_sql = tables.map do |entry|
       if entry.kind_of?(Hash)

data/spec/support/models.rb

@@ -5,16 +5,3 @@ end
 class Pet < ActiveRecord::Base
   belongs_to :person, touch: true, inverse_of: :pets
 end
-
-class Post < ActiveRecord::Base
-  has_many :comments, dependent: :destroy
-end
-
-class User < ActiveRecord::Base
-  has_many :comments, dependent: :destroy
-end
-
-class Comment < ActiveRecord::Base
-  belongs_to :post, touch: true
-  belongs_to :user, touch: true
-end

data/spec/support/schema.rb

@@ -16,18 +16,4 @@ ActiveRecord::Schema.define do
     t.timestamps
   end
 
-  create_table :posts, force: true do |t|
-    t.timestamps null: false
-  end
-
-  create_table :users, force: true do |t|
-    t.timestamps null: false
-  end
-
-  create_table :comments, force: true do |t|
-    t.integer :post_id
-    t.integer :user_id
-    t.timestamps null: false
-  end
-
 end

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-delay_touching
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Brian Morearty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -178,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -186,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Batch up your ActiveRecord "touch" operations for better performance.