nylas 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf84356618303aac11fbe3a42e849cf12c39523
-  data.tar.gz: 61186e74226ef63f22a636cad9ada12ef9ba15ee
+  metadata.gz: ab2bbc150ba9969544a9044e70426435899ce892
+  data.tar.gz: ef8eaf6732b5dba963c8a6e4fbc238e91de70950
 SHA512:
-  metadata.gz: 0bd236ce1d002c37a428e68e5268c1e006bd5ec598b242f4d3f032acef6e04564b829f52cd60efa988b3af35d0fbb3e0eca27a674e5964db31f7c6ddbc56b1bc
-  data.tar.gz: 2fb547cd6fe80d29b14af51164e95755934214ff1a53d2f916673db10e9a08b4f4ad0804f98f21d1b9c2fea8f15bfc02e375c0f2cf9f59eed26e06e7de346a91
+  metadata.gz: 05aea3e3090be4f44562970ca4e80eb127825d4fef4565800e1d2a40a2063c250583ffb782f456e7d0ac5d2cb5bc1323879f3703b3fa12b433b6bbe2af723f4a
+  data.tar.gz: 90ef6270c015fe24d10e968679fbe7b2e33e29cec4d282c561a997708cc011cf260578b4306d59877c691d790ab128c89e2e79c13bb9fee0a3fcf33cc18b9b39

data/lib/account.rb

@@ -1,6 +1,6 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class Account < RestfulModel
 
     parameter :account_id
@@ -15,7 +15,7 @@ module Inbox
       collection = ManagementModelCollection.new(Account, @_api, {:account_id=>@account_id})
       ::RestClient.post("#{collection.url}/#{@account_id}/#{action}",{}) do |response, request, result|
           # Throw any exceptions
-        json = Inbox.interpret_response(result, response, :expected_class => Object)
+        json = Nylas.interpret_response(result, response, :expected_class => Object)
       end
     end
 

data/lib/api_account.rb

@@ -3,7 +3,7 @@
 # account management endpoint.
 require 'restful_model'
 
-module Inbox
+module Nylas
   class APIAccount < RestfulModel
 
     parameter :account_id

data/lib/api_thread.rb

@@ -2,7 +2,7 @@ require 'restful_model'
 require 'time_attr_accessor'
 require 'mixins'
 
-module Inbox
+module Nylas
   class Thread < RestfulModel
     extend TimeAttrAccessor
 

data/lib/calendar.rb

@@ -1,7 +1,7 @@
 require 'restful_model'
 require 'event'
 
-module Inbox
+module Nylas
   class Calendar < RestfulModel
 
     parameter :name

data/lib/contact.rb

@@ -1,10 +1,10 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class Contact < RestfulModel
 
     parameter :name
     parameter :email
 
   end
-end
+end

data/lib/draft.rb

@@ -1,6 +1,6 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class Draft < Message
 
     parameter :thread_id
@@ -32,25 +32,18 @@ module Inbox
       end
 
       ::RestClient.post(url, data.to_json, :content_type => :json) do |response, request, result|
-
-        # This is mostly lifted from Inbox#interpret_response. We're not using the original function
-        # because we need to pass an additional error message to the Exception constructor.
-        Inbox.interpret_http_status(result)
-        json = JSON.parse(response)
-        if json.is_a?(Hash) && (json['type'] == 'api_error' or json['type'] == 'invalid_request_error')
-          exc = Inbox.http_code_to_exception(result.code.to_i)
-          exc_type = json['type']
-          exc_message = json['message']
-          exc_server_error = json['server_error']
-          raise exc.new(exc_type, exc_message, server_error=exc_server_error)
-        end
-        raise UnexpectedResponse.new(result.msg) if result.is_a?(Net::HTTPClientError)
-
-        self.inflate(json)
+        response = Nylas.interpret_response(result, response, {:expected_class => Object})
+        self.inflate(response)
       end
 
       self
     end
 
