inbox 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eed0e8c05ccc5058757a802114677ef14f3d290
-  data.tar.gz: d8561281e5cac7dc75c2d940f602a05b3b022fd5
+  metadata.gz: e4c45defbc44bf103f5b3dc5e96f48d29e640299
+  data.tar.gz: f02c604694341f461eea4b746eacccfd5c2888c4
 SHA512:
-  metadata.gz: 1520cdba3b742d01486e28820830ed6db74748c9f35146c254bdf4e17167286acece7fb9da28ab44e7f17f05e6d5c4a2166129cda211d6764492146fa424411e
-  data.tar.gz: 3ffd9f2218a91713f9011de687dd79de1ce852f32c9b3fbe2505dace03ef3b95cc65f258308236584719c104fac1dcf6f72fb84b23d2df7bd2b1ad2ca98d281c
+  metadata.gz: 1c3eb310a357ddb279efff8ae524f7c1a94a2e8970363682380b0f820a2ca7527581e2f37231a41d729b81c05ceefbf2fd8ed52ecef0e5c3054b3a24cfba92f3
+  data.tar.gz: 0e0931047cd3c10b64c6c8eb3a1f1f636cc8de647c424bb185c5263026b62cda70fbca3b7fd80f4208ace9a59c636490400dab2d912b742bc01681ad47d868bd

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: inbox
 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