dallal 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef7931f202a80463bfca59f1e2d4a32b74cf7114
-  data.tar.gz: 8c243ab925cdab39f98c364b92994bd260244da5
+  metadata.gz: 332a7870ab01d845102d4439b7687269a55c6446
+  data.tar.gz: 2b564c24671a2badf45e3ede17d55aa6165270b9
 SHA512:
-  metadata.gz: 283eff9f49bacda0ce3a827515adc71c821b792b6bbd8a3e8c8a5264da389890feae70026fa9ad81f8335538ac59499fbf6b5be6e259bb5539ac6d5539804149
-  data.tar.gz: 4258db0fff6f2ba0a416cbd9cdaec87a7cc0cac597cc8e9f6de030e4258ba985fed2aa713d25e52970cb46ea13354a1518768d79a63d5b159642bfddfe4fc1db
+  metadata.gz: 8cf61158702241cc1c7c1f2a26d2cef32f4f9cbff7db2b5ae9f605424c744084fe46c97ed926ac1ceb92df70ab684a26c566c6b43a7f9d0e2fb91a50b8fb02a3
+  data.tar.gz: cb56f9645b9a346a5c41e676f29b81aa8d6d85c87f747b1544628f3cbd19206482d6f3c8d2f02c3d6ad39488c09029546bfe4babbc86e679845bb307104f7226

data/lib/dallal/events/event_subscriber.rb

@@ -14,7 +14,6 @@ module Dallal
 
       def execute
         if should_create_notifications?
-          # Trigger an ActiJob for this notification
           DallalJob.perform_later payload[:class], payload[:id], payload[:event].to_s
         end
       end

data/lib/dallal/notification.rb

@@ -11,19 +11,25 @@ module Dallal
       @notifiers = {}
     end
 
-    def notify target, &block
-      @target = Array(target).flatten.compact.uniq
+    # TODO Collection of targets is not supported
+    def notify *args, &block
+      notify_opts = args.extract_options!
+      return unless should_send?(notify_opts[:if])
+
+      @target = Array(args).flatten.compact.uniq
       instance_eval(&block)
     end
 
     def with *args, &block
       opts = args.extract_options!
+      # TODO Move if condition to notify method
       if should_send?(opts[:if])
         instance_eval(&block)
         args.each { |arg| @notifiers[arg] = get_notifier(arg) }
       end
     end
 
+    # TODO fix this. This is a quick and dirty patch for email
     def user
       @target.first
     end
@@ -43,6 +49,7 @@ module Dallal
       opts[:persist].present?
     end
 
+    # TODO Add support for multiple targets
     def dispatch!
       validate!
       @notifiers.each { |_, n| n.notify! }
@@ -70,7 +77,7 @@ module Dallal
       return true if condition.blank?
 
       if condition.is_a?(Proc)
-        _object.instance_exec(&condition)
+        instance_exec(&condition)
       else
         _object.send(condition)
       end

data/lib/dallal/version.rb

@@ -1,3 +1,7 @@
 module Dallal
-  VERSION = "0.0.1"
+  MAJOR = 0
+  MINOR = 1
+  PATCH = 1
+
+  VERSION = [MAJOR, MINOR, PATCH].compact.join(".")
 end

data/spec/dallal/events/observer_spec.rb

@@ -23,7 +23,7 @@ describe Dallal::Events::Observer do
       expect(subject.callbacks.size).to eq 0
       executed = false
 
-      subject.on :create, a: 1, b: 2 do
+      subject.on :create, {a: 2, b: 2} do
         executed = true
       end
 
@@ -31,9 +31,36 @@ describe Dallal::Events::Observer do
       expect(subject.callbacks.size).to eq 1
       callback = subject.callbacks[0]
       expect(callback[:on]).to eq([:create])
-      expect(callback[:opts]).to eq({a: 1, b: 2})
+      expect(callback[:opts]).to eq({a: 2, b: 2})
       expect(callback[:block]).to be_a(Proc)
     end
+    context 'multiple definitions' do
+      before { subject.instance_variable_set(:@__notification_callbacks, []) }
+      it 'append all definitions to callbacks' do
+        first_executed = false
+        second_executed = false
+        subject.on :create, a: 1 do
+          first_executed = true
+        end
+
+        subject.on :create, b: 2 do
+          second_executed = true
+        end
+
+        expect(first_executed).to be false
+        expect(second_executed).to be false
+        expect(subject.callbacks.size).to eq 2
+        first_callback = subject.callbacks.first
+        second_callback = subject.callbacks.last
+        expect(first_callback[:on]).to eq [:create]
+        expect(first_callback[:opts]).to eq a: 1
+        expect(first_callback[:block]).to be_a Proc
+
+        expect(second_callback[:on]).to eq [:create]
+        expect(second_callback[:opts]).to eq b: 2
+        expect(second_callback[:block]).to be_a Proc
+      end
+    end
   end
 
   describe '.create_notification' do
