pling-actionmailer 0.2.0 → 0.3.0

data/.gitignore

@@ -6,3 +6,4 @@
 doc/
 Gemfile.lock
 pkg/*
+.DS_Store

data/README.md

@@ -6,7 +6,7 @@
 
 ## Install
 
-    gem 'pling-actionmailer', :require => 'pling/gateways/action_mailer'
+    gem 'pling-actionmailer', :require => 'pling/action_mailer'
 
 ## Build Status
 

data/lib/pling/action_mailer.rb

@@ -0,0 +1,6 @@
+module Pling
+  module ActionMailer
+    autoload :Gateway, 'pling/action_mailer/gateway'
+    autoload :Mailer,  'pling/action_mailer/mailer'
+  end 
+end

data/lib/pling/action_mailer/gateway.rb

@@ -0,0 +1,31 @@
+require 'pling'
+require 'action_mailer'
+
+module Pling
+  module ActionMailer
+    class Gateway < Pling::Gateway
+
+      handles :email, :mail, :actionmailer
+
+      def initialize(configuration)
+        super
+        require_configuration([:from])
+      end
+
+      def deliver!(message, device)
+        mailer = configuration[:mailer] || Pling::ActionMailer::Mailer
+        mailer.pling_message(message, device, configuration).deliver
+      end
+
+      private
+
+        def default_configuration
+          super.merge({
+            :html => true,
+            :text => true
+          })
+        end
+
+    end
+  end
+end

data/lib/pling/action_mailer/mailer.rb

@@ -0,0 +1,18 @@
+require 'action_mailer'
+
+module Pling
+  module ActionMailer
+    class Mailer < ::ActionMailer::Base
+      append_view_path File.expand_path('../../../../app/views', __FILE__)
+
+      def pling_message(message, device, configuration)
+        @message, @device, @configuration = message, device, configuration
+
+        mail(:to => device.identifier, :from => configuration[:from], :subject => message.subject) do |format|
+          format.text { render 'pling/mailer/pling_message' } if configuration[:text]
+          format.html { render 'pling/mailer/pling_message' } if configuration[:html]
+        end
+      end
+    end
+  end
+end

data/pling-actionmailer.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "pling-actionmailer"
-  s.version     = "0.2.0"
+  s.version     = "0.3.0"
   s.authors     = ["benedikt", "t6d", "fabrik42"]
   s.email       = ["benedikt@synatic.net", "me@t6d.de", "fabrik42@gmail.com"]
   s.homepage    = "http://flinc.github.com/pling-actionmailer"

data/spec/pling/{gateway/action_mailer_spec.rb → action_mailer/gateway_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Pling::Gateway::ActionMailer do
+describe Pling::ActionMailer::Gateway do
 
   let(:valid_configuration) do
     { :from => 'random@example.com' }
@@ -12,11 +12,11 @@ describe Pling::Gateway::ActionMailer do
   let(:mail) { mock(:deliver => true) }
 
   before do
-    Pling::Gateway::ActionMailer::Mailer.stub(:pling_message => mail)
+    Pling::ActionMailer::Mailer.stub(:pling_message => mail)
   end
 
   it 'should handle various action mailer related device types' do
-    Pling::Gateway::ActionMailer.handled_types.should =~ [:mail, :email, :actionmailer]
+    Pling::ActionMailer::Gateway.handled_types.should =~ [:mail, :email, :actionmailer]
   end
 
   context 'when created with an invalid configuration' do
@@ -24,7 +24,7 @@ describe Pling::Gateway::ActionMailer do
       it "should raise an error when :#{attribute} is missing" do
         configuration = valid_configuration
         configuration.delete(attribute)
-        expect { Pling::Gateway::ActionMailer.new(configuration) }.to raise_error(ArgumentError, /:#{attribute} is missing/)
+        expect { Pling::ActionMailer::Gateway.new(configuration) }.to raise_error(ArgumentError, /:#{attribute} is missing/)
       end
     end
   end
@@ -32,9 +32,9 @@ describe Pling::Gateway::ActionMailer do
   context 'when created with a valid configuration' do
     it 'should pass the full configuration to the mailer' do
       configuration = valid_configuration.merge({ :something => true })
-      gateway = Pling::Gateway::ActionMailer.new(configuration)
+      gateway = Pling::ActionMailer::Gateway.new(configuration)
 
-      Pling::Gateway::ActionMailer::Mailer.
+      Pling::ActionMailer::Mailer.
         should_receive(:pling_message).
         with(anything, anything, hash_including(configuration)).and_return(mail)
 
@@ -47,21 +47,21 @@ describe Pling::Gateway::ActionMailer do
         with(message, device, hash_including(valid_configuration)).
         and_return(mail)
 
-      gateway = Pling::Gateway::ActionMailer.new(valid_configuration.merge(:mailer => mailer))
+      gateway = Pling::ActionMailer::Gateway.new(valid_configuration.merge(:mailer => mailer))
 
       gateway.deliver(message, device)
     end
 
     it 'should not change the configuration' do
       configuration = valid_configuration.merge(:html => true, :text => false)
-      gateway = Pling::Gateway::ActionMailer.new(configuration)
+      gateway = Pling::ActionMailer::Gateway.new(configuration)
 
       expect { gateway.deliver(message, device) }.to_not change(configuration, :count)
     end
   end
 
   describe '#deliver' do
-    subject { Pling::Gateway::ActionMailer.new(valid_configuration) }
+    subject { Pling::ActionMailer::Gateway.new(valid_configuration) }
 
     it 'should raise an error if no message is given' do
       expect { subject.deliver(nil, device) }.to raise_error
@@ -82,7 +82,7 @@ describe Pling::Gateway::ActionMailer do
     end
 
     it 'should try to deliver the given message' do
-      Pling::Gateway::ActionMailer::Mailer.
+      Pling::ActionMailer::Mailer.
         should_receive(:pling_message).
         with(message, device, hash_including(valid_configuration)).
         and_return(mail)

data/spec/pling/{gateway/action_mailer → action_mailer}/mailer_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Pling::Gateway::ActionMailer::Mailer do
+describe Pling::ActionMailer::Mailer do
   subject { described_class }
 
-  let(:message) { Pling::Message.new('Hello from Pling') }
+  let(:message) { Pling::Message.new(:body => 'Hello from Pling', :subject => 'Subject') }
   let(:device)  { Pling::Device.new(:identifier => 'DEVICEIDENTIFIER', :type => :email) }
   let(:mail)    { described_class.pling_message(message, device, configuration) }
   let(:configuration) do
@@ -14,7 +14,7 @@ describe Pling::Gateway::ActionMailer::Mailer do
     }
   end
 
-  specify { described_class.ancestors =~ ActionMailer::Base }
+  specify { described_class.ancestors =~ ::ActionMailer::Base }
 
   describe '.pling_message' do
 
@@ -49,6 +49,10 @@ describe Pling::Gateway::ActionMailer::Mailer do
       mail.to.should include('DEVICEIDENTIFIER')
     end
 
+    it 'should use message.subject as subject' do
+      mail.subject.should include('Subject')
+    end
+
     it 'should use sender from the configuration' do
       mail.from.should include('random@example.com')
     end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ require 'bundler'
 
 Bundler.require
 
-require 'pling/gateway/action_mailer'
+require 'pling/action_mailer'
+require 'action_mailer'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pling-actionmailer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pling
-  requirement: &70346678559800 !ruby/object:Gem::Requirement
+  requirement: &70155430875740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346678559800
+  version_requirements: *70155430875740
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70346678558420 !ruby/object:Gem::Requirement
+  requirement: &70155430874580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346678558420
+  version_requirements: *70155430874580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346678557260 !ruby/object:Gem::Requirement
+  requirement: &70155430873600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70346678557260
+  version_requirements: *70155430873600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70346678556360 !ruby/object:Gem::Requirement
+  requirement: &70155430872680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70346678556360
+  version_requirements: *70155430872680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346678555560 !ruby/object:Gem::Requirement
+  requirement: &70155430871840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70346678555560
+  version_requirements: *70155430871840
 description: Pling Gateway to ActionMailer
 email:
 - benedikt@synatic.net
@@ -86,10 +86,12 @@ files:
 - Rakefile
 - app/views/pling/mailer/pling_message.html.erb
 - app/views/pling/mailer/pling_message.text.erb
-- lib/pling/gateway/action_mailer.rb
+- lib/pling/action_mailer.rb
+- lib/pling/action_mailer/gateway.rb
+- lib/pling/action_mailer/mailer.rb
 - pling-actionmailer.gemspec
-- spec/pling/gateway/action_mailer/mailer_spec.rb
-- spec/pling/gateway/action_mailer_spec.rb
+- spec/pling/action_mailer/gateway_spec.rb
+- spec/pling/action_mailer/mailer_spec.rb
 - spec/spec_helper.rb
 homepage: http://flinc.github.com/pling-actionmailer
 licenses: []
@@ -116,7 +118,7 @@ signing_key:
 specification_version: 3
 summary: Pling Gateway to ActionMailer
 test_files:
-- spec/pling/gateway/action_mailer/mailer_spec.rb
-- spec/pling/gateway/action_mailer_spec.rb
+- spec/pling/action_mailer/gateway_spec.rb
+- spec/pling/action_mailer/mailer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/pling/gateway/action_mailer.rb

@@ -1,42 +0,0 @@
-require 'pling'
-require 'action_mailer'
-
-module Pling
-  module Gateway
-    class ActionMailer < Base
-      class Mailer < ::ActionMailer::Base
-        append_view_path File.expand_path('../../../../app/views', __FILE__)
-
-        def pling_message(message, device, configuration)
-          @message, @device, @configuration = message, device, configuration
-
-          mail(:to => device.identifier, :from => configuration[:from]) do |format|
-            format.text { render 'pling/mailer/pling_message' } if configuration[:text]
-            format.html { render 'pling/mailer/pling_message' } if configuration[:html]
-          end
-        end
-      end
-
-      handles :email, :mail, :actionmailer
-
-      def initialize(configuration)
-        setup_configuration(configuration, :require => [:from])
-      end
-
-      def deliver!(message, device)
-        mailer = configuration[:mailer] || Pling::Gateway::ActionMailer::Mailer
-        mailer.pling_message(message, device, configuration).deliver
-      end
-
-      private
-
-        def default_configuration
-          super.merge({
-            :html => true,
-            :text => true
-          })
-        end
-
-    end
-  end
-end