changey 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c069619a0b94fd4ff58b8a911a21a801e733ae8
-  data.tar.gz: 1be948578e766f84a8281c4941a8e03f2f36c95c
+SHA256:
+  metadata.gz: d8c78386d3b7a2e1892b475f22d0f52fefead80d3da22c3b8d5e91234d86eca0
+  data.tar.gz: 4c79d6dcd35446eb584eff3cc1a5a38a1be9aeff8bf9524742830d7a9463fb8c
 SHA512:
-  metadata.gz: 2694c30516924e1b32a4afcb724b245f5d49dfe33afb66b532e989b098d56c97f76e74059522779c0ebd0f494bd0b0f089177ec9d571ae1ae336ad128971abd8
-  data.tar.gz: 88cf3f20ed7fcbc4e7e8d6b5623e0cd0f5d86eee01ab2d4283e11700d322755855b88eae6cbc897357e282a5aaee6954c999a80c342fe3bcc16442296f4d33df
+  metadata.gz: 70bf8086506bba355f2ab7ff16fa9115c61b2bb04558621ba34d57e83dcb5fc29807dcfc3833a493289a74b051797799594ae8a701d5cce546a6bc22a616e662
+  data.tar.gz: 878d1ae30630fc98adb4dcf4b8451ee25e6607ad21238b0441b8f87a45f90b35372316002db4b11b738c817013dae92192ee9603507cd6e1d712ac379bcd775d

data/lib/changey.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'changey/railtie' if defined?(Rails)

data/lib/changey/block_dsl.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module Changey
   class BlockDSL
+
     def initialize(track)
       @track = track
     end
@@ -19,5 +22,6 @@ module Changey
     def after_commit(name = nil, &block)
       @track.after_commits << (block || name)
     end
+
   end
 end

data/lib/changey/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'changey/track'
 require 'changey/block_dsl'
 
@@ -13,6 +15,7 @@ module Changey
     end
 
     module ClassMethods
+
       def changey_tracks
         @changey_tracks ||= []
       end
@@ -22,11 +25,11 @@ module Changey
       end
 
       def when_attribute(attribute_name, options = {}, &block)
-        if self.changey_tracks.empty?
+        if changey_tracks.empty?
           include InstanceMethods
         end
 
-        unless options.has_key?(:changes_from) || options.has_key?(:changes_to)
+        unless options.key?(:changes_from) || options.key?(:changes_to)
           raise MissingChangeValue, "Attribute #{attribute_name} must specify a 'changes_to' or a 'changes_from' value"
         end
 
@@ -35,17 +38,18 @@ module Changey
         end
 
         track = Track.new(attribute_name)
-        track.direction = options.has_key?(:changes_from) ? :from : :to
-        track.expected_value = options.has_key?(:changes_from) ? options[:changes_from] : options[:changes_to]
+        track.direction = options.key?(:changes_from) ? :from : :to
+        track.expected_value = options.key?(:changes_from) ? options[:changes_from] : options[:changes_to]
 
-        if options.has_key?(:to) || options.has_key?(:from)
-          track.expected_other_value = options.has_key?(:to) ? options[:to] : options[:from]
+        if options.key?(:to) || options.key?(:from)
+          track.expected_other_value = options.key?(:to) ? options[:to] : options[:from]
         end
 
         BlockDSL.new(track).instance_eval(&block)
-        self.changey_tracks << track
+        changey_tracks << track
         track
       end
+
     end
 
     module InstanceMethods
@@ -58,30 +62,34 @@ module Changey
         base.after_commit       { run_changey_callbacks(:after_commit)  }
       end
 
-      private def set_changey_tracks
+      private
+
+      def set_changey_tracks
         @changey_tracks_to_run = self.class.changey_tracks.select { |t| t.run?(self) }.each_with_object({}) do |track, hash|
           hash[track] = [send("#{track.attribute}_was"), send(track.attribute)]
         end
       end
 
-      private def clear_changey_tracks
+      def clear_changey_tracks
         @changey_tracks_to_run = nil
       end
 
-      private def run_changey_callbacks(event)
-        if @changey_tracks_to_run
-          @changey_tracks_to_run.each do |track, (was, now)|
-            callbacks = track.send(event.to_s.pluralize)
-            callbacks.each do |callback|
-              if callback.is_a?(Proc)
-                instance_exec(was, now, &callback)
-              elsif callback.is_a?(Symbol)
-                send(callback)
-              end
+      def run_changey_callbacks(event)
+        return unless @changey_tracks_to_run
+
+        @changey_tracks_to_run.each do |track, (was, now)|
+          callbacks = track.send(event.to_s.pluralize)
+          callbacks.each do |callback|
+            case callback
+            when Proc
+              instance_exec(was, now, &callback)
+            when Symbol
+              send(callback)
             end
           end
         end
       end
+
     end
 
   end

data/lib/changey/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Changey
   class Railtie < Rails::Railtie
 

data/lib/changey/track.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Changey
   class Track
 
@@ -31,25 +33,27 @@ module Changey
       previous_value = record.send("#{attribute}_was")
       current_value  = record.send(attribute)
 
-      if expected_other_value != Nothing
-        if direction == :from && matches?(previous_value, expected_value) && matches?(current_value, expected_other_value)
+      if expected_other_value == Nothing
+        if direction == :from && matches?(previous_value, expected_value)
           return true
         end
 
-        if direction == :to && matches?(current_value, expected_value) && matches?(previous_value, expected_other_value)
+        if direction == :to && matches?(current_value, expected_value)
           return true
         end
       else
-        if direction == :from && matches?(previous_value, expected_value)
+        if direction == :from && matches?(previous_value, expected_value) &&
+           matches?(current_value, expected_other_value)
           return true
         end
 
-        if direction == :to && matches?(current_value, expected_value)
+        if direction == :to && matches?(current_value, expected_value) &&
+           matches?(previous_value, expected_other_value)
           return true
         end
       end
 
-      return false
+      false
     end
 
     private
@@ -59,7 +63,7 @@ module Changey
       when Array
         expectation.include?(value)
       when Regexp
-        !!(expectation =~ value)
+        !(expectation =~ value).nil?
       when Proc
         expectation.call(value) == true
       when :anything

data/lib/changey/version.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module Changey
-  VERSION = '1.0.0'
+
+  VERSION = '1.1.0'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,21 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An Active Record extension to provide state callbacks
 email:
 - me@adamcooke.io
@@ -55,17 +69,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An Active Record extension to provide state callbacks
 test_files: []
-has_rdoc: