mallet 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a22a894d34fabb23ea057f9e9afc63c9f77c7d
-  data.tar.gz: 6512395df890e8a236f40ba7cc25cb21995824cc
+  metadata.gz: dbbc94de710c39031154385d6c93856ebae55bbb
+  data.tar.gz: bbc00fa3852f38b3ca0868d65e3bdac2ec1449e9
 SHA512:
-  metadata.gz: 03f2eff8d3ff75351c02f3df1e712cb9046182b009dd4a6408c3dd4a5d9e439c58c6603495adaa100dcd2b31e04d4a9594de225dfcdc5c9594ee4bdcea8d481e
-  data.tar.gz: 9df4378a0384dd88febcaa1f04e6a4e2f4a61c093f3190e4fd302a516e469a0b1d98d652df02a19470552f846f1d39ac337c98e5d7ab37dd7e7750eabc9b33d4
+  metadata.gz: 6447dd374d7820ab52e7c34315029787fb865d7a3a042d92cad67ba987f5449ee3356677dc9c83a1ef80d38e0af35384a79b30ce7548da81cb8c4a61e57292b6
+  data.tar.gz: 50fd75a9c9085c5b75acce8605a4e64f3889f0495adcc83d2d7935425527e10dfccf05a8c82eea89cc7e9dd5e7d91491ae5f39525dbc8bc7a1702e5edc80e9be

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@mallet --create
+rvm use 2.1.2@mallet --create

data/Gemfile

@@ -7,9 +7,7 @@ group :development do
   gem 'rspec'
   gem 'rspec-rails'
   gem 'sqlite3'
-  gem 'database_cleaner', '>= 0.9.1'
 end
 
-group :test do
-  gem 'database_cleaner', '>= 0.9.1'
-end
+gem 'database_cleaner', '>= 0.9.1', group: [:development, :test]
+

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    mallet (0.1.6)
+    mallet (0.1.7)
       actionmailer
       activerecord
       activesupport
-      delayed_job_active_record
       i18n
       workflow
 
@@ -45,11 +44,6 @@ GEM
       rails (>= 3.0.0)
       thor (>= 0.14.6)
     database_cleaner (0.9.1)
-    delayed_job (4.0.2)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
-      activerecord (>= 3.0, < 4.2)
-      delayed_job (>= 3.0, < 4.1)
     diff-lcs (1.2.1)
     erubis (2.7.0)
     hike (1.2.1)
@@ -115,7 +109,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    workflow (1.1.0)
+    workflow (1.2.0)
 
 PLATFORMS
   ruby
@@ -127,3 +121,6 @@ DEPENDENCIES
   rspec
   rspec-rails
   sqlite3
+
+BUNDLED WITH
+   1.10.3

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

@@ -16,22 +16,6 @@ class CreateMalletTables < ActiveRecord::Migration
     add_index "mallet_mails", ["definition"], :name => "index_mallet_mails_on_definition"
     add_index "mallet_mails", ["malletable_type", "malletable_id"], :name => "index_mallet_mails_on_malletable_type_and_malletable_id"
     add_index "mallet_mails", ["send_date"], :name => "index_mallet_mails_on_send_date"
-
-    create_table "delayed_jobs", :force => true do |t|
-      t.integer  "priority",   :default => 0
-      t.integer  "attempts",   :default => 0
-      t.text     "handler"
-      t.text     "last_error"
-      t.datetime "run_at"
-      t.datetime "locked_at"
-      t.datetime "failed_at"
-      t.string   "locked_by"
-      t.string   "queue"
-      t.datetime "created_at",                :null => false
-      t.datetime "updated_at",                :null => false
-    end
-
-    add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
  
   end
 

data/lib/mallet.rb

@@ -1,7 +1,6 @@
 require "active_record"
 require "action_mailer"
 require "workflow"
-require "delayed_job_active_record"
 require "mallet/version"
 
 module Mallet

data/lib/mallet/mail.rb

@@ -69,14 +69,6 @@ module Mallet
       Hooks.on_success(self)
     end
 
-    def delayed_delivery
-      delay(queue: 'mallet_mails').deliver!
-    end
-
-    def self.deliver_all!
-      with_pending_state.each(&:delayed_delivery)
-    end
-
   end
 
 end

data/lib/mallet/version.rb

@@ -1,3 +1,3 @@
 module Mallet
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/mallet.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency "actionmailer"
   s.add_dependency "i18n"
   s.add_dependency "workflow"
-  s.add_dependency "delayed_job_active_record"
   
   s.add_development_dependency 'combustion'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mallet
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Douglas Anderson
@@ -9,107 +9,93 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! ' Send and track mails asynchronously. '
+description: " Send and track mails asynchronously. "
 email:
 - i.am.douglas.anderson@gmail.com
 - tjegels@gmail.com
@@ -117,7 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .rvmrc
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -131,16 +117,6 @@ files:
 - lib/mallet/mail_generation.rb
 - lib/mallet/version.rb
 - mallet.gemspec
