mallet 0.0.1 → 0.0.2

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in invoicing.gemspec
+# Specify your gem's dependencies in mallet.gemspec
 gemspec
 
 group :development do

data/lib/generators/active_record/mallet_generator.rb

@@ -1,4 +1,4 @@
-module Invoicing
+module Mallet
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
@@ -6,7 +6,7 @@ module Invoicing
       source_root File.expand_path("../templates", __FILE__)
 
       desc <<-CONTENT
-        Copies the invoicing migration file to the migrations
+        Copies the mallet migration file to the migrations
         folder.
         
         Please run rake db:migrate once the installer is 
@@ -23,7 +23,7 @@ module Invoicing
       end
 
       def create_migration_file
-        migration_template 'migration.rb', 'db/migrate/create_invoicing_tables.rb'
+        migration_template 'migration.rb', 'db/migrate/create_mallet_tables.rb'
       end
     end
   end

data/lib/mallet/mail.rb

@@ -5,6 +5,11 @@ module Mallet
 
     belongs_to :malletable, polymorphic: true
 
+    scope :pending, where(workflow_state: 'pending')
+    scope :sent, where(workflow_state: 'sent')
+    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 :malletable
@@ -15,9 +20,10 @@ module Mallet
     workflow do
       state :pending do
         event :deliver, :transitions_to => :sent
+        event :error, :transitions_to => :failed
       end
 
-      state :error
+      state :failed
       state :sent
     end
 
@@ -32,6 +38,11 @@ module Mallet
     def deliver
       mailer_class.constantize.send mailer_method.to_sym, malletable
     end
+
+    def self.deliver_all!
+      pending.each(&:delayed_delivery)
+    end
+
   end
 
 end

data/lib/mallet/version.rb

@@ -1,3 +1,3 @@
 module Mallet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/mallet/mail_spec.rb

@@ -2,18 +2,20 @@ require 'spec_helper'
 
 describe Mallet::Mail do
 
+  before(:each) do
+    @job = Delayed::Job.create!
+  end
+
   context "on creation" do
 
     before(:each) do
-      job = Delayed::Job.create!
+      job = @job
 
       @mail = Mallet::mail do
         to job
         mailer ActionMailer::Base.name
         method 'welcome'
       end
-
-      @job = job
     end
 
     it "should default to a pending state" do
@@ -40,7 +42,7 @@ describe Mallet::Mail do
   context "on delivery" do
 
     before(:each) do
-      job = Delayed::Job.create!
+      job = @job
       
       @mail = Mallet::mail do
         to job
@@ -60,4 +62,57 @@ describe Mallet::Mail do
 
   end
 
+  context "filtering mails" do
+
+    it "should filter by pending" do
+      job = @job
+
+      expect {
+        Mallet::mail do
+          to job
+          mailer ActionMailer::Base.name
+          method 'welcome'
+        end
+      }.to change{ Mallet::Mail.pending.count }.by(1)
+    end
+
+    it "should filter by sent" do
+      job = @job
+
+      mail = Mallet::mail do
+        to job
+        mailer ActionMailer::Base.name
+        method 'welcome'
+      end
+
+      expect {mail.error!}.to change{ Mallet::Mail.failed.count }.by(1)
+    end
+
+    it "should filter by failed" do
+      job = @job
+
+      mail = Mallet::mail do
+        to job
+        mailer ActionMailer::Base.name
+        method 'welcome'
+      end
+
+      mail.should_receive(:deliver)
+      expect {mail.deliver!}.to change{ Mallet::Mail.sent.count }.by(1)
+    end
+
+    it "should filter by malletable item" do
+      job = @job
+
+      expect{
+        mail = Mallet::mail do
+          to job
+          mailer ActionMailer::Base.name
+          method 'welcome'
+        end
+      }.to change{ Mallet::Mail.for(job).count }.by(1)
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mallet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -138,7 +138,6 @@ files:
 - README.md
 - Rakefile
 - config.ru
-- lib/generators/active_record/invoicing_generator.rb
 - lib/generators/active_record/mallet_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/mallet.rb

data/lib/generators/active_record/invoicing_generator.rb

@@ -1,30 +0,0 @@
-module Mallet
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-      
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc <<-CONTENT
-        Copies the mallet migration file to the migrations
-        folder.
-        
-        Please run rake db:migrate once the installer is 
-        complete.
-
-  CONTENT
-
-      def self.next_migration_number(dirname) #:nodoc:
-        if ActiveRecord::Base.timestamped_migrations
-          Time.now.utc.strftime("%Y%m%d%H%M%S")
-        else
-          "%.3d" % (current_migration_number(dirname) + 1)
-        end
-      end
-
-      def create_migration_file
-        migration_template 'migration.rb', 'db/migrate/create_mallet_tables.rb'
-      end
-    end
-  end
-end