spacex 0.0.7 → 1.0.0

data/lib/spacex.rb

@@ -11,3 +11,6 @@ require_relative 'spacex/roadster'
 require_relative 'spacex/dragon_capsules'
 require_relative 'spacex/ships'
 require_relative 'spacex/missions'
+require_relative 'spacex/rockets'
+require_relative 'spacex/capsules'
+require_relative 'spacex/cores'

data/lib/spacex/base_request.rb

@@ -1,31 +1,56 @@
-require 'byebug'
-
 module SPACEX
   class Response < Hashie::Mash
     disable_warnings
   end
 
   module BaseRequest
-    def self.get(path)
-      data = call_api(path)
-      SPACEX::Response.new(data.get.body)
-    end
+    class << self
+      def info(path, klass = nil, params = {})
+        response_body = get(path, params).body
+        process(response_body, klass)
+      end
 
-    def self.retrieve_all(path)
-      data = call_api(path)
-      data.get.body.map { |k| [k] }
-    end
+      private
+
+      def get(path, params)
+        conn(path).get do |req|
+          req.params = params
+        end
+      end
+
+      def process(response_body, klass)
+        if response_body.is_a? Array
+          response_body.map do |element|
+            processed_response(element, klass)
+          end
+        else
+          processed_response(response_body, klass)
+        end
+      end
+
+      def processed_response(response, klass)
+        if klass.nil?
+          spacex_response(response)
+        else
+          klass.new(spacex_response(response))
+        end
+      end
+
+      def spacex_response(response)
+        SPACEX::Response.new(response)
+      end
 
-    def self.call_api(path)
-      Faraday.new(
-        url: "#{SPACEX::ROOT_URI}/#{path}",
-        request: {
-          params_encoder: Faraday::FlatParamsEncoder
-        }
-      ) do |c|
-        c.use ::FaradayMiddleware::ParseJson
-        c.use Faraday::Response::RaiseError
-        c.use Faraday::Adapter::NetHttp
+      def conn(path)
+        Faraday.new(
+          url: "#{SPACEX::ROOT_URI}/#{path}",
+          request: {
+            params_encoder: Faraday::FlatParamsEncoder
+          }
+        ) do |c|
+          c.use ::FaradayMiddleware::ParseJson
+          c.use Faraday::Response::RaiseError
+          c.use Faraday::Adapter::NetHttp
+        end
       end
     end
   end

data/lib/spacex/capsules.rb

@@ -0,0 +1,19 @@
+module SPACEX
+  class Capsules < Hashie::Trash
+    include Hashie::Extensions::IgnoreUndeclared
+
+    property 'capsule_serial'
+    property 'capsule_id'
+    property 'status'
+    property 'original_launch'
+    property 'original_launch_unix'
+    property 'missions'
+    property 'landings'
+    property 'type'
+    property 'details'
+
+    def self.info(capsule_serial = nil)
+      SPACEX::BaseRequest.info("capsules/#{capsule_serial}", SPACEX::Capsules)
+    end
+  end
+end

data/lib/spacex/company_info.rb

@@ -1,7 +1,7 @@
 module SPACEX
   module CompanyInfo
     def self.info
-      SPACEX::BaseRequest.get('info')
+      SPACEX::BaseRequest.info('info')
     end
   end
 end

data/lib/spacex/cores.rb

@@ -0,0 +1,22 @@
+module SPACEX
+  class Cores < Hashie::Trash
+    include Hashie::Extensions::IgnoreUndeclared
+
+    property 'core_serial'
+    property 'block'
+    property 'status'
+    property 'original_launch'
+    property 'original_launch_unix'
+    property 'missions'
+    property 'rtls_attempts'
+    property 'rtls_landings'
+    property 'asds_attempts'
+    property 'asds_landings'
+    property 'water_landing'
+    property 'details'
+
+    def self.info(core_serial = nil)
+      SPACEX::BaseRequest.info("cores/#{core_serial}", SPACEX::Cores)
+    end
+  end
+end

data/lib/spacex/dragon_capsules.rb

