dallal 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 332a7870ab01d845102d4439b7687269a55c6446
-  data.tar.gz: 2b564c24671a2badf45e3ede17d55aa6165270b9
+  metadata.gz: 53e11c8daaf54da4d759d04172b5e2ba5fcc4d1d
+  data.tar.gz: 69bb8738060d5c68b1ddc1c888a25aeaa873cbb2
 SHA512:
-  metadata.gz: 8cf61158702241cc1c7c1f2a26d2cef32f4f9cbff7db2b5ae9f605424c744084fe46c97ed926ac1ceb92df70ab684a26c566c6b43a7f9d0e2fb91a50b8fb02a3
-  data.tar.gz: cb56f9645b9a346a5c41e676f29b81aa8d6d85c87f747b1544628f3cbd19206482d6f3c8d2f02c3d6ad39488c09029546bfe4babbc86e679845bb307104f7226
+  metadata.gz: 5a30fb2af03e8d7e81ce72b2cb7286a147b5191a3eeadbe26dfebf1ca83db9e52c477ecf58a4bce0b29edc773fbd0248f66b71420576168e88ba92d1455702a4
+  data.tar.gz: 7ae52241acef4c1e0af8c716499ac5899f3a9e534ad2222176c8ec85786b07fd12af54784c7a1073e2573a25c980a304479c35356e2b7a906fb9b724ab73ee16

data/app/mailers/dallal/mailer.rb

