usno-imagery 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3111708e4b2554709cc8b5f8478d2c5bf9e2f383
-  data.tar.gz: 9cae9895b598cda54a7f801c442e0a20e7b2198b
+  metadata.gz: fabb79015db48b6037ca726a93948839af3d1b88
+  data.tar.gz: e0a6d3688b0efbc0ed415791da8d72485dc101fc
 SHA512:
-  metadata.gz: e10fb7cc6dfc408b6118a047453bc679f38b33bb32e46b91d715bbfcb230590d29e047c91e4d413452084af7e533641535b06129a6558eeece60c986c8ce3b8c
-  data.tar.gz: 71e94813ee4bd84db37e88fb38042e23be75a0f1b29f8a143343dad1d7c46635d0f5717fc5ee3520e28dbf600f9a815f9223924ba43182a4087822878be04d03
+  metadata.gz: ecb191db6725f9a28fddaad2564e6fbe9d0fc1cbf82ddf8cf738cf0c73052870255e270ce8c4dbb4adec9bab81e1529350d23b5b21cdc96cc9c5e897a5a892cc
+  data.tar.gz: 6c5a7d44b24da88f14820d464f4acb08ee02da8c853b0437f1a0c75f912b9172a6448bed48e673e38a1e6a79d7844f743f4462005d175a1163e28b9cffd34115

data/README.md

@@ -1,4 +1,4 @@
-# USNO::Imagery
+# USNO::Imagery [![Code Climate](https://codeclimate.com/github/rthbound/usno-imagery.png)](https://codeclimate.com/github/rthbound/usno-imagery)
 
 Builds URLs for consuming USNO's imagery data services
 

data/lib/usno/imagery.rb

@@ -1,5 +1,8 @@
 require_relative "imagery/version"
 require_relative "imagery/earth/view"
+require_relative "imagery/earth/earth_view"
+require_relative "imagery/earth/call"
+require_relative "imagery/earth/call_with_time"
 
 require_relative "imagery/earth/map"
 require_relative "imagery/earth/rise"

data/lib/usno/imagery/earth/call.rb

@@ -0,0 +1,16 @@
+module USNO
+  module Imagery
+    module Earth
+      module Call
+        def self.included(base)
+          def call
+            result true, @usno_imagery_class.new({
+              view: @view,
+              time: nil
+            }).call.data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usno/imagery/earth/call_with_time.rb

@@ -0,0 +1,16 @@
+module USNO
+  module Imagery
+    module Earth
+      module CallWithTime
+        def self.included(base)
+          def call
+            result true, @usno_imagery_class.new({
+              view: @view,
+              time: @time || Time.now
+            }).call.data
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usno/imagery/earth/earth_view.rb

@@ -0,0 +1,17 @@
+module USNO
+  module Imagery
+    module Earth
+      class EarthView < PayDirt::Base
+        def initialize(options = {})
+          options = {
+            usno_imagery_class: USNO::Imagery::Earth::View
+          }.merge(options)
+
+          # sets instance variables from key value pairs,
+          # will fail if any keys given before options aren't in options
+          load_options(:view, :usno_imagery_class, options)
+        end
+      end
+    end
+  end
+end

data/lib/usno/imagery/earth/map.rb

@@ -3,23 +3,13 @@ require 'pay_dirt'
 module USNO
   module Imagery
     module Earth
-      class Map < PayDirt::Base
+      class Map < EarthView
+        include USNO::Imagery::Earth::CallWithTime
+
         def initialize(options = {})
           options = {
-            view: "full",
-            usno_imagery_class: USNO::Imagery::Earth::View
-          }.merge(options)
-
-          # sets instance variables from key value pairs,
-          # will fail if any keys given before options aren't in options
-          load_options(:view, :usno_imagery_class, options)
-        end
-
-        def call
-          result true, @usno_imagery_class.new({
-            view: @view,
-            time: @time || Time.now
-          }).call.data
+            view: "full"
+          }.merge(options) and super
         end
       end
     end

data/lib/usno/imagery/earth/moon.rb

@@ -3,23 +3,13 @@ require 'pay_dirt'
 module USNO
   module Imagery
     module Earth
-      class Moon < PayDirt::Base
+      class Moon < EarthView
+        include USNO::Imagery::Earth::CallWithTime
+
         def initialize(options = {})
           options = {
-            view: "moon",
-            usno_imagery_class: USNO::Imagery::Earth::View
-          }.merge(options)
-
-          # sets instance variables from key value pairs,
-          # will fail if any keys given before options aren't in options
-          load_options(:view, :usno_imagery_class, options)
-        end
-
-        def call
-          result true, @usno_imagery_class.new({
-            view: @view,
-            time: @time || Time.now
-          }).call.data
+            view: "moon"
+          }.merge(options) and super
         end
       end
     end

data/lib/usno/imagery/earth/rise.rb

@@ -3,23 +3,13 @@ require 'pay_dirt'
 module USNO
   module Imagery
     module Earth
-      class Rise < PayDirt::Base
+      class Rise < EarthView
+        include USNO::Imagery::Earth::Call
+
         def initialize(options = {})
           options = {
-            view: "rise",
-            usno_imagery_class: USNO::Imagery::Earth::View
-          }.merge(options)
-
-          # sets instance variables from key value pairs,
-          # will fail if any keys given before options aren't in options
-          load_options(:view, :usno_imagery_class, options)
-        end
-
-        def call
-          result true, @usno_imagery_class.new({
-            view: @view,
-            time: nil
-          }).call.data
+            view: "rise"
+          }.merge(options) and super
         end
       end
     end

