nvlope 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd510beb0984f8e9ba22af3a1e68663d875669b
-  data.tar.gz: 6ef841b1008c40533ed7dd2a1e9541c89648dca8
+  metadata.gz: 6f323a601352b22c4a9d1a1a663e32cce9e09c76
+  data.tar.gz: d0692731b041722896a76e37e2b19e670226b649
 SHA512:
-  metadata.gz: 53da464862a6a87a2a01a1384cd11cdd650842b1876c10e88e2b29838400d5d9c16ce120c20c907e8c2bd8908ca9e9b14e7fa16a6728d0a85e2b55bf4a0d238d
-  data.tar.gz: 4fb3d419f8d0d2578b7fa78a06e3f57ec9ac03eb6ad0747849529fb7d1f2716dc7611402126b38f5f34c52a2e02e849da4d82538b54816f7d7832f013ea62c3c
+  metadata.gz: ea35523c79dc384ca7a42965bd74a552077af3c02b79e5e17aae72b35ef76de1ecf58be1efc8f160d8fe1ffba5ebad8371b5fcd1bfcca8ffa22bf8bd8cf4d02f
+  data.tar.gz: 5d3f649ef2332556e91e6e6bff1291a57182909d6bf9147c070f9e48499bcf9cc9376d3e38ef4ec16a0c54d3936c2089d8909710691283a1abc14a1eb5a226e6

data/lib/nvlope.rb

@@ -1,11 +1,13 @@
 require 'uri'
 require 'httparty'
 require 'nvlope/version'
+require 'logger'
 
 class Nvlope
 
   autoload :Arguments,         'nvlope/arguments'
   autoload :Model,             'nvlope/model'
+  autoload :Request,           'nvlope/request'
   autoload :Session,           'nvlope/session'
   autoload :AccessToken,       'nvlope/access_token'
   autoload :Account,           'nvlope/account'
@@ -15,8 +17,15 @@ class Nvlope
   autoload :Message,           'nvlope/message'
   autoload :EmailAddress,      'nvlope/email_address'
 
-  def self.Arguments hash
-    Nvlope::Arguments.new hash
+  class << self
+    def Arguments hash
+      Nvlope::Arguments.new hash
+    end
+
+    def logger
+      @logger ||= Logger.new('/dev/null')
+    end
+    attr_writer :logger
   end
 
   def initialize arguments
@@ -29,12 +38,18 @@ class Nvlope
     @grant_type     = arguments.optional(:grant_type ){ 'password'                }.to_s
     @domain         = arguments.optional(:domain     ){ 'https://api.nvlope.com/' }.to_s
     @api_version    = arguments.optional(:api_version){ 'v1'                      }.to_s
+    @logger         = arguments.optional(:logger)
   end
 
   attr_accessor :grant_type, :username, :password, :client_id, :client_secret, :domain, :api_version
 
-  def url path
-    File.join(domain, api_version, path)
+  def logger
+    @logger || self.class.logger
+  end
+  attr_writer :logger
+
+  def access_token?
+    !@access_token.nil?
   end
 
   def access_token
@@ -49,25 +64,27 @@ class Nvlope
     @messages ||= Messages.new(self)
   end
 
-  def request method, path, query={}, headers={}
-    headers['Authorization'] ||= "Bearer #{access_token}"
-    url = url(path)
-    # puts "Nvlope: #{method.upcase} #{url}"
-    HTTParty.send(method, url, query: query, headers: headers)
+  def unauthenticated_request method, path, options={}
+    Request.new(self, method, path, options).perform!
   end
 
+  def authenticated_request method, path, options={}
+    options[:headers] ||= {}
+    options[:headers]['Authorization'] ||= "Bearer #{access_token}"
+    Request.new(self, method, path, options).perform!
+  end
 
   def get_access_token
     @access_token = begin
-      url = url('oauth2/token')
-      # puts "Nvlope: POST #{url}"
-      response = HTTParty.post(url, query:{
-        grant_type:    grant_type,
-        username:      username,
-        password:      password,
-        client_id:     client_id,
-        client_secret: client_secret,
-      })
+      response = unauthenticated_request(:post, 'oauth2/token',
+        query: {
+          grant_type:    grant_type,
+          username:      username,
+          password:      password,
+          client_id:     client_id,
+          client_secret: client_secret,
+        }
+      )
       response['access_token']
     end
   end

data/lib/nvlope/message.rb