@@ -13,7 +13,7 @@ module Dallal
       {
         from: address_format(@notification.from_email, @notification.from_name),
         reply_to: address_format(@notification.from_email, @notification.from_name),
-        to: @notification.user.email,
+        to: @notification.target.email,
         cc: nil,
         subject: subject,
         template_name: "#{object_plural_name}/#{@notification.template_name}"

data/lib/dallal/notification.rb

@@ -1,59 +1,49 @@
+require 'dallal/notifications/email_notification'
+require 'dallal/notifications/sms_notification'
+
 module Dallal
   class Notification
     attr_accessor :event, :model_class, :opts, :_object
-    attr_reader :template_name
+    attr_reader :targets
+    attr_reader :notifiers
 
     def initialize args = {}
       args.each do |k, v|
         send("#{k}=", v)
       end
 
-      @notifiers = {}
+      @notifiers = []
     end
 
-    # 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
+      @targets = 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
-
-    # TODO !!! Watch out same payload for multiple notifers that
-    # require payload
-    def payload payload
-      @payload = payload
-    end
+      return unless should_send?(opts[:if])
 
-    # Same here as payload
-    def template template
-      @template_name = template
+      # create a notifier for each target
+      @targets.each do |target|
+        args.each do |name|
+          notifier = get_notifier(name, target, &block)
+          @notifiers << notifier
+        end
+      end
     end
 
     def persist?
       opts[:persist].present?
     end
 
-    # TODO Add support for multiple targets
     def dispatch!
       validate!
-      @notifiers.each { |_, n| n.notify! }
-      @notifiers.each { |_, n| n.persist! } if persist?
+      @notifiers.each { |n| n.notify! }
+      @notifiers.each { |n| n.persist! } if persist?
     end
 
     private
@@ -68,9 +58,10 @@ module Dallal
       end
     end
 
-    def get_notifier(name)
-      # TODO Pass concrete notifications to notifiers. Ex, EmailNotification, JsonPayloadNotification, SmsNotification ...
-      Dallal::Notifiers::Notifier.send(name, self)
+    def get_notifier(name, target, &block)
+      notification = "Dallal::Notifications::#{name.to_s.camelcase}Notification".constantize.new(self, target)
+      notification.instance_eval(&block)
+      notification.notifier
     end
 
     def should_send?(condition)

data/lib/dallal/notifications/base_notification.rb

@@ -0,0 +1,25 @@
+module Dallal
+  module Notifications
+    class BaseNotification
+      attr_reader :target
+
+      def initialize(notification, target)
+        @notification = notification
+        @target = target
+      end
+
+      def method_missing(name, *args, &block)
+        if @notification.respond_to?(name)
+          @notification.send(name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to?(method_name, include_private=true)
+        @notification.respond_to?(method_name) || super
+      end
+
+    end
+  end
+end

data/lib/dallal/notifications/email_notification.rb

@@ -0,0 +1,24 @@
+require 'dallal/notifications/base_notification'
+module Dallal
+  module Notifications
+    class EmailNotification < BaseNotification
+      attr_reader :from_name, :from_email
+      attr_reader :template_name
+
+      def initialize(notification, target)
+        super(notification, target)
+
+        @from_name = Dallal.configuration.from_name
+        @from_email = Dallal.configuration.from_email
+      end
+
+      def notifier
+        Dallal::Notifiers::EmailNotifier.new(self)
+      end
+
+      def template template
+        @template_name = template
+      end
+    end
+  end
+end

data/lib/dallal/notifications/sms_notification.rb

@@ -0,0 +1,16 @@
+require 'dallal/notifications/base_notification'
+module Dallal
+  module Notifications
+    class SmsNotification < BaseNotification
+      attr_reader :sms_payload
+ 
+      def payload payload
+        @sms_payload = payload
+      end
+
+      def notifier
+        Dallal::Notifiers::SmsNotifier.new(self)
+      end
+    end
+  end
+end

data/lib/dallal/notifiers/email_notifier.rb

@@ -2,8 +2,6 @@ module Dallal
   module Notifiers
     class EmailNotifier < Notifier
       def notify!
-        # TODO please pass a email notification instead
-        define_email_methods
         mailer.notify(notification).deliver_now
       end
 
@@ -12,14 +10,6 @@ module Dallal
 
       private
 
-      def define_email_methods
-        [:from_email, :from_name].each do |name|
-          notification.define_singleton_method(name) do
-            Dallal.configuration.send(name)
-          end
-        end
-      end
-
       def mailer
         Dallal::Mailer
       end

data/lib/dallal/notifiers/notifier.rb

@@ -10,14 +10,6 @@ module Dallal
         @notification = notification
       end
 
-      def self.email(notification)
-        Dallal::Notifiers::EmailNotifier.new(notification)
-      end
-  
-      def self.sms(notification)
-        Dallal::Notifiers::SmsNotifier.new(notification)
-      end
-
       def notify!(*args)
         Notifier.api_not_implemented(self)
       end

data/lib/dallal/notifiers/sms_notifier.rb

@@ -8,7 +8,6 @@ module Dallal
 
 
       def persist!
-
       end
     end
   end

data/lib/dallal/version.rb

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

data/spec/dallal/notification_spec.rb

@@ -33,11 +33,11 @@ describe Dallal::Notification do
         executed = true
       end
       expect(executed).to eq true
-      expect(subject.instance_variable_get(:@target)).to eq [@user]
+      expect(subject.targets).to eq [@user]
     end
 
     context 'notify with nested with block' do
-      it 'evaluates an email block correctly' do
+      it 'calls with block' do
         executed = false
         subject.notify(@user) do
           with :email do
@@ -46,9 +46,10 @@ describe Dallal::Notification do
           end
         end
         expect(executed).to be true
-        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])
+        notifier = subject.notifiers.first
+        expect(notifier).to be_a(Dallal::Notifiers::EmailNotifier)
+        expect(notifier.notification.template_name).to eq :an_email_template
+        expect(subject.targets).to eq([@user])
       end
 
       it 'evaluates correctly an sms block' do
@@ -57,13 +58,13 @@ describe Dallal::Notification do
             payload({ a:1, b: 2 })
           end
         end
-        expect(subject.instance_variable_get(:@template)).to eq nil
-        expect(subject.instance_variable_get(:@payload)).to eq({a: 1, b: 2})
-        expect(subject.instance_variable_get(:@target)).to eq([@user])
-        expect(subject.instance_variable_get(:@notifiers)[:sms]).to be_a(Dallal::Notifiers::SmsNotifier)
+        notifier = subject.notifiers.first
+        expect(notifier).to be_a(Dallal::Notifiers::SmsNotifier)
+        expect(notifier.notification.sms_payload).to eq({a: 1, b: 2})
+        expect(subject.targets).to eq([@user])
       end
 
-      it 'evaluates correctly when an if lambda returns true' do
+      it 'calls the block when an if lambda returns true' do
         subject.define_singleton_method('post') do
           @post
         end