data/lib/usno/imagery/earth/set.rb

@@ -4,23 +4,13 @@ require 'pay_dirt'
 module USNO
   module Imagery
     module Earth
-      class Set < PayDirt::Base
+      class Set < EarthView
+        include USNO::Imagery::Earth::Call
+
         def initialize(options = {})
           options = {
-            view: "set",
-            usno_imagery_class: USNO::Imagery::Earth::View
-          }.merge(options)
-
-          # sets instance variables from key value pairs,
-          # will fail if any keys given before options aren't in options
-          load_options(:view, :usno_imagery_class, options)
-        end
-
-        def call
-          result true, @usno_imagery_class.new({
-            view: @view,
-            time: nil
-          }).call.data
+            view: "set"
+          }.merge(options) and super
         end
       end
     end

data/lib/usno/imagery/earth/sun.rb

@@ -3,23 +3,13 @@ require 'pay_dirt'
 module USNO
   module Imagery
     module Earth
-      class Sun < PayDirt::Base
+      class Sun < EarthView
+        include USNO::Imagery::Earth::CallWithTime
+
         def initialize(options = {})
           options = {
             view: "sun",
-            usno_imagery_class: USNO::Imagery::Earth::View
-          }.merge(options)
-
-          # sets instance variables from key value pairs,
-          # will fail if any keys given before options aren't in options
-          load_options(:view, :usno_imagery_class, options)
-        end
-
-        def call
-          result true, @usno_imagery_class.new({
-            view: @view,
-            time: @time || Time.now
-          }).call.data
+          }.merge(options) and super
         end
       end
     end

data/lib/usno/imagery/version.rb

@@ -1,5 +1,5 @@
 module USNO
   module Imagery
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

data/test/unit/usno/imagery/earth/map_test.rb

@@ -4,7 +4,8 @@ describe USNO::Imagery::Earth::Map do
   before do
     @subject = USNO::Imagery::Earth::Map
     @params = {
-      view: "full"
+      view: "full",
+      time: Time.now
     }
   end
 
@@ -20,5 +21,14 @@ describe USNO::Imagery::Earth::Map do
       result.successful?.must_equal true
       result.must_be_kind_of PayDirt::Result
     end
+
+    it "returns the proper url" do
+      result = @subject.new(@params).call.data
+
+      result.must_include @params[:time].strftime("%k:%M").lstrip
+      result.must_include @params[:time].strftime("%m/%d/%Y").lstrip
+      result.must_include "http://api.usno.navy.mil/imagery/earth.png"
+      result.must_include "?view=full"
+    end
   end
 end

data/test/unit/usno/imagery/earth/moon_test.rb

@@ -5,6 +5,7 @@ describe USNO::Imagery::Earth::Moon do
     @subject = USNO::Imagery::Earth::Moon
     @params = {
       view: "moon",
+      time: Time.now
     }
   end
 
@@ -20,5 +21,14 @@ describe USNO::Imagery::Earth::Moon do
       result.successful?.must_equal true
       result.must_be_kind_of PayDirt::Result
     end
+
+    it "returns the proper url" do
+      result = @subject.new(@params).call.data
+
+      result.must_include @params[:time].strftime("%k:%M").lstrip
+      result.must_include @params[:time].strftime("%m/%d/%Y").lstrip
+      result.must_include "http://api.usno.navy.mil/imagery/earth.png"
+      result.must_include "?view=moon"
+    end
   end
 end

data/test/unit/usno/imagery/earth/rise_test.rb

@@ -20,5 +20,12 @@ describe USNO::Imagery::Earth::Rise do
       result.successful?.must_equal true
       result.must_be_kind_of PayDirt::Result
     end
+
+    it "returns the proper url" do
+      result = @subject.new(@params).call.data
+
+      result.must_include "http://api.usno.navy.mil/imagery/earth.png"
+      result.must_include "?view=rise"
+    end
   end
 end

data/test/unit/usno/imagery/earth/set_test.rb

@@ -20,5 +20,12 @@ describe USNO::Imagery::Earth::Set do
       result.successful?.must_equal true
       result.must_be_kind_of PayDirt::Result
     end
+
+    it "returns the proper url" do
+      result = @subject.new(@params).call.data
+
+      result.must_include "http://api.usno.navy.mil/imagery/earth.png"
+      result.must_include "?view=set"
+    end
   end
 end

data/test/unit/usno/imagery/earth/sun_test.rb

@@ -5,6 +5,7 @@ describe USNO::Imagery::Earth::Sun do
     @subject = USNO::Imagery::Earth::Sun
     @params = {
       view: "sun",
+      time: Time.now
     }
   end
 
@@ -20,5 +21,14 @@ describe USNO::Imagery::Earth::Sun do
       result.successful?.must_equal true
       result.must_be_kind_of PayDirt::Result
     end
+
+    it "returns the proper url" do
+      result = @subject.new(@params).call.data
+
+      result.must_include @params[:time].strftime("%k:%M").lstrip
+      result.must_include @params[:time].strftime("%m/%d/%Y").lstrip
+      result.must_include "http://api.usno.navy.mil/imagery/earth.png"
+      result.must_include "?view=sun"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usno-imagery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan T. Hosford
@@ -121,6 +121,9 @@ files:
 - README.md
 - Rakefile
 - lib/usno/imagery.rb
+- lib/usno/imagery/earth/call.rb
+- lib/usno/imagery/earth/call_with_time.rb
+- lib/usno/imagery/earth/earth_view.rb
 - lib/usno/imagery/earth/map.rb
 - lib/usno/imagery/earth/moon.rb
 - lib/usno/imagery/earth/rise.rb