changey 0.0.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8760b67cbf8d8eec056fd80ead4b86c2133f31b4
-  data.tar.gz: 1d2fc324b094b89e5d9863056a9434347f864922
+  metadata.gz: 1c069619a0b94fd4ff58b8a911a21a801e733ae8
+  data.tar.gz: 1be948578e766f84a8281c4941a8e03f2f36c95c
 SHA512:
-  metadata.gz: 929f25e36a6ac959fc940a4f7d25d1141086aafbfd016e77939f1254e8d84cba9ec3f3e83241ceef860a9bd2c7253e1a6cbac9d44315f2ce695a347e6022a89b
-  data.tar.gz: 16e86288fd1a978e8675f22aca134b14e47d67743909f14bac1a4bba9772a4e5d584a8b3c831a75c4a9c0faf5f6dc5b0eaa7da73ba64d5340b257d3710bcfb33
+  metadata.gz: 2694c30516924e1b32a4afcb724b245f5d49dfe33afb66b532e989b098d56c97f76e74059522779c0ebd0f494bd0b0f089177ec9d571ae1ae336ad128971abd8
+  data.tar.gz: 88cf3f20ed7fcbc4e7e8d6b5623e0cd0f5d86eee01ab2d4283e11700d322755855b88eae6cbc897357e282a5aaee6954c999a80c342fe3bcc16442296f4d33df

data/lib/changey.rb

@@ -0,0 +1 @@
+require 'changey/railtie' if defined?(Rails)

data/lib/changey/dsl.rb

@@ -10,7 +10,6 @@ module Changey
 
     def self.load(load_into)
       load_into.extend ClassMethods
-      load_into.send :include, InstanceMethods
     end
 
     module ClassMethods
@@ -18,7 +17,15 @@ module Changey
         @changey_tracks ||= []
       end
 
+      def reset_changey!
+        @changey_tracks = nil
+      end
+
       def when_attribute(attribute_name, options = {}, &block)
+        if self.changey_tracks.empty?
+          include InstanceMethods
+        end
+
         unless options.has_key?(:changes_from) || options.has_key?(:changes_to)
           raise MissingChangeValue, "Attribute #{attribute_name} must specify a 'changes_to' or a 'changes_from' value"
         end
@@ -57,14 +64,20 @@ module Changey
         end
       end
 
+      private def clear_changey_tracks
+        @changey_tracks_to_run = nil
+      end
+
       private def run_changey_callbacks(event)
-        @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)
+        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
             end
           end
         end

data/lib/changey/track.rb

@@ -14,9 +14,11 @@ module Changey
     attr_accessor :after_saves
     attr_accessor :after_commits
 
-    def initialize(attribute)
+    def initialize(attribute, direction = nil, expected_value = nil, expected_other_value = Nothing)
       @attribute = attribute
-      @expected_other_value = Nothing
+      @direction = direction
+      @expected_value = expected_value
+      @expected_other_value = expected_other_value
       @validates = []
       @before_saves = []
       @after_saves = []
@@ -30,19 +32,19 @@ module Changey
       current_value  = record.send(attribute)
 
       if expected_other_value != Nothing
-        if direction == :from && previous_value == expected_value && current_value == expected_other_value
+        if direction == :from && matches?(previous_value, expected_value) && matches?(current_value, expected_other_value)
           return true
         end
 
-        if direction == :to && current_value == expected_value && previous_value == expected_other_value
+        if direction == :to && matches?(current_value, expected_value) && matches?(previous_value, expected_other_value)
           return true
         end
       else
-        if direction == :from && previous_value == expected_value
+        if direction == :from && matches?(previous_value, expected_value)
           return true
         end
 
-        if direction == :to && current_value == expected_value
+        if direction == :to && matches?(current_value, expected_value)
           return true
         end
       end
@@ -50,5 +52,22 @@ module Changey
       return false
     end
 
+    private
+
+    def matches?(value, expectation)
+      case expectation
+      when Array
+        expectation.include?(value)
+      when Regexp
+        !!(expectation =~ value)
+      when Proc
+        expectation.call(value) == true
+      when :anything
+        true
+      else
+        value == expectation
+      end
+    end
+
   end
 end

data/lib/changey/version.rb

@@ -1,3 +1,3 @@
 module Changey
-  VERSION = '0.0.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changey
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord