troelskn-handsoap 0.2.8 → 0.2.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
 :major: 0
 :minor: 2
+:patch: 9

data/generators/handsoap/handsoap_generator.rb

@@ -13,29 +13,44 @@ class HandsoapGenerator < Rails::Generator::Base
     # Wsdl argument is required.
     usage if @args.empty?
     @wsdl_uri = @args.shift
+    @basename = @args.shift
   end
 
+  # def add_options!(opt)
+  #   opt.on('--soap-actions') { |value| options[:soap_actions] = true }
+  #   opt.on('--no-soap-actions') { |value| options[:soap_actions] = false }
+  # end
+
   def banner
-		"Generates the scaffold for a Handsoap binding."+
+		"Generates the scaffold for a Handsoap binding." +
       "\n" + "You still have to fill in most of the meat, but this gives you a head start." +
-			"\n" + "Usage: #{$0} #{spec.name} URI" +
-      "\n" + "  URI       URI of the WSDL to generate from"
+			"\n" + "Usage: #{$0} #{spec.name} URI [BASENAME] [OPTIONS]" +
+      "\n" + "    URI       URI of the WSDL to generate from" +
+      "\n" + "    BASENAME  The basename to use for the service. If omitted, the name will be deducted from the URL."  +
+      # "\n"  +
+      # "\n" + "The following options are available:" +
+      # "\n" + "    --soap-actions     If set, stubs will be generated with soap-action parameters. (Default)" +
+      # "\n" + "    --no-soap-actions  If set, stubs will be generated without soap-action parameters." +
+      # "\n" + "    --soap-version-1   If set, the generator will look for SOAP v 1.1 endpoints." +
+      # "\n" + "    --soap-version-2   If set, the generator will look for SOAP v 1.2 endpoints." +
+      ""
   end
 
   def manifest
     wsdl = Handsoap::Parser::Wsdl.read(@wsdl_uri)
+    compiler = Handsoap::Compiler.new(wsdl, @basename)
     protocol = wsdl.preferred_protocol
-    file_name = Handsoap::Compiler.service_basename(wsdl)
+    file_name = compiler.service_basename
     record do |m|
       m.directory "app"
       m.directory "app/models"
       m.file_contents "app/models/#{file_name}_service.rb" do |file|
-        file.write Handsoap::Compiler.compile_service(wsdl, protocol, :soap_actions)
+        file.write compiler.compile_service(protocol, :soap_actions)
       end
       m.directory "test"
       m.directory "test/integration"
       m.file_contents "test/integration/#{file_name}_service_test.rb" do |file|
-        file.write Handsoap::Compiler.compile_test(wsdl, protocol)
+        file.write compiler.compile_test(protocol)
       end
       # TODO
       # Ask user about which endpoints to use ?
@@ -45,7 +60,7 @@ class HandsoapGenerator < Rails::Generator::Base
         out.puts "  You should copy these to the appropriate environment files."
         out.puts "  (Eg. `config/environments/*.rb`)"
         out.puts "----"
-        out.puts Handsoap::Compiler.compile_endpoints(wsdl, protocol)
+        out.puts compiler.compile_endpoints(protocol)
         out.puts "----"
       end
     end

data/lib/handsoap/compiler.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 module Handsoap
-  module Compiler
     class CodeWriter
 
       def initialize
@@ -36,13 +35,25 @@ module Handsoap
       end
     end
 
-    def self.write
+  class Compiler
+
+    def initialize(wsdl, basename = nil)
+      @wsdl = wsdl
+      if basename
+        @basename = basename.gsub(/[^a-zA-Z0-9]/, "_").gsub(/_+/, "_").gsub(/(^_+|_+$)/, '')
+      else
+        @basename = @wsdl.service
+      end
+      @basename = underscore(@basename).gsub(/_service$/, "")
+    end
+
+    def write
       writer = CodeWriter.new
       yield writer
       writer.to_s
     end
 
-    def self.underscore(camel_cased_word)
+    def underscore(camel_cased_word)
       camel_cased_word.to_s.gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').
@@ -50,7 +61,7 @@ module Handsoap
         downcase
     end
 
-    def self.camelize(lower_case_and_underscored_word)
+    def camelize(lower_case_and_underscored_word)
       lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) {
         "::" + $1.upcase
       }.gsub(/(^|_)(.)/) {
@@ -58,7 +69,7 @@ module Handsoap
       }
     end
 
-    def self.method_name(operation)
+    def method_name(operation)
       if operation.name.match /^(get|find|select|fetch)/i
         "#{underscore(operation.name)}"
       else
@@ -66,19 +77,19 @@ module Handsoap
       end
     end
 
-    def self.service_basename(wsdl)
-      underscore(wsdl.service).gsub(/_service$/, "")
+    def service_basename
+      @basename
     end
 
-    def self.service_name(wsdl)
-      camelize(service_basename(wsdl)) + "Service"
+    def service_name
+      camelize(service_basename) + "Service"
     end
 
