agroclimatology 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614aa05f4413eb3aaf19cecbcf9939391d77dafd
-  data.tar.gz: 3bb1eb9b5433675f805a0d994ea0c3d4f865ecca
+  metadata.gz: 67a1d196fe995c26ea25be5a2690bd7e7d219a1f
+  data.tar.gz: c8a8c65d62236cfa72a7b8138de5b745e7f6baca
 SHA512:
-  metadata.gz: a3af64c9064612ab623c8e8b73310ccc4dab603f1dc2a5b64f840fc7c3bb1471716b88fe14efd37669fb02dcbe415df392dc5a3dd7faed99634c4e991d5a713a
-  data.tar.gz: f0055cd757a1d13a0e7a159cefedf073336189ad8ce0888ceae673f799a35451a7d301fbf58a07833f5775bb483d4e96be76d2d46df2a0102033d589e7773294
+  metadata.gz: 5cbfd885da778503f479caecfee920a635cb81872a07b3d0060da6962c239473f6e5ed736242250f2c6fdfeec1911997c0f1dd572c0fa95eb7659477556a754e
+  data.tar.gz: 19a681c22a9006be01fffea90b51d700cd99ff5040131cba03a620728ba1a46420e1a3fa4075eabe26067db40c03c13c95a7e1c420b1c1bacd8a245a936a70a5

data/README.md

@@ -4,7 +4,7 @@
 
 Ruby client for interacting with the [NASA (POWER) Agroclimatology Web Resource](http://power.larc.nasa.gov/cgi-bin/agro.cgi)
 
-Initial functionality is focused on getting solar radiation datasets (insolation on horizontal surface)
+Initial functionality is focused on getting solar radiation data
 for a given latitude and longitude. Other solar radiation and meteorological query parameters will be available in subsequent versions.
 
 ## Installation
@@ -51,10 +51,12 @@ Agroclimatology.fetch(-26.660446, 152.964647, 2015, 2016)
 
 ### Output
 
-Returns result set containing records for every day included in year_start - year_end range as JSON
-- year                - Year
-- day                 - Day of Year
-- insolation_surface  - Average Insolation Incident On A Horizontal Surface (MJ/m^2/day)  
+Returns JSON output containing records for every day included in year_start - year_end range
+- **year**                - Year
+- **day**                 - Day of Year
+- **rad_atmosphere** - Average Top-of-atmosphere Insolation (MJ/m^2/day)
+- **rad_surface** - Average Insolation Incident On A Horizontal Surface (MJ/m^2/day)  
+- **rad_flux** - Average Downward Longwave Radiative Flux (MJ/m^2/day)  
 
 ## Development
 
@@ -62,7 +64,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/bjohnston/agroclimatology.
+Bug reports and pull requests are welcome on GitHub at https://github.com/brycejohnston/agroclimatology.
 
 ## License
 

data/agroclimatology.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.9.2"
+  spec.add_dependency "httparty", "~> 0.13.7"
   spec.add_dependency "oj", "~> 2.15"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/agroclimatology/version.rb

@@ -1,3 +1,3 @@
 module Agroclimatology
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/agroclimatology.rb

@@ -1,6 +1,6 @@
 require "agroclimatology/version"
 require "csv"
-require "faraday"
+require "httparty"
 require "oj"
 
 module Agroclimatology
@@ -10,10 +10,10 @@ module Agroclimatology
     url << "&lat=#{lat.to_s}&lon=#{lon.to_s}"
     url << "&ms=1&ds=1&ys=#{year_start.to_s}"
     url << "&me=12&de=31&ye=#{year_end.to_s}"
-    url << "&p=swv_dwn&submit=Submit"
+    url << "&p=toa_dwn&p=swv_dwn&p=lwv_dwn&submit=Submit"
 
-    response = Faraday.get url
-    if response.status == 200
+    response = HTTParty.get(url)
+    if response.code == 200
       page_data = response.body.split("-END HEADER-").last
       data = []
       page_data.split("\n").each do |line|
@@ -22,7 +22,9 @@ module Agroclimatology
           daily_record = {
             "year": row[0],
             "day_of_year": row[1],
-            "insolation_surface": row[2]
+            "rad_atmosphere": row[2],
+            "rad_surface": row[3],
+            "rad_flux": row[4]
           }
           data << daily_record
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agroclimatology
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryce Johnston
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.13.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement