shapewear 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,4 +1,5 @@
 # https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
+language: ruby
 script: "bundle exec rake"
 rvm:
   - 1.8.7

data/README.md

@@ -1,15 +1,21 @@
-shapewear [![Build Status](https://secure.travis-ci.org/elementar/shapewear.png)](http://travis-ci.org/elementar/shapewear)
-=========
+# shapewear [![Build Status](https://secure.travis-ci.org/elementar/shapewear.png)](http://travis-ci.org/elementar/shapewear)
 
-Make your fat service look skinny.
+Shapewear make your fat service look skinny.
 
-Work in Progress
-----------------
+Most of the inspiration for this gem came from [Savon](http://savonrb.com/) and [HTTParty](http://httparty.rubyforge.org/), 
+thanks Daniel Harrington (a.k.a. rubiii) and John Nunemaker!
 
-This gem is still in early development, and it's not yet yet ready for use. Any contribution and feedback is welcome.
+## Work in Progress
 
-Installation
-------------
+This gem is still in early development. It's only working for some very basic cases. Any contribution and feedback is welcome.
+
+### Roadmap
+
+* Add more tests;
+* Add support for SOAP 1.2;
+* Add cleaner integration on Rails and Sinatra (Rack middleware?).
+
+## Installation
 
 Shapewear is available through [Rubygems](http://rubygems.org/gems/shapewear) and can be installed via:
 
@@ -62,7 +68,7 @@ class MyFirstServiceController < ApplicationController
   end
 
   def serve
-    render :xml => MyHelloService.serve(params)
+    render :xml => MyHelloService.serve(request)
   end
 end
 ```
@@ -78,7 +84,7 @@ class MySinatraApp < Sinatra::App
 
   post "my_first_service" do
     content_type "application/xml"
-    MyHelloService.serve(params)
+    MyHelloService.serve(request)
   end
 end
 ```

data/lib/shapewear.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'nokogiri'
 
 require 'shapewear/version'

data/lib/shapewear/dsl.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'builder'
 
 module Shapewear::DSL
@@ -18,7 +20,7 @@ module Shapewear::DSL
                 'xsd1' => "http://schema.example.com/#{self.name}",
                 'wsdl' => 'http://schemas.xmlsoap.org/wsdl/',
                 'soap' => 'http://schemas.xmlsoap.org/wsdl/soap/',
-                'xsd' => 'http://www.w3.org/2000/10/XMLSchema',
+                'xsd' => 'http://www.w3.org/2001/XMLSchema',
                 'env' => 'http://schemas.xmlsoap.org/soap/envelope/'
   end
 

data/lib/shapewear/logging.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Shapewear::Logging
   def logger
     @logger ||= (::Rails.logger rescue Logger.new(STDOUT))

data/lib/shapewear/request.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Shapewear::Request
   # @param request [Rack::Request, Hash]
   def serve(request)

data/lib/shapewear/version.rb

@@ -1,5 +1,7 @@
+# encoding: UTF-8
+
 module Shapewear
 
-  Version = "0.0.3"
+  Version = "0.0.4"
 
 end

data/lib/shapewear/wsdl.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'builder'
 
 #noinspection RubyArgCount,RubyResolve
@@ -10,6 +12,7 @@ module Shapewear::WSDL
     xm.definitions :name => self.name, 'targetNamespace' => namespaces['tns'],
                    'xmlns' => namespaces['wsdl'],
                    'xmlns:soap' => namespaces['soap'],
+                   'xmlns:xsd' => namespaces['xsd'],
                    'xmlns:xsd1' => namespaces['xsd1'],
                    'xmlns:tns' => namespaces['tns'] do |xdef|
 
@@ -17,39 +20,39 @@ module Shapewear::WSDL
         xtypes.schema 'xmlns' => namespaces['xsd'], 'targetNamespace' => namespaces['xsd1'] do |xschema|
 
           # define elements for each defined method
-          instance_methods(false).each do |m|
-            build_type_elements_for_method(m, xschema)
+          operations.each do |m, op_opts|
+            build_type_elements_for_method(m, op_opts, xschema)
           end
         end
       end
 
-      instance_methods(false).each do |m|
-        xdef.message :name => "#{m.camelize}Input" do |xmsg|
-          xmsg.part :name => :body, :element => "xsd1:#{m.camelize}Request"
+      operations.each do |m, op_opts|
+        xdef.message :name => "#{op_opts[:public_name]}Input" do |xmsg|
+          xmsg.part :name => :body, :element => "xsd1:#{op_opts[:public_name]}Request"
         end unless instance_method(m).arity == 0
-        xdef.message :name => "#{m.camelize}Output" do |xmsg|
-          xmsg.part :name => :body, :element => "xsd1:#{m.camelize}Response"
+        xdef.message :name => "#{op_opts[:public_name]}Output" do |xmsg|
+          xmsg.part :name => :body, :element => "xsd1:#{op_opts[:public_name]}Response"
         end
       end
 
       xdef.portType :name => "#{self.name}PortType" do |xpt|
-        instance_methods(false).each do |m|
-          xpt.operation :name => m.camelize do |xop|
-            xop.input :message => "tns:#{m.camelize}Input" unless instance_method(m).arity == 0
-            xop.output :message => "tns:#{m.camelize}Output"
+        operations.each do |m, op_opts|
+          xpt.operation :name => op_opts[:public_name] do |xop|
+            xop.input :message => "tns:#{op_opts[:public_name]}Input" unless instance_method(m).arity == 0
+            xop.output :message => "tns:#{op_opts[:public_name]}Output"
           end
         end
       end
 
       xdef.binding :name => "#{self.name}Binding", :type => "tns:#{self.name}PortType" do |xbind|
-        xbind.tag! 'soap:binding', :style => 'document', :transport => 'http://schemas.xmlsoap.org/soap/http'
+        xbind.tag! 'soap:binding', :style => 'rpc', :transport => 'http://schemas.xmlsoap.org/soap/http'
         operations.each do |op, op_opts|
           xbind.operation :name => op_opts[:public_name] do |xop|
             doc = op_opts[:documentation] rescue nil
             xop.documentation doc unless doc.nil?
             xop.tag! 'soap:operation', :soapAction => "#{namespaces['tns']}/#{op_opts[:public_name]}"
-            xop.input { |xin| xin.tag! 'soap:body', :use => 'literal' } unless instance_method(op).arity == 0
-            xop.output { |xin| xin.tag! 'soap:body', :use => 'literal' }
+            xop.input { |xin| xin.tag! 'soap:body', :use => 'literal', :namespace => namespaces['tns'] } unless instance_method(op).arity == 0
+            xop.output { |xin| xin.tag! 'soap:body', :use => 'literal', :namespace => namespaces['tns'] }
           end
         end
       end
@@ -63,10 +66,9 @@ module Shapewear::WSDL
     end
   end
 
-  def build_type_elements_for_method(m, xschema)
+  def build_type_elements_for_method(m, op_options, xschema)
     # element for method arguments
     um = instance_method(m)
-    op_options = options[:operations][m.to_sym] rescue nil
 
     if um.arity > 0
       xschema.element :name => "#{op_options[:public_name]}Request" do |xreq|
@@ -106,7 +108,7 @@ module Shapewear::WSDL
     end
 
     # element for method result
-    xschema.element :name => "#{op_options[:public_name]}" do |xreq|
+    xschema.element :name => "#{op_options[:public_name]}Response" do |xreq|
       xreq.complexType do |xct|
         xct.all do |xall|
           ret = op_options[:returns] rescue nil

data/shapewear.gemspec

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 lib = File.expand_path("../lib", __FILE__)
 $:.unshift lib unless $:.include? lib
 

data/spec/shapewear/dsl_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
 describe Shapewear::DSL do

data/spec/shapewear/savon_usage_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
 describe Shapewear do

data/spec/shapewear/service_definitions/complete_service.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # This class represents a fully customized service.
 # It is used to test the extensiveness of the Shapewear DSL.
 class CompleteService

data/spec/shapewear/service_definitions/minimal_working_service.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 # This class represents a minimal working service, without the use of any of the Shapewear specific DSL.
 # It is used to test the Convention-over-Configuration-ness of Shapewear.
 class MinimalWorkingService

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require "bundler"
 Bundler.require :default, :development
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shapewear
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - "F\xC3\xA1bio Batista"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder