keeguon-actionwebservice 3.0.1 → 3.0.17

data/README

@@ -1,4 +1,4 @@
-*Action Web Service -- Serving APIs on rails*
+= Action Web Service -- Serving APIs on rails
 
 Action Web Service provides a way to publish interoperable web service APIs with
 Rails without spending a lot of time delving into protocol details.

data/Rakefile

@@ -9,15 +9,15 @@ require 'fileutils'
 require File.join(File.dirname(__FILE__), 'lib', 'action_web_service', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ".#{Time.now.strftime('%Y%m%d%H%M%S')}"
-PKG_NAME      = 'rubyjedi-actionwebservice'
+PKG_NAME      = 'dps-actionwebservice'
 PKG_VERSION   = ActionWebService::VERSION::STRING + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = "aws"
-RUBY_FORGE_USER    = "webster132"
+RUBY_FORGE_PROJECT = ""
+RUBY_FORGE_USER    = ""
 
 desc "Default Task"
 task :default => [ :test ]
@@ -104,18 +104,18 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 
-# Publish beta gem
-desc "Publish the API documentation"
-task :pgem => [:package] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
-end
-
-# Publish documentation
-desc "Publish the API documentation"
-task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/aws", "doc").upload
-end
+## Publish beta gem
+#desc "Publish the API documentation"
+#task :pgem => [:package] do
+#  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+#  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+#end
+#
+## Publish documentation
+#desc "Publish the API documentation"
+#task :pdoc => [:rdoc] do
+#  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/aws", "doc").upload
+#end
 
 
 def each_source_file(*args)
@@ -172,13 +172,13 @@ task :lines do
   puts "  Lines #{total_lines}, LOC #{total_loc}"
 end
 
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  require 'rubyforge'
-
-  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
-
-  rubyforge = RubyForge.new
-  rubyforge.login
-  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
+#desc "Publish the release files to RubyForge."
+#task :release => [ :package ] do
+#  require 'rubyforge'
+#
+#  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
+#
+#  rubyforge = RubyForge.new
+#  rubyforge.login
+#  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
+#end

data/lib/action_web_service/api.rb

@@ -82,8 +82,10 @@ module ActionWebService # :nodoc:
           if expects
             expects.each do |type|
               type = type.element_type if type.is_a?(ArrayType)
-              if type.type_class.ancestors.include?(ActiveRecord::Base) && !allow_active_record_expects
-                raise(ActionWebServiceError, "ActiveRecord model classes not allowed in :expects")
+              if Object.const_defined?('ActiveRecord')
+                if type.type_class.ancestors.include?(ActiveRecord::Base) && !allow_active_record_expects
+                  raise(ActionWebServiceError, "ActiveRecord model classes not allowed in :expects")
+                end
               end
             end
           end

data/lib/action_web_service/casting.rb

@@ -31,7 +31,11 @@ module ActionWebService # :nodoc:
 
         def cast_expects(api_method, params) # :nodoc:
           return [] if api_method.expects.nil?
-          api_method.expects.zip(params).map{ |type, param| cast(param, type) }
+          if params.is_a?(Array)
+              api_method.expects.zip(params).map{ |type, param| cast(param, type) }
+          elsif params.is_a?(Hash)
+              api_method.expects.map {|type| cast(params[type.name.to_s], type) }
+          end
         end
 
         def cast_returns(api_method, return_value) # :nodoc:

data/lib/action_web_service/dispatcher/action_controller_dispatcher.rb

@@ -137,27 +137,6 @@ module ActionWebService # :nodoc:
             end
           end
 
-          def log_error(exception)
-            return unless logger
-
-            ActiveSupport::Deprecation.silence do
-              if ActionView::TemplateError === exception
-                logger.fatal(exception.to_s)
-              else
-                logger.fatal(
-                  "\n#{exception.class} (#{exception.message}):\n  " +
-                  clean_backtrace(exception).join("\n  ") + "\n\n"
-                )
-              end
-            end
-          end
-
-          def clean_backtrace(exception)
-            defined?(Rails) && Rails.respond_to?(:backtrace_cleaner) ?
-              Rails.backtrace_cleaner.clean(exception.backtrace) :
-              exception.backtrace
-          end
-
           def indent(body)
             body.split(/\n/).map{|x| "  #{x}"}.join("\n")
           end
@@ -171,15 +150,14 @@ module ActionWebService # :nodoc:
         SoapHttpTransport = 'http://schemas.xmlsoap.org/soap/http'
 
         def wsdl
-          case request.method
-          when :get
+          if request.get?
             begin
               options = { :type => 'text/xml', :disposition => 'inline' }
               send_data(to_wsdl, options)
             rescue Exception => e
               log_error(e) unless logger.nil?
             end
-          when :post
+          elsif request.post?
             render :status => 500, :text => 'POST not supported'
           end
         end
@@ -187,8 +165,7 @@ module ActionWebService # :nodoc:
         private
           def base_uri
             host = request.host_with_port
-            # TODO replace relative_url_root 
-            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
@@ -206,8 +183,7 @@ module ActionWebService # :nodoc:
             case dispatching_mode
             when :direct
               api = self.class.web_service_api
-              web_service_name =  self.class.to_s.sub(/Controller$/, '').underscore
-              api = (web_service_name + '_api').classify.constantize unless api
+              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|

data/lib/action_web_service/protocol/abstract.rb

@@ -72,7 +72,7 @@ module ActionWebService # :nodoc:
       end
     end
 
-    class SimpleActionPackRequest < Rack::Request # :nodoc:
+    class SimpleActionPackRequest < ActionDispatch::Request # :nodoc:
       def initialize(env = {})
         @env = env
         @qparams = {}

data/lib/action_web_service/protocol/soap_protocol.rb

@@ -3,6 +3,11 @@ require 'action_web_service/protocol/soap_protocol/marshaler'
 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:
@@ -59,7 +64,9 @@ module ActionWebService # :nodoc:
           end
           request = envelope.body.request
           method_name = request.elename.name
-          params = request.collect{ |k, v| marshaler.soap_to_ruby(request[k]) }
+          params = {}
+          request.each {|k,v| params[k] = marshaler.soap_to_ruby(v) }
+
           Request.new(self, method_name, params, service_name, nil, nil, protocol_options)
         end
 
@@ -102,16 +109,12 @@ module ActionWebService # :nodoc:
             response = SOAP::RPC::SOAPMethodResponse.new(qname, nil)
           else
             if return_value.is_a?(Exception)
-              if return_value.respond_to?(:to_soap_fault)
-                response = return_value.to_soap_fault
-              else
-                detail = SOAP::Mapping::SOAPException.new(return_value)
-                response = SOAP::SOAPFault.new(
-                  SOAP::SOAPQName.new('%s:%s' % [SOAP::SOAPNamespaceTag, 'Server']),
-                  SOAP::SOAPString.new(return_value.to_s),
-                  SOAP::SOAPString.new(self.class.name),
-                  marshaler.ruby_to_soap(detail))
-              end
+              detail = SOAP::Mapping::SOAPException.new(return_value)
+              response = SOAP::SOAPFault.new(
+                SOAP::SOAPQName.new('%s:%s' % [SOAP::SOAPNamespaceTag, 'Server']),
+                SOAP::SOAPString.new(return_value.to_s),
+                SOAP::SOAPString.new(self.class.name),
+                marshaler.ruby_to_soap(detail))
             else
               if return_type
                 param_def = [['retval', 'return', marshaler.lookup_type(return_type).mapping]]
@@ -150,7 +153,7 @@ module ActionWebService # :nodoc:
 
         private
           def has_valid_soap_action?(request)
-            return nil unless request.method == 'POST'
+            return nil unless request.post?
             soap_action = request.env['HTTP_SOAPACTION']
             return nil unless soap_action
             soap_action = soap_action.dup

data/lib/action_web_service/scaffolding.rb

@@ -42,21 +42,21 @@ module ActionWebService
         add_template_helper(Helpers)
         module_eval <<-"end_eval", __FILE__, __LINE__ + 1
           def #{action_name}
-            if request.method == :get
+            if request.get?
               setup_invocation_assigns
               render_invocation_scaffold 'methods'
             end
           end
 
           def #{action_name}_method_params
-            if request.method == :get
+            if request.get?
               setup_invocation_assigns
               render_invocation_scaffold 'parameters'
             end
           end
 
           def #{action_name}_submit
-            if request.method == :post
+            if request.post?
               setup_invocation_assigns
               protocol_name = params['protocol'] ? params['protocol'].to_sym : :soap
               case protocol_name
@@ -108,16 +108,16 @@ module ActionWebService
               customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
               default_template = scaffold_path(action)
               begin
-                content = @template.render(:file => customized_template)
+                content = view_context.render(:file => customized_template)
               rescue ActionView::MissingTemplate
-                content = @template.render(:file => default_template)
+                content = view_context.render(:file => default_template)
               end
-              @template.instance_variable_set("@content_for_layout", content)
-              if self.active_layout.nil?
+              @content_for_layout = content
+              #if self.action_has_layout?
+              #  render :file => self.send(:_layout), :use_full_path => true
+              #else
                 render :file => scaffold_path("layout")
-              else
-                render :file => self.active_layout, :use_full_path => true
-              end
+              #end
             end
 
             def scaffold_path(template_name)
@@ -125,8 +125,8 @@ module ActionWebService
             end
 
             def reset_invocation_response
-              erase_render_results
-              response.instance_variable_set :@header, Rack::Utils::HeaderHash.new(::ActionController::Response::DEFAULT_HEADERS.merge("cookie" => []))
+              self.instance_variable_set(:@_response_body, nil)
+              response.instance_variable_set :@header, Rack::Utils::HeaderHash.new("cookie" => [], 'Content-Type' => 'text/html')
             end
 
             def public_method_name(service_name, method_name)
@@ -179,12 +179,12 @@ module ActionWebService
               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
@@ -228,7 +228,7 @@ module ActionWebService
         methods = service.api_methods_full.sort {|a, b| a[1] <=> b[1]}.map do |desc, name|
           content_tag("li", link_to(name, :action => action, :service => service.name, :method => name))
         end
-        content_tag("ul", methods.join("\n"))
+        content_tag("ul", methods.join("\n").html_safe)
       end
     end
 

data/lib/action_web_service/templates/scaffolds/methods.html.erb

@@ -1,6 +1,6 @@
-<% @scaffold_container.services.each do |service| %>
+<%= @scaffold_container.services.each do |service| %>
 
   <h4>API Methods for <%= service %></h4>
-  <%= service_method_list(service) %>
+  <%= service_method_list(service).html_safe %>
 
 <% end %>

data/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 %>
 

data/lib/action_web_service/templates/scaffolds/result.html.erb

@@ -26,5 +26,5 @@ Invocation took <tt><%= '%f' % @method_elapsed %></tt> seconds
 </p>
 
 <p>
-<%= link_to "Back", :action => @scaffold_action_name + '_method_params', :method => @scaffold_method.public_name, :service => @scaffold_service.name %>
+  <%= link_to "Back", "#{@scaffold_action_name}_method_params?method=#{@scaffold_method.public_name}&service=#{@scaffold_service.name}" %>
 </p>

data/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

data/lib/action_web_service.rb

@@ -22,15 +22,19 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+
 begin
-  require 'active_support'
-  require 'action_controller'
-  require 'active_record'
+  require 'activesupport'
+  require 'actioncontroller'
+  require 'activerecord'
+  require 'actionpack'
+  require 'active_support/core_ext/class/inheritable_attributes'
+  require 'action_dispatch/routing'
 rescue LoadError
   require 'rubygems'
-  gem 'activesupport'
-  gem 'actionpack'
-  gem 'activerecord'
+  gem 'activesupport', '>=3.0.5'
+  gem 'actionpack'   , '>=3.0.5'
+  gem 'activerecord' , '>=3.0.5'
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keeguon-actionwebservice
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: actionwebservice
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.17
 description: Adds WSDL/SOAP and XML-RPC web service support to Action Pack
 email: rubyjedi@gmail.com, bitserf@gmail.com, ksibilev@yahoo.com
 executables: []