resat 0.7.5 → 0.7.6

data/lib/api_request.rb

@@ -114,11 +114,7 @@ module Resat
     
     # Does response include given header or body field? 
     def has_response_field?(field, target)
-      return unless @response
-      return @response.key?(field) if target == 'header'
-      return true if field.nil? || field.empty?
-      doc = REXML::Document.new(@response.body) rescue nil
-      return doc && !doc.elements[field].nil?
+      !!get_response_field(field, target)
     end
     
     # Get value of response header or body field
@@ -126,13 +122,35 @@ module Resat
       return unless @response
       return @response[field] if target == 'header'
       return @response.body if field.nil? || field.empty?
-      doc = REXML::Document.new(@response.body)
-      elem = doc.elements[field]
-      return elem.get_text.to_s if elem
+      json = JSON.load(@response.body) rescue nil
+      field = nil
+      if json
+        field = json_field(json, field)
+      else
+        doc = REXML::Document.new(@response.body)
+        elem = doc.elements[field]
+        field = elem.get_text.to_s if elem
+      end
+      field
     end
 
     protected
     
+    # Retrieve JSON body field
+    def json_field(json, field)
+      return nil unless json
+      fields = field.split('/')
+      fields.each do |field|
+        if json.is_a?(Array)
+          json = json[field.to_i]
+        else
+          json = json[field]
+        end
+        return nil unless json
+      end
+      json
+    end
+
     # Calculate number of seconds to wait before sending request
     def delay_seconds
       seconds = nil

data/lib/resat.rb

@@ -3,7 +3,7 @@
 #
 
 module Resat
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end
 
 require File.join(File.dirname(__FILE__), 'engine')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resat
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Raphael Simon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency