mail_manager 0.1.4 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTM3MzI4NzE3MmUxZDQ2N2VmMDRmMTc3NDY4ODc4MjVkZjVmOTUwMg==
+    YmI2YWUyOThkMDMzMWU4MGY2YzY0YjM4YjFhMmExMDVjNzU3MmQzOA==
   data.tar.gz: !binary |-
-    ZTI0Yjg4NzgxNWVlMzc0ZWY3NWU2MjYwNTEyZGUwMzg5NjU3ZDdlMQ==
+    ZmMzMDA3OTNkZWYxY2EwM2UzMTlhNmE3ZjM0ZWZkNGYzMGM4NjExNw==
 SHA512:
   metadata.gz: !binary |-
-    NjUzYzcwYzQxMjI2ODdkOGRjNTlkYWQ5NjgyZGQwMThmNTlmN2M4MzAzZDdl
-    ZGJjY2M0MWY0ZDRkMjlhZjQ4ZTczN2I2OGYyMjY4NjFkNmViYWJhNjE1ZmU4
-    MmVlODRmYjEwZGY2YzZkZTA1Njc4ODBjYmI0OGQ0NmQ1YTgwMmQ=
+    MTRiYzdhMTk4ZWM5ZDYxMmM2MWYzZDg0NGFkYzZiMjg5N2JmNWFhOGJhNWU1
+    NzhhMmM2OTkwMjg1NTM3MzE4OGJkNjY4Y2YwMjRlMjFhMWE1NWY5YmY1ZjZk
+    ODE5NDJjZDA3NTFlNGRlNjJlNjY3NDI1NmE3NTY3YzI2ZDM3YWE=
   data.tar.gz: !binary |-
-    NjA4OWM0ZTU1YzFlZjg5NWY1ZDFiOGQxYWUwODQ4YjU2MzViZDljYmUxMDYz
-    YTM0ZjgwMDc0MDU0Y2RmYWJlOGExMjJkYTBlYzA5ZTJhN2I4MGU1YjE5OTgz
-    YzE1ZDlkOTBlZDVkNzg5MTMwYWVhZjVkZGE1YWUxYzBiZDUwY2U=
+    YWYyYjI3MWZkODRlNmMzMjFhMmU5OWIzMzAxZjY0NmZmZTZhM2FlYjE0NDll
+    MWQ2NWE1ODEzNjU3OWMxZjcyMjk2YmRmZDRjOWNmZGZlYjgxNzE0N2Q3MTc2
+    NmYxMTg2ODJhMWRiYWEyNTJlZjFiNzZkNWU4MDQ1YjkwZWNkMjY=

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 *.sqlite3
 log
 *.log
+spec/test_app/config/database.yml

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p547
+ruby-1.9.3-p551

data/Gemfile

@@ -6,18 +6,23 @@ gemspec
 
 # jquery-rails is used by the dummy application
 gem "jquery-rails"
-
-# Testing Gems
-gem "rspec-rails", "~>2.14"
-gem "factory_girl_rails", "~>4.3"
-gem "faker"
-gem "sqlite3"
-gem 'post_office'
-gem 'foreman'
-gem 'database_cleaner'
+gem 'spring'
+gem "spring-commands-rspec"
+gem "spring-commands-cucumber"
+gem 'pry-rails'
+gem 'thor', '0.19.1'
 gem 'guard-rspec'
 gem 'guard-livereload'
-gem 'zeus'
-gem 'pry-rails'
 gem 'delayed_job_active_record'
-gem 'cucumber-rails'
+gem 'sqlite3'
+gem 'mysql2'
+
+# Testing Gems
+group :test do
+  gem "rspec-rails", "~>2.14"
+  gem "factory_girl_rails", "~>4.3"
+  gem "faker"
+  gem 'post_office'
+  gem 'database_cleaner'
+  gem 'cucumber-rails', require: false
+end

data/Procfile

@@ -1,4 +1,3 @@
-lockable:     spec/test_app/script/lockable run
+lockable:     spec/test_app/script/with_lock run
 post_office:  post_office -s 25000 -p 11000
 guard:        guard
-zeus:         zeus start

data/app/controllers/mail_manager/application_controller.rb

@@ -1,4 +1,5 @@
 module MailManager
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ApplicationController
+    load_and_authorize_resource if respond_to? :load_and_authorize_resource
   end
 end

