web_methods 0.0.1 → 0.0.3

data/lib/web_methods/html_parser.rb

@@ -9,9 +9,14 @@ module WebMethods
     def parse
       table_to_hash @doc.css('body > table')
     end
-private    
+private 
+    def convert_table table
+      return nil if table.children.length == 0
+      array?(table) ? table_to_array(table) : table_to_hash(table)
+    end
+
     def array? table
-      table.xpath('tr').first.xpath('td').length == 1
+      table.at('tr').xpath('td').length == 1
     end
 
     def table_to_array table
@@ -37,7 +42,7 @@ private
         if tds.length == 2
           if tds[1].at('table')
             child_table = tds[1].at('table')
-            out[tds[0].inner_text] = array?(child_table) ? table_to_array(child_table) : table_to_hash(child_table)
+            out[tds[0].inner_text] = convert_table(child_table)
           else
             out[tds[0].inner_text] = tds[1].inner_text
           end
@@ -45,7 +50,5 @@ private
       end
       out
     end
-
-
   end
 end

data/lib/web_methods/server.rb

@@ -1,18 +1,31 @@
 require 'net/http'
 require 'web_methods/html_parser'
+require 'log4r'
 
 module WebMethods
-class Server
-  def initialize host, port, username, password
-    @host, @port, @username, @password = host, port, username, password
-  end
+  class Server
+    attr_reader :logger
+
+    def initialize host, port, username, password
+      @host, @port, @username, @password = host, port, username, password
+      @logger = Log4r::Logger.new("WebMethods::Server")
+    end
 
-  def invoke package, service, params
-    res = Net::HTTP.start(@host, @port) do |http|
-      req = Net::HTTP::Get.new("/invoke/#{package}/#{service}?#{params.map{|k,v|"#{k}=#{v}"}.join('&')}")
-      req.basic_auth @username, @password
-      HtmlParser.new(http.request(req).body).parse
+    def invoke package, service, params
+      @logger.debug "Connecting to #{@host}:#{@port}"
+      res = Net::HTTP.start(@host, @port) do |http|
+        url = "/invoke/#{package}/#{service}?#{params.map{|k,v|"#{k}=#{v}"}.join('&')}"
+        @logger.debug "Sending request to #{url}"
+        req = Net::HTTP::Get.new(url)
+        req.basic_auth @username, @password
+        response = http.request(req)
+        @logger.debug "Received response: #{response}"
+        body = response.body
+        @logger.debug "Body was:\n#{body}"
+        hash = HtmlParser.new(body).parse
+        @logger.debug "Parsed to #{hash.inspect}"
+        hash
+      end
     end
   end
 end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: web_methods
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mark Ryall
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +11:00
+date: 2010-01-25 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.2
+    version: 
 description: |
   Some classes for encapsulating interaction with an instance of webMethods Integration Server