junk_drawer 1.4.0 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 238eb68d411dc0c6089296530a43a2465975d417
-  data.tar.gz: 655fec097bfbdf9aa9ad42d1b3ebb95b96f5e6de
+SHA256:
+  metadata.gz: c19a96b9707d53151fb3edf626ce443ad60cb4503ac75b108bd46eb6d7694f54
+  data.tar.gz: a4e87efeacae9353c7784dbad2a47294292b088c39fb50f5ad387dec2a8dcaa9
 SHA512:
-  metadata.gz: 97e29c483b957b9de82874825ec57a185f4b44ec4bfb00db45cdc7666fba99bc1466a0cbec786428efcbeec02843919373e1fd5177bfb4413b9e4b8b7fb5069b
-  data.tar.gz: 361c72c75c5263153d8ca6b0bcdd1fcc0cc2a158710492ba30de723f4ef1bfdc866a9745d7ab712f78a47b7769a5a7bc4297ed068a67213a3bc3f7a792582331
+  metadata.gz: 19a935285fd80b81d4d7c432f1775196032f766bdc78df61967b504d433566be1a36e04992c6266466fc5c480ff69aaef4edf21705ef48e6d9fbd4d9cfa0fffa
+  data.tar.gz: 2ad821ea7cc213f62c55bd07e96394fe1ea3618684bc13dea806cf83bb94cae883dc8bc392dd988e6ee1f6d80dfdf8e91459fb1907a58666ebca919fe50daa75

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,10 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
+  - 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:

data/Gemfile

@@ -6,3 +6,5 @@ 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

@@ -220,6 +220,13 @@ 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

data/gemfiles/rails_4.2.gems

@@ -6,3 +6,5 @@ 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

@@ -6,3 +6,5 @@ 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

@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_runtime_dependency 'ruby2_keywords', '~> 0.0.2'
   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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'ruby2_keywords'
+
 module JunkDrawer
   # error to be thrown by Callable
   class CallableError < StandardError
@@ -19,8 +21,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)
+      ruby2_keywords def call(*args, &block)
+        new.(*args, &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,38 +58,36 @@ 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 ? serialized_value(caster, 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(caster, value)
+    def serialized_value(type, value)
       if ::ActiveRecord::VERSION::MAJOR >= 5
-        caster.serialize(value)
+        type.serialize(value)
       else
-        caster.type_cast_for_database(value)
+        type.type_cast_for_database(value)
       end
     end
   end

data/lib/junk_drawer/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: junk_drawer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.3
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
+        version: 0.0.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,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
@@ -229,8 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: random useful Ruby utilities