+    def destroy
+      ::RestClient::Request.execute(method: :delete, url: self.url, payload: ({ :version => self.version }).to_json) do |response, request, result|
+        response = Nylas.interpret_response(result, response, options={:raw_response=>true})
+      end
+    end
+
   end
 end

data/lib/event.rb

@@ -1,6 +1,6 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class Event < RestfulModel
 
     parameter :title
@@ -35,7 +35,7 @@ module Inbox
       data = {:event_id => @id, :status => status, :comment => comment}
 
       ::RestClient.post(url, data.to_json, :content_type => :json) do |response, request, result|
-        json = Inbox.interpret_response(result, response, :expected_class => Object)
+        json = Nylas.interpret_response(result, response, :expected_class => Object)
         self.inflate(json)
       end
 

data/lib/file.rb

@@ -1,6 +1,6 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class File < RestfulModel
 
     parameter :size
@@ -20,7 +20,7 @@ module Inbox
 
     def save!
       ::RestClient.post(url, {:file => @file}) do |response, request, result|
-        json = Inbox.interpret_response(result, response, :expected_class => Object)
+        json = Nylas.interpret_response(result, response, :expected_class => Object)
         json = json[0] if (json.class == Array)
         inflate(json)
       end
@@ -30,7 +30,7 @@ module Inbox
     def download
       download_url = self.url('download')
       ::RestClient.get(download_url) do |response, request, result|
-        Inbox.interpret_http_status(result)
+        Nylas.interpret_response(result, response, {:raw_response => true})
         response
       end
     end

data/lib/folder.rb

@@ -1,6 +1,6 @@
 require 'restful_model'
 
-module Inbox
+module Nylas
   class Folder < RestfulModel
 
     parameter :display_name

data/lib/label.rb

@@ -1,4 +1,4 @@
 require 'folder'
 
-module Inbox
+module Nylas
 end

data/lib/message.rb

@@ -2,7 +2,7 @@ require 'restful_model'
 require 'file'
 require 'mixins'
 
-module Inbox
+module Nylas
   class Message < RestfulModel
 
     parameter :subject
@@ -20,7 +20,7 @@ module Inbox
     parameter :folder
     parameter :labels
 
-    include Inbox::ReadUnreadMethods
+    include Nylas::ReadUnreadMethods
 
     def inflate(json)
       super
@@ -80,10 +80,9 @@ module Inbox
     end
 
     def raw
-      model = nil
       collection = RestfulModelCollection.new(Message, @_api, {:message_id=>@id})
       RestClient.get("#{collection.url}/#{id}/", :accept => 'message/rfc822'){ |response,request,result|
-        Inbox.interpret_http_status(result)
+        Nylas.interpret_response(result, response, {:raw_response => true})
         response
       }
     end
@@ -92,8 +91,8 @@ module Inbox
       expanded_url = url(action='?view=expanded')
 
       RestClient.get(expanded_url){ |response,request,result|
-        json = Inbox.interpret_response(result, response, :expected_class => Object)
-        expanded_message = Inbox::ExpandedMessage.new(@_api)
+        json = Nylas.interpret_response(result, response, :expected_class => Object)
+        expanded_message = Nylas::ExpandedMessage.new(@_api)
         expanded_message.inflate(json)
         expanded_message
       }

data/lib/mixins.rb

