Skip to content

Updated swapi.rb to handle HTTP <-> HTTPS #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated swapi.rb to handle HTTP <-> HTTPS #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ba00ac
Updated swapi.rb to handle HTTP <-> HTTPS
Brodur Oct 8, 2020
9290298
Added JSON Parsing by default
Brodur Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions lib/swapi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require 'open-uri'
require "open-uri"

module Swapi
class << self
BASE_URL = 'http://swapi.co/api'
PLANETS = 'planets'
PEOPLE = 'people'
STARSHIPS = 'starships'
VEHICLES = 'vehicles'
SPECIES = 'species'
FILMS = 'films'
BASE_URL = "https://swapi.dev/api".freeze
PLANETS = "planets".freeze
PEOPLE = "people".freeze
STARSHIPS = "starships".freeze
VEHICLES = "vehicles".freeze
SPECIES = "species".freeze
FILMS = "films".freeze

def get_all(type)
get type
Expand Down Expand Up @@ -40,12 +40,23 @@ def get_film(film_id)

private

def get(type, id = '')
def get(type, id = "")
response = execute_request("#{type}/#{id}")
end

def execute_request(uri)
response = open("#{BASE_URL}/#{uri}", "User-Agent" => "swapi-ruby").read
url = "#{BASE_URL}/#{uri}"

uri = URI.parse(url)
tries = 3

begin
response = JSON.parse(uri.open(redirect: false).read)
rescue OpenURI::HTTPRedirect => e
uri = e.uri # assigned from the "Location" response header
retry if (tries -= 1) > 0
raise
end
end
end
end