activerecord-update 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c2f6991302388163951e76a30a77490613974ad6
-  data.tar.gz: 69c7913ae32b9b2be3ead5c5570fdad080cc425b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODNmMzBiN2U0NmY1YmNkMmE5NzgwZWVkMDUyYTUyYmZlNjljMWRmMA==
+  data.tar.gz: !binary |-
+    N2VhOTRjYjJiN2FjNjk0MjAyZWIwMTk4NTUwNmI0M2M2MDJiODU0MA==
 SHA512:
-  metadata.gz: 05c28fe52389d585a66a5e4818c8849c5203a1a53db2399468f84c0449d3ffe1412b3e8604df679ef749eebd65d4eea05bbc14e5fba409af5ef42cbd2f049f4a
-  data.tar.gz: c1ff81888f193ac6477339581a97d93de28ed838ff09f43f312ace5718e5ef275a7eaab903b42368bf44734d4f296f2e942d333daed5d403abc54343d08d12cb
+  metadata.gz: !binary |-
+    NTg3YjE2NjIwNDRmNTgzYmIzYmQzNTZhNDdkZDM4YmNiMjk3Mzg3NDYyNDg2
+    NTJkOWFkOWQzNGU2YjNiYjA0MGY5MmMyMTE5ZDYzNjM2ZDdhOTE4YzM0NWFk
+    ODk4YmJiODc1OTA2NTlmZmE5NjFiZmJiYTRlM2Q4MTZiOGNlY2M=
+  data.tar.gz: !binary |-
+    YjRjMzBmMmFjNjA5ZDM1NmQ4YjljZDUxYWQzYjMyZTgyNWMxZDEyODljZjgw
+    ZjlkMTQwMzJlMzVkZTEzN2M2NTViYTkxMmJkMjIxYWZlOWNkOWE2YWFjNjNj
+    OWJiNTQ0ZTc5ZmM4NjY1ZDRmMjMwNDgxOTJkYjI4N2E1MTQ4MDg=

data/.gitignore

@@ -1,4 +1,4 @@
-/.bundle/
+.bundle/
 /.yardoc
 /Gemfile.lock
 /_yardoc/
@@ -8,3 +8,4 @@
 /profile_reports/
 /spec/reports/
 /tmp/
+*.gemfile.lock

data/.rubocop.yml

@@ -17,3 +17,14 @@ Metrics/BlockLength:
 
 Style/AlignParameters:
   EnforcedStyle: with_fixed_indentation
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+AllCops:
+  Exclude:
+    # Ignore what's in core_ext since those files are copied directly from
+    # ActiveSupport
+    - 'lib/activerecord-update/core_ext/**/*'
+    # Everything in this directory is automatically generated
+    - 'gemfiles/**/*'

data/.travis.yml

@@ -5,6 +5,16 @@ rvm:
   - 2.3.3
   - 2.1.5
 
+gemfile:
+  - gemfiles/4.1.gemfile
+
+matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.3.gemfile
+      before_script:
+        - ./before_script2.3.sh
+
 cache: bundler
 before_install: gem install bundler -v 1.13.6
 

data/Appraisals

@@ -0,0 +1,18 @@
+appraise '2.3' do
+  gem 'activerecord', '2.3.5'
+
+  group :development, :test do
+    gem 'database_cleaner', '1.4.1'
+    gem 'rubocop', '0.41.2'
+    gem 'rb-readline'
+  end
+end
+
+appraise '4.1' do
+  gem 'activerecord', '4.1.9'
+
+  group :development, :test do
+    gem 'database_cleaner', '~> 1.5.3'
+    gem 'rubocop', '0.46.0'
+  end
+end

data/README.md