-- spec/README
-- spec/internal/config/database.yml
-- spec/internal/config/database.yml.sample
-- spec/internal/config/routes.rb
-- spec/internal/db/mallet_test.sqlite
-- spec/internal/db/schema.rb
-- spec/internal/log/.gitignore
-- spec/internal/public/favicon.ico
-- spec/lib/mallet/mail_spec.rb
-- spec/spec_helper.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -150,28 +126,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mallet
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A mail gem.
-test_files:
-- spec/README
-- spec/internal/config/database.yml
-- spec/internal/config/database.yml.sample
-- spec/internal/config/routes.rb
-- spec/internal/db/mallet_test.sqlite
-- spec/internal/db/schema.rb
-- spec/internal/log/.gitignore
-- spec/internal/public/favicon.ico
-- spec/lib/mallet/mail_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/internal/config/database.yml

@@ -1,3 +0,0 @@
-test:
-  adapter:  sqlite3
-  database: db/mallet_test.sqlite

data/spec/internal/config/database.yml.sample

@@ -1,3 +0,0 @@
-test:
-  adapter:  sqlite3
-  database: db/mallet_test.sqlite

data/spec/internal/config/routes.rb

@@ -1,3 +0,0 @@
-Rails.application.routes.draw do
-  #
-end

data/spec/internal/db/schema.rb

@@ -1,35 +0,0 @@
-ActiveRecord::Schema.define do
-  
-  create_table "mallet_mails", :force => true do |t|
-    t.string "definition"
-    t.string "malletable_type"
-    t.string "malletable_id"
-    t.string "workflow_state"
-    t.string "message_id"
-    t.text "data"
-    t.float "wait_time"
-    t.date "send_date"
-    t.timestamps
-  end
-
-  add_index "mallet_mails", ["definition"], :name => "index_mallet_mails_on_definition"
-  add_index "mallet_mails", ["malletable_type", "malletable_id"], :name => "index_mallet_mails_on_malletable_type_and_malletable_id"
-  add_index "mallet_mails", ["send_date"], :name => "index_mallet_mails_on_send_date"
-
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
-  
-end

data/spec/internal/log/.gitignore

@@ -1 +0,0 @@
-*.log

data/spec/lib/mallet/mail_spec.rb

@@ -1,101 +0,0 @@
-require 'spec_helper'
-
-describe Mallet::Mail do
-
-  before(:each) do
-    @job = Delayed::Job.create!
-
-    Mallet::DEFINITIONS['welcome'] = {
-      'mailer' => 'ActionMailer::Base',
-      'method' => 'welcome'
-    }
-  end
-
-  context "on creation" do
-
-    before(:each) do
-      @mail = Mallet::mail(for: @job, definition: 'welcome')
-    end
-
-    it "should default to a pending state" do
-      @mail.should be_pending
-    end
-
-    it "should record the malletable class" do
-      @mail.malletable.should == @job
-    end
-
-  end
-
-  context "on delivery" do
-
-    before(:each) do
-      @mail = Mallet::mail(for: @job, definition: 'welcome')
-    end
-
-    it "should mark the mail as sent" do
-      @mail.deliver!
-      @mail.should be_sent
-    end
-
-  end
-
-  context "hooks" do
-
-    it "should call a hook on creation" do
-      Mallet::Hooks.should_receive(:on_create).once
-
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-    end
-
-    it "should call a hook when delivering" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      Mallet::Hooks.should_receive(:on_deliver).with(mail).once
-      mail.deliver!
-    end
-
-    it "should call a hook on error" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      Mallet::Hooks.should_receive(:on_error).with(mail).once
-      mail.error!
-    end
-
-    it "should call a hook when delivered successfully" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      mail.update_column(:workflow_state, 'sent')
-      Mallet::Hooks.should_receive(:on_success).with(mail).once
-      mail.success!
-    end
-
-    it "should call a hook when bounced" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      mail.update_column(:workflow_state, 'sent')
-      Mallet::Hooks.should_receive(:on_bounce).with(mail).once
-      mail.bounce!
-    end
-
-  end
-
-  context "filtering mails" do
-
-    it "should filter by pending" do
-      expect { Mallet::mail(for: @job, definition: 'welcome') }.to change{ Mallet::Mail.with_pending_state.count }.by(1)
-    end
-
-    it "should filter by sent" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      expect {mail.deliver!}.to change{ Mallet::Mail.with_sent_state.count }.by(1)
-    end
-
-    it "should filter by failed" do
-      mail = Mallet::mail(for: @job, definition: 'welcome')
-      expect {mail.error!}.to change{ Mallet::Mail.with_failed_state.count }.by(1)
-    end
-
-    it "should filter by malletable item" do
-      expect{ Mallet::mail(for: @job, definition: 'welcome') }.to change{ Mallet::Mail.for(@job).count }.by(1)
-    end
-
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,31 +0,0 @@
-
-require 'rubygems'
-require 'bundler'
-
-Bundler.require :default, :development
-
-Combustion.initialize! :active_record
-
-require 'rspec/rails'
-
-RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-  config.color_enabled = true
-  config.formatter = :documentation # :progress, :html, :textmate
-  #config.include FactoryGirl::Syntax::Methods
-
-  # config.before(:suite) do
-  #   DatabaseCleaner.strategy = :transaction
-  #   DatabaseCleaner.clean_with(:truncation)
-  # end
-
-  # config.before(:each) do
-  #   DatabaseCleaner.start
-  # end
-
-  # config.after(:each) do
-  #   DatabaseCleaner.clean
-  # end
-end
-
-#FactoryGirl.find_definitions