@@ -26,22 +26,8 @@ module SPACEX
     property 'wikipedia'
     property 'description'
 
-    class << self
-      def retrieve_all
-        data = SPACEX::BaseRequest.call_api('dragons')
-        data.get.body.map { |k| SPACEX::DragonCapsules.new(k) }
-      end
-
-      def get(dragon_id = nil)
-        return retrieve_all if dragon_id.nil?
-
-        data = SPACEX::BaseRequest.get("dragons/#{dragon_id}")
-        SPACEX::DragonCapsules.new(data)
-      end
-
-      def info(dragon_id = nil)
-        get(dragon_id)
-      end
+    def self.info(dragon_id = nil)
+      SPACEX::BaseRequest.info("dragons/#{dragon_id}", SPACEX::DragonCapsules)
     end
   end
 end

data/lib/spacex/launches.rb

@@ -1,7 +1,19 @@
 module SPACEX
   module Launches
     def self.latest
-      SPACEX::BaseRequest.get('launches/latest')
+      SPACEX::BaseRequest.info('launches/latest')
+    end
+
+    def self.next
+      SPACEX::BaseRequest.info('launches/next')
+    end
+
+    def self.all
+      SPACEX::BaseRequest.info('launches')
+    end
+
+    def self.info
+      all
     end
   end
 end

data/lib/spacex/missions.rb

@@ -11,22 +11,8 @@ module SPACEX
     property 'twitter'
     property 'description'
 
-    class << self
-      def retrieve_all
-        data = SPACEX::BaseRequest.call_api('missions')
-        data.get.body.map { |k| SPACEX::Missions.new(k) }
-      end
-
-      def get(mission_id = nil)
-        return retrieve_all if mission_id.nil?
-
-        data = SPACEX::BaseRequest.get("missions/#{mission_id}")
-        SPACEX::Missions.new(data)
-      end
-
-      def info(mission_id = nil)
-        get(mission_id)
-      end
+    def self.info(mission_id = nil)
+      SPACEX::BaseRequest.info("missions/#{mission_id}", SPACEX::Missions)
     end
   end
 end

data/lib/spacex/roadster.rb

@@ -1,7 +1,7 @@
 module SPACEX
   module Roadster
     def self.info
-      SPACEX::BaseRequest.get('roadster')
+      SPACEX::BaseRequest.info('roadster')
     end
   end
 end

data/lib/spacex/rockets.rb

@@ -0,0 +1,7 @@
+module SPACEX
+  module Rockets
+    def self.info(rocket_id = nil)
+      SPACEX::BaseRequest.info("rockets/#{rocket_id}")
+    end
+  end
+end

data/lib/spacex/ships.rb

@@ -26,22 +26,8 @@ module SPACEX
     property 'url'
     property 'image'
 
-    class << self
-      def retrieve_all
-        data = SPACEX::BaseRequest.call_api('ships')
-        data.get.body.map { |k| SPACEX::Ships.new(k) }
-      end
-
-      def get(ship_id = nil)
-        return retrieve_all if ship_id.nil?
-
-        data = SPACEX::BaseRequest.get("ships/#{ship_id}")
-        SPACEX::Ships.new(data)
-      end
-
-      def info(ship_id = nil)
-        get(ship_id)
-      end
+    def self.info(ship_id = nil)
+      SPACEX::BaseRequest.info("ships/#{ship_id}", SPACEX::Ships)
     end
   end
 end

data/lib/spacex/version.rb

@@ -1,5 +1,5 @@
 module SPACEX
-  VERSION = '0.0.7'.freeze
+  VERSION = '1.0.0'.freeze
   ROOT_URI = 'https://api.spacexdata.com/v3'.freeze
 
   def self.help

data/spacex.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.add_dependency 'faraday', '>= 0.9'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'faraday', '~> 0.9'
+  s.add_dependency 'faraday_middleware', '~> 0.12'
   s.add_dependency 'hashie', '3.6.0'
+  s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'rubocop', '0.51.0'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'vcr', '~> 4'
+  s.add_development_dependency 'webmock', '~> 3.4'
 end

data/spec/fixtures/spacex/capsules.yml

@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.spacexdata.com/v3/capsules/
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.15.3
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 15 Oct 2018 04:13:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=dd8346f9a0220b57866735728f74ebd191539576817; expires=Tue, 15-Oct-19
+        04:13:37 GMT; path=/; domain=.spacexdata.com; HttpOnly; Secure
+      Vary:
+      - Accept-Encoding, Origin
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Response-Time:
+      - 49ms
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 469f74439912572f-IAD
+    body:
+      encoding: ASCII-8BIT
+      string: '[{"capsule_serial":"C201","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Pressure vessel used for Dragon 2 structural testing. Rumored
+        to be repurposed for first Red Dragon Mission","reuse_count":0},{"capsule_serial":"C202","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Capsule used to qualify Dragon 2''s environmental control
+        and life support systems.","reuse_count":0},{"capsule_serial":"C203","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Rumored to be used for Inflight Abort Test after DM-1","reuse_count":0},{"capsule_serial":"C204","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Currently in construction for use in DM-2","reuse_count":0},{"capsule_serial":"C205","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"In construction for use in first mission in contract under
+        the CCtCap contract","reuse_count":0},{"capsule_serial":"C101","capsule_id":"dragon1","status":"retired","original_launch":"2010-12-08T15:43:00.000Z","original_launch_unix":1291822980,"missions":[{"name":"COTS
+        1","flight":7}],"landings":0,"type":"Dragon 1.0","details":"Reentered after
+        three weeks in orbit","reuse_count":0},{"capsule_serial":"C102","capsule_id":"dragon1","status":"retired","original_launch":"2012-05-02T07:44:00.000Z","original_launch_unix":1335944640,"missions":[{"name":"COTS
+        2","flight":8}],"landings":1,"type":"Dragon 1.0","details":"First Dragon spacecraft","reuse_count":0},{"capsule_serial":"C103","capsule_id":"dragon1","status":"unknown","original_launch":"2012-10-08T00:35:00.000Z","original_launch_unix":1349656500,"missions":[{"name":"CRS-1","flight":9}],"landings":1,"type":"Dragon
+        1.0","details":"First of twenty missions flown under the CRS1 contract","reuse_count":0},{"capsule_serial":"C104","capsule_id":"dragon1","status":"unknown","original_launch":"2013-03-01T19:10:00.000Z","original_launch_unix":1362165000,"missions":[{"name":"CRS-2","flight":10}],"landings":1,"type":"Dragon
+        1.0","details":null,"reuse_count":0},{"capsule_serial":"C105","capsule_id":"dragon1","status":"unknown","original_launch":"2014-04-18T19:25:00.000Z","original_launch_unix":1397849100,"missions":[{"name":"CRS-3","flight":14}],"landings":1,"type":"Dragon
+        1.1","details":"First Dragon v1.1 capsule","reuse_count":0},{"capsule_serial":"C106","capsule_id":"dragon1","status":"active","original_launch":"2014-09-21T05:52:00.000Z","original_launch_unix":1411278720,"missions":[{"name":"CRS-4","flight":18},{"name":"CRS-11","flight":41}],"landings":2,"type":"Dragon
+        1.1","details":"First Dragon capsule to be reused","reuse_count":1},{"capsule_serial":"C107","capsule_id":"dragon1","status":"unknown","original_launch":"2015-01-10T09:47:00.000Z","original_launch_unix":1420883220,"missions":[{"name":"CRS-5","flight":19}],"landings":1,"type":"Dragon
+        1.1","details":null,"reuse_count":0},{"capsule_serial":"C108","capsule_id":"dragon1","status":"active","original_launch":"2015-04-14T20:10:00.000Z","original_launch_unix":1429042200,"missions":[{"name":"CRS-6","flight":22},{"name":"CRS-13","flight":51}],"landings":2,"type":"Dragon
+        1.1","details":"Second Dragon capsule to be reused","reuse_count":1},{"capsule_serial":"C109","capsule_id":"dragon1","status":"destroyed","original_launch":"2015-06-28T14:21:00.000Z","original_launch_unix":1435501260,"missions":[{"name":"CRS-7","flight":24}],"landings":0,"type":"Dragon
+        1.1","details":"Destroyed on impact after F9 launch failure","reuse_count":0},{"capsule_serial":"C110","capsule_id":"dragon1","status":"active","original_launch":"2016-04-08T20:43:00.000Z","original_launch_unix":1460148180,"missions":[{"name":"CRS-8","flight":28},{"name":"CRS-14","flight":59}],"landings":2,"type":"Dragon
+        1.1","details":null,"reuse_count":1},{"capsule_serial":"C111","capsule_id":"dragon1","status":"active","original_launch":"2016-07-18T04:45:00.000Z","original_launch_unix":1468817100,"missions":[{"name":"CRS-9","flight":32},{"name":"CRS-15","flight":64}],"landings":2,"type":"Dragon
+        1.1","details":null,"reuse_count":1},{"capsule_serial":"C112","capsule_id":"dragon1","status":"active","original_launch":"2017-02-19T14:39:00.000Z","original_launch_unix":1487515140,"missions":[{"name":"CRS-10","flight":36}],"landings":1,"type":"Dragon
+        1.1","details":null,"reuse_count":0},{"capsule_serial":"C113","capsule_id":"dragon1","status":"active","original_launch":"2017-08-14T16:31:00.000Z","original_launch_unix":1502728260,"missions":[{"name":"CRS-12","flight":45}],"landings":1,"type":"Dragon
+        1.1","details":"The last newly manufactured Dragon 1","reuse_count":0}]'
+    http_version: 
+  recorded_at: Mon, 15 Oct 2018 04:13:37 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/spacex/capsules/C202.yml

@@ -0,0 +1,123 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.spacexdata.com/v3/capsules/C202
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.15.3
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 11 Oct 2018 16:56:57 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=dde4b2f1d71fa0b62f41b29183867cebd1539277017; expires=Fri, 11-Oct-19
+        16:56:57 GMT; path=/; domain=.spacexdata.com; HttpOnly; Secure
+      Vary:
+      - Accept-Encoding, Origin
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Response-Time:
+      - 35ms
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 4682dcee4d542474-IAD
+    body:
+      encoding: ASCII-8BIT
+      string: '{"capsule_serial":"C202","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Capsule used to qualify Dragon 2''s environmental control
+        and life support systems.","reuse_count":0}'
+    http_version: 
+  recorded_at: Thu, 11 Oct 2018 16:56:57 GMT
+- request:
+    method: get
+    uri: https://api.spacexdata.com/v3/capsules/C202
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.15.3
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Thu, 11 Oct 2018 16:56:57 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Set-Cookie:
+      - __cfduid=d39640f3b8c92ab574c8c50a302d44b5b1539277017; expires=Fri, 11-Oct-19
+        16:56:57 GMT; path=/; domain=.spacexdata.com; HttpOnly; Secure
+      Vary:
+      - Accept-Encoding, Origin
+      X-Dns-Prefetch-Control:
+      - 'off'
+      X-Frame-Options:
+      - SAMEORIGIN
+      Strict-Transport-Security:
+      - max-age=15552000; includeSubDomains
+      X-Download-Options:
+      - noopen
+      X-Content-Type-Options:
+      - nosniff
+      X-Xss-Protection:
+      - 1; mode=block
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Response-Time:
+      - 38ms
+      Expect-Ct:
+      - max-age=604800, report-uri="https://report-uri.cloudflare.com/cdn-cgi/beacon/expect-ct"
+      Server:
+      - cloudflare
+      Cf-Ray:
+      - 4682dcefa91a5729-IAD
+    body:
+      encoding: ASCII-8BIT
+      string: '{"capsule_serial":"C202","capsule_id":"dragon2","status":"active","original_launch":null,"original_launch_unix":null,"missions":[],"landings":0,"type":"Dragon
+        2.0","details":"Capsule used to qualify Dragon 2''s environmental control
+        and life support systems.","reuse_count":0}'
+    http_version: 
+  recorded_at: Thu, 11 Oct 2018 16:56:57 GMT
+recorded_with: VCR 4.0.0