@@ -40,6 +40,11 @@ books.each { |book| book.title = nil }
 Book.update_records!(books) # will raise an ActiveRecord::RecordInvalid error
 ```
 
+## Supported Versions
+
+* Ruby 1.9.3 or later
+* ActiveRecord 2.3.x and 4.1.x
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then,

data/activerecord-update.gemspec

@@ -31,18 +31,21 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '4.1.9'
-  spec.add_dependency 'activesupport', '4.1.9'
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency 'database_cleaner', '~> 1.5'
+  spec.add_dependency 'activerecord', '>= 2.3.5', '<= 4.1.9'
+  spec.add_dependency 'activesupport', '>= 2.3.5', '<= 4.1.9'
+
+  spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'database_cleaner', '>= 1.4.1', '< 1.6'
   spec.add_development_dependency 'pg', '0.18.2'
   spec.add_development_dependency 'pry-rescue', '~> 1.4'
   spec.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'redcarpet', '~> 3.3'
   spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'rubocop', '0.46.0'
+  spec.add_development_dependency 'rubocop', '>= 0.41.2', '<= 0.46.0'
   spec.add_development_dependency 'ruby-prof', '~> 0.16'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'timecop', '~> 0.8'

data/before_script2.3.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+# The Psych YAML parser has a bug where `[:foo]` fails to parse
+sed -Ei $'s/    order: \[ :year, :month, :day \]/    order:\\\n      - :year\\\n      - :month\\\n      - :day/g' "$(bundle show activesupport)"/lib/active_support/locale/en.yml
+bundle exec rake db:create
+bundle exec rake db:migrate

data/gemfiles/2.3.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "2.3.5"
+
+group :development, :test do
+  gem "database_cleaner", "1.4.1"
+  gem "rubocop", "0.41.2"
+  gem "rb-readline"
+end
+
+gemspec path: "../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "4.1.9"
+
+group :development, :test do
+  gem "database_cleaner", "~> 1.5.3"
+  gem "rubocop", "0.46.0"
+end
+
+gemspec path: "../"

data/lib/activerecord-update.rb

@@ -1,6 +1,17 @@
 # rubocop:disable Style/FileName
 
-require 'active_support/core_ext/string/strip'
+begin
+  require 'active_support/core_ext/string/strip'
+rescue LoadError
+  require 'activerecord-update/core_ext/string/strip'
+end
+
+begin
+  require 'active_support/core_ext/hash/slice'
+rescue LoadError
+  require 'activerecord-update/core_ext/hash/slice'
+end
+
 require 'active_record'
 
 require 'activerecord-update/version'

data/lib/activerecord-update/active_record/base.rb

@@ -111,10 +111,12 @@ module ActiveRecord
       # @see .update_records
       def _update_records(
         records,
-        raise_on_validation_failure:,
-        raise_on_stale_objects:
+        options
       )
 
+        raise_on_validation_failure = options[:raise_on_validation_failure]
+        raise_on_stale_objects = options[:raise_on_stale_objects]
+
         changed = changed_records(records)
         valid, failed = validate_records(changed, raise_on_validation_failure)
         return build_result(valid, failed, []) if valid.empty?
@@ -275,7 +277,13 @@ module ActiveRecord
       # @return [String] the table alias quoted.
       def quoted_table_alias
         @quoted_table_alias ||=
-          connection.quote_table_name(arel_table.alias.name)
+          connection.quote_table_name(table_name + '_2')
+      end
+
+      unless defined?(quoted_primary_key)
+        def quoted_primary_key
+          @quoted_primary_key ||= connection.quote_column_name(primary_key)
+        end
       end
 
       # Quotes/escapes the given column value to prevent SQL injection attacks.
@@ -443,8 +451,7 @@ module ActiveRecord
           # We're using `slice` instead of `changed_attributes` because we need
           # to include all the changed attributes from all the changed records
           # and not just the changed attributes for a given record.
-          values = record
-            .slice(*changed_attributes)
+          values = slice(record, *changed_attributes)
             .merge('updated_at' => updated_at)
             .values
 
@@ -456,6 +463,17 @@ module ActiveRecord
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength
 
+      # Returns a hash of the given methods with their names as keys and
+      # returned values as values.
+      def slice(record, *methods)
+        if record.respond_to?(:slice)
+          record.slice(*methods)
+        else
+          result = methods.map! { |m| [m, record.public_send(m)] }
+          Hash[result].with_indifferent_access
+        end
+      end
+
       # Increments the lock column of the given record if locking is enabled.
       #
       # @param record [ActiveRecord::Base] the record to update the lock column
@@ -613,6 +631,12 @@ module ActiveRecord
         return unless result.stale_objects?
         record = result.stale_objects.first
         return unless raise_on_stale_objects
+
+        if ActiveRecord::VERSION::MAJOR == 2
+          message = "Attempted to update a stale object: #{record.class.name}"
+          raise ActiveRecord::StaleObjectError, message
+        end
+
         raise ActiveRecord::StaleObjectError.new(record, 'update')
       end
 
@@ -670,7 +694,13 @@ module ActiveRecord
       #
       # @return [void]
       def mark_changes_applied(records)
-        records.each { |e| e.send(:changes_applied) }
+        if records.first.respond_to?(:changes_applied, true)
+          records.each { |e| e.send(:changes_applied) }
+        else # ActiveRecord 3.2
+          records.each do |e|
+            e.instance_variable_get(:@changed_attributes).clear
+          end
+        end
       end
     end
   end

data/lib/activerecord-update/core_ext/hash/slice.rb

@@ -0,0 +1,48 @@
+class Hash
+  # Slices a hash to include only the given keys. Returns a hash containing
+  # the given keys.
+  #
+  #   { a: 1, b: 2, c: 3, d: 4 }.slice(:a, :b)
+  #   # => {:a=>1, :b=>2}
+  #
+  # This is useful for limiting an options hash to valid keys before
+  # passing to a method:
+  #
+  #   def search(criteria = {})
+  #     criteria.assert_valid_keys(:mass, :velocity, :time)
+  #   end
+  #
+  #   search(options.slice(:mass, :velocity, :time))
+  #
+  # If you have an array of keys you want to limit to, you should splat them:
+  #
+  #   valid_keys = [:mass, :velocity, :time]
+  #   search(options.slice(*valid_keys))
+  def slice(*keys)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    keys.each_with_object(self.class.new) { |k, hash| hash[k] = self[k] if has_key?(k) }
+  end
+
+  # Replaces the hash with only the given keys.
+  # Returns a hash containing the removed key/value pairs.
+  #
+  #   { a: 1, b: 2, c: 3, d: 4 }.slice!(:a, :b)
+  #   # => {:c=>3, :d=>4}
+  def slice!(*keys)
+    keys.map! { |key| convert_key(key) } if respond_to?(:convert_key, true)
+    omit = slice(*self.keys - keys)
+    hash = slice(*keys)
+    hash.default      = default
+    hash.default_proc = default_proc if default_proc
+    replace(hash)
+    omit
+  end
+
+  # Removes and returns the key/value pairs matching the given keys.
+  #
+  #   { a: 1, b: 2, c: 3, d: 4 }.extract!(:a, :b) # => {:a=>1, :b=>2}
+  #   { a: 1, b: 2 }.extract!(:a, :x)             # => {:a=>1}
+  def extract!(*keys)
+    keys.each_with_object(self.class.new) { |key, result| result[key] = delete(key) if has_key?(key) }
+  end
+end

data/lib/activerecord-update/core_ext/string/strip.rb

@@ -0,0 +1,23 @@
+class String
+  # Strips indentation in heredocs.
+  #
+  # For example in
+  #
+  #   if options[:usage]
+  #     puts <<-USAGE.strip_heredoc
+  #       This command does such and such.
+  #
+  #       Supported options are:
+  #         -h         This message
+  #         ...
+  #     USAGE
+  #   end
+  #
+  # the user would see the usage message aligned against the left margin.
+  #
+  # Technically, it looks for the least indented non-empty line
+  # in the whole string, and removes that amount of leading whitespace.
+  def strip_heredoc
+    gsub(/^#{scan(/^[ \t]*(?=\S)/).min}/, "".freeze)
+  end
+end

data/lib/activerecord-update/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Update
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

metadata

@@ -1,71 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-update
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jacob Carlborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.1.9
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - <=
       - !ruby/object:Gem::Version
         version: 4.1.9
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -84,140 +116,146 @@ dependencies:
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.41.2
+    - - <=
       - !ruby/object:Gem::Version
         version: 0.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.41.2
+    - - <=
       - !ruby/object:Gem::Version
         version: 0.46.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.16'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Batch updating for ActiveRecord models
@@ -227,21 +265,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
+- Appraisals
 - Gemfile
 - README.md
 - Rakefile
 - activerecord-update.gemspec
+- before_script2.3.sh
 - bin/console
 - bin/setup
+- gemfiles/2.3.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/activerecord_2.3.gemfile.lock
+- gemfiles/activerecord_4.1.gemfile.lock
 - lib/activerecord-update.rb
 - lib/activerecord-update/active_record/base.rb
 - lib/activerecord-update/active_record/update/result.rb
+- lib/activerecord-update/core_ext/hash/slice.rb
+- lib/activerecord-update/core_ext/string/strip.rb
 - lib/activerecord-update/version.rb
 homepage: https://github.com/jacob-carlborg/activerecord-update
 licenses: []
@@ -253,17 +299,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Batch updating for ActiveRecord models