game_of_thrones_api 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd6e56b8e7824f68bd7ac7986630639c2390cc3
-  data.tar.gz: 029801b8def9109f1bebb81596dc88e245baddc3
+  metadata.gz: a078977179fabc795d32224b634241e1626bdf99
+  data.tar.gz: 9fb064b4100378430cf6bb61ec2a43d68bbce462
 SHA512:
-  metadata.gz: ba15cf937e98ce214145f2c52addb9214ab89d20548dd5f089a5dc171c59ff85fda04608c7b8d9c1a50b9f8481a131ac1a03d1d221a9a586baf81913d9b02ed6
-  data.tar.gz: 0a421f4cb0ffaa6e41ce96e546ae96cd5aaa44b452c5359f3d521a201775d1d05019ebd0be99ca0578e5dcb91461e7cff4e89617aed4e5542273d3020430ed41
+  metadata.gz: 5002c3711cba6322a1fa72f19322b0a89c8c42cb85dcf430eb830c7e251f1a55328ca50e01f7b7c9ae3b88d1648c59112e202e3f957ec274c4283991b0b5701f
+  data.tar.gz: b38bfb700b90b3ac0f6ee66b78e708ec534a87ce624f76d485943100e336598f7828f22b4d6c82f93c2f45abf1f7ce730988c86e1bc9d82e8da88949c3d25451

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+notes.rb

data/README.md

@@ -6,7 +6,7 @@ API Wrapper using [An API Of Ice And Fire](https://anapioficeandfire.com/)
 
 Still In developement. Basic Functionality. Find Books, Characters and Houses.
 
-##### TODO: Better filtering, incorporate pagination, complete API functionality and of course tests.
+##### TODO: Better filtering, fuzzy find for houses, complete API functionality and of course tests.
 
 ## Installation
 
@@ -35,7 +35,7 @@ GameOfThronesApi.get_books
 
 #### Find a single book
 ```
-GameOfThronesApi.find_book('A Game of Thrones')
+GameOfThronesApi.find_book('A Dance with Dragons')
 ```
 
 #### Retrieve Characters
@@ -53,9 +53,9 @@ GameOfThronesApi.find_book('Jon Snow')
 GameOfThronesApi.get_houses
 ```
 
-#### Find a single book
+#### Find a specific House, must be complete house name. Will implement a fuzzy search in the future.
 ```
-GameOfThronesApi.find_house('targaryen')
+GameOfThronesApi.find_house("House Targaryen of King's Landing")
 ```
 
 ## Contributing

data/lib/game_of_thrones_api.rb

@@ -8,31 +8,39 @@ module GameOfThronesApi
   BASE_ENDPOINT = "http://anapioficeandfire.com/api"
 
   def self.get_books
-    get("#{BASE_ENDPOINT}/books").parsed_response
+    response    = get("#{BASE_ENDPOINT}/books?page=1&pageSize=50")
+    total_pages = get_page_count(response)
+
+    get_all_records('books', response, total_pages)
   end
 
   def self.find_book(name)
-    name = name_query(filter)
+    name = name_query(name)
     get("#{BASE_ENDPOINT}/books#{name}").parsed_response
   end
 
   def self.get_characters
-    get("#{BASE_ENDPOINT}/characters").parsed_response
+    response    = get("#{BASE_ENDPOINT}/characters?page=1&pageSize=50")
+    total_pages = get_page_count(response)
+
+    get_all_records('characters', response, total_pages)
   end
 
   def self.find_character(name)
-    name = name_query(filter)
+    name = name_query(name)
     get("#{BASE_ENDPOINT}/characters#{name}").parsed_response
   end
 
   def self.get_houses
-    filter = name_query(filter) if filter
-    get("#{BASE_ENDPOINT}/houses#{filter}").parsed_response
+    response    = get("#{BASE_ENDPOINT}/houses?page=1&pageSize=50")
+    total_pages = get_page_count(response)
+
+    get_all_records('houses', response, total_pages)
   end
 
   def self.find_house(name)
-    filter = name_query(filter) if filter
-    get("#{BASE_ENDPOINT}/houses#{filter}").parsed_response
+    name = name_query(name)
+    get("#{BASE_ENDPOINT}/houses#{name}").parsed_response
   end
 
   module_function
@@ -44,4 +52,20 @@ module GameOfThronesApi
   def uri_escape(term)
     term.gsub(' ', '%20')
   end
+
+  def get_page_count(response)
+    page_links = response.headers['link'].scan(/<(\S+)>/).flatten
+    /\?page\=(\d+)\&/.match(page_links.last)[1].to_i
+  end
+
+  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
+    end
+
+    characters
+  end
 end

data/lib/game_of_thrones_api/version.rb

@@ -1,3 +1,3 @@
 module GameOfThronesApi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: game_of_thrones_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Tam