macaco 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef247b290b179c9b35eb058c9067ee3e34ae9028
+  data.tar.gz: c508f2cc3d6a5cecb15ed37847b6ccaf0b3c7fb3
+SHA512:
+  metadata.gz: 41cbd0c14ab5e61333d1bcb0a0ce740650f89da0e0892ed21067ad5954497d99e7d38e68a690e7e54e5f2d4f2bb04b7a3c21f9ee25bf7b98d0449a4b89121ae1
+  data.tar.gz: 9284d424e25eb6e2ad266df81017d9ba3217fdf71b7efb1bff1b669886c658a2cf9027b569f52565ee6572b3c1c6f12acf73b548eeea3798111bbd32d7d88bd9

data/.travis.yml

@@ -4,8 +4,11 @@ rvm:
 - 1.9.2
 - 1.9.3
 - 2.0.0
+- 2.1.0
 - jruby-19mode
-- rbx-19mode
+- rbx
 env:
   global:
-    secure: RRPan9WyIeNkwnDDHlmL+BgwSVP7dLcdUc7ZBQ4MF/XWH6dbkkTu5wDGxRnnI/Rjuwz1GKBpbV74La7X/3QrAQeQIUu5B/jdj2CgZvrTt2ngsbsPcLqLJXd6cCIUqBt125tkyPMDn3n/s1flloVvTLYRWZHwG0jOZiVy5rEdf9Q=
+  - secure: bKfiz20c9hES95IOSzQmolmV5Rplhe11XS/puPsTeYANuL0jda6xlEP+r7/wtztFueQDIGJzVDrJPNkAaQms5qOwTVursdx5W4H9FanNTX7GBaAiaR6YmbcysBJTByPO48ustEUQR2mxsOA5JTYXdYb7nQd6hzJujGqzf+WTe58=
+  - secure: C3a8krkzZK3tPlWNpduon0LCUAUaa2d3CA/aU15GV/yG/CH+fjjXeQhQNcQMN5Ahe8DFvVdZly5VZf5VnXh1k1mzebrqGurTgX6D483l+oc8ym6igiDnxtB5Q3VxjDjMsK1uLBltSXzOcdoGjyKm5AflqWNH5RXHY+7vAIWu9bs=
+  - secure: dDpqHaTNH7Fway0b0WcVHCuaedMemAv3HMt92xD7wIHYkgue/Selx1MVA9e9f+/+x+2EkzyziktniKBGX77TgpCLBCq5x1CWOTQX0HSOt+hDOgJrLx2Yklo0LKoFGkjDw0tbH9nrMe6tA//bbn9FmUuKO3h5/nV7JZm1bmOQX84=

data/Gemfile

@@ -1,10 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :test do
-  gem 'minitest'
-  gem 'webmock'
-  gem 'vcr'
-  gem 'rake'
-end

data/bin/bundler

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('macaco', 'bundler')

data/lib/macaco/api.rb

@@ -4,7 +4,7 @@ module Macaco
     def self.post(args = {})
 
       request = request_instance(args)
-      request.body = args[:data].to_json
+      request.body = args[:data]
 
       JSON.parse(http_response(request, args).body)
 
@@ -17,7 +17,7 @@ module Macaco
       end
 
       def self.request_instance(args)
-        Net::HTTP::Post.new(args[:mail].api_path, initheader = { 'Content-Type' => 'application/json' })
+        Net::HTTP::Post.new(args[:mail].api_path, { 'Content-Type' => args[:mail].content_type })
       end
 
       def self.http_instance(args)

data/lib/macaco/senders/mandrill.rb

@@ -1,8 +1,8 @@
 module Macaco
   class Mandrill < Sender
 
-    def api_key
-      Macaco.config.api_key || ENV['MACACO_API_KEY']
+    def docs
+      'https://mandrillapp.com/api/docs/messages.JSON.html#method-send'
     end
 
     def api_root
@@ -13,6 +13,10 @@ module Macaco
       '/api/1.0/messages/send.json'
     end
 