data/app/models/mail_manager.rb

@@ -1,12 +1,3 @@
 module MailManager
 end
 
-require 'mail_manager/bounce'
-require 'mail_manager/mailable_registry'
-require 'mail_manager/mailer'
-require 'mail_manager/mailing'
-require 'mail_manager/mailing_list'
-require 'mail_manager/message'
-require 'mail_manager/contactable_registry'
-require 'mail_manager/subscription'
-require 'mail_manager/contact'

data/app/models/mail_manager/contactable_registry.rb

@@ -95,8 +95,8 @@ module MailManager
           subscription_attributes[:mailing_list_id].to_i == subscription.mailing_list_id.to_i} || {}
       end
 
-      def subscribe(mailing_list)
-        set_contactable_data && MailManager::Subscription.subscribe(contact,mailing_list)
+      def subscribe(mailing_list, status='active')
+        set_contactable_data && MailManager::Subscription.subscribe(contact,mailing_list, status)
       end
 
       def unsubscribe(mailing_list)

data/app/models/mail_manager/mailer.rb

@@ -241,23 +241,31 @@ module MailManager
     
       def fetch(uri_str, limit = 10)
         # You should choose better exception.
-        # raise ArgumentError, 'HTTP redirect too deep' if limit == 0
-
-        # response = Net::HTTP.get_response(URI.parse(uri_str))
-        # case response
-        # when Net::HTTPSuccess     then response.body
-        # when Net::HTTPRedirection then fetch(response['location'], limit - 1)
-        # else
-        #   response.error!
-        # end
-        body = ''
-        Curl.get(uri_str) do |http|
-          http.follow_location = true
-          http.interface = '127.0.0.1' if request_local?(uri_str)
-          http.on_success{|response| body = response.body}
+        raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+        uri = URI.parse(uri_str)
+        request = Net::HTTP::Get.new("#{uri.path}#{"?"+uri.query if uri.query.to_s.strip != ''}")
+        
+        response = Net::HTTP.start(
+          uri.host, uri.port, 
+          :use_ssl => uri.scheme == 'https', 
+          :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |https|
+          https.request(request)
         end
-        raise Exception.new("Couldn't fetch URL: #{uri_str}") unless body.present?
-        body
+        case response
+        when Net::HTTPSuccess     then response.body
+        when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+        else
+          response.error!
+        end
+        # CURB version - gem wouldn't install anymore on CentOS
+        # body = ''
+        # Curl.get(uri_str) do |http|
+        #   http.follow_location = true
+        #   http.interface = '127.0.0.1' if request_local?(uri_str)
+        #   http.on_success{|response| body = response.body}
+        # end
+        # raise Exception.new("Couldn't fetch URL: #{uri_str}") unless body.present?
+        # body
       end
     end
   end

data/app/models/mail_manager/subscription.rb

@@ -66,8 +66,8 @@ module MailManager
     end
 
     # subscribes the contact to the list
-    def self.subscribe(contact, mailing_list)
-      change_subscription_status(contact, mailing_list, 'active')
+    def self.subscribe(contact, mailing_list, status='active')
+      change_subscription_status(contact, mailing_list, status)
     end
 
     # unsubscribes the contact from the list

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = 'spec/test_app'

data/features/support/env.rb

@@ -2,30 +2,10 @@
 ENV["RAILS_ENV"] ||= "test"
 ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "/../../spec/test_app"
 require File.expand_path(ENV['RAILS_ROOT'] + "/config/environment.rb")
+require 'database_cleaner'
 require 'cucumber/rails/world'
 require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
-Cucumber::Rails.use_transactional_fixtures
-Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling 
-                              # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
 
-require 'webrat'
+`rake db:schema:load`
 
-Webrat.configure do |config|
-  config.mode = :rails
-end
-
-require 'cucumber/rails/rspec'
-require 'webrat/core/matchers'
-
-`rake db:test:clone_structure`
-
-require "#{MailManager::PLUGIN_ROOT}/spec/factories"
-require 'pickle/world'
-# Example of configuring pickle:
-#
-#Pickle.configure do |config|
-#  config.adapters = [:factory_girl]
-  #config.map 'I', 'myself', 'me', 'my', :to => 'user: "me"'
-#end
-require 'pickle/path/world'
-require 'pickle/email/world'
+#require "#{MailManager::PLUGIN_ROOT}/spec/factories"

data/lib/mail_manager/engine.rb

@@ -9,6 +9,9 @@ module MailManager
         MailManager.initialize_with_config(MailManager::Config.initialize!)
       end
     end
+    initializer "mail_manager.factories", :after => "factory_girl.set_factory_paths" do
+      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/test_app/spec/factories', __FILE__) if defined?(FactoryGirl)
+    end
     config.generators do |g|
       g.test_framework :rspec, :fixture => false
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'

data/lib/mail_manager/lock.rb

@@ -1,36 +1,41 @@
-class MailManager::Lock
-  class MailManager::LockException < Exception
-  end
-  def self.with_lock(name, timeout=5, max_attempts=1, &block)
-    ActiveRecord::Base.connection_pool.with_connection do |connection|
-      begin
-        lock = get_lock(connection,name,timeout,max_attempts)
-        raise MailManager::LockException.new("Failed to obtain lock #{name} in #{timeout} secs") unless lock
-        yield lock
-      ensure
-        is_released = release_lock(connection,name)
-        Rails.logger.warn "Warning: lock #{name} not released!" unless is_released.values.include?('1')
+if ActiveRecord::Base.connection.adapter_name =~ /mysql/i
+  class MailManager::Lock
+    class MailManager::LockException < Exception
+    end
+    def self.with_lock(name, timeout=5, max_attempts=1, &block)
+      ActiveRecord::Base.connection_pool.with_connection do |connection|
+        begin
+          lock = get_lock(connection,name,timeout,max_attempts)
+          raise MailManager::LockException.new("Failed to obtain lock #{name} in #{timeout} secs") unless lock
+          yield lock
+        ensure
+          is_released = release_lock(connection,name)
+          Rails.logger.warn "Warning: lock #{name} not released!" unless is_released.values.include?('1')
+        end
       end
     end
-  end
-  
-  private
-  
-  def self.name_prefix
-    "#{MailManager.site_url}-#{Rails.env}"
-  end
-  
-  def self.get_lock(connection,name,timeout,max_attempts)
-    attempts = 0
-    lock = {}
-    while !lock.values.include?('1') and attempts < max_attempts do 
-      attempts += 1
-      lock = connection.select_one("SELECT GET_LOCK('#{name_prefix}-#{name}',#{timeout})")
+    
+    private
+    
+    def self.name_prefix
+      "#{MailManager.site_url}-#{Rails.env}"
+    end
+    
+    def self.get_lock(connection,name,timeout,max_attempts)
+      attempts = 0
+      lock = {}
+      while !lock.values.include?('1') and attempts < max_attempts do 
+        attempts += 1
+        lock = connection.select_one("SELECT GET_LOCK('#{name_prefix}-#{name}',#{timeout})")
+      end
+      lock.values.detect{|value| value.to_s.eql?('1')}
+    end
+    
+    def self.release_lock(connection,name)
+      connection.select_one("SELECT RELEASE_LOCK('#{name_prefix}-#{name}')")
     end
-    lock.values.detect{|value| value.to_s.eql?('1')}
-  end
-  
-  def self.release_lock(connection,name)
-    connection.select_one("SELECT RELEASE_LOCK('#{name_prefix}-#{name}')")
   end
+else
+  require 'with_lock'
+  MailManager::Lock = WithLock::Client
 end

data/lib/mail_manager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = "0.1.4"
+  VERSION = "3.0.0"
 end

data/mail_manager.gemspec

@@ -13,12 +13,15 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://ireach.com"
 
   gem.add_dependency "rails", "~>3.2"
-  gem.add_dependency "daemons"
-  gem.add_dependency "mini_magick"
-  gem.add_dependency "will_paginate"
+  gem.add_dependency "daemons", "~>1.1"
+  gem.add_dependency "with_lock", "~>0.1"
+  gem.add_dependency "mini_magick", "~>4.1"
+  gem.add_dependency "will_paginate", "~>3.0"
+  gem.add_dependency 'unix_utils', "~>0.0"
   gem.add_dependency "delayed_job", "~>4"
-  gem.add_dependency 'delayed_job_active_record'
+  gem.add_dependency 'delayed_job_active_record', "~>4"
   gem.add_dependency "dynamic_form", "~>1.1"
+  gem.add_dependency 'cancancan', "~>1.9"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/script/with_lock

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path(File.join('..','..','lib'), __FILE__)
+
+require "rubygems"
+require "bundler"
+Bundler.setup
+
+FileUtils.mkdir_p('tmp/pids') unless File.exists?('tmp/pids')
+
+require 'with_lock'
+if ARGV.include?('start')
+  begin
+    locker = WithLock::Client.locker
+  rescue WithLock::LockException => e
+    puts "Starting WithLock on #{WithLock::Server::url}!"
+    WithLock::Server::start_service
+    locker = WithLock::Client.locker
+  end
+  puts "Clearing WithLock locks!"
+  locker = WithLock::Client.locker
+  locker.locks.each_pair do |lock,data|
+    pid = data[:owner].split('|').last
+    if locker.running?(pid) || !data[:owner].include?(`hostname`.strip)
+      puts "Running - pid"
+    else
+      puts "Not Running - pid"
+      locker.release(data[:owner],lock)
+    end
+  end
+elsif ARGV.include?('stop')
+  puts "Stopping WithLock!"
+  WithLock::Server::stop_service
+elsif ARGV.include?('run')
+  puts "Running WithLock!"
+  WithLock::Server::run_service
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require File.expand_path("../../spec/test_app/config/environment", __FILE__)
 
+require 'database_cleaner'
 require 'rspec/rails'
 # require 'rspec/autorun'
 `rake db:schema:load`
@@ -25,7 +26,7 @@ RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 
   # If true, the base class of anonymous controllers will be inferred
   # automatically. This will be the default behavior in future versions of
@@ -41,7 +42,7 @@ RSpec.configure do |config|
   config.color_enabled = true
 
   # Use color not only in STDOUT but also in pagers and files
-  config.tty = true
+  #config.tty = true
 
-  config.formatter = :documentation # :progress, :html, :textmate
+  #config.formatter = :documentation # :progress, :html, :textmate
 end

data/spec/test_app/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/spec/test_app/bin/cucumber

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('cucumber', 'cucumber')

data/spec/test_app/bin/rails

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/test_app/bin/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('rake', 'rake')

data/spec/test_app/bin/rspec

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path("../spring", __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/spec/test_app/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/spec/test_app/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/spec/test_app/config/database.mysql.yml

@@ -0,0 +1,28 @@
+credentials: &credentials
+  encoding: utf8
+  adapter: mysql2
+  username: mail_manager
+  password: mail_manager_pass
+  host: localhost
+  reconnect: true
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *credentials
+  database: mail_manager_development 
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  <<: *credentials
+  database: mail_manager_test
+
+# production:
+#   <<: *credentials
+#   database: mail_manager
+#   host: localhost
+
+cucumber:
+  <<: *test

data/spec/test_app/config/{database.yml → database.sqlite.yml}

@@ -12,7 +12,7 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
+test: &test
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
@@ -23,3 +23,6 @@ test:
 #   database: db/production.sqlite3
 #   pool: 5
 #   timeout: 5000
+
+cucumber:
+  <<: *test

data/spec/test_app/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = './'

data/spec/test_app/config/with_lock.example.yml

@@ -0,0 +1,3 @@
+url: druby://localhost:9999
+scope: <%= File.basename(File.expand_path('.')) %><%= ":#{Rails.env}" if defined?(Rails) %>
+directory: 'tmp'

data/spec/test_app/features/support/env.rb

@@ -0,0 +1,58 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+require 'cucumber/rails'
+
+# Capybara defaults to CSS3 selectors rather than XPath.
+# If you'd prefer to use XPath, just uncomment this line and adjust any
+# selectors in your step definitions to use the XPath syntax.
+# Capybara.default_selector = :xpath
+
+# By default, any exception happening in your Rails application will bubble up
+# to Cucumber so that your scenario will fail. This is a different from how 
+# your application behaves in the production environment, where an error page will 
+# be rendered instead.
+#
+# Sometimes we want to override this default behaviour and allow Rails to rescue
+# exceptions and display an error page (just like when the app is running in production).
+# Typical scenarios where you want to do this is when you test your error pages.
+# There are two ways to allow Rails to rescue exceptions:
+#
+# 1) Tag your scenario (or feature) with @allow-rescue
+#
+# 2) Set the value below to true. Beware that doing this globally is not
+# recommended as it will mask a lot of errors for you!
+#
+ActionController::Base.allow_rescue = false
+
+# Remove/comment out the lines below if your app doesn't have a database.
+# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
+begin
+  DatabaseCleaner.strategy = :transaction
+rescue NameError
+  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+end
+
+# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# See the DatabaseCleaner documentation for details. Example:
+#
+#   Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+#     # { :except => [:widgets] } may not do what you expect here
+#     # as Cucumber::Rails::Database.javascript_strategy overrides
+#     # this setting.
+#     DatabaseCleaner.strategy = :truncation
+#   end
+#
+#   Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+#     DatabaseCleaner.strategy = :transaction
+#   end
+#
+
+# Possible values are :truncation and :transaction
+# The :transaction strategy is faster, but might give you threading problems.
+# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
+Cucumber::Rails::Database.javascript_strategy = :truncation
+

data/spec/test_app/lib/tasks/cucumber.rake

@@ -0,0 +1,65 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new({:wip => 'test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    Cucumber::Rake::Task.new({:rerun => 'test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'rerun'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+
+    task :statsetup do
+      require 'rails/code_statistics'
+      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+    end
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+
+  # In case we don't have the generic Rails test:prepare hook, append a no-op task that we can depend upon.
+  task 'test:prepare' do
+  end
+
+  task :stats => 'cucumber:statsetup'
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end

data/spec/test_app/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/spec/test_app/script/{lockable → with_lock}

@@ -7,17 +7,17 @@ Bundler.setup
 
 FileUtils.mkdir_p('tmp/pids') unless File.exists?('tmp/pids')
 
-require 'lockable'
+require 'with_lock'
 if ARGV.include?('start')
   begin
-    locker = Lockable::Client.locker
-  rescue Lockable::LockException => e
-    puts "Starting Lockable on #{Lockable::Server::url}!"
-    Lockable::Server::start_service
-    locker = Lockable::Client.locker
+    locker = WithLock::Client.locker
+  rescue WithLock::LockException => e
+    puts "Starting WithLock on #{WithLock::Server::url}!"
+    WithLock::Server::start_service
+    locker = WithLock::Client.locker
   end
-  puts "Clearing Lockable locks!"
-  locker = Lockable::Client.locker
+  puts "Clearing WithLock locks!"
+  locker = WithLock::Client.locker
   locker.locks.each_pair do |lock,data|
     pid = data[:owner].split('|').last
     if locker.running?(pid) || !data[:owner].include?(`hostname`.strip)
@@ -28,9 +28,9 @@ if ARGV.include?('start')
     end
   end
 elsif ARGV.include?('stop')
-  puts "Stopping Lockable!"
-  Lockable::Server::stop_service
+  puts "Stopping WithLock!"
+  WithLock::Server::stop_service
 elsif ARGV.include?('run')
-  puts "Running Lockable!"
-  Lockable::Server::run_service
-end
+  puts "Running WithLock!"
+  WithLock::Server::run_service
+end

data/spec/test_app/spec/models/mail_manager/bounce_spec.rb

@@ -4,14 +4,17 @@ require 'spec_helper'
 describe MailManager::Bounce do
   context "when checking pop account" do
     it "should not blow up when mail contains a bad extended char" do
+      Delayed::Worker.delay_jobs = true
       send_bounce('bad_utf8_chars.eml')
       MailManager::BounceJob.new.perform
+      Delayed::Worker.delay_jobs = false
     end
   end
   def send_bounce(filename)
-    mail = Mail.new(File.readlines(File.expand_path(File.join(__FILE__,'..','..','..','support','files',filename))).join)
-    mail.delivery_method ActionMailer::Base.delivery_method
+    PostOffice.start_post_office
+    mail = Mail.new(File.read(File.join(Rails.root,'spec','support','files',filename)))
+    mail.delivery_method :smtp
     mail.delivery_method.settings.merge!(ActionMailer::Base.smtp_settings)
     mail.deliver
   end
-end
+end

data/spec/test_app/spec/models/mail_manager/mailer_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe MailManager::Mailer do
+  it "Can fetch images from https servers" do
+    image_url = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRwNmnMYLBp2Sw9vg-snbZ_GKONKo_WY0f3S1ETL2era2DZKKqD'
+    data = MailManager::Mailer.fetch(image_url)
+    expect(data.to_s[0..100]).to include('JFIF')
+  end
+end

data/spec/test_app/spec/models/mail_manager/mailing_list_spec.rb

@@ -6,10 +6,10 @@ describe MailManager::MailingList do
       @mailing_list = FactoryGirl.build(:mailing_list)
     end
     it "must have a name" do 
-      @mailing_list.name.present?.should be_true
-      @mailing_list.valid?.should be_true
+      @mailing_list.name.present?.should == true
+      @mailing_list.valid?.should == true
       @mailing_list.name = nil
-      @mailing_list.valid?.should be_false
+      @mailing_list.valid?.should == false
     end
   end
 end

data/spec/test_app/spec/models/user_spec.rb

@@ -8,12 +8,12 @@ describe User do
     it "should have a uniq email" do
       @user.save
       @user2 = FactoryGirl.build(:user, {email: @user.email})
-      @user2.valid?.should be_false
+      @user2.valid?.should == false
     end
     it "should have an email" do
-      @user.valid?.should be_true
+      @user.valid?.should == true
       @user.email = nil
-      @user.valid?.should be_false
+      @user.valid?.should == false
     end
   end
   context "integrated with mail manager" do
@@ -21,10 +21,10 @@ describe User do
       @user = FactoryGirl.create(:user)
     end
     it "should respond to subscriptions" do
-      @user.respond_to?(:subscriptions).should be_true
+      @user.respond_to?(:subscriptions).should == true
     end
     it "should have a contact" do
-      @user.contact.present?.should be_true
+      @user.contact.present?.should == true
     end
     it "should have the same email as the contact" do
       @user.email.should == @user.contact.email_address

data/spec/test_app/spec/spec_helper.rb

@@ -0,0 +1,38 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = false
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+end

data/spec/test_app/spec/support/database_cleaner.rb

@@ -5,7 +5,11 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
+    if ActiveRecord::Base.connection.adapter_name =~ /sqlite/
+      DatabaseCleaner.strategy = :truncation # sqlite3 doesn't support nested transactions :transaction
+    else
+      DatabaseCleaner.strategy = :transaction # assume a transactional database (we're using active_record)
+    end
   end
 
   config.before(:each, :js => true) do
@@ -20,4 +24,4 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
-end
+end

data/spec/test_app/spec/support/post_office.rb

@@ -0,0 +1,13 @@
+module PostOffice
+  def self.start_post_office
+    return if `lsof -i TCP:25000 | grep LISTEN | wc -l`.to_i == 1
+    unless(@post_office_pipe.present?)
+      @post_office_pipe = IO.popen("post_office -s 25000 -p 11000")
+      5.times do
+        break if `lsof -i TCP:25000 | grep LISTEN | wc -l`.to_i == 1
+        sleep 0.1
+      end
+      Rails.logger.debug "Opened post office! SMTP: 2500 POP: 11000" if `lsof -i TCP:25000 | grep LISTEN | wc -l`.to_i == 1
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Lone Star Internet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,44 +28,72 @@ dependencies:
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: with_lock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: unix_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +112,16 @@ dependencies:
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: cancancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: Manages the delivery of mailable items. Handles bounces, unsubscribe,
   opt-in, etc.
 email:
@@ -196,6 +238,8 @@ files:
 - config/daemons.yml
 - config/initializers/delayed_job.rb
 - config/routes.rb
+- config/spring.rb
+- config/with_lock.yml
 - db/migrate/001_mail_mgr_initial.rb
 - db/migrate/002_mail_mgr_create_contact.rb
 - db/migrate/003_mail_mgr_test_message.rb
@@ -210,7 +254,6 @@ files:
 - db/mlm_migrate/005_mlm_to_mail_mgr_scoped.rb
 - doc/README_FOR_APP
 - doc/mlm.wiki.txt
-- engine_plan.rb
 - features/bounce_management.feature
 - features/contact_management.feature
 - features/mailable.feature
@@ -245,9 +288,11 @@ files:
 - lib/workers/mail_manager/test_message_job.rb
 - mail_manager.gemspec
 - script/rails
+- script/with_lock
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/test_app/.rspec
 - spec/test_app/README.rdoc
 - spec/test_app/Rakefile
 - spec/test_app/app/assets/javascripts/application.js
@@ -266,10 +311,17 @@ files:
 - spec/test_app/app/views/users/index.html.erb
 - spec/test_app/app/views/users/new.html.erb
 - spec/test_app/app/views/users/show.html.erb
+- spec/test_app/bin/cucumber
+- spec/test_app/bin/rails
+- spec/test_app/bin/rake
+- spec/test_app/bin/rspec
+- spec/test_app/bin/spring
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb
-- spec/test_app/config/database.yml
+- spec/test_app/config/cucumber.yml
+- spec/test_app/config/database.mysql.yml
+- spec/test_app/config/database.sqlite.yml
 - spec/test_app/config/environment.rb
 - spec/test_app/config/environments/development.rb
 - spec/test_app/config/environments/production.rb
@@ -281,9 +333,10 @@ files:
 - spec/test_app/config/initializers/session_store.rb
 - spec/test_app/config/initializers/wrap_parameters.rb
 - spec/test_app/config/locales/en.yml
-- spec/test_app/config/lockable.yml
 - spec/test_app/config/mail_manager.yml
 - spec/test_app/config/routes.rb
+- spec/test_app/config/spring.rb
+- spec/test_app/config/with_lock.example.yml
 - spec/test_app/db/migrate/20131217101010_create_users.rb
 - spec/test_app/db/migrate/20131221064151_mail_mgr_initial.rb
 - spec/test_app/db/migrate/20131221064152_mail_mgr_create_contact.rb
@@ -295,30 +348,35 @@ files:
 - spec/test_app/db/migrate/20131221072600_create_delayed_jobs.rb
 - spec/test_app/db/schema.rb
 - spec/test_app/db/structure.sql
+- spec/test_app/features/support/env.rb
+- spec/test_app/lib/tasks/cucumber.rake
 - spec/test_app/public/404.html
 - spec/test_app/public/422.html
 - spec/test_app/public/500.html
 - spec/test_app/public/favicon.ico
+- spec/test_app/script/cucumber
 - spec/test_app/script/delayed_job
-- spec/test_app/script/lockable
 - spec/test_app/script/rails
+- spec/test_app/script/with_lock
 - spec/test_app/spec/controllers/users_controller_spec.rb
 - spec/test_app/spec/factories/mailing_lists.rb
 - spec/test_app/spec/factories/mailings.rb
 - spec/test_app/spec/factories/original_factories.rb.txt
 - spec/test_app/spec/factories/users.rb
 - spec/test_app/spec/models/mail_manager/bounce_spec.rb
+- spec/test_app/spec/models/mail_manager/mailer_spec.rb
 - spec/test_app/spec/models/mail_manager/mailing_list_spec.rb
 - spec/test_app/spec/models/user_spec.rb
 - spec/test_app/spec/requests/users_spec.rb
 - spec/test_app/spec/routing/users_routing_spec.rb
+- spec/test_app/spec/spec_helper.rb
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/bad_utf8_chars.eml
+- spec/test_app/spec/support/post_office.rb
 - spec/test_app/spec/views/users/edit.html.erb_spec.rb
 - spec/test_app/spec/views/users/index.html.erb_spec.rb
 - spec/test_app/spec/views/users/new.html.erb_spec.rb
 - spec/test_app/spec/views/users/show.html.erb_spec.rb
-- zeus.json
 homepage: http://ireach.com
 licenses: []
 metadata: {}
@@ -338,7 +396,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mailing list management tool
@@ -358,6 +416,7 @@ test_files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/test_app/.rspec
 - spec/test_app/README.rdoc
 - spec/test_app/Rakefile
 - spec/test_app/app/assets/javascripts/application.js
@@ -376,10 +435,17 @@ test_files:
 - spec/test_app/app/views/users/index.html.erb
 - spec/test_app/app/views/users/new.html.erb
 - spec/test_app/app/views/users/show.html.erb
+- spec/test_app/bin/cucumber
+- spec/test_app/bin/rails
+- spec/test_app/bin/rake
+- spec/test_app/bin/rspec
+- spec/test_app/bin/spring
 - spec/test_app/config.ru
 - spec/test_app/config/application.rb
 - spec/test_app/config/boot.rb
-- spec/test_app/config/database.yml
+- spec/test_app/config/cucumber.yml
+- spec/test_app/config/database.mysql.yml
+- spec/test_app/config/database.sqlite.yml
 - spec/test_app/config/environment.rb
 - spec/test_app/config/environments/development.rb
 - spec/test_app/config/environments/production.rb
@@ -391,9 +457,10 @@ test_files:
 - spec/test_app/config/initializers/session_store.rb
 - spec/test_app/config/initializers/wrap_parameters.rb
 - spec/test_app/config/locales/en.yml
-- spec/test_app/config/lockable.yml
 - spec/test_app/config/mail_manager.yml
 - spec/test_app/config/routes.rb
+- spec/test_app/config/spring.rb
+- spec/test_app/config/with_lock.example.yml
 - spec/test_app/db/migrate/20131217101010_create_users.rb
 - spec/test_app/db/migrate/20131221064151_mail_mgr_initial.rb
 - spec/test_app/db/migrate/20131221064152_mail_mgr_create_contact.rb
@@ -405,25 +472,31 @@ test_files:
 - spec/test_app/db/migrate/20131221072600_create_delayed_jobs.rb
 - spec/test_app/db/schema.rb
 - spec/test_app/db/structure.sql
+- spec/test_app/features/support/env.rb
+- spec/test_app/lib/tasks/cucumber.rake
 - spec/test_app/public/404.html
 - spec/test_app/public/422.html
 - spec/test_app/public/500.html
 - spec/test_app/public/favicon.ico
+- spec/test_app/script/cucumber
 - spec/test_app/script/delayed_job
-- spec/test_app/script/lockable
 - spec/test_app/script/rails
+- spec/test_app/script/with_lock
 - spec/test_app/spec/controllers/users_controller_spec.rb
 - spec/test_app/spec/factories/mailing_lists.rb
 - spec/test_app/spec/factories/mailings.rb
 - spec/test_app/spec/factories/original_factories.rb.txt
 - spec/test_app/spec/factories/users.rb
 - spec/test_app/spec/models/mail_manager/bounce_spec.rb
+- spec/test_app/spec/models/mail_manager/mailer_spec.rb
 - spec/test_app/spec/models/mail_manager/mailing_list_spec.rb
 - spec/test_app/spec/models/user_spec.rb
 - spec/test_app/spec/requests/users_spec.rb
 - spec/test_app/spec/routing/users_routing_spec.rb
+- spec/test_app/spec/spec_helper.rb
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/bad_utf8_chars.eml
+- spec/test_app/spec/support/post_office.rb
 - spec/test_app/spec/views/users/edit.html.erb_spec.rb
 - spec/test_app/spec/views/users/index.html.erb_spec.rb
 - spec/test_app/spec/views/users/new.html.erb_spec.rb

data/engine_plan.rb

@@ -1,13 +0,0 @@
-require 'zeus/rails'
-
-ROOT_PATH = File.expand_path(Dir.pwd)
-ENV_PATH  = File.expand_path('spec/test_app/config/environment',  ROOT_PATH)
-BOOT_PATH = File.expand_path('spec/test_app/config/boot',  ROOT_PATH)
-APP_PATH  = File.expand_path('spec/test_app/config/application',  ROOT_PATH)
-ENGINE_ROOT = File.expand_path(Dir.pwd)
-ENGINE_PATH = File.expand_path('lib/mail_manager/engine', ENGINE_ROOT)
-
-class EnginePlan < Zeus::Rails
-end
-
-Zeus.plan = EnginePlan.new

data/zeus.json

@@ -1,22 +0,0 @@
-{
-  "command": "ruby -rubygems -r./engine_plan -eZeus.go",
-
-  "plan": {
-    "boot": {
-      "default_bundle": {
-        "development_environment": {
-          "prerake": {"rake": []},
-          "runner": ["r"],
-          "console": ["c"],
-          "server": ["s"],
-          "generate": ["g"],
-          "destroy": ["d"],
-          "dbconsole": []
-        },
-        "test_environment": {
-          "test_helper": {"test": ["rspec", "testrb"]}
-        }
-      }
-    }
-  }
-}