nylas 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b60f55a392bfe4d0f3c6e0ecc37e783752add29
-  data.tar.gz: 1a6af142d7458455dd49ed9c45e3f3b18d93cb59
+  metadata.gz: ccf84356618303aac11fbe3a42e849cf12c39523
+  data.tar.gz: 61186e74226ef63f22a636cad9ada12ef9ba15ee
 SHA512:
-  metadata.gz: a0ed44667ecb4975213ceb7fa746d821d0e5cc01752fce9b1e7dde670559fec3c001b52a34fc20bf92f208a2fb32644107494c8866f8a24003f42d7f57e165f4
-  data.tar.gz: 8e4d7ef85607a1f9011017198ff5c1e65bb52abf1be5cf98f9caddb542df5685f5e1391cf542f4fd104172804e77153d456a8b79bcfa12757c6c8063bd87e608
+  metadata.gz: 0bd236ce1d002c37a428e68e5268c1e006bd5ec598b242f4d3f032acef6e04564b829f52cd60efa988b3af35d0fbb3e0eca27a674e5964db31f7c6ddbc56b1bc
+  data.tar.gz: 2fb547cd6fe80d29b14af51164e95755934214ff1a53d2f916673db10e9a08b4f4ad0804f98f21d1b9c2fea8f15bfc02e375c0f2cf9f59eed26e06e7de346a91

data/lib/api_thread.rb

@@ -34,7 +34,7 @@ module Inbox
        label
       end
 
-      if not folder.nil?
+      if not folder.nil? and folder.is_a?(Hash)
        folder = Folder.new(@_api)
        folder.inflate(@folder)
        @folder = folder
@@ -52,14 +52,22 @@ module Inbox
     def as_json(options = {})
       hash = {}
 
+      if not @unread.nil?
+        hash["unread"] = @unread
+      end
+
+      if not @starred.nil?
+        hash["starred"] = @starred
+      end
+
       if not @labels.nil? and @labels != []
-        hash["labels"] = @labels.map do |label|
+        hash["label_ids"] = @labels.map do |label|
           label.id
         end
       end
 
       if not @folder.nil?
-        hash["folder"] = @folder.id
+        hash["folder_id"] = @folder.id
       end
 
       hash

data/lib/message.rb

@@ -38,7 +38,7 @@ module Inbox
        label
       end
 
-      if not folder.nil?
+      if not folder.nil? and folder.is_a?(Hash)
        folder = Folder.new(@_api)
        folder.inflate(@folder)
        @folder = folder
@@ -59,13 +59,13 @@ module Inbox
       end
 
       if not @labels.nil? and @labels != []
-        hash["labels"] = @labels.map do |label|
+        hash["label_ids"] = @labels.map do |label|
           label.id
         end
       end
 
       if not @folder.nil?
-        hash["folder"] = @folder.id
+        hash["folder_id"] = @folder.id
       end
 
       hash

data/lib/restful_model_collection.rb

@@ -15,17 +15,16 @@ module Inbox
     def each
       return enum_for(:each) unless block_given?
 
-      @filters[:offset] = 0 unless @filters.key?(:offset)
-      @filters[:limit] = 100 unless @filters.key?(:limit)
-
+      offset = 0
+      chunk_size = 100
       finished = false
       while (!finished) do
-        results = get_model_collection()
+        results = get_model_collection(offset, chunk_size)
         results.each { |item|
           yield item
         }
-        @filters[:offset] += results.length
-        finished = results.length < @filters[:limit]
+        offset += results.length
+        finished = results.length < chunk_size
       end
     end
 
@@ -65,17 +64,12 @@ module Inbox
       finished = false
       chunk_size = 100
 
-      while (!finished && accumulated.length < limit) do
-        @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
+      if limit < chunk_size
+        chunk_size = limit
+      end
 
-        results = get_model_collection()
+      while (!finished && accumulated.length < limit) do
+        results = get_model_collection(offset + accumulated.length, chunk_size)
         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...
@@ -142,8 +136,10 @@ module Inbox
       model
     end
 
-    def get_model_collection
+    def get_model_collection(offset = 0, limit = 100)
       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 = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

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