junk_drawer 1.3.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fa1bc248af13f000203f8c72364c382c44de203a
-  data.tar.gz: 05ad7bf2b95cb6630eab0129811dcb68cd8e1e6b
+SHA256:
+  metadata.gz: 4f24671eaa9add85408c8966382db1f81bd41c401bf08bc9fa367507d48a5024
+  data.tar.gz: 586334b2252f4e4b19d6338686b4c4b53435a6144f12cc5b642e85509bca8e2a
 SHA512:
-  metadata.gz: 99d8ee5d88bc1bcd7d3253fc4dbac3be7be6418ede9a772bc4963233b0785344429ee40a2f8b2078e8d51e678aead1701eeba99ed4227ade2206b79e7af1912b
-  data.tar.gz: 108ff56c6ed5bbe24e81edcfa099e0ae7a55cada04469a0e9900d76b4b3623b64f334f39eaa52ed048b18811bf7fd8e907b83e95f7169d9f745de2ee93f4673b
+  metadata.gz: 68798dd630e0f3508d5fcd30480c9f7eb04e3d12a1035bf4bdd39003d976e1a3eed76bd717fd8671985b4f33924dde6eeabaa37ab2d154d2b4aa42df13b8f7a0
+  data.tar.gz: 67bd7ba05df3c718c79c37dffffb3936894a541253b17d382809af1805c36cc330b465016f7ca7f1886a4496128817d8cd3621a4bf2c7a724c6fdad8aadc7a9d

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+*gems.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -20,7 +20,7 @@ Metrics/MethodLength:
 Metrics/BlockLength:
   Exclude:
     - junk_drawer.gemspec
-    - spec/**/*_spec.rb
+    - spec/**/*
 
 RSpec/ExampleLength:
   Enabled: false

data/.travis.yml

@@ -1,13 +1,21 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 addons:
   postgresql: '9.4'
-before_install: gem install bundler -v 1.13.6
+before_install: gem install bundler -v 2.0.2
 before_script:
   - createdb junk_drawer_test -U postgres
 script:
   - bundle exec rubocop
   - bundle exec rake
   - bundle exec rake build
+gemfile:
+  - Gemfile
+  - gemfiles/rails_5.0.gems
+  - gemfiles/rails_4.2.gems

data/Gemfile

@@ -3,3 +3,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'activerecord', '~> 5.1.0'
+gem 'activesupport', '~> 5.1.0'
+gem 'hstore_accessor', '~> 1.1.1'
+gem 'jsonb_accessor', '~> 1.0.0'

data/README.md

@@ -211,7 +211,8 @@ database.
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run
-`rake spec` to run the tests. You can also run `bin/console` for an interactive
+`rake spec` to run the tests, or `bin/test` to run tests for all supported
+ActiveRecord versions. You can also run `bin/console` for an interactive
 prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To
@@ -219,10 +220,17 @@ release a new version, update the version number in `version.rb`, and then run
 `bundle exec rake release`, which will create a git tag for the version, push
 git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+In order to run tests against different Rails versions, you can use
