mandrill-rails 0.0.3 → 0.0.4

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
+  # - rbx-18mode # removing for now; travis is having chronic intermittent issues building this properly at the moment
   - rbx-19mode
   - jruby-18mode
   - jruby-19mode

data/CHANGELOG

@@ -0,0 +1,3 @@
+0.0.4
+===================================================================
+* removed manadrill gem as a dependency (thanks to @ssaunier for highlighting this)

data/README.rdoc

@@ -1,20 +1,22 @@
 = Mandrill::Rails {<img src="https://secure.travis-ci.org/evendis/mandrill-rails.png" />}[http://travis-ci.org/evendis/mandrill-rails]
 
-Mandrill::Rails extends the capabilities of the
-{Mandrill}[https://github.com/tatemae-consultancy/mandrill] gem to provide tighter integration for Rails projects.
-
 The primary goal of Mandrill::Rails is to make supporting Mandrill web hooks as easy and Rails-native as possible. As other opportunities for better Rails integration of the Mandrill API are discovered, these may be rolled in too.
 
+Mandrill::Rails currently does not need or require any direct Mandrill API integration (such as provided by
+various {Mandrill}[https://rubygems.org/search?utf8=%E2%9C%93&query=mandrill]
+and {MailChimp}[https://rubygems.org/search?utf8=%E2%9C%93&query=mailchimp] gems).
+If you need direct API integration in addition to Mandrill::Rails features, you can choose to add whichever best meets your needs.
+
 FYI, {Mandrill}[http://mandrill.com/] is the transactional email service by the same folks who do MailChimp.
 
 == Requirements and Known Limitations
 
-* Tested with MRI 1.8.7, 1.9.2, 1.9.3, Rubinius (1.8 and 1.9 mode), JRuby (1.8 and 1.9 mode)
-* Requires Rails >= 3.0.3 (including 3.1 and 3.2)
-* Includes {Mandrill}[https://github.com/tatemae-consultancy/mandrill] ~> 0.0.2 as a dependency
+* Tested with MRI 1.8.7, 1.9.2, 1.9.3, Rubinius (1.9 mode), JRuby (1.8 and 1.9 mode).
+* Rubinius 1.8 mode build temporarily removed since travis is having intermittent problems with this config.
+* Requires Rails >= 3.0.3 (including 3.1 and 3.2).
 
 Food for thought (upcoming features maybe)..
-* some generators may be handy to avoid the manual coding to hook up web hooks
+* some generators may be handy to avoid the manual coding to wire up web hooks
 * I thought about implementing this as an engine, but the overhead did not seem appropriate. Maybe that view will change..
 
 == The Mandrill::Rails Cookbook
@@ -35,7 +37,10 @@ Or install it yourself as:
 
 === How do I install it for gem development?
 
-If you want to work on enhancements of fix bugs in Mandrill::Rails, fork and clone the github repository. If you are using bundler (recommended), run <tt>bundle</tt> to install development dependencies.
+If you want to work on enhancements or fix bugs in Mandrill::Rails, fork and clone the github repository. If you are using bundler (recommended), run <tt>bundle</tt> to install development dependencies.
+
+Run tests using <tt>rake</tt> or <tt>rake spec</tt>, and note that guard is also included with the development dependencies so
+you can kick-off continuous testing of changed files by running <tt>bundle exec guard</tt>.
 
 See the section below on 'Contributing to Mandrill::Rails' for more information.
 
@@ -71,7 +76,7 @@ See {Mandrill WebHooks}[https://mandrillapp.com/settings/webhooks]
 * select the events you want to trigger on
 * set the "Post to URL" to point to your controller e.g. http://mydomain.com/inbox
 
-=== How do I handle a specific Mandrill event payload in my app?
+=== How do I handle specific Mandrill event payloads in my app?
 
 Once we have configured Mandrill and setup our routes and controllers, our app will successfully
 receive WebHook event notifications from Mandrill. But we are not doing anything with the payload yet.
@@ -82,9 +87,9 @@ we are interested in.
 The list of available event types includes: inbound, send, hard_bounce, soft_bounce, open,
 click, spam, unsub, and reject.
 
-In our controller, we simply write a method called `handle_<event-type>` and it will be called
+In our controller, we simply write a method called <tt>handle_<event-type></tt> and it will be called
 for each event payload received. The event payload will be passed to this method
-as an Mandrill::WebHook::EventDecorator - basically a Hash with some additional methods to
+as a Mandrill::WebHook::EventDecorator - basically a Hash with some additional methods to
 help extract payload-specific elements.
 
 For example, to handle inbound email:
@@ -109,7 +114,7 @@ And if you don't care to handle a specific payload type - then just don't implem
 
 === How do I pull apart the event_payload?
 
-The `event_payload` object passed to our handler represents a single event and is packaged
+The <tt>event_payload</tt> object passed to our handler represents a single event and is packaged
 as an Mandrill::WebHook::EventDecorator - basically a Hash with some additional methods to
 help extract payload-specific elements.
 
@@ -127,10 +132,10 @@ some are included in the project source under spec/fixtures/webhook_examples.
 
 === What additional methods does event_payload provide to help extract payload-specific elements?
 
-In addition to prividing full Hash-like access to the raw message, the `event_payload` object
+In addition to prividing full Hash-like access to the raw message, the <tt>event_payload</tt> object
 (a Mandrill::WebHook::EventDecorator) provides a range of helper methods for some of the more obvious
 things you might need to do with the payload. Here are some examples (see
-{Mandrill::WebHook::EventDecorator class documentation}[http://rubydoc.info/gems/mandrill-rails/0.0.2/Mandrill/WebHook/EventDecorator]
+{Mandrill::WebHook::EventDecorator class documentation}[http://rubydoc.info/gems/mandrill-rails/Mandrill/WebHook/EventDecorator]
 for full details)
 
     event_payload.message_id
@@ -160,14 +165,14 @@ for full details)
 
 === How to extend Mandrill::WebHook::EventDecorator for application-specific payload handling?
 
-It's quite likely you may benefit from adding more application-specific intelligence to the
-`event_payload` object.
+It's likely you may benefit from adding more application-specific intelligence to the
+<tt>event_payload</tt> object.
 
 There are many ways to do this, but it is quite legitimate to reopen the EventDecorator class and add your own methods
 if you wish.
 
-For example `event_payload.user_email` returns the subject user email address, but perhaps I will commonly want to
-match that with a user record in my system. Or I similarly want to resolve `event_payload.recipient_emails` to user records.
+For example <tt>event_payload.user_email</tt> returns the subject user email address, but perhaps I will commonly want to
+match that with a user record in my system. Or I similarly want to resolve <tt>event_payload.recipient_emails</tt> to user records.
 In this case, I could extend EventDecorator in my app like this:
 
     # Extends Mandrill::WebHook::EventDecorator with app-specific event payload transformation
@@ -187,7 +192,7 @@ In this case, I could extend EventDecorator in my app like this:
 
 === How do I extract attachments from an inbound email?
 
-The EventDecorator class provides an `attachments` method to access an array of attachments (if any).
+The EventDecorator class provides an <tt>attachments</tt> method to access an array of attachments (if any).
 Each attachment is encapsulated in a class that describes the name, mime type, raw and decoded content.
 
 For example:
@@ -211,10 +216,13 @@ For example:
       end
     end
 
-=== How do I use Mandrill gem features with Mandrill::Rails?
+=== How do I use Mandrill API features with Mandrill::Rails?
 
-{Mandrill}[https://github.com/tatemae-consultancy/mandrill] is included with Mandrill::Rails
-and its behaviour is unchanged. You can use all the features of the Mandrill gem as normal.
+Mandrill::Rails currently does not need or require any direct Mandrill API integration (such as provided by
+various {Mandrill}[https://rubygems.org/search?utf8=%E2%9C%93&query=mandrill]
+and {MailChimp}[https://rubygems.org/search?utf8=%E2%9C%93&query=mailchimp] gems).
+If you need direct API integration in addition to Mandrill::Rails features,
+you can choose to add whichever best meets your needs and use as normal.
 
 == Contributing to Mandrill::Rails
 
@@ -224,7 +232,7 @@ and its behaviour is unchanged. You can use all the features of the Mandrill gem
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Please try not to mess with the gemspec, Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 == Copyright
 

data/lib/mandrill-rails/version.rb

@@ -3,5 +3,5 @@ module Mandrill
   end
 end
 unless defined?(Mandrill::Rails::VERSION)
-  Mandrill::Rails::VERSION = "0.0.3"
+  Mandrill::Rails::VERSION = "0.0.4"
 end

data/mandrill-rails.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Mandrill::Rails::VERSION
 
-  gem.add_runtime_dependency(%q<mandrill>, ["~> 0.0.2"])
   gem.add_runtime_dependency(%q<activesupport>, [">= 3.0.3"])
   gem.add_development_dependency(%q<bundler>, [">= 1.1.0"])
   gem.add_development_dependency(%q<rake>, ["~> 0.9.2.2"])

data/spec/mandrill/web_hook/event_decorator_spec.rb

@@ -16,7 +16,7 @@ describe Mandrill::WebHook::EventDecorator do
   # * soft_bounce - message has soft bounced
   # * spam - recipient marked a message as spam
   # * unsub - recipient unsubscribed
-  # http://goingon.in/inbox
+  #
   {
     'inbound' => {
       :event_type => 'inbound',
@@ -211,14 +211,14 @@ describe Mandrill::WebHook::EventDecorator do
       let(:raw_event) { webhook_example_event('inbound_with_multiple_attachments') }
       its(:count) { should eql(2) }
       describe "pdf attachment" do
-        subject { event_payload.attachments.first }
+        subject { event_payload.attachments.select{|a| a.type =~ /pdf/ }.first }
         its(:name) { should eql('sample.pdf') }
         its(:type) { should eql('application/pdf') }
         its(:content) { should match(/^JVBERi0xL/) }
         its(:decoded_content) { should match(/^%PDF-1.3/) }
       end
       describe "txt attachment" do
-        subject { event_payload.attachments.last }
+        subject { event_payload.attachments.select{|a| a.type =~ /plain/ }.first }
         its(:name) { should eql('sample.txt') }
         its(:type) { should eql('text/plain') }
         its(:content) { should eql("This is \na sample\ntext file\n") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandrill-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mandrill
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +117,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - Guardfile
 - LICENSE
@@ -183,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides webhook processing and event decoration to make using Mandrill with