mailman-rails 0.0.2 → 0.0.3

data/README.md

@@ -4,10 +4,15 @@ This gem helps you integrate <a href="https://github.com/titanous/mailman">ruby
 
 ## Installation
 
-Add these line to your application's Gemfile:
+Add this line to your application's Gemfile:
 
     gem 'mailman-rails'
-    gem 'mailman', :git => 'https://github.com/titanous/mailman' # The version in rubygems isn't yet compatible with this gem
+
+And one of these lines depending on status of pull requests, versions etc:
+
+    gem 'mailman', :git => 'https://github.com/johncant/mailman'
+    gem 'mailman', :git => 'https://github.com/titanous/mailman'
+    gem 'mailman'
 
 And then execute:
 

data/lib/mailman-rails.rb

@@ -1,13 +1,36 @@
-require "mailman-rails/version"
 require "rubygems"
-Gem.send :require, "mailman" # Force loading of the Gem, not my file
 require 'mailman'
-require "mailman/rails"
-require "mailman/rails/railtie"
-require File.expand_path("../mailman", __FILE__)
+require "mailman-rails"
+require "mailman-rails/version"
+#require "mailman-rails/railtie"
+#require File.expand_path("../mailman", __FILE__)
 
 module Mailman
   module Rails
-    # Railtie added further down the tree
+    require 'mailman-rails/railtie'
+
+    @@application = nil
+
+    def self.application
+      @@application ||= Mailman::Application.new do end # Avoid forcing Mailman to require a block
+    end
+
+    def self.configure(&block)
+      Mailman.config.instance_exec(&block)
+    end
+
+    def self.receive(&block)
+      self.application.instance_exec(&block)
+    end
+
+    def self.run!
+
+      # Under no circumstances should Mailman itself load the Rails enviroment!
+      Mailman.config.rails_root = false
+
+      self.application.run
+    end
+
   end
 end
+

data/lib/{mailman/rails → mailman-rails}/tasks/mailman.rake

@@ -1,3 +1,5 @@
+require File.expand_path('../../../mailman-rails', __FILE__)
+
 namespace :mailman do
 
   mailman_tasks = [:start, :stop, :restart, :status]
@@ -27,7 +29,7 @@ task :mailman => :environment do
 
   Mailman.config.logger = Logger.new("#{Rails.root}/log/mailman.#{Rails.env}.log")
 
-  Mailman.run!
+  Mailman::Rails.run!
 
 end
 

data/lib/mailman-rails/version.rb

@@ -1,5 +1,5 @@
 module Mailman
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/mailman_spec.rb

@@ -19,13 +19,13 @@ describe Mailman do
     # It's not true though, if one of the "ghost" specs fails, you still notice.
     spec = self
 
-    Mailman.configure do
+    Mailman::Rails.configure do
       self.maildir = "#{spec.gem_root}/tmp/examples/"
     end
 
     emails_parsed = 0
 
-    Mailman.receive do
+    Mailman::Rails.receive do
       to('email1@example') do
         route = self
         spec.instance_eval do
@@ -36,7 +36,7 @@ describe Mailman do
       end
     end
 
-    Mailman.receive do
+    Mailman::Rails.receive do
       to('email2@example') do
         route = self
         spec.instance_eval do
@@ -47,7 +47,7 @@ describe Mailman do
       end
     end
 
-    Mailman.application.process_maildir # If this had already happened, the spec would fail
+    Mailman::Rails.application.process_maildir # If this had already happened, the spec would fail
 
     emails_parsed.should == 2
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailman-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,11 +91,9 @@ files:
 - examples/new/1353967927.V801I42421M758136.example
 - examples/new/1353967928.V801I42421M758136.example
 - lib/mailman-rails.rb
+- lib/mailman-rails/railtie.rb
+- lib/mailman-rails/tasks/mailman.rake
 - lib/mailman-rails/version.rb
-- lib/mailman.rb
-- lib/mailman/rails.rb
-- lib/mailman/rails/railtie.rb
-- lib/mailman/rails/tasks/mailman.rake
 - mailman-rails.gemspec
 - spec/mailman_spec.rb
 - spec/spec_helper.rb

data/lib/mailman.rb

@@ -1,23 +0,0 @@
-module Mailman
-  @@application = nil
-
-  def self.application
-    @@application ||= Mailman::Application.new do end # Avoid forcing Mailman to require a block
-  end
-
-  def self.configure(&block)
-    Mailman.config.instance_exec(&block)
-  end
-
-  def self.receive(&block)
-    self.application.instance_exec(&block)
-  end
-
-  def self.run!
-
-    # Under no circumstances should Mailman itself load the Rails enviroment!
-    Mailman.config.rails_root = false
-
-    self.application.run
-  end
-end

data/lib/mailman/rails.rb

@@ -1,4 +0,0 @@
-module Mailman
-  module Rails
-  end
-end