game_of_thrones_api 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a183c141181b06da9971102948278966afc87107
-  data.tar.gz: f71d6fb00c936bf1384c9dc9cf4f348b6107d3d1
+  metadata.gz: e35ef7f62a8e03e487fc3a0b08fc643411ca6174
+  data.tar.gz: 4b8512e1383f38cecde0eac6c3235467c592e45b
 SHA512:
-  metadata.gz: 7009e890f25fc8619098ede5ad2212d541680db6d9d38bd33f7f25a75fca3d7f9942772e1a50f0da4fb82d1c916cf46adcfbbb14aa53b8dd92b2619d08be3ac6
-  data.tar.gz: b7e9aee365b8195b9d60e563a62a15e2d1d6d074a7ff3f3e512fcf2e7c95132d836838d953bbe956baf5fa58efee03affffe4e39d60c0a96e329221fa6d5e6ab
+  metadata.gz: 90ff96e9407265de9666a4de70fefa40f0c9d6bbf8b9701a3148d489da683244429743cb5e57653a24bfd5ae2d60207d061c83de117a6cd81a55e31d4a62ac86
+  data.tar.gz: 6a3af14417c53252a0897fc3be6925def477b6764c1a157b6ee11f2f52b4b49512354d78eb7b17049e985cecbec753459a20d6602584ec18e8bf9d190d6f1f01

data/lib/game_of_thrones_api.rb

@@ -24,7 +24,7 @@ module GameOfThronesApi
       response    = get("#{BASE_ENDPOINT}/books?page=1&pageSize=50")
       total_pages = get_page_count(response)
 
-      get_all_records('books', response, total_pages)
+      get_all_records('books', response.parsed_response, total_pages)
     end
   end
 
@@ -40,7 +40,7 @@ module GameOfThronesApi
       response    = get("#{BASE_ENDPOINT}/characters?page=1&pageSize=50")
       total_pages = get_page_count(response)
 
-      get_all_records('characters', response, total_pages)
+      get_all_records('characters', response.parsed_response, total_pages)
     end
   end
 
@@ -56,7 +56,7 @@ module GameOfThronesApi
       response    = get("#{BASE_ENDPOINT}/houses?page=1&pageSize=50")
       total_pages = get_page_count(response)
 
-      get_all_records('houses', response, total_pages)
+      get_all_records('houses', response.parsed_response, total_pages)
     end
   end
 
@@ -89,7 +89,7 @@ module GameOfThronesApi
   def titleize_query(query)
     split_words =
       query.split.map.with_index do |word, index|
-        if WORD_PARTICLES.exclude?(word) || index.zero?
+        if !WORD_PARTICLES.include?(word) || index.zero?
           word.capitalize
         else
           word
@@ -101,14 +101,13 @@ module GameOfThronesApi
 
   # The API results are paginated, just looping through the pages to collect
   # all the records associated with the category.
-  def get_all_records(category, response, total_pages, page = 1)
-    characters  = response.parsed_response
-
-    while total_pages >= page
-      page       += 1
-      characters += get("#{BASE_ENDPOINT}/#{category}?page=#{page}&pageSize=50").parsed_response
+  def get_all_records(category, records, total_pages, page = 1)
+    if total_pages >= page
+      page    += 1
+      records += get("#{BASE_ENDPOINT}/#{category}?page=#{page}&pageSize=50").parsed_response
+      get_all_records(category, records, total_pages, page)
+    else
+      records
     end
-
-    characters
   end
 end

data/lib/game_of_thrones_api/version.rb

@@ -1,3 +1,3 @@
 module GameOfThronesApi
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: game_of_thrones_api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Tam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Game of Thrones