-    def self.endpoint_name(wsdl)
-      "#{service_basename(wsdl).upcase}_SERVICE_ENDPOINT"
+    def endpoint_name
+      "#{service_basename.upcase}_SERVICE_ENDPOINT"
     end
 
-    def self.detect_protocol(wsdl)
+    def detect_protocol
       if endpoints.select { |endpoint| endpoint.protocol == :soap12 }.any?
         :soap12
       elsif endpoints.select { |endpoint| endpoint.protocol == :soap11 }.any?
@@ -88,12 +99,12 @@ module Handsoap
       end
     end
 
-    def self.compile_endpoints(wsdl, protocol)
+    def compile_endpoints(protocol)
       version = protocol == :soap12 ? 2 : 1
-      wsdl.endpoints.select { |endpoint| endpoint.protocol == protocol }.map do |endpoint|
+      @wsdl.endpoints.select { |endpoint| endpoint.protocol == protocol }.map do |endpoint|
         write do |w|
-          w.puts "# wsdl: #{wsdl.url}"
-          w.begin "#{endpoint_name(wsdl)} = {"
+          w.puts "# wsdl: #{@wsdl.url}"
+          w.begin "#{endpoint_name} = {"
           w.puts ":uri => '#{endpoint.url}',"
           w.puts ":version => #{version}"
           w.end "}"
@@ -101,21 +112,21 @@ module Handsoap
       end
     end
 
-    def self.compile_service(wsdl, protocol, *options)
-      binding = wsdl.bindings.find { |b| b.protocol == protocol }
+    def compile_service(protocol, *options)
+      binding = @wsdl.bindings.find { |b| b.protocol == protocol }
       raise "Can't find binding for requested protocol (#{protocol})" unless binding
       write do |w|
         w.puts "# -*- coding: utf-8 -*-"
         w.puts "require 'handsoap'"
         w.puts
-        w.begin "class #{service_name(wsdl)} < Handsoap::Service"
-        w.puts "endpoint #{endpoint_name(wsdl)}"
+        w.begin "class #{service_name} < Handsoap::Service"
+        w.puts "endpoint #{endpoint_name}"
         w.begin "on_create_document do |doc|"
-        w.puts "doc.alias 'tns', '#{wsdl.target_ns}'"
+        w.puts "doc.alias 'tns', '#{@wsdl.target_ns}'"
         w.end
         w.puts
         w.puts "# public methods"
-        wsdl.interface.operations.each do |operation|
+        @wsdl.interface.operations.each do |operation|
           action = binding.actions.find { |a| a.name == operation.name }
           raise "Can't find action for operation #{operation.name}" unless action
           w.puts
@@ -140,20 +151,20 @@ module Handsoap
       end
     end
 
-    def self.compile_test(wsdl, protocol)
-      binding = wsdl.bindings.find { |b| b.protocol == protocol }
+    def compile_test(protocol)
+      binding = @wsdl.bindings.find { |b| b.protocol == protocol }
       raise "Can't find binding for requested protocol (#{protocol})" unless binding
       write do |w|
         w.puts "# -*- coding: utf-8 -*-"
         w.puts "require 'test_helper'"
         w.puts
-        w.puts "# #{service_name(wsdl)}.logger = $stdout"
+        w.puts "# #{service_name}.logger = $stdout"
         w.puts
-        w.begin "class #{service_name(wsdl)}Test < Test::Unit::TestCase"
-        wsdl.interface.operations.each do |operation|
+        w.begin "class #{service_name}Test < Test::Unit::TestCase"
+        @wsdl.interface.operations.each do |operation|
           w.puts
           w.begin "def test_#{underscore(operation.name)}"
-          w.puts "result = #{service_name(wsdl)}.#{method_name(operation)}"
+          w.puts "result = #{service_name}.#{method_name(operation)}"
           w.end
         end
         w.end

data/lib/handsoap/service.rb

@@ -25,6 +25,9 @@ module Nokogiri
     class Nodeset
       include Utf8StringPatch
     end
+    class Attr
+      include Utf8StringPatch
+    end
   end
 end
 
@@ -188,18 +191,21 @@ module Handsoap
       return if n.nil?
       n.to_utf8
     end
+    alias_method :xml_to_s, :xml_to_str
     # Helper to serialize a node into a ruby integer
     def xml_to_int(node, xquery = nil)
       n = xquery ? node.xpath(xquery, ns).first : node
       return if n.nil?
       n.to_s.to_i
     end
+    alias_method :xml_to_i, :xml_to_int
     # Helper to serialize a node into a ruby float
     def xml_to_float(node, xquery = nil)
       n = xquery ? node.xpath(xquery, ns).first : node
       return if n.nil?
       n.to_s.to_f
     end
+    alias_method :xml_to_f, :xml_to_float
     # Helper to serialize a node into a ruby boolean
     def xml_to_bool(node, xquery = nil)
       n = xquery ? node.xpath(xquery, ns).first : node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: troelskn-handsoap
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-16 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency