junk_drawer 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ccbaed0545acce12327a2220ffd61a1f2c89a88
-  data.tar.gz: bb229cb6b5d34628b6122a1476bb854afd474726
+SHA256:
+  metadata.gz: 41bdf84aed0cada468a2754eaeb98650346f35789f2ffaae69b2b79026abe720
+  data.tar.gz: 7e8394ce972f2eeb72d2c28ba5966a67da30f1561575595d329d8533781a3c46
 SHA512:
-  metadata.gz: dc88c0d245fe98b677b94b172968605fa4bec3070fb889e226ce2eb92b848cc24fba1c59bbe92ec99a834c66498f5642b69681a4f34ade042c0db3c6c716a287
-  data.tar.gz: 1743c1dc5149e743d231ff3aa0708ef1cfdc52b19b78f094ed03eaa2e5dbbb8a57cb2cf7def040918e47f766ff5d63898d60bd9103be6eb7062ca1adacec95cc
+  metadata.gz: 55ae0cc6d20c582a88be1cd28d92bb2942ffc44d671aabff3cc4d6c6dbd3c1ee61d5232f2e86d6cfa44422d98c8daf86563c097db6ef078261d584a80c389c9a
+  data.tar.gz: 07d25dce3efde1f44f6d41382453d2e3b1d9f7c2cf7d5658006acd6bf21ecfe4c62237e64a3a324094d1bf17ea6ca7a023395ae09da531a07830fa7538941308

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+vendor/

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/README.md

@@ -27,9 +27,18 @@ gem 'junk_drawer', require: 'junk_drawer/rails'
 
 ### Contents
 
-- [JunkDrawer::Callable](#junkdrawercallable)
-- [JunkDrawer::Notifier](#junkdrawernotifier)
-- [JunkDrawer::BulkUpdatable](#junkdrawerbulkupdatable)
+- [JunkDrawer](#junkdrawer)
+  - [Installation](#installation)
+    - [Contents](#contents)
+  - [Usage](#usage)
+    - [JunkDrawer::Callable](#junkdrawercallable)
+    - [JunkDrawer::Notifier](#junkdrawernotifier)
+  - [Rails](#rails)
+    - [JunkDrawer::BulkUpdatable](#junkdrawerbulkupdatable)
+      - [Caveats](#caveats)
+  - [Development](#development)
+  - [Contributing](#contributing)
+  - [License](#license)
 
 ## Usage
 
@@ -129,6 +138,28 @@ your selected strategy. The strategies available are as follows:
 3) `:null` is a noop. If you want to disable notifications temporarily, you can
   configure the strategy to `:null`.
 
+4) To create your own custom notifier, configure `JunkDrawer::Notifier` with
+  a callable object as the strategy.
+
+```ruby
+class MyNotifier
+  include JunkDrawer::Callable
+
+  def call(*args)
+    SomeMonitoringService.notify(*args)
+  end
+end
+
+JunkDrawer::Notifier.strategy = MyNotifier
+```
+
+```ruby
+JunkDrawer::Notifier.strategy = ->(*args) {
+  MonitoringServiceA.notify(*args)
+  MonitoringServiceB.notify(*args)
+}
+```
+
 If you're using Rails, you may want to configure `Notifier` based on the
 environment, so in your `config/environments/development.rb` you might have:
 

data/junk_drawer.gemspec

@@ -21,7 +21,7 @@ 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'

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,7 +21,7 @@ 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, &block)
+      ruby2_keywords def call(*args, &block)
         new.(*args, &block)
       end
 

data/lib/junk_drawer/notifier.rb

@@ -12,7 +12,12 @@ module JunkDrawer
 
     class << self
 
-      attr_accessor :strategy
+      attr_reader :strategy
+
+      def strategy=(strategy)
+        @strategy =
+          strategy.is_a?(Symbol) ? STRATEGIES.fetch(strategy) : strategy
+      end
 
     end
 
@@ -23,13 +28,7 @@ module JunkDrawer
     }.freeze
 
     def call(*args)
-      strategy.(*args)
-    end
-
-  private
-
-    def strategy
-      STRATEGIES.fetch(self.class.strategy)
+      self.class.strategy.(*args)
     end
 
   end

data/lib/junk_drawer/rails/bulk_updatable.rb

@@ -11,13 +11,30 @@ module JunkDrawer
       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 }
@@ -41,12 +58,11 @@ module JunkDrawer
         "#{quoted_column_name} = tmp_table.#{quoted_column_name}"
       end.join(', ')
 
-      <<-SQL.squish
-        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)

data/lib/junk_drawer/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: junk_drawer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2020-10-13 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
@@ -243,8 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: random useful Ruby utilities