nasa_apod 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d31a43152985d59e34975a663fcb651a2bd777
-  data.tar.gz: 658ec7835c0844b0cad89a118e744f1d03a497a9
+  metadata.gz: 61d6d9f7704b23273d740a7209453dd814a39fb1
+  data.tar.gz: 5ec5a5f6460072032eb478590625e3cc07ac1741
 SHA512:
-  metadata.gz: 9906f36774613d527a27684ac1f4998253701c3eebb4e4d0a0c6640288737e8373dadc91093a0a0a9cecf387acb0e066bd9ab2c1d71091c42908e20c06b43b87
-  data.tar.gz: c76b3f7243c91b3bdd3260c15ee02c98ff0ad2430289c7fab7dcdd51084a275e9dbc24bfc0c5a75c0df1a6028ff1396bfd5a6b8ddef404476b6af06e1d418bc1
+  metadata.gz: d7316997ecbc3a6f01ea70a0189de1983c19cae7155a484788d7c9357a96e57080b4b85016a595078df363364dc130e835a9efe135354c25e5630d345f30ba75
+  data.tar.gz: b6d01c6d16305eeb275b5241fde5a0a8f1b2b39c40732b2635f74f7fa228227345c03278e09cc5125d004963649e78f3aa8b521ae9da9c5853db9585c2d04bdc

data/README.md

@@ -46,6 +46,15 @@ result = client.search
 result.url #=> "http://apod.nasa.gov/apod/image/1506/CeresMountain_Dawn_1041.jpg"
 ```
 
+Note: Sometimes result.url will return a video url. You should build logic to handle both media_type: 'image' and media_type: 'video'.
+
+If the media_type: 'video', you can use video_thumbnail_url to get a jpg thumbnail of the video.
+
+```
+result = client.search
+result.video_thumbnail_url #=> 'http://img.youtube.com/vi/3LdZ_NftIh8/sddefault.jpg' 
+```
+
 Get HD image URL:
 
 ```

data/lib/nasa_apod/client.rb

@@ -40,14 +40,14 @@ module NasaApod
 
     alias wormhole random_post
 
+    private
+
     def attributes
       instance_variables.each_with_object({}) do |var, hash|
         hash[var.to_s.delete('@')] = instance_variable_get(var)
       end
     end
 
-    private
-
     def handle_response(response)
       if response['error'].nil?
         NasaApod::SearchResults.new(response)

data/lib/nasa_apod/search_results.rb

@@ -2,6 +2,7 @@ module NasaApod
  
   class SearchResults
     attr_accessor :url, :media_type, :title, :explanation, :hd_url, :date, :copyright
+    attr_reader :video_thumbnail_url
 
     def initialize(attributes={})
       @url = attributes["url"]
@@ -12,6 +13,18 @@ module NasaApod
       @date = attributes["date"]
       @copyright = attributes["copyright"]
     end
+
+    def video_thumbnail_url
+      if @media_type == 'video'
+        "http://img.youtube.com/vi/#{youtube_id}/sddefault.jpg"
+      end
+    end
+
+    private
+
+    def youtube_id
+      @url.match(/(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu\.be\/)([^"&?\/ ]{11})/)[1]
+    end
   end
   
 end

data/lib/nasa_apod/version.rb

@@ -1,3 +1,3 @@
 module NasaApod
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/nasa_apod_spec.rb

@@ -42,7 +42,7 @@ module NasaApod
       end
 
       it 'returns a HD image with params' do
-        results = client.search(:hd => true)
+        results = client.search(:date => Date.parse("2016-05-08"), :hd => true)
         expect(results.hd_url).to_not  be(nil)
       end
     end
@@ -57,15 +57,6 @@ module NasaApod
       end
     end
 
-    describe '#attributes' do
-      let(:client) { Client.new }
-
-      it 'returns a hash of attributes' do
-        attributes = client.attributes 
-        expect(attributes.class).to eq(Hash)
-        expect(attributes['api_key']).to eq('DEMO_KEY')
-      end
-    end
   end
 
   describe SearchResults do
@@ -84,6 +75,22 @@ module NasaApod
         end
       end
     end
+
+    context 'when media_type is video' do
+      describe "#video_thumbnail_url" do
+        let(:result) { SearchResults.new(attributes) }
+        let(:attributes) {{"url" =>  "https://www.youtube.com/embed/3LdZ_NftIh8?rel=0",
+                        "media_type" =>  "video",
+                        "title" =>  "Test title",
+                        "explanation" => "Test explanation",
+                        "date" => "1995-06-16"
+                        }}
+
+        it 'returns a image url' do
+          expect(result.video_thumbnail_url).to eq('http://img.youtube.com/vi/3LdZ_NftIh8/sddefault.jpg')
+        end
+      end
+    end
   end
 
   describe Error do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nasa_apod
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Gabe Dominguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler