Merge remote-tracking branch 'upstream/livestation/master'

courtland · Jan 25, 2012 · 8e73685 · 8e73685
2 parents 4a150a9 + 563da10
commit 8e73685
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/actionwebservice.gemspec b/actionwebservice.gemspec
@@ -8,15 +8,15 @@ Gem::Specification.new do |s|
   s.name = 'dps-actionwebservice'
   s.summary = "Web service support for Action Pack."
   s.description = %q{Adds WSDL/SOAP and XML-RPC web service support to Action Pack}
-  s.version = "3.0.5.#{Time.now.strftime('%Y%m%d%H%M%S')}"
+  s.version = "3.1.0"
 
   s.author = "Laurence A. Lee, Leon Breedt, Kent Sibilev"
   s.email = "rubyjedi@gmail.com, bitserf@gmail.com, ksibilev@yahoo.com"
   s.homepage = "http://wiki.github.com/rubyjedi/actionwebservice/"
 
-  s.add_dependency('activesupport', '~> 3.0.5')
-  s.add_dependency('actionpack',    '~> 3.0.5')
-  s.add_dependency('activerecord',  '~> 3.0.5')
+  s.add_dependency('activesupport', '~> 3.1')
+  s.add_dependency('actionpack',    '~> 3.1')
+  s.add_dependency('activerecord',  '~> 3.1')
 
   s.has_rdoc = true
   s.requirements << 'none'

diff --git a/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -165,7 +165,7 @@ def wsdl
         private
           def base_uri
             host = request.host_with_port
-            relative_url_root = ::ActionController::Base.relative_url_root
+            relative_url_root = Rails.configuration.action_controller[:relative_url_root]
             scheme = request.ssl? ? 'https' : 'http'
             '%s://%s%s/%s/' % [scheme, host, relative_url_root, self.class.controller_path]
           end
@@ -183,7 +183,7 @@ def to_wsdl
             case dispatching_mode
             when :direct
               api = self.class.web_service_api
-              web_service_name = self.class.name.sub(/Controller$/, '').underscore
+              web_service_name = controller_name.sub(/Controller$/, '').underscore
               apis[web_service_name] = [api, register_api(api, marshaler)]
             when :delegated, :layered
               self.class.web_services.each do |web_service_name, info|

diff --git a/lib/action_web_service/protocol/soap_protocol.rb b/lib/action_web_service/protocol/soap_protocol.rb
@@ -3,6 +3,11 @@
 require 'soap/streamHandler'
 require 'action_web_service/client/soap_client'
 
+SOAP::SOAPNamespaceTag = 'env'
+SOAP::XSDNamespaceTag = 'xsd'
+SOAP::XSINamespaceTag = 'xsi'
+
+
 module ActionWebService # :nodoc:
   module API # :nodoc:
     class Base # :nodoc:

diff --git a/lib/action_web_service/scaffolding.rb b/lib/action_web_service/scaffolding.rb
@@ -179,12 +179,12 @@ def method_parameter_input_fields(method, type, field_name_base, idx, was_struct
               true)
             if member_type.custom?
               parameters << content_tag('li', label)
-              parameters << content_tag('ul', nested_content)
+              parameters << content_tag('ul', nested_content.html_safe)
             else
-              parameters << content_tag('li', label + ' ' + nested_content)
+              parameters << content_tag('li', (label + ' ' + nested_content).html_safe)
             end
           end
-          content_tag('ul', parameters)
+          content_tag('ul', parameters.html_safe)
         else
           # If the data source was structured previously we already have the index set          
           field_name_base = "#{field_name_base}[#{idx}]" unless was_structured

diff --git a/lib/action_web_service/templates/scaffolds/methods.html.erb b/lib/action_web_service/templates/scaffolds/methods.html.erb
@@ -1,6 +1,6 @@
 <%= @scaffold_container.services.each do |service| %>
 
   <h4>API Methods for <%= service %></h4>
-  <%= service_method_list(service) %>
+  <%= service_method_list(service).html_safe %>
 
 <% end %>
diff --git a/lib/action_web_service/templates/scaffolds/parameters.html.erb b/lib/action_web_service/templates/scaffolds/parameters.html.erb
@@ -1,6 +1,6 @@
 <h4>Method Invocation Details for <em><%= @scaffold_service %>#<%= @scaffold_method.public_name %></em></h4>
 
-<% form_tag(:action => @scaffold_action_name + '_submit') do  -%>
+<%= form_tag(:action => @scaffold_action_name + '_submit') do  -%>
 <%= hidden_field_tag "service", @scaffold_service.name %>
 <%= hidden_field_tag "method", @scaffold_method.public_name %>
 

diff --git a/lib/action_web_service/version.rb b/lib/action_web_service/version.rb
@@ -1,9 +1,9 @@
 # encoding: UTF-8
 module ActionWebService
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 5
+    MAJOR = 3
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end