serviceproxy 0.2.0 → 0.2.1

data/bin/wsdl2proxy

@@ -30,7 +30,7 @@ proxy.service_methods.each do |service_method|
   end
   
   def parse_#{underscore(service_method)}(response)
-    Hpricot.XML(response.body)
+    Nokogiri.XML(response.body)
   end
   EOS
 end

data/lib/service_proxy/base.rb

@@ -14,7 +14,7 @@ require File.dirname(__FILE__) + '/parser'
 
 module ServiceProxy
   class Base
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   
     attr_accessor :endpoint, :service_methods, :soap_actions, :http, 
                   :uri, :debug, :wsdl, :target_namespace
@@ -123,4 +123,4 @@ module ServiceProxy
         downcase
     end  
   end
-end
+end

data/lib/service_proxy/parser.rb

@@ -1,29 +1,35 @@
 module ServiceProxy
   class Parser < Nokogiri::XML::SAX::Document
-    attr_accessor :wsdl_namespace, :soap_namespace, :target_namespace, :service_methods, :soap_actions
+    attr_accessor :wsdl_namespace, :soap_namespace, :target_namespace, :service_methods, :soap_actions, :binding
     
     def initialize(*args)
       self.service_methods = []
       self.soap_actions = Hash.new('')
+      self.binding = false
       super
     end
     
-    def start_element_namespace(name, attributes, prefix, uri, namespace)      
+    def start_element_namespace(name, attributes, prefix, uri, namespace)
       case name
+        when 'binding'
+          self.binding = true
         when 'definitions'
           self.wsdl_namespace = prefix if uri == 'http://schemas.xmlsoap.org/wsdl/'
           self.soap_namespace = prefix if uri == 'http://schemas.xmlsoap.org/wsdl/soap/'
           attribute = attributes.find { |attribute| attribute.localname == 'targetNamespace' }
           self.target_namespace = attribute.value if attribute
         when "operation"
-          service_method = attributes.first.value if prefix == self.wsdl_namespace
-          soap_action = attributes.find { |attribute| attribute.localname == 'soapAction' }
-          self.soap_actions[self.service_methods.last] = soap_action.value if soap_action          
-          (self.service_methods << service_method unless self.service_methods.include?(service_method)) if service_method
+          if self.binding
+            service_method = attributes.first.value if prefix == self.wsdl_namespace
+            soap_action = attributes.find { |attribute| attribute.localname == 'soapAction' }
+            self.soap_actions[self.service_methods.last] = soap_action.value if soap_action
+            (self.service_methods << service_method unless self.service_methods.include?(service_method)) if service_method
+          end
       end
     end
     
     def end_element_namespace(name, prefix, uri)
+      self.binding = false if name == 'binding' && prefix == self.wsdl_namespace
     end
   end
 end

data/spec/service_helper.rb

@@ -1,5 +1,3 @@
-require 'hpricot'
-
 # Service Endpoints
 class ISBNService < ServiceProxy::Base  
   
@@ -10,8 +8,9 @@ class ISBNService < ServiceProxy::Base
   end
   
   def parse_is_valid_isbn13(response)
-    xml = Hpricot.XML(response.body)
-    xml.at("m:IsValidISBN13Result").inner_text == 'true' ? true : false
+    xml = Nokogiri.XML(response.body)
+    namespace = { 'm' => 'http://webservices.daehosting.com/ISBN' }
+    xml.at('//m:IsValidISBN13Result', namespace).inner_text == 'true' ? true : false
   end  
 end
 
@@ -25,7 +24,7 @@ class SHAGeneratorService < ServiceProxy::Base
   end
   
   def parse_gen_ssha(response)
-    xml = Hpricot.XML(response.body)
+    xml = Nokogiri.XML(response.body)
     xml.at("return").inner_text
   end
 end
@@ -52,7 +51,7 @@ class ZipcodeService < ServiceProxy::Base
   end
 
   def parse_zip_code_world_us(response)
-    Hpricot.XML(response.body)
+    xml = Nokogiri.XML(response.body)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: serviceproxy
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Durham
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -04:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: Lightweight SOAP library for Ruby
 email: jeremydurham@gmail.com
 executables: 
@@ -86,7 +76,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lightweight SOAP library for Ruby
 test_files: []