+`BUNDLE_GEMFILE`:
+
+```sh
+$ BUNDLE_GEMFILE=gemfiles/rails_4.2.gems rake spec
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/mockdeep/junk_drawer. This project is intended to be a
+https://github.com/thread-pond/junk_drawer. This project is intended to be a
 safe, welcoming space for collaboration, and contributors are expected to
 adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 

data/bin/setup

@@ -3,6 +3,9 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
+createuser -s -r postgres
+createdb junk_drawer_test -U postgres
+
 bundle install
 
 # Do any other automated setup that you need to do here

data/bin/test

@@ -0,0 +1,3 @@
+(export BUNDLE_GEMFILE=Gemfile; bundle && bundle exec rake)
+(export BUNDLE_GEMFILE=gemfiles/rails_5.0.gems; bundle && bundle exec rake spec)
+(export BUNDLE_GEMFILE=gemfiles/rails_4.2.gems; bundle && bundle exec rake spec)

data/gemfiles/rails_4.2.gems

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 4.2.0'
+gem 'activesupport', '~> 4.2.0'
+gem 'hstore_accessor', '~> 1.1.1'
+gem 'jsonb_accessor', '~> 0.3.3'

data/gemfiles/rails_5.0.gems

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'
+gem 'hstore_accessor', '~> 1.1.1'
+gem 'jsonb_accessor', '~> 1.0.0'

data/junk_drawer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['lobatifricha@gmail.com']
 
   spec.summary       = 'random useful Ruby utilities'
-  spec.homepage      = 'https://github.com/mockdeep/junk_drawer'
+  spec.homepage      = 'https://github.com/thread-pond/junk_drawer'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -21,14 +21,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_development_dependency 'activerecord', '~> 4.2'
-  spec.add_development_dependency 'activesupport', '~> 4.2'
-  spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'guard', '~> 2.14'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'guard-rubocop', '~> 1.2'
   spec.add_development_dependency 'pg', '~> 0.20'
   spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-byebug', '~> 3.6.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.48.1'

data/lib/junk_drawer/callable.rb

@@ -19,8 +19,8 @@ module JunkDrawer
     # an instance. It also causes an error to be raised if a public instance
     # method is defined with a name other than `call`
     module ClassMethods
-      def call(*args)
-        new.(*args)
+      def call(*args, **kwargs, &block)
+        new.(*args, **kwargs, &block)
       end
 
       def to_proc

data/lib/junk_drawer/rails/bulk_updatable.rb

@@ -7,34 +7,45 @@ require 'active_record/connection_adapters/postgresql_adapter'
 module JunkDrawer
   # module to allow bulk updates for `ActiveRecord` models
   module BulkUpdatable
-    ATTRIBUTE_TYPE_TO_POSTGRES_CAST = {
-      datetime: '::timestamp',
-      hstore: '::hstore',
-      boolean: '::boolean',
-      jsonb: '::jsonb',
-    }.freeze
-
-    POSTGRES_VALUE_CASTERS = {
-      hstore: ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Hstore.new,
-      jsonb: ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Jsonb.new,
-    }.freeze
-
     def bulk_update(objects)
       objects = objects.select(&:changed?)
       return unless objects.any?
 
-      changed_attributes = extract_changed_attributes(objects)
-      query = build_query_for(objects, changed_attributes)
+      unique_objects = uniquify_and_merge(objects)
+      changed_attributes = extract_changed_attributes(unique_objects)
+      query = build_query_for(unique_objects, changed_attributes)
       connection.execute(query)
+      objects.each(&:clear_changes_information)
     end
 
   private
 
+    def uniquify_and_merge(objects)
+      grouped_objects = objects.group_by(&:id).values
+      grouped_objects.each do |group|
+        next if group.length == 1
+
+        attrs = group.each_with_object({}) do |object, changes|
+          object.changed.each do |changed_attribute|
+            changes[changed_attribute] = object[changed_attribute]
+          end
+        end
+        group.each { |object| object.attributes = attrs }
+      end
+      grouped_objects.map(&:first)
+    end
+
     def extract_changed_attributes(objects)
       now = Time.zone.now
       objects.each { |object| object.updated_at = now }
 
-      objects.flat_map(&:changed).uniq
+      changed_attributes = objects.flat_map(&:changed).uniq
+      if ::ActiveRecord::VERSION::MAJOR >= 5
+        column_names & changed_attributes
+      else
+        # to remove virtual columns from jsonb_accessor 0.3.3
+        columns.select(&:sql_type).map(&:name) & changed_attributes
+      end
     end
 
     def build_query_for(objects, attributes)
@@ -47,31 +58,37 @@ module JunkDrawer
         "#{quoted_column_name} = tmp_table.#{quoted_column_name}"
       end.join(', ')
 
-      <<-SQL
-        UPDATE #{table_name}
-        SET #{assignment_query}
-        FROM (VALUES #{object_values}) AS tmp_table(id, #{attributes.join(', ')})
-        WHERE #{table_name}.id = tmp_table.id
-      SQL
+      "UPDATE #{table_name} " \
+      "SET #{assignment_query} " \
+      "FROM (VALUES #{object_values}) " \
+      "AS tmp_table(id, #{attributes.join(', ')}) " \
+      "WHERE #{table_name}.id = tmp_table.id"
     end
 
     def sanitized_values(object, attributes)
-      postgres_types = attributes.map do |attribute|
-        attribute_type = columns_hash[attribute.to_s].type
-        "?#{ATTRIBUTE_TYPE_TO_POSTGRES_CAST[attribute_type]}"
-      end
-
       postgres_values = attributes.map do |attribute|
         value = object[attribute]
-        attribute_type = columns_hash[attribute.to_s].type
-        caster = POSTGRES_VALUE_CASTERS[attribute_type]
 
-        caster ? caster.type_cast_for_database(value) : value
+        # AR internal `columns_hash`
+        column = columns_hash[attribute.to_s]
+
+        # AR internal `type_for_attribute`
+        type = type_for_attribute(column.name)
+        type_cast = "::#{column.sql_type}"
+        type_cast = "#{type_cast}[]" if column.array
+
+        "#{connection.quote(serialized_value(type, value))}#{type_cast}"
       end
 
-      sanitize_sql_array(
-        ["(?, #{postgres_types.join(', ')})", object.id, *postgres_values],
-      )
+      "(#{[object.id, *postgres_values].join(', ')})"
+    end
+
+    def serialized_value(type, value)
+      if ::ActiveRecord::VERSION::MAJOR >= 5
+        type.serialize(value)
+      else
+        type.type_cast_for_database(value)
+      end
     end
   end
 end

data/lib/junk_drawer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JunkDrawer
-  VERSION = '1.3.0'
+  VERSION = '1.6.2'
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: junk_drawer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.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: guard
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +197,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/test
+- gemfiles/rails_4.2.gems
+- gemfiles/rails_5.0.gems
 - junk_drawer.gemspec
 - lib/junk_drawer.rb
 - lib/junk_drawer/callable.rb
@@ -235,7 +210,7 @@ files:
 - lib/junk_drawer/rails.rb
 - lib/junk_drawer/rails/bulk_updatable.rb
 - lib/junk_drawer/version.rb
-homepage: https://github.com/mockdeep/junk_drawer
+homepage: https://github.com/thread-pond/junk_drawer
 licenses:
 - MIT
 metadata: {}
@@ -254,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: random useful Ruby utilities