@@ -92,6 +119,28 @@ describe Dallal::Events::Observer do
           expect(notification.user).to eq @user 
         end
       end
+
+      context "mutliple events" do
+        before { subject.instance_variable_set(:@__notification_callbacks, []) }
+        it 'calls all events' do
+          first_executed = false
+          second_executed = false
+
+          subject.on :create, a: 1 do
+            first_executed = true
+          end
+
+          subject.on :create, b: 2 do
+            second_executed = true
+          end
+
+          notification = double('Dallal::Notification')
+          expect(Dallal::Notification).to receive(:new).with(event: :create, model_class: 'User', opts: { a: 1 }, _object: @user).and_return(notification)
+          expect(Dallal::Notification).to receive(:new).with(event: :create, model_class: 'User', opts: { b: 2 }, _object: @user).and_return(notification)
+          expect(notification).to receive(:dispatch!).exactly(2).times
+          subject.create_notification(id: @user.id, event: :create)
+        end
+      end
     end
 
     context 'when called with an event that is not defined' do

data/spec/dallal/notification_spec.rb

@@ -26,6 +26,7 @@ describe Dallal::Notification do
     subject do
       Dallal::Notification.new(event: :create, model_class: 'Post', opts: { a: 1 }, _object: @post)
     end
+
     it 'should get the target(s) and call the block' do
       executed = false
       subject.notify(@user) do
@@ -61,7 +62,41 @@ describe Dallal::Notification do
         expect(subject.instance_variable_get(:@target)).to eq([@user])
         expect(subject.instance_variable_get(:@notifiers)[:sms]).to be_a(Dallal::Notifiers::SmsNotifier)
       end
+
+      it 'evaluates correctly when an if lambda returns true' do
+        subject.define_singleton_method('post') do
+          @post
+        end
+        allow(subject).to receive(:post).and_return(@post)
+
+        subject.notify(@user, if: -> (){ post.id.present?} ) do
+          with :email do
+            template :an_email_template
+          end
+        end
+        expect(subject.instance_variable_get(:@template_name)).to eq :an_email_template
+        expect(subject.instance_variable_get(:@notifiers)[:email]).to be_a(Dallal::Notifiers::EmailNotifier)
+        expect(subject.instance_variable_get(:@target)).to eq([@user])
+      end
+
+      it 'does not call the block when if lambda evaluates to false' do
+        subject.define_singleton_method('post') do
+          @post
+        end
+        allow(subject).to receive(:post).and_return(@post)
+
+        subject.notify(@user, if: -> (){ post.id == -100} ) do
+          raise "BLock should not be executed"
+          with :email do
+            template :an_email_template
+          end
+        end
+        expect(subject.instance_variable_get(:@template_name)).to eq nil
+        expect(subject.instance_variable_get(:@notifiers)[:email]).to eq nil
+        expect(subject.instance_variable_get(:@target)).to eq nil
+      end
     end
+
     context "multiple notifiers" do
       it '' do
         subject.notify(@user) do
@@ -126,6 +161,17 @@ describe Dallal::Notification do
   end
 
   describe '#should_send?' do
+    subject do
+      Dallal::Notification.new(event: :create, model_class: 'Post', opts: { a: 1 }, _object: @post)
+    end
+    before do
+      subject.define_singleton_method('post') do
+        @post
+      end
+      allow(subject).to receive(:post).and_return(@post)
+    end
+
+
     it 'return true on blank values' do
       [nil, false, ''].each do |val|
         expect(subject.send(:should_send?, val)).to be true
@@ -140,12 +186,11 @@ describe Dallal::Notification do
     end
 
     it 'evaluates a proc to object instance' do
-      _proc = -> () { a_method }
+      _proc = ->(){ post.id.present? }
 
-      subject._object = double("SomeObject")
       result = double("Result")
 
-      expect(subject._object).to receive(:a_method).and_return(result)
+      expect(subject.post).to receive_message_chain(:id, :present?).and_return(result)
       expect(subject.send(:should_send?, _proc)).to eq result
     end
   end