mars_photos 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a533a53524d6ab2e3f35b6682c8a19cb53449761
-  data.tar.gz: 557be1d304bf8f0c2902f3fa541232a8036281ef
+  metadata.gz: caa7bbd47c9d2326827488405d9bb8f7c204c0ca
+  data.tar.gz: c3bdafca68b394498a4d8df0479b75892496bc9c
 SHA512:
-  metadata.gz: 82d7669f924d2a853bda847c3a42fa4f5b846143e643c9fa3c96a23d46b210522721f9af073a2d422318401ccb99520c3312005493d81c9723a73591bd9f9929
-  data.tar.gz: a57f096949946d4c9eeace474a4c4d9e397b4cb75da76df60d7dd3412522cc6efefbed5805ac42f898d4c86dda820d36fef5b0b9332d8cc7a5f8d8244eafdf18
+  metadata.gz: 3114fb19aaae40ef324004136be9d79f6727466183d0284214ce535009027a6547fa6f251baff45ed07156bfd19a53178ed3f83f1cf9aaf2ad6787b596abe838
+  data.tar.gz: 27a3d65fcd6356c06bb41bae2e7da1bea50902ab681121c572e873ec1084895e56151c150f7d1365055d688b597db8e1d6a247fc88aa15014eeb2ed8ff944c21

data/README.md

@@ -1,5 +1,7 @@
 # MarsPhotos
 
+[![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.
 
 ## Installation
@@ -60,7 +62,11 @@ You can also instantiate the Rover class:
 ```ruby
 @curiosity = MarsPhotos::Rover.new('curiosity')
 
-@curiosity.get(1000) # retrieves photos taken by curiosity on sol 1000
+@curiosity.get(sol: 1000)
+@curiosity.get(earth_date: '2015-6-3')
+
+@curiosity.get_by_sol(1000)
+@curiosity.get_by_earth_date('2015-6-3')
 ```
 
 ### Rovers

data/lib/mars_photos/api.rb

@@ -6,18 +6,10 @@ module MarsPhotos
       @key = key
     end
 
-    def get(rover:, sol: nil, earth_date: nil, cam: nil)
-      if sol
-        date = "&sol=#{sol}"
-      elsif earth_date
-        date = "&earth_date=#{earth_date}"
-      else
-        raise "You must provide a sol or earth date"
-      end
-
-      camera = cam ? "&camera=#{cam}" : ""
-
-      response = HTTParty.get("https://api.nasa.gov/mars-photos/api/v1/rovers/#{rover}/photos?api_key=#{@key}#{date}#{camera}")
+    def get(params={})
+      params[:key] = @key
+      url = MarsPhotos::URL.build(params)
+      response = HTTParty.get(url)
 
       if block_given?
         response['photos'].each { |photo| yield photo }

data/lib/mars_photos/rover.rb

@@ -1,12 +1,38 @@
+require 'pry'
+
 module MarsPhotos
   class Rover
     attr_accessor :name
     def initialize(name)
       @name = name
+      @key = 'DEMO_KEY'
+    end
+
+    def get(parameters = {})
+      parameters[:rover] = @name
+      parameters[:key] = @key
+      url = MarsPhotos::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)
+      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(parameter = {})
-      url = MarsPhotos::Calculations.build_url(name, parameter)
+    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"
       response = HTTParty.get(url)
       response['photos']
     end

data/lib/mars_photos/url.rb

@@ -0,0 +1,17 @@
+module MarsPhotos::URL
+  def self.build(params={})
+    base_url = "https://api.nasa.gov/mars-photos/api/v1/rovers/"
+
+    if params[:sol]
+      date = "&sol=#{params[:sol]}"
+    elsif params[:earth_date]
+      date = "&earth_date=#{params[:earth_date]}"
+    else
+      raise "You must provide a sol or earth date"
+    end
+
+    camera = params[:cam] ? "&camera=#{params[:cam]}" : ""
+
+    "#{base_url}#{params[:rover]}/photos?api_key=#{params[:key]}#{date}#{camera}"
+  end
+end

data/lib/mars_photos/version.rb

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

data/lib/mars_photos.rb

@@ -1,4 +1,4 @@
 require 'httparty'
 require 'mars_photos/rover'
 require 'mars_photos/api'
-require 'mars_photos/mars_photos_calculations'
+require 'mars_photos/url'

data/mars_photos.gemspec

@@ -31,8 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "vcr"
+  spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_dependency "httparty"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mars_photos
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Tweedie
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -129,8 +157,8 @@ files:
 - bin/setup
 - lib/mars_photos.rb
 - lib/mars_photos/api.rb
-- lib/mars_photos/mars_photos_calculations.rb
 - lib/mars_photos/rover.rb
+- lib/mars_photos/url.rb
 - lib/mars_photos/version.rb
 - mars_photos.gemspec
 homepage: https://github.com/cltweedie/mars_photos

data/lib/mars_photos/mars_photos_calculations.rb

@@ -1,8 +0,0 @@
-module MarsPhotos::Calculations
-  def self.build_url(rover_name, parameter)
-    url_rovers = "https://api.nasa.gov/mars-photos/api/v1/rovers/"
-    key = parameter.keys.first.to_s
-    value = parameter[parameter.keys.first]
-    "#{url_rovers}#{rover_name}/photos?#{key}=#{value}&api_key=DEMO_KEY"
-  end
-end