mallet 0.0.5 → 0.0.6

data/lib/generators/active_record/templates/migration.rb

@@ -2,8 +2,7 @@ class CreateMalletTables < ActiveRecord::Migration
   def self.change
 
     create_table "mallet_mails", :force => true do |t|
-      t.string "mailer_class"
-      t.string "mailer_method"
+      t.string "definition"
       t.string "malletable_type"
       t.string "malletable_id"
       t.string   "workflow_state"

data/lib/mallet/mail.rb

@@ -12,8 +12,7 @@ module Mallet
     scope :failed, where(workflow_state: 'failed')
     scope :for, lambda {|malletable| where(malletable_type: malletable.class.name, malletable_id: malletable.id)}
 
-    validates_presence_of :mailer_class
-    validates_presence_of :mailer_method
+    validates_presence_of :definition
     validates_presence_of :malletable
 
     before_save :validate
@@ -34,6 +33,7 @@ module Mallet
     end
 
     def validate
+      raise Exception unless DEFINITIONS.has_key?(definition)
       raise Exception unless mailer_class.constantize.ancestors.include? ActionMailer::Base
     end
 
@@ -42,6 +42,7 @@ module Mallet
     end
 
     def deliver
+      validate
       mailer_class.constantize.send mailer_method.to_sym, malletable
     end
 
@@ -49,6 +50,16 @@ module Mallet
       pending.each(&:delayed_delivery)
     end
 
+    protected
+
+    def mailer_class
+      DEFINITIONS[definition]['mailer']
+    end
+
+    def mailer_method
+      DEFINITIONS[definition]['method']
+    end
+
   end
 
 end

data/lib/mallet/mail_generation.rb

@@ -13,25 +13,13 @@ module Mallet
       mail.malletable_id = malletable.id
     end
 
-    def mailer(mailer)
-      mail.mailer_class = mailer
-    end
-
-    def method(method)
-      mail.mailer_method = method
+    def definition(name)
+      mail.definition = name
     end
 
     def persist!
       mail.save!
     end
-
-    def definition(name)
-      (DEFINITIONS[name] || {}).each do |key, value|
-        if respond_to?(key.to_sym)
-          send key.to_sym, value
-        end
-      end
-    end
     
   end
 

data/lib/mallet/version.rb

@@ -1,3 +1,3 @@
 module Mallet
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/internal/db/schema.rb

@@ -1,8 +1,7 @@
 ActiveRecord::Schema.define do
   
   create_table "mallet_mails", :force => true do |t|
-    t.string "mailer_class"
-    t.string "mailer_method"
+    t.string "definition"
     t.string "malletable_type"
     t.string "malletable_id"
     t.string "workflow_state"

data/spec/lib/mallet/mail_spec.rb

@@ -4,6 +4,11 @@ describe Mallet::Mail do
 
   before(:each) do
     @job = Delayed::Job.create!
+
+    Mallet::DEFINITIONS['welcome'] = {
+      'mailer' => 'ActionMailer::Base',
+      'method' => 'welcome'
+    }
   end
 
   context "on creation" do
@@ -13,8 +18,7 @@ describe Mallet::Mail do
 
       @mail = Mallet::mail do
         to job
-        mailer ActionMailer::Base.name
-        method 'welcome'
+        definition 'welcome'
       end
     end
 
@@ -26,6 +30,14 @@ describe Mallet::Mail do
       @mail.malletable.should == @job
     end
 
+    it "should identify the mailer class" do
+      @mail.send(:mailer_class).should == "ActionMailer::Base"
+    end
+
+    it "should identify the mailer method" do
+      @mail.send(:mailer_method).should == "welcome"
+    end
+
     it "should trigger sending the mail via delayed job" do
       Delayed::Job.count.should == 2
       ActionMailer::Base.should_receive(:welcome).with(@job)
@@ -33,29 +45,13 @@ describe Mallet::Mail do
     end
 
     it "should raise an exception if the mailer does not inherit from ActionMailer" do
-      @mail.mailer_class = String.name
-      expect { @mail.save! }.to raise_error
-    end
-
-  end
-
-  context "creating a mallet mail" do
-
-    it "should allow a definition to be specified" do
-      Mallet::DEFINITIONS['audit'] = {
-        'mailer' => 'ActionMailer::Base',
+      Mallet::DEFINITIONS['bad_definition'] = {
+        'mailer' => 'ActionMailer::Base2',
         'method' => 'welcome'
       }
 
-      job = @job
-
-      @mail = Mallet::mail do
-        to job
-        definition 'audit'
-      end
-
-      @mail.mailer_class.should == 'ActionMailer::Base'
-      @mail.mailer_method.should == 'welcome'
+      @mail.definition = 'bad_definition'
+      expect { @mail.save! }.to raise_error
     end
 
   end
@@ -67,8 +63,7 @@ describe Mallet::Mail do
       
       @mail = Mallet::mail do
         to job
-        mailer ActionMailer::Base.name
-        method 'welcome'
+        definition 'welcome'
       end
 
       @job = job
@@ -91,8 +86,7 @@ describe Mallet::Mail do
       expect {
         Mallet::mail do
           to job
-          mailer ActionMailer::Base.name
-          method 'welcome'
+          definition 'welcome'
         end
       }.to change{ Mallet::Mail.pending.count }.by(1)
     end
@@ -102,8 +96,7 @@ describe Mallet::Mail do
 
       mail = Mallet::mail do
         to job
-        mailer ActionMailer::Base.name
-        method 'welcome'
+        definition 'welcome'
       end
 
       expect {mail.error!}.to change{ Mallet::Mail.failed.count }.by(1)
@@ -114,8 +107,7 @@ describe Mallet::Mail do
 
       mail = Mallet::mail do
         to job
-        mailer ActionMailer::Base.name
-        method 'welcome'
+        definition 'welcome'
       end
 
       mail.should_receive(:deliver)
@@ -128,8 +120,7 @@ describe Mallet::Mail do
       expect{
         mail = Mallet::mail do
           to job
-          mailer ActionMailer::Base.name
-          method 'welcome'
+          definition 'welcome'
         end
       }.to change{ Mallet::Mail.for(job).count }.by(1)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mallet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: