inbox 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b6984a5e605532a22d7f884478155114856e0c
-  data.tar.gz: 387c6b20f67ae5e836f4ad20fb791f85c1c43b79
+  metadata.gz: 0eed0e8c05ccc5058757a802114677ef14f3d290
+  data.tar.gz: d8561281e5cac7dc75c2d940f602a05b3b022fd5
 SHA512:
-  metadata.gz: 399247811e80bc82d7934b19073cd37f4acb54593608b6992cb8394fea1f34a9e9480d9b389809daa7177fb7872a427a601b63a5df6caca8ba58928e681b9727
-  data.tar.gz: 9a6493e1b86fef9772faaf72621043f9a121308a415bd7f9bf5dbf20307cdba266e1edab53f0f42659152b880050c6f8024b21d94e2aa395351be1f4874b6d2c
+  metadata.gz: 1520cdba3b742d01486e28820830ed6db74748c9f35146c254bdf4e17167286acece7fb9da28ab44e7f17f05e6d5c4a2166129cda211d6764492146fa424411e
+  data.tar.gz: 3ffd9f2218a91713f9011de687dd79de1ce852f32c9b3fbe2505dace03ef3b95cc65f258308236584719c104fac1dcf6f72fb84b23d2df7bd2b1ad2ca98d281c

data/README.md

@@ -83,7 +83,9 @@ def login
   # This URL must be registered with your application in the developer portal
   callback_url = url_for(:action => 'login_callback')
 
-  redirect_to nylas.url_for_authentication(callback_url, user_email)
+  # You can also optionally pass state, an optional arbitrary string that
+  # will be passed back to us at the end of the auth flow.
+  redirect_to nylas.url_for_authentication(callback_url, user_email, {:state => 'ben auth'})
 end
 ```
 
@@ -458,23 +460,36 @@ The streaming API will receive deltas in real time, without needing to repeatedl
 ```ruby
 cursor = nylas.latest_cursor
 
-last_cursor = nil
-nylas.delta_stream(cursor) do |event, object|
-  if event == "create" or event == "modify"
-    if object.is_a?(Nylas::Contact)
-      puts "#{object.name} - #{object.email}"
-    elsif object.is_a?(Nylas::Event)
-      puts "Event!"
+EventMachine.run do
+  nylas.delta_stream(cursor) do |event, object|
+    if event == "create" or event == "modify"
+      if object.is_a?(Nylas::Contact)
+        puts "#{object.name} - #{object.email}"
+      elsif object.is_a?(Nylas::Event)
+        puts "Event!"
+      end
+    elsif event == "delete"
+      # In the case of a deletion, the API only returns the ID of the object.
+      # In this case, the Ruby SDK returns a dummy object with only the id field
+      # set.
+      puts "Deleting from collection #{object.class.name}, id: #{object}"
     end
-  elsif event == "delete"
-    # In the case of a deletion, the API only returns the ID of the object.
-    # In this case, the Ruby SDK returns a dummy object with only the id field
-    # set.
-    puts "Deleting from collection #{object.class.name}, id: #{object}"
   end
-  last_cursor = object.cursor
+end
+```
+
+To receive streams from multiple accounts, call `delta_stream` for each of them inside an `EventMachine.run` block.
 
-  # This will loop indefintely
+```ruby
+api_handles = [] # a list of Nylas::API objects
+
+EventMachine.run do
+  api_handles.each do |a|
+    cursor = a.latest_cursor()
+    a.delta_stream(cursor) do |event, object|
+      puts object
+    end
+  end
 end
 ```
 
@@ -541,9 +556,9 @@ nylas = Nylas::API.new(nil, nil, nil, 'http://localhost:5555/')
 # going to use.
 account_id = nylas.accounts.first.id
 
-# Display the contents of the first message for the first account
+# Display the body of the first message for the first account
 nylas = Nylas::API.new(nil, nil, account_id, 'http://localhost:5555/')
-puts nylas.messages.first.contents
+puts nylas.messages.first.body
 ```
 
 

data/lib/inbox.rb

@@ -3,6 +3,7 @@ require 'rest-client'
 require 'yajl'
 require 'em-http'
 require 'ostruct'
+require 'active_support/core_ext/hash'
 
 require 'account'
 require 'api_account'
@@ -113,11 +114,20 @@ module Inbox
     end
 
     def url_for_authentication(redirect_uri, login_hint = '', options = {})
-      trialString = 'false'
-      if options[:trial] == true
-        trialString = 'true'
+      params = {
+        :client_id => @app_id,
+        :trial => options.fetch(:trial, false),
+        :response_type => 'code',
+        :scope => 'email',
+        :login_hint => login_hint,
+        :redirect_uri => redirect_uri,
+      }
+
+      if options.has_key?(:state) then
+        params[:state] = options[:state]
       end
-      "https://#{@service_domain}/oauth/authorize?client_id=#{@app_id}&trial=#{trialString}&response_type=code&scope=email&login_hint=#{login_hint}&redirect_uri=#{redirect_uri}"
+
+      "https://#{@service_domain}/oauth/authorize?" + params.to_query
     end
 
     def url_for_management
@@ -203,23 +213,6 @@ module Inbox
           end
     end
 
-    def get_cursor(timestamp)
-      # Get the cursor corresponding to a specific timestamp.
-      warn "Nylas#get_cursor is deprecated. Use Nylas#latest_cursor instead."
-
-      path = self.url_for_path("/delta/generate_cursor")
-      data = { :start => timestamp }
-
-      cursor = nil
-
-      RestClient.post(path, data.to_json, :content_type => :json) do |response,request,result|
-        json = Inbox.interpret_response(result, response, {:expected_class => Object})
-        cursor = json["cursor"]
-      end
-
-      cursor
-    end
-
     def latest_cursor
       # Get the cursor corresponding to a specific timestamp.
       path = self.url_for_path("/delta/latest_cursor")
@@ -364,15 +357,17 @@ module Inbox
         end
       end
 
-      EventMachine.run do
-        http = EventMachine::HttpRequest.new(path, :connect_timeout => 0, :inactivity_timeout => timeout).get(:keepalive => true)
-        http.stream do |chunk|
-          parser << chunk
-        end
-        http.errback do
-          raise UnexpectedResponse.new http.error
-        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
+      http.stream do |chunk|
+        parser << chunk
       end
+
+      http.errback do
+        raise UnexpectedResponse.new http.error
+      end
+
     end
   end
 end

data/lib/message.rb

@@ -9,6 +9,7 @@ module Inbox
     parameter :snippet
     parameter :from
     parameter :to
+    parameter :reply_to
     parameter :cc
     parameter :bcc
     parameter :date

data/lib/nylas.rb

@@ -3,6 +3,7 @@ require 'rest-client'
 require 'yajl'
 require 'em-http'
 require 'ostruct'
+require 'active_support/core_ext/hash'
 
 require 'account'
 require 'api_account'
@@ -113,11 +114,20 @@ module Inbox
     end
 
     def url_for_authentication(redirect_uri, login_hint = '', options = {})
-      trialString = 'false'
-      if options[:trial] == true
-        trialString = 'true'
+      params = {
+        :client_id => @app_id,
+        :trial => options.fetch(:trial, false),
+        :response_type => 'code',
+        :scope => 'email',
+        :login_hint => login_hint,
+        :redirect_uri => redirect_uri,
+      }
+
+      if options.has_key?(:state) then
+        params[:state] = options[:state]
       end
-      "https://#{@service_domain}/oauth/authorize?client_id=#{@app_id}&trial=#{trialString}&response_type=code&scope=email&login_hint=#{login_hint}&redirect_uri=#{redirect_uri}"
+
+      "https://#{@service_domain}/oauth/authorize?" + params.to_query
     end
 
     def url_for_management
@@ -203,23 +213,6 @@ module Inbox
           end
     end
 
-    def get_cursor(timestamp)
-      # Get the cursor corresponding to a specific timestamp.
-      warn "Nylas#get_cursor is deprecated. Use Nylas#latest_cursor instead."
-
-      path = self.url_for_path("/delta/generate_cursor")
-      data = { :start => timestamp }
-
-      cursor = nil
-
-      RestClient.post(path, data.to_json, :content_type => :json) do |response,request,result|
-        json = Inbox.interpret_response(result, response, {:expected_class => Object})
-        cursor = json["cursor"]
-      end
-
-      cursor
-    end
-
     def latest_cursor
       # Get the cursor corresponding to a specific timestamp.
       path = self.url_for_path("/delta/latest_cursor")
@@ -364,15 +357,17 @@ module Inbox
         end
       end
 
-      EventMachine.run do
-        http = EventMachine::HttpRequest.new(path, :connect_timeout => 0, :inactivity_timeout => timeout).get(:keepalive => true)
-        http.stream do |chunk|
-          parser << chunk
-        end
-        http.errback do
-          raise UnexpectedResponse.new http.error
-        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
+      http.stream do |chunk|
+        parser << chunk
       end
+
+      http.errback do
+        raise UnexpectedResponse.new http.error
+      end
+
     end
   end
 end

data/lib/restful_model_collection.rb

@@ -15,16 +15,17 @@ module Inbox
     def each
       return enum_for(:each) unless block_given?
 
-      offset = 0
-      chunk_size = 100
+      @filters[:offset] = 0 unless @filters.key?(:offset)
+      @filters[:limit] = 100 unless @filters.key?(:limit)
+
       finished = false
       while (!finished) do
-        results = get_model_collection(offset, chunk_size)
+        results = get_model_collection()
         results.each { |item|
           yield item
         }
-        offset += results.length
-        finished = results.length < chunk_size
+        @filters[:offset] += results.length
+        finished = results.length < @filters[:limit]
       end
     end
 
@@ -64,12 +65,17 @@ module Inbox
       finished = false
       chunk_size = 100
 
-      if limit < chunk_size
-        chunk_size = limit
-      end
-
       while (!finished && accumulated.length < limit) do
-        results = get_model_collection(offset + accumulated.length, chunk_size)
+        @filters[:offset] = offset + accumulated.length
+
+        # if the total items we want, minus how many we already have, is fewer than we plan to grab...
+        remaining = limit - accumulated.length
+        if remaining < chunk_size
+          chunk_size = remaining
+        end
+        @filters[:limit] = chunk_size
+
+        results = get_model_collection()
         accumulated = accumulated.concat(results)
 
         # we're done if we have more than 'limit' items, or if we asked for 50 and got less than 50...
@@ -136,10 +142,8 @@ module Inbox
       model
     end
 
-    def get_model_collection(offset = 0, limit = 100)
+    def get_model_collection
       filters = @filters.clone
-      filters[:offset] = offset
-      filters[:limit] = limit
       models = []
 
       RestClient.get(url, :params => filters){ |response,request,result|

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Inbox
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inbox
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Gotow
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client