sraas 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af79a1b3cdc77cf6ea26c5ce968562ca573867d2
-  data.tar.gz: 2d000227d9c4c79cb5076e6349021a6874536695
+  metadata.gz: 15de4390f85d779d412e993f44cd3c604b6fad13
+  data.tar.gz: 927b836ef0adc1ad02bbf39cdfbf69aebc74b923
 SHA512:
-  metadata.gz: db4cb29c28282f4cc4ca12638867191d3e16b872ae0ceed73f48fcc0b67cf556980048e3f3cddd76f61879bf840dc3792ad167867ab0334e8ab4e74a30160349
-  data.tar.gz: 803a4c99a0c1a1237ccc30a9ca311b4bb733e7f7a03f6316fe8c134474c5cab0fbc5255c112dc5e035a1900f7d6096b9409ec34a104774d1213d85029132e100
+  metadata.gz: b9ddada0d84318aecf1b2199a9237f453ebfa704bcae1f1a21fbe7889aef217baed2c2e2eab3c9688413157ea5660c73e2f12ee019e8999d89e61e625223d402
+  data.tar.gz: 3ed3051c1919b7523933f26939d731edb11e625c1d83dab18a0be5e4c766fc268029556695779bdd9f2379fb22f108f336cae8472604b22aa879c1b8d7ead056

data/lib/sraas.rb

@@ -53,30 +53,17 @@ module Sraas
     # This returns template cards "index" json
     # if limit is > 100, do paging here.
     def template_cards(template_deck_id, offset: 0, limit: 100)
-      if limit <= 100
-        paging = { limit: limit, offset: offset }.to_query
-        JSON.parse(Sraas.api_resource(:get, "#{self.template_decks_endpoint}/#{template_deck_id}/template_cards", paging))
-      else
-        template_cards = []
-        q, r = limit.divmod(100)
-
-        # if remainder > 0, request for it first.
-        if r > 0
-          paging = { limit: r, offset: offset }.to_query
-          template_cards << JSON.parse(Sraas.api_resource(:get, "#{self.template_decks_endpoint}/#{template_deck_id}/template_cards", paging))
-          offset += r
-        end
-        q.times do
-          paging = { limit: 100, offset: offset }.to_query
-          result = JSON.parse(Sraas.api_resource(:get, "#{self.template_decks_endpoint}/#{template_deck_id}/template_cards", paging))
-          # If limit is bigger than number of template_cards, break once result is empty
-          # e.g. limit = 10000
-          break if result.empty?
-          template_cards << result
-          offset += result.count
-        end
-        template_cards.flatten
+      template_cards = []
+      remainder = limit
+      while remainder > 0 do
+        paging = { limit: remainder, offset: offset} #even if limit(remainder) > 100, it will be 100 on sraas side.
+        result = JSON.parse(Sraas.api_resource(:get, "#{self.template_decks_endpoint}/#{template_deck_id}/template_cards", paging))
+        break if result.empty?
+        template_cards << result
+        remainder -= 100
+        offset += 100
       end
+      template_cards.flatten
     end
 
     # This returns template card "full" json

data/lib/sraas/version.rb

@@ -1,3 +1,3 @@
 module Sraas
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sraas
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jonathan Siegel