@@ -19,12 +19,15 @@ class Nvlope::Message < Nvlope::Model
     subject
   }
 
+  alias_method :html_part, :html
+  alias_method :text_part, :text
+
   def created_at
     @created_at ||= Time.at(created)
   end
 
   def header
-    @header ||= Nvlope::Message::Header.new(nvlope, raw['header'])
+    @header ||= Nvlope::Message::Header.new(nvlope, raw['header'] || {})
   end
 
   def sender
@@ -48,6 +51,10 @@ class Nvlope::Message < Nvlope::Model
     define_method(key){ header.send(key) }
   end
 
+  def delete
+    nvlope.messages.delete [id]
+  end
+
   def mail_message
     mail_message = Mail::Message.new
     mail_message.date         = header.date
@@ -70,4 +77,8 @@ class Nvlope::Message < Nvlope::Model
     mail_message
   end
 
+  def == other
+    (self.class === other || other.class === self) && self.id == other.id
+  end
+
 end

data/lib/nvlope/messages.rb

@@ -5,21 +5,22 @@ class Nvlope::Messages
   end
   attr_reader :nvlope
 
-  def query params={}, headers={}
-    params[:include] ||= 'all'
-    raw = nvlope.request(:get, '/messages', params, headers)
+  def query query={}
+    query[:include] ||= 'all'
+    raw = nvlope.authenticated_request(:get, '/messages', query: query)
     Nvlope::MessageCollection.new(nvlope, raw)
   end
 
-  def bulk_get message_ids, params={}, headers={}
-    params["message_ids"] = message_ids
-    raw = nvlope.request(:post, '/messages', params, headers)
+  def bulk_get message_ids, query={}
+    query["message_ids"] = message_ids
+    raw = nvlope.authenticated_request(:post, '/messages', query: query)
     Nvlope::MessageCollection.new(nvlope, raw)
   end
 
-  def delete message_ids, params={}, headers={}
-    params["message_ids"] = message_ids
-    nvlope.request(:delete, '/messages', params, headers)
+  def delete message_ids, query={}
+    query["message_ids"] = message_ids
+    headers = {'Content-Type' => 'application/json'}
+    nvlope.authenticated_request(:delete, '/messages', body: query.to_json, headers: headers)
     self
   end
 

data/lib/nvlope/model.rb

@@ -6,12 +6,12 @@ class Nvlope::Model
 
   def self.keys *keys
     @keys ||= Set[]
-    return @keys if keys.empty?
     keys = keys.flatten.map(&:to_s).to_set
     keys.each do |key|
       define_method(key_to_method_name(key)){ raw[key] }
     end
     @keys += keys
+    @keys + (superclass.respond_to?(:keys) ? superclass.keys : Set[])
   end
 
   def initialize nvlope, raw={}

data/lib/nvlope/request.rb

@@ -1,8 +1,39 @@
 class Nvlope::Request
 
-  def initialize nvlope, raw
-    @nvlope, @raw = nvlope, raw
+  Failed = Class.new(StandardError) do
+    def initialize request, response
+      @request, @response = request, response
+      super("code: #{response.code}\n#{response.body}")
+    end
+    attr_reader :request, :response
+  end
+
+  include HTTParty
+
+  def initialize nvlope, method, path, options={}
+    @nvlope, @method, @path, @options = nvlope, method, path, options
+    @url = File.join(nvlope.domain, nvlope.api_version, path)
+  end
+  attr_reader :nvlope, :method, :path, :url, :options
+
+  def response
+    @response ||= begin
+      nvlope.logger.info "Nvlope request: #{method.to_s.upcase} #{url} #{options.inspect}"
+      HTTParty.send(method, url, options)
+    end
+  end
+
+  def perform
+    response
+  end
+
+  def perform!
+    case response.code
+    when 200..299
+      return response
+    else
+      raise Failed.new(response.request, response)
+    end
   end
-  attr_reader :nvlope, :raw
 
 end

data/lib/nvlope/version.rb

@@ -1,3 +1,3 @@
 class Nvlope
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/nvlope_spec.rb

@@ -97,7 +97,7 @@ describe Nvlope do
         query: query,
         headers: headers.merge('Authorization' => 'Bearer FAKE_ACCESS_TOKEN'),
       )
-      nvlope.request(:get, 'some/path', query, headers)
+      nvlope.request(:get, 'some/path', query: query, headers: headers)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nvlope
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jared Grippe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail