mars_photos 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa7bbd47c9d2326827488405d9bb8f7c204c0ca
-  data.tar.gz: c3bdafca68b394498a4d8df0479b75892496bc9c
+  metadata.gz: 5e89020f09acef91f102a688370b36e939b75a5a
+  data.tar.gz: c88788b6701bf6df434678a97e728fa6c0a9c2a2
 SHA512:
-  metadata.gz: 3114fb19aaae40ef324004136be9d79f6727466183d0284214ce535009027a6547fa6f251baff45ed07156bfd19a53178ed3f83f1cf9aaf2ad6787b596abe838
-  data.tar.gz: 27a3d65fcd6356c06bb41bae2e7da1bea50902ab681121c572e873ec1084895e56151c150f7d1365055d688b597db8e1d6a247fc88aa15014eeb2ed8ff944c21
+  metadata.gz: a16aba734b9d3b98622f5987d86523a3c8f83555ccac2d6b30707ffec9692844c716199d70a67f8c768cfbe7288ade1ff07b9916a1bb37846fe5204548a3a00d
+  data.tar.gz: 2a0d2901c438ca4dee4527ed5ea24dc3cb86c4460803ec36cc1a92cbb62c2b70e289497b56d4571d968b4d2d2dc1a001194209ab362f020e6e9f12c1007a7446

data/README.md

@@ -1,6 +1,6 @@
 # MarsPhotos
 
-[![Test Coverage](https://codeclimate.com/github/cltweedie/mars_photos/badges/coverage.svg)](https://codeclimate.com/github/cltweedie/mars_photos/coverage)
+[![Gem Version](https://badge.fury.io/rb/mars_photos.svg)](https://badge.fury.io/rb/mars_photos) [![Build Status](https://travis-ci.org/cltweedie/mars_photos.svg?branch=master)](https://travis-ci.org/cltweedie/mars_photos) [![Test Coverage](https://codeclimate.com/github/cltweedie/mars_photos/badges/coverage.svg)](https://codeclimate.com/github/cltweedie/mars_photos/coverage)
 
 A Ruby wrapper for NASAs Mars Rover Photos API.
 
@@ -83,27 +83,19 @@ Images are available from three rovers:
 
 Sol is a time measurement representing the number of Martian solar days since the rover landed. It starts from 0.
 
-### Curiosity's Cameras
-
-  Abbreviation | Camera
-  ------------ | ------------------------------
-   FHAZ        |  Front Hazard Avoidance Camera
-   RHAZ        |  Rear Hazard Avoidance Camera
-   MAST        |  Mast Camera
-   CHEMCAM     |  Chemistry and Camera Complex
-   MAHLI       |  Mars Hand Lens Imager
-   MARDI       |  Mars Descent Imager
-   NAVCAM      |  Navigation Camera
-
-### Opportunity and Spirit's Cameras
-
-  Abbreviation | Camera
-  ------------ | -----------------------------
-    FHAZ       |  Front Hazard Avoidance Camera
-    RHAZ       |  Rear Hazard Avoidance Camera
-    PANCAM     |  Panoramic Camera
-    NAVCAM     |  Navigation Camera
-    MINITES    |  Miniature Thermal Emission Spectrometer (Mini-TES)
+### Cameras
+
+Abbreviation | Camera                             | Curiosity | Spirit | Opportunity
+------------ | -----------------------------------|-----------|--------|------------
+ FHAZ        |  Front Hazard Avoidance Camera     |  ✓ |✓|✓
+ RHAZ        |  Rear Hazard Avoidance Camera      |  ✓ |✓|✓
+ MAST        |  Mast Camera                       |  ✓ |        |
+ CHEMCAM     |  Chemistry and Camera Complex      |  ✓ |        |
+ MAHLI       |  Mars Hand Lens Imager             |  ✓ |        |
+ MARDI       |  Mars Descent Imager               |  ✓ |        |
+ NAVCAM      |  Navigation Camera                 |  ✓ |✓|✓
+ PANCAM      |  Panoramic Camera                  |           |✓|✓
+ MINITES     |  Mini Thermal Emission Spectrometer|           |✓|✓
 
 ## Development
 

data/lib/mars_photos/api.rb

@@ -8,7 +8,7 @@ module MarsPhotos
 
     def get(params={})
       params[:key] = @key
-      url = MarsPhotos::URL.build(params)
+      url = URL.build(params)
       response = HTTParty.get(url)
 
       if block_given?

data/lib/mars_photos/rover.rb

@@ -2,37 +2,28 @@ require 'pry'
 
 module MarsPhotos
   class Rover
-    attr_accessor :name
-    def initialize(name)
-      @name = name
-      @key = 'DEMO_KEY'
+    attr_accessor :name, :key
+    def initialize(params = {})
+      @name = params[:name]
+      @key = params[:key] ? params[:key] : 'DEMO_KEY'
     end
 
     def get(parameters = {})
       parameters[:rover] = @name
       parameters[:key] = @key
-      url = MarsPhotos::URL.build(parameters)
+      url = URL.build(parameters)
       response = HTTParty.get(url)
       response['photos']
     end
 
     def get_by_sol(sol)
-      url = MarsPhotos::URL.build(rover: name, sol: sol, key: @key)
+      url = URL.build(rover: name, sol: sol, key: @key)
       response = HTTParty.get(url)
       response['photos']
     end
 
     def get_by_earth_date(earth_date)
-      url = MarsPhotos::URL.build(rover: name, earth_date: earth_date, key: @key)
-      response = HTTParty.get(url)
-      response['photos']
-    end
-
-    def get_by_sol_and_cam(parameters)
-      sol = parameters[:sol]
-      cam = parameters[:cam]
-      url_rovers = "https://api.nasa.gov/mars-photos/api/v1/rovers/"
-      url = "#{url_rovers}#{name}/photos?sol=#{sol}&camera=#{cam}&api_key=DEMO_KEY"
+      url = URL.build(rover: name, earth_date: earth_date, key: @key)
       response = HTTParty.get(url)
       response['photos']
     end

data/lib/mars_photos/url.rb

@@ -11,7 +11,7 @@ module MarsPhotos::URL
     end
 
     camera = params[:cam] ? "&camera=#{params[:cam]}" : ""
-
-    "#{base_url}#{params[:rover]}/photos?api_key=#{params[:key]}#{date}#{camera}"
+    page = params[:page] ? "&page=#{params[:page]}" : ""
+    "#{base_url}#{params[:rover]}/photos?api_key=#{params[:key]}#{date}#{camera}#{page}"
   end
 end

data/lib/mars_photos/version.rb

@@ -1,3 +1,3 @@
 module MarsPhotos
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mars_photos
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Tweedie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler