swapir 1.0.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404826b301e9dbde596f73bdbffeb5d6dba9a079
-  data.tar.gz: 9fb4230d8ed2c3fe30f4ee22e688d7f8c9497778
+  metadata.gz: 2d2a8e7bac0bf47a87c77dc2c926f355f9a9c7a3
+  data.tar.gz: a2b01bc6228379f1108103136f27910cd7b5fc5f
 SHA512:
-  metadata.gz: b789af461e734f40a2da061e957d25f1c0dde486ae757129ddae9446e85c62a787f84e9485ba449cc4431893bb05e9fe4606198395dad589be77b5c896511970
-  data.tar.gz: 4a408280301cf658adc3958b86d9f3c1adee2065c1ffccedf0b451d67fdde547752d609e838ba35616d6316a5ba6574b9a55ccf1e200ddd2e425fb0bb1ed8121
+  metadata.gz: b1bf0ae045ae400da0c8942ca5aca1d9f5f3ab9f5f7f70505930e7375b120aa6722b6ba14662c6f99fab4c60419240242b082267f8811e28d25c93198772133d
+  data.tar.gz: c1db00aa94f84ab487577576d528280cd5660a524a11624f4ec269fe8d94fbeb8d86d5d306952611924a2cfa05a41eba8b0419e241f0c9b1b6328814f6216c92

data/Gemfile

@@ -6,7 +6,3 @@ gemspec :name => "swapir"
 
 gem "rest-client"
 gem "json"
-
-group :development do
-	gem "byebug"
-end

data/lib/swapir.rb

@@ -6,7 +6,6 @@
 # external gem dependencies
 require "rest-client"
 require "json"
-require "byebug"
 
 # internal dependencies
 require "swapir/resource_api"
@@ -28,15 +27,15 @@ class Swapir
     # handle the raised exception
     begin
       RestClient.get(api_base_url).code == 200
-    rescue Errno::ECONNREFUSED => e
+    rescue RestClient::ExceptionWithResponse => e
       false
     end
   end
 
   def self.request(resource)
-    return "" unless self.api_available?
-    # call the Star Wars Api endpoint returns the api response
-    # and does not raise an exception when it fails
+    return "Star Wars API is not available" unless self.api_available?
+    # rest-client returns the swapi response with status 200
+    # it does not raise an exception when the request fails
     begin
       RestClient.get(api_base_url + resource)
     rescue RestClient::ExceptionWithResponse => e
@@ -45,7 +44,7 @@ class Swapir
   end
 
   def self.decode(response)
-    # convert the Star Wars Api response body
+    # convert the Star Wars Api response body for a single resource
     # return the data in a Ruby Hash
     JSON.parse(response.body)
   end
@@ -55,4 +54,24 @@ class Swapir
     # return the data collection in a Ruby Hash
     JSON.parse(response.body)["results"]
   end
+
+  def self.paginated_request(resource)
+    next_url = api_base_url + resource
+    total_records = nil
+    collection = []
+
+    loop do
+      response = RestClient.get(next_url)
+      break if response.code != 200
+
+      total_records = decode(response)["count"]
+      data = decode_results(response)
+      collection += data
+
+      break if (data.empty? || collection.length >= total_records)
+      next_url = decode(response)["next"]
+    end
+
+    collection
+  end
 end

data/lib/swapir/resource_list_api.rb

@@ -14,7 +14,7 @@ module ResourceListApi
       # define_method creates a closure which can hold references
       # to large objects that will never be garbage collected
       define_method("get_all_#{resource}") do
-        decode_results(request(resource))
+        paginated_request(resource)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swapir
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.1
 platform: ruby
 authors:
 - Riana Ferreira
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement