macaco 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1078ceb7dcd54467dbbd9273ab210fd1c1ac8f12
-  data.tar.gz: 5430c892dafa8b343f999f581605cf0708355ac6
+  metadata.gz: 6c311cce7eb6b749472dc6545918ec37cd9b0f4a
+  data.tar.gz: fd41959ac47959eebe4511f602f7d9ddeba47eff
 SHA512:
-  metadata.gz: 1af44dd2a4569cc3d21883ebad45aab3377bd44b73762c1517f07bce44e1643e9d5926069de27687b60606acd928e8b5c1524e6e9567b9843a008cfa150bb9b1
-  data.tar.gz: 134a25373c4dd29a5f11f6063e2f8f5fb0c3d624ec14cbf11be1bab03b60c68f550ba2e6cbe9d590d639dfcf03319ffd1fa3b16235208ae87bb5f7e7a9ab2f28
+  metadata.gz: 807ada9767d78334929d61824d3256e442406ea682867507b358750169d2a3e3cd8bff1b98110514580b84320cfcee64636d090f3e0241379b4b17a4e913a48e
+  data.tar.gz: 050d3a949f4c66deb632cab47e7c6cd75233bd29db41665fa59dd30bc0790f01f79a1fed32ee9c7e1377a2d29bf41aefcf72bf87b4f86b97c4576adb6d9c8986

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .ruby-version
 .ruby-gemset
 fixtures/vcr_cassettes/*
+bin/

data/.travis.yml

@@ -1,14 +1,18 @@
 language: ruby
+
 cache: bundler
+
 rvm:
-- 1.9.2
-- 1.9.3
-- 2.0.0
-- 2.1.0
-- jruby-19mode
-- rbx
+  - 1.9.3
+  - 2.1
+  - 2.2
+  - 2.3.0
+  - jruby-19mode
+
+before_install:
+  - gem install bundler -v 1.11.2
+
 env:
   global:
-  - secure: bKfiz20c9hES95IOSzQmolmV5Rplhe11XS/puPsTeYANuL0jda6xlEP+r7/wtztFueQDIGJzVDrJPNkAaQms5qOwTVursdx5W4H9FanNTX7GBaAiaR6YmbcysBJTByPO48ustEUQR2mxsOA5JTYXdYb7nQd6hzJujGqzf+WTe58=
-  - secure: C3a8krkzZK3tPlWNpduon0LCUAUaa2d3CA/aU15GV/yG/CH+fjjXeQhQNcQMN5Ahe8DFvVdZly5VZf5VnXh1k1mzebrqGurTgX6D483l+oc8ym6igiDnxtB5Q3VxjDjMsK1uLBltSXzOcdoGjyKm5AflqWNH5RXHY+7vAIWu9bs=
-  - secure: dDpqHaTNH7Fway0b0WcVHCuaedMemAv3HMt92xD7wIHYkgue/Selx1MVA9e9f+/+x+2EkzyziktniKBGX77TgpCLBCq5x1CWOTQX0HSOt+hDOgJrLx2Yklo0LKoFGkjDw0tbH9nrMe6tA//bbn9FmUuKO3h5/nV7JZm1bmOQX84=
+  - secure: er1Lqs3NDljT6tTinixr2pHonlCP8G33dW1INaEQwoTFRR9BqRqsfci6LVF9yJH+vtrK1d6Pf+rmtq9Qf8M+PqHmDe5YPhF6qRsrVAcnQt27sYP6c+XPB0v3IY9Nokl8mR+CysLgv/mPwEUEdoMymgpdiTKcA+c3ZOUaoKVk+Is=
+  - secure: pHFAESEdswQm3Ser9ex+gmdRTz0UBEj3+57lzi3lQyZu2cHoV3kEirZjwEdjJUzXcMxV00I2i87ULnO+IuDPvbMvmvncJtseMHQ2WeX17tvWTe5TiEFxLE4IqwzTiHbuFFqAAO6gi+rbNa3St09zAf/7FPDP9aY4+5JSqW8hK/s=

data/README.md

@@ -1,7 +1,7 @@
 # Macaco
-[![Build Status](https://travis-ci.org/jamesduncombe/macaco.png?branch=master)](https://travis-ci.org/jamesduncombe/macaco)
+[![Build Status](https://travis-ci.org/jamesduncombe/macaco.svg?branch=master)](https://travis-ci.org/jamesduncombe/macaco)
 
-Tiny wrapper around (for now) [Mandrill API's send method](https://mandrillapp.com/api/docs/messages.JSON.html#method=send). Later to be expanded to handle Sendgrid's send method too.
+Tiny wrapper around [Sendgrid](https://sendgrid.com/docs/API_Reference/Web_API/mail.html#-send) and [Mandrill API's send methods](https://mandrillapp.com/api/docs/messages.JSON.html#method=send).
 
 ## Installation
 
@@ -19,24 +19,19 @@ Or install it yourself as:
 
 ## Usage
 
-By default Macaco tries to find your mail API key with the `MACACO_API_KEY`
-environment variable.
-
-However, you can configure Macaco to use a different key by passing a block to the
-configure method. Here I've used a different environment variable:
+You can configure Macaco to use your API key by passing a block to the
+configure method. Here I've used one for Sendgrid:
 
 ```ruby
 Macaco.configure do |config|
-  config.api_key = ENV['MANDRILL_API_KEY']
+  config.api_key = ENV['SENDGRID_API_KEY']
 end
 ```
 
-At the moment we just have the [send message](https://mandrillapp.com/api/docs/messages.JSON.html#method=send) method. Use it like this:
-
 First create a new mail object:
 
 ```ruby
-mail = Macaco::Mandrill.new do
+mail = Macaco::Sendgrid.new do
   to 'to@test.com'
   from 'from@test.com'
   subject 'This is my subject'
@@ -54,8 +49,7 @@ mail.send
 ## Todo
 
 - Add further reflection methods to be able to inspect the mail object
-- Add support for Sendgrid's send method
-
+- Add support for other API's send methods
 
 ## Contributing
 

data/lib/macaco/api.rb

@@ -2,12 +2,10 @@ module Macaco
   class Api
 
     def self.post(args = {})
-
       request = request_instance(args)
       request.body = args[:data]
 
       JSON.parse(http_response(request, args).body)
-
     end
 
     private
@@ -17,7 +15,10 @@ module Macaco
       end
 
       def self.request_instance(args)
-        Net::HTTP::Post.new(args[:mail].api_path, { 'Content-Type' => args[:mail].content_type })
+        headers = {
+          'Content-Type' => args[:mail].content_type
+        }.merge(args.fetch(:headers) { Hash.new })
+        Net::HTTP::Post.new(args[:mail].api_path, headers)
       end
 
       def self.http_instance(args)

data/lib/macaco/senders/mandrill.rb

@@ -29,6 +29,11 @@ module Macaco
       }
     end
 
+    def to(val = nil)
+      return @to unless val
+      @to << { email: val }
+    end
+
     def send
       data = to_hash.merge!({ key: api_key })
       Macaco::Api.post({ mail: self, data: convert_data_params(data) })

data/lib/macaco/senders/sender.rb

@@ -30,7 +30,7 @@ module Macaco
 
     def to(val = nil)
       return @to unless val
-      @to << { email: val }
+      @to << val
     end
 
     def from(val = nil)

data/lib/macaco/senders/sendgrid.rb

@@ -2,7 +2,7 @@ module Macaco
   class Sendgrid < Sender
 
     def docs
-      'http://sendgrid.com/docs/API_Reference/Web_API/mail.html'
+      'https://sendgrid.com/docs/API_Reference/Web_API/mail.html#-send'
     end
 
     def api_root
@@ -27,30 +27,23 @@ module Macaco
       }
     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) })
+      data = to_hash
+      Macaco::Api.post({
+        mail: self,
+        data: convert_data_params(data),
+        headers: { "Authorization" => "Bearer #{api_key}" }
+      })
     end
 
     private
 
     def convert_data_params(data)
-      addr = Addressable::URI.new
-      addr.query_values = data
-      addr.query
+      URI.encode_www_form(data)
     end
 
     def api_key
-      Macaco.config.api_key || ENV['MACACO_API_KEY']
-    end
-
-    def api_user
-      Macaco.config.api_user || ENV['MACACO_USER']
+      Macaco.config.api_key || ENV['SENDGRID_API_KEY']
     end
 
   end

data/lib/macaco/version.rb

@@ -1,3 +1,3 @@
 module Macaco
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/macaco.rb

@@ -19,10 +19,6 @@ module Macaco
   end
 
   class Configuration
-    attr_accessor :api_key, :api_user, :sender
-
-    def initialize
-      @sender   = :mandrill
-    end
+    attr_accessor :api_key
   end
 end

data/macaco.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Macaco::VERSION
   gem.authors       = ["James Duncombe"]
   gem.email         = ["james@jamesduncombe.com"]
-  gem.summary       = %q{Tiny wrapper around Mandrill API's send method}
-  gem.description   = %q{Tiny gem to wrap Mandrill API's send method without other gem dependencies}
+  gem.summary       = %q{When all you want to do is send email}
+  gem.description   = %q{Tiny gem to send email using popular email providers}
   gem.homepage      = "https://github.com/jamesduncombe/macaco"
   gem.license       = 'MIT'
 
@@ -19,10 +19,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'minitest', '~> 5.0'
-  gem.add_development_dependency 'webmock',  '~> 1.15'
-  gem.add_development_dependency 'vcr',      '~> 2.9'
+  gem.add_development_dependency 'webmock',  '~> 0'
+  gem.add_development_dependency 'vcr',      '~> 3.0'
   gem.add_development_dependency 'rake',     '~> 10.1'
 
-  gem.add_runtime_dependency 'addressable',  '~> 2.3'
-
 end

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

@@ -21,7 +21,7 @@ describe Macaco::Sender do
 
   describe '#to' do
     it 'sets the recipient if theres a string provided' do
-      mail.to.must_equal [ { email: 'to@test.com' } ]
+      mail.to.must_equal [ 'to@test.com' ]
     end
   end
 
@@ -52,5 +52,5 @@ describe Macaco::Sender do
       n.body_text.must_equal 'This is a test'
     end
   end
-  
+
 end

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

@@ -5,7 +5,6 @@ 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
 
@@ -21,7 +20,7 @@ describe Macaco::Sendgrid do
 
   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'
+      Macaco::Sendgrid.new.docs.must_equal 'https://sendgrid.com/docs/API_Reference/Web_API/mail.html#-send'
     end
   end
 

data/spec/lib/macaco_spec.rb

@@ -5,9 +5,9 @@ describe Macaco do
   describe '#configure' do
     it 'configures the gem' do
       Macaco.configure do |config|
-        config.api_key = 'dfsdf'
+        config.api_key = 'YOUR_API_KEY'
       end
-      Macaco.config.api_key.must_match 'dfsdf'
+      Macaco.config.api_key.must_match 'YOUR_API_KEY'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaco
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - James Duncombe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,26 +66,10 @@ dependencies:
     - - "~>"
       - !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
+description: Tiny gem to send email using popular email providers
 email:
 - james@jamesduncombe.com
-executables:
-- bundler
-- rake
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -95,8 +79,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/bundler
-- bin/rake
 - lib/macaco.rb
 - lib/macaco/api.rb
 - lib/macaco/senders/mandrill.rb
@@ -129,10 +111,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Tiny wrapper around Mandrill API's send method
+summary: When all you want to do is send email
 test_files:
 - spec/lib/macaco/senders/mandrill_spec.rb
 - spec/lib/macaco/senders/sender_spec.rb

data/bin/bundler

@@ -1,16 +0,0 @@
-#!/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/bin/rake

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' 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', 'rake')