@@ -74,9 +75,12 @@ describe Dallal::Notification 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])
+
+        expect(subject.notifiers.size).to eq 1
+        notifier = subject.notifiers.first
+        expect(notifier).to be_a Dallal::Notifiers::EmailNotifier
+        expect(notifier.notification.template_name).to eq :an_email_template
+        expect(subject.targets).to eq [@user]
       end
 
       it 'does not call the block when if lambda evaluates to false' do
@@ -88,17 +92,17 @@ describe Dallal::Notification do
         subject.notify(@user, if: -> (){ post.id == -100} ) do
           raise "BLock should not be executed"
           with :email do
+            raise "BLock should not be executed"
             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
+        expect(subject.notifiers).to be_empty
+        expect(subject.targets).to be nil
       end
     end
 
     context "multiple notifiers" do
-      it '' do
+      it 'fills properties correctly' do
         subject.notify(@user) do
           with :email do
             template :email_template
@@ -107,10 +111,14 @@ describe Dallal::Notification do
             payload a: 1, b: 2
           end
         end
-        expect(subject.instance_variable_get(:@notifiers)[:email]).to be_a(Dallal::Notifiers::EmailNotifier)
-        expect(subject.instance_variable_get(:@template_name)).to eq :email_template
-        expect(subject.instance_variable_get(:@payload)).to eq(a: 1, b: 2)
-        expect(subject.instance_variable_get(:@notifiers)[:sms]).to be_a(Dallal::Notifiers::SmsNotifier)
+        email_notifier = subject.notifiers.first
+        sms_notifier = subject.notifiers.last
+
+        expect(subject.notifiers.size).to eq 2
+        expect(email_notifier).to be_a(Dallal::Notifiers::EmailNotifier)
+        expect(email_notifier.notification.template_name).to eq :email_template
+        expect(sms_notifier).to be_a(Dallal::Notifiers::SmsNotifier)
+        expect(sms_notifier.notification.sms_payload).to eq(a: 1, b: 2)
       end
    end
   end
@@ -124,10 +132,9 @@ describe Dallal::Notification do
             template :a
           end
         end
-        expect(subject.instance_variable_get(:@notifiers)[:sms]).to be nil
-        expect(subject.instance_variable_get(:@notifiers)[:sms]).to be nil
-        expect(subject.instance_variable_get(:@notifiers)[:email]).to receive(:notify!)
-        expect(subject.instance_variable_get(:@notifiers)[:email]).to_not receive(:persist!)
+        expect(subject.notifiers.size).to eq 1
+        expect(subject.notifiers.first).to receive(:notify!)
+        expect(subject.notifiers.first).to_not receive(:persist!)
 
         subject.dispatch!
       end

data/spec/dallal/notifiers/notifier_spec.rb

@@ -5,20 +5,12 @@ describe Dallal::Notifiers::Notifier do
   subject { Dallal::Notifiers::Notifier.new(notification) }
   it { expect(subject).to be_a Dallal::AbstractInterface }
 
-  context '.sms' do
-    it 'return a sms notifier' do
-      result = Dallal::Notifiers::Notifier.sms(notification)
-      expect(result).to be_a(Dallal::Notifiers::SmsNotifier)
-      expect(result.notification).to eq notification
-    end
-  end
-  context '.email' do
-    it 'returns an email notifier' do
-      result = Dallal::Notifiers::Notifier.email(notification)
-      expect(result).to be_a(Dallal::Notifiers::EmailNotifier)
-      expect(result.notification).to eq notification
+  describe "#persist!" do
+    it 'should raise an error' do
+      expect{ subject.persist! }.to raise_error(Dallal::AbstractInterface::InterfaceNotImplementedError)
     end
   end
+
   describe "#notify" do
     it 'should raise an error' do
       expect{ subject.notify! }.to raise_error(Dallal::AbstractInterface::InterfaceNotImplementedError)

data/spec/dummy/app/views/dallal/mailer/posts/register.html.erb

@@ -1,5 +1,5 @@
 <h1>Register email</h1>
 This is a test data template fixture
 
-<%= @notification.user %>
+<%= @notification.target %>