+    def content_type
+      'application/json'
+    end
+
     def to_hash
       {
         message: {
@@ -27,7 +31,17 @@ module Macaco
 
     def send
       data = to_hash.merge!({ key: api_key })
-      Macaco::Api.post({ mail: self, data: data })
+      Macaco::Api.post({ mail: self, data: convert_data_params(data) })
+    end
+
+    private
+
+    def convert_data_params(data)
+      data.to_json
+    end
+
+    def api_key
+      Macaco.config.api_key || ENV['MACACO_API_KEY']
     end
 
   end

data/lib/macaco/senders/sendgrid.rb

@@ -0,0 +1,57 @@
+module Macaco
+  class Sendgrid < Sender
+
+    def docs
+      'http://sendgrid.com/docs/API_Reference/Web_API/mail.html'
+    end
+
+    def api_root
+      'api.sendgrid.com'
+    end
+
+    def api_path
+      '/api/mail.send.json'
+    end
+
+    def content_type
+      'application/x-www-form-urlencoded'
+    end
+
+    def to_hash
+      {
+        from: @from,
+        to: @to,
+        subject: @subject,
+        html: @body_html,
+        text: @body_text
+      }
+    end
+
+    def to(val = nil)
+      return @to unless val
+      @to << val
+    end
+
+    def send
+      data = to_hash.merge!({ api_key: api_key, api_user: api_user })
+      Macaco::Api.post({ mail: self, data: convert_data_params(data) })
+    end
+
+    private
+
+    def convert_data_params(data)
+      addr = Addressable::URI.new
+      addr.query_values = data
+      addr.query
+    end
+
+    def api_key
+      Macaco.config.api_key || ENV['MACACO_API_KEY']
+    end
+
+    def api_user
+      Macaco.config.api_user || ENV['MACACO_USER']
+    end
+
+  end
+end

data/lib/macaco/version.rb

@@ -1,3 +1,3 @@
 module Macaco
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/macaco.rb

@@ -6,6 +6,7 @@ require 'macaco/version'
 require 'macaco/api'
 require 'macaco/senders/sender'
 require 'macaco/senders/mandrill'
+require 'macaco/senders/sendgrid'
 
 module Macaco
   class << self
@@ -18,10 +19,9 @@ module Macaco
   end
 
   class Configuration
-    attr_accessor :api_key, :sender
+    attr_accessor :api_key, :api_user, :sender
 
     def initialize
-      @api_key  = ENV['MACACO_API_KEY']
       @sender   = :mandrill
     end
   end

data/macaco.gemspec

@@ -17,4 +17,12 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency 'minitest', '~> 0'
+  gem.add_development_dependency 'webmock',  '~> 1.15'
+  gem.add_development_dependency 'vcr',      '~> 2.9'
+  gem.add_development_dependency 'rake',     '~> 10.1'
+
+  gem.add_runtime_dependency 'addressable',  '~> 2.3'
+
 end

data/spec/lib/macaco/senders/mandrill_spec.rb

@@ -2,16 +2,28 @@ require 'spec_helper'
 
 describe Macaco::Mandrill do
 
+  before do
+    Macaco.configure do |config|
+      config.api_key = ENV['MANDRILL_API_KEY']
+    end
+  end
+
   let(:mail) do
     Macaco::Mandrill.new do
-      to      'to@test.com'
-      from    'from@test.com'
+      to      'james@jamesduncombe.com'
+      from    'james@jamesduncombe.com'
       subject 'Subject for my email'
       body_html '<h1>This is a header for the HTML version</h1>'
       body_text 'This is the Text version'
     end
   end
 
+  describe '#docs' do
+    it 'returns back the address for the documentation for the REAL API method' do
+      Macaco::Mandrill.new.docs.must_equal 'https://mandrillapp.com/api/docs/messages.JSON.html#method-send'
+    end
+  end
+
   describe '#api_root' do
     it { Macaco::Mandrill.new.api_root.must_equal 'mandrillapp.com' }
   end
@@ -33,7 +45,7 @@ describe Macaco::Mandrill do
 
   describe '#send' do
     subject do
-      VCR.use_cassette('send') do
+      VCR.use_cassette('send_mandrill') do
         mail.send
       end
     end

data/spec/lib/macaco/senders/sendgrid_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Macaco::Sendgrid do
+
+  before do
+    Macaco.configure do |config|
+      config.api_key  = ENV['SENDGRID_API_KEY']
+      config.api_user = ENV['SENDGRID_USER']
+    end
+  end
+
+  let(:mail) do
+    Macaco::Sendgrid.new do
+      to      'james@jamesduncombe.com'
+      from    'james@jamesduncombe.com'
+      subject 'Subject for my email'
+      body_html '<h1>This is a header for the HTML version</h1>'
+      body_text 'This is the Text version'
+    end
+  end
+
+  describe '#docs' do
+    it 'returns back the address for the documentation for the REAL API method' do
+      Macaco::Sendgrid.new.docs.must_equal 'http://sendgrid.com/docs/API_Reference/Web_API/mail.html'
+    end
+  end
+
+  describe '#api_root' do
+    it { Macaco::Sendgrid.new.api_root.must_equal 'api.sendgrid.com' }
+  end
+
+  describe '#api_path' do
+    it { Macaco::Sendgrid.new.api_path.must_equal '/api/mail.send.json' }
+  end
+
+  describe '#to_hash' do
+    subject { mail.to_hash }
+    it { subject.must_be_kind_of Hash }
+  end
+
+  describe '#to_json' do
+    it 'converts the mandrill hash into a JSON string' do
+      mail.to_json.must_be_kind_of String
+    end
+  end
+
+  describe '#send' do
+    subject do
+      VCR.use_cassette('send_sendgrid') do
+        mail.send
+      end
+    end
+    it { subject.must_be_kind_of Hash }
+    it { subject['message'].must_equal 'success' }
+  end
+end

data/spec/spec_helper.rb

@@ -5,14 +5,9 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 require 'vcr'
-
 require 'macaco'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.hook_into :webmock
 end
-
-Macaco.configure do |config|
-  config.api_key = ENV['MANDRILL_API_KEY']
-end

metadata

@@ -1,68 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: macaco
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - James Duncombe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
-dependencies: []
+date: 2014-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Tiny gem to wrap Mandrill API's send method without other gem dependencies
 email:
 - james@jamesduncombe.com
 executables:
+- bundler
 - rake
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bundler
 - bin/rake
 - lib/macaco.rb
 - lib/macaco/api.rb
 - lib/macaco/senders/mandrill.rb
 - lib/macaco/senders/sender.rb
+- lib/macaco/senders/sendgrid.rb
 - lib/macaco/version.rb
 - macaco.gemspec
 - spec/lib/macaco/senders/mandrill_spec.rb
 - spec/lib/macaco/senders/sender_spec.rb
+- spec/lib/macaco/senders/sendgrid_spec.rb
 - spec/lib/macaco_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/jamesduncombe/macaco
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tiny wrapper around Mandrill API's send method
 test_files:
 - spec/lib/macaco/senders/mandrill_spec.rb
 - spec/lib/macaco/senders/sender_spec.rb
+- spec/lib/macaco/senders/sendgrid_spec.rb
 - spec/lib/macaco_spec.rb
 - spec/spec_helper.rb