@@ -1,4 +1,4 @@
-module Inbox
+module Nylas
   module ReadUnreadMethods
     def update_param!(param, value)
       update('PUT', '', {

data/lib/nylas.rb

@@ -2,6 +2,8 @@ require 'json'
 require 'rest-client'
 require 'yajl'
 require 'em-http'
+
+
 require 'ostruct'
 require 'active_support/core_ext/hash'
 
@@ -21,41 +23,43 @@ require 'restful_model'
 require 'restful_model_collection'
 require 'version'
 
-module Inbox
+module Nylas
   Error = Class.new(::StandardError)
-  AccessDenied = Class.new(Error)
-  ResourceNotFound = Class.new(Error)
   NoAuthToken = Class.new(Error)
   UnexpectedAccountAction = Class.new(Error)
   UnexpectedResponse = Class.new(Error)
   class APIError < Error
-    attr_accessor :error_type
+    attr_accessor :type
+    attr_accessor :message
     attr_accessor :server_error
 
-    def initialize(type, error, server_error = nil)
-      super(error)
-      self.error_type = type
+    def initialize(type, message, server_error = nil)
+      super(message)
+      self.type = type
+      self.message = message 
       self.server_error = server_error
     end
   end
+  AccessDenied = Class.new(APIError)
+  ResourceNotFound = Class.new(APIError)
   InvalidRequest = Class.new(APIError)
   MessageRejected = Class.new(APIError)
   SendingQuotaExceeded = Class.new(APIError)
   ServiceUnavailable = Class.new(APIError)
-
-  def self.interpret_http_status(result)
-    # Handle HTTP errors and RestClient errors
-    raise ResourceNotFound.new if result.code.to_i == 404
-    raise AccessDenied.new if result.code.to_i == 403
-  end
+  BadGateway = Class.new(APIError)
+  InternalError = Class.new(APIError)
+  MailProviderError = Class.new(APIError)
 
   HTTP_CODE_TO_EXCEPTIONS = {
     400 => InvalidRequest,
     402 => MessageRejected,
     403 => AccessDenied,
     404 => ResourceNotFound,
+    422 => MailProviderError,
     429 => SendingQuotaExceeded,
-    503 => ServiceUnavailable
+    500 => InternalError,
+    502 => BadGateway,
+    503 => ServiceUnavailable,
   }.freeze
 
   def self.http_code_to_exception(http_code)
@@ -63,19 +67,27 @@ module Inbox
   end
 
   def self.interpret_response(result, result_content, options = {})
-    # Handle HTTP errors
-    self.interpret_http_status(result)
 
-    # Handle content expectation errors
+    # We expected a certain kind of object, but the API didn't return anything
     raise UnexpectedResponse.new if options[:expected_class] && result_content.empty?
-    json = options[:result_parsed]? result_content : JSON.parse(result_content)
-    if json.is_a?(Hash) && (json['type'] == 'api_error' or json['type'] == 'invalid_request_error')
-      exc = Inbox.http_code_to_exception(result.code.to_i)
-      raise exc.new(json['type'], json['message'])
+
+    # If it's already parsed, or if we've received an actual raw payload on success, don't parse
+    if options[:result_parsed] || (options[:raw_response] && result.code.to_i == 200)
+      response = result_content
+    else
+      response = JSON.parse(result_content)
     end
+
+    if result.code.to_i != 200
+      exc = Nylas.http_code_to_exception(result.code.to_i)
+      if response.is_a?(Hash)
+        raise exc.new(response['type'], response['message'], response.fetch('server_error', nil))
+      end
+    end
+    
     raise UnexpectedResponse.new(result.msg) if result.is_a?(Net::HTTPClientError)
-    raise UnexpectedResponse.new if options[:expected_class] && !json.is_a?(options[:expected_class])
-    json
+    raise UnexpectedResponse.new if options[:expected_class] && !response.is_a?(options[:expected_class])
+    response
 
   rescue JSON::ParserError => e
     # Handle parsing errors
@@ -91,13 +103,13 @@ module Inbox
 
     def initialize(app_id, app_secret, access_token = nil, api_server = 'https://api.nylas.com',
                    service_domain = 'api.nylas.com')
-      raise "When overriding the Inbox API server address, you must include https://" unless api_server.include?('://')
+      raise "When overriding the Nylas API server address, you must include https://" unless api_server.include?('://')
       @api_server = api_server
       @access_token = access_token
       @app_secret = app_secret
       @app_id = app_id
       @service_domain = service_domain
-      @version = Inbox::VERSION
+      @version = Nylas::VERSION
 
       if ::RestClient.before_execution_procs.empty?
         ::RestClient.add_before_execution_proc do |req, params|
@@ -148,7 +160,7 @@ module Inbox
       }
 
       ::RestClient.post("https://#{@service_domain}/oauth/token", data) do |response, request, result|
-        json = Inbox.interpret_response(result, response, :expected_class => Object)
+        json = Nylas.interpret_response(result, response, :expected_class => Object)
         return json['access_token']
       end
     end
@@ -194,7 +206,7 @@ module Inbox
       path = self.url_for_path("/account")
 
       RestClient.get(path, {}) do |response,request,result|
-        json = Inbox.interpret_response(result, response, {:expected_class => Object})
+        json = Nylas.interpret_response(result, response, {:expected_class => Object})
         model = APIAccount.new(self)
         model.inflate(json)
         model
@@ -220,7 +232,7 @@ module Inbox
       cursor = nil
 
       RestClient.post(path, :content_type => :json) do |response,request,result|
-        json = Inbox.interpret_response(result, response, {:expected_class => Object})
+        json = Nylas.interpret_response(result, response, {:expected_class => Object})
         cursor = json["cursor"]
       end
 
@@ -228,23 +240,23 @@ module Inbox
     end
 
     OBJECTS_TABLE = {
-      "account" => Inbox::Account,
-      "calendar" => Inbox::Calendar,
-      "draft" => Inbox::Draft,
-      "thread" => Inbox::Thread,
-      "contact" => Inbox::Contact,
-      "event" => Inbox::Event,
-      "file" => Inbox::File,
-      "message" => Inbox::Message,
-      "folder" => Inbox::Folder,
-      "label" => Inbox::Label,
+      "account" => Nylas::Account,
+      "calendar" => Nylas::Calendar,
+      "draft" => Nylas::Draft,
+      "thread" => Nylas::Thread,
+      "contact" => Nylas::Contact,
+      "event" => Nylas::Event,
+      "file" => Nylas::File,
+      "message" => Nylas::Message,
+      "folder" => Nylas::Folder,
+      "label" => Nylas::Label,
     }
 
     # It's possible to ask the API to expand objects.
     # In this case, we do the right thing and return
     # an expanded object.
     EXPANDED_OBJECTS_TABLE = {
-      "message" => Inbox::ExpandedMessage,
+      "message" => Nylas::ExpandedMessage,
     }
 
     def _build_exclude_types(exclude_types)
@@ -280,7 +292,7 @@ module Inbox
         json = nil
 
         RestClient.get(path) do |response,request,result|
-          json = Inbox.interpret_response(result, response, {:expected_class => Object})
+          json = Nylas.interpret_response(result, response, {:expected_class => Object})
         end
 
         start_cursor = json["cursor_start"]
@@ -332,7 +344,7 @@ module Inbox
 
       parser = Yajl::Parser.new(:symbolize_keys => false)
       parser.on_parse_complete = proc do |data|
-        delta = Inbox.interpret_response(OpenStruct.new(:code => '200'), data, {:expected_class => Object, :result_parsed => true})
+        delta = Nylas.interpret_response(OpenStruct.new(:code => '200'), data, {:expected_class => Object, :result_parsed => true})
 
         if not OBJECTS_TABLE.has_key?(delta['object'])
           next
@@ -356,10 +368,10 @@ module Inbox
             yield delta["event"], obj
         end
       end
-
+      
       http = EventMachine::HttpRequest.new(path, :connect_timeout => 0, :inactivity_timeout => timeout).get(:keepalive => true)
 
-      # set a callback on the HTTP stream that parses incoming chunks as they come in
+      # set a callback on the HTTP stream that parses incoming chunks as they come in		
       http.stream do |chunk|
         parser << chunk
       end
@@ -367,9 +379,7 @@ module Inbox
       http.errback do
         raise UnexpectedResponse.new http.error
       end
-
+  
     end
   end
 end
-
-Nylas = Inbox.clone

data/lib/parameters.rb

@@ -1,4 +1,4 @@
-module Inbox
+module Nylas
   module Parameters
     def self.included(base)
       base.extend(ClassMethods)