reorm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349b42b82a65b2182cbb0d4e22ead28a3009c8c4
-  data.tar.gz: 69773c3cf634e58f0bde246101027d01876ecfec
+  metadata.gz: 1918c9ecdd0e0a161e62b8587b254e1a9679b052
+  data.tar.gz: aeb3dd4474c0aee5e7fd42b681ab12941114fa31
 SHA512:
-  metadata.gz: 4c999d7600d72b61f1b1462a87ef3dd19a5a284c7c580a77f3c0fdb08a0121b87aa01250ae30e104813352c33d5a453deb7be664e496e7d6e6eb906244fc47a9
-  data.tar.gz: 3390fb660e114daa2287541d0f04335a80c0958703b8c75141dcf0289f91ac166483fd9afca6ea5a2bebae1a6901be773596dd7ddaa89dad8b8b80d5198cc4a5
+  metadata.gz: 1605bae7dc2d7fd475f8e042cc291da4b56a069291a84462bec879a772b2261088d270bae06431afd263689acc3900f92e887f7d59c49be44f08c006a31715a6
+  data.tar.gz: c3be7ca8d516f9da9c6450b34afabb6bbf9f8805c28872719a691835df6a4729bafeaf5c7a019c6ea6043313259ae793a7095ccd7a203d9f2007144aa6e5f171

data/lib/reorm/modules/event_modules.rb

@@ -8,8 +8,7 @@ module Reorm
     @@class_events = {}
   end
 
-  # A module that defines the class level methods for setting event handlers.
-  module EventHandler
+  module SpecifyEventHandlers
     include EventData
 
     def after_create(*methods)
@@ -45,13 +44,18 @@ module Reorm
     end
 
     def store_event_handlers(event, *methods)
-      if self.instance_of?(Class)
-        @@class_events[self] = {} if !@@class_events.include?(self)
-        @@class_events[self][event] = [] if !@@class_events[self].include?(event)
-        @@class_events[self][event] = @@class_events[self][event].concat(methods).uniq
-      else
-        self.class.store_event_handlers(event, *methods)
-      end
+      @@class_events[self] = {} if !@@class_events.include?(self)
+      @@class_events[self][event] = [] if !@@class_events[self].include?(event)
+      @@class_events[self][event] = @@class_events[self][event].concat(methods).uniq
+    end
+  end
+
+  # A module that defines the class level methods for setting event handlers.
+  module EventHandler
+    include EventData
+
+    def EventHandler.included(target)
+      target.extend(SpecifyEventHandlers)
     end
   end
 
@@ -69,7 +73,7 @@ module Reorm
             if handlers.include?(event)
               handlers[event].each do |handler|
                 if !object.respond_to?(handler)
-                  raise Error, "Unable to locate a method called '#{event}' for an instance of the #{object.class.name} class."
+                  raise Error, "Unable to locate a method called '#{handler}' for an instance of the #{object.class.name} class."
                 end
                 object.__send__(handler)
               end
@@ -78,5 +82,9 @@ module Reorm
         end
       end
     end
+
+    def EventSource.included(target)
+      target.extend(EventSource)
+    end
   end
 end

data/lib/reorm/version.rb

@@ -1,6 +1,6 @@
 module Reorm
   MAJOR_VERSION              = 0
   MINOR_VERSION              = 1
-  BUILD_VERSION              = 2
+  BUILD_VERSION              = 3
   VERSION                    = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{BUILD_VERSION}"
 end

data/spec/reorm/modules/event_source_spec.rb

@@ -3,8 +3,9 @@ require "spec_helper"
 class EventSourceTest
   include Reorm::EventHandler
   include Reorm::EventSource
-  extend Reorm::EventHandler
-  extend Reorm::EventSource
+
+  before_create :event_handler
+  before_validate :does_not_exist
 
   def initialize
     @count = 0
@@ -30,14 +31,6 @@ describe EventSourceTest do
   end
 
   describe "#fire_events()" do
-    describe "called at the instance level" do
-      it "calls methods assigned to events when those events are fired" do
-        subject.before_create :event_handler
-        subject.fire_events(events: [:before_create])
-        expect(subject.count).to eq(1)
-      end
-    end
-
     describe "called at the class level" do
       it "calls methods assigned to events when those events are fired" do
         EventSourceTest.before_create :event_handler
@@ -45,5 +38,11 @@ describe EventSourceTest do
         expect(subject.count).to eq(1)
       end
     end
+
+    it "raises an exception if an event that has been specified does not exist" do
+      expect {
+        subject.fire_events(target: subject, events: [:before_validate])
+      }.to raise_exception(Reorm::Error, "Unable to locate a method called 'does_not_exist' for an instance of the EventSourceTest class.")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reorm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Peter Wood