gi_cat_driver 0.2.0 → 0.2.1

data/README.md

@@ -43,6 +43,19 @@ Annotated source code documentation is available at http://nsidc.github.com/gi_c
 Rubydoc API documentation is available at http://rubydoc.info/gems/gi_cat_driver/
 
 ## Version History
+* 0.2.1
+  * Fixed harvester requests to use Faraday
+* 0.2.0
+  * Introduced Faraday gem to replace rest-client and webmock for testing requests
+  * Implemented tests for methods that use fixtures to mock response data
+* 0.1.12
+  * Fixed typo in check for harvest status
+* 0.1.11
+  * Added sleep to harvest method to limit console output
+* 0.1.10
+  * Fixed rocco rake task
+* 0.1.9
+  * Added rake task to generate rocco docs
 * 0.1.8
   * Changed harvest api so the timeout is configurable
 * 0.1.7

data/lib/gi_cat_driver/version.rb

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

data/lib/gi_cat_driver.rb

@@ -126,8 +126,8 @@ module GiCatDriver
     # Retrive the distributor id given a profile id
     def get_active_profile_distributor_id(id)
       active_profile_request = "#{@base_url}/services/conf/brokerConfigurations/#{id}"
-      response = RestClient.get(active_profile_request, STANDARD_HEADERS)
-      id = Nokogiri::XML(response).css("component id").text
+      response = Faraday.get(active_profile_request, STANDARD_HEADERS)
+      id = Nokogiri::XML(response.body).css("component id").text
       return id
     end
 
@@ -135,8 +135,8 @@ module GiCatDriver
     def get_harvest_resources(profile_id)
       id = get_active_profile_distributor_id(profile_id)
       harvest_resource_request = "#{@base_url}/services/conf/brokerConfigurations/#{profile_id}/distributors/#{id}"
-      response = RestClient.get(harvest_resource_request, STANDARD_HEADERS)
-      doc = Nokogiri::XML(response)
+      response = Faraday.get(harvest_resource_request, STANDARD_HEADERS)
+      doc = Nokogiri::XML(response.body)
       harvestersinfo_array = {}
       doc.css("component").each do |component|
         harvestersinfo_array[component.css("id").text.to_sym] = component.css("title").text
@@ -148,7 +148,7 @@ module GiCatDriver
     def harvest_resource_for_active_configuration(harvesterid, harvestername = "n/a")
       Faraday.get(
         "#{@base_url}/services/conf/brokerConfigurations/#{self.get_active_profile_id}/harvesters/#{harvesterid}/start",
-        STANDARD_HEADERS) do |response, request, result, &block|
+        AUTHORIZATION_HEADERS) do |response, request, result, &block|
           case response.code
           when 200
             puts "#{Time.now}: Initiate harvesting GI-Cat resource #{harvestername}. Please wait a couple minutes for the process to complete."
@@ -181,7 +181,7 @@ module GiCatDriver
         rnum=rand
         request = @base_url + "/services/conf/giconf/status?id=#{harvesterid}&rand=#{rnum}"
 
-        response = Faraday.get request
+        response = Faraday.get request, STANDARD_HEADERS
         responsexml = Nokogiri::XML::Reader(response.body)
         responsexml.each do |node|
           if node.name == "status" && !node.inner_xml.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gi_cat_driver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: