savon_model 0.3.1 → 0.4.0

data/lib/savon/model.rb

@@ -7,52 +7,91 @@ module Savon
   # Model for SOAP service oriented applications.
   module Model
 
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
 
-    module ClassMethods
+    def self.handle_response=(recipe)
+      @handle_response = recipe
+    end
 
-      # Returns a memoized <tt>Savon::Client</tt> instance. Accepts a block and passes it
-      # to <tt>Savon::Client.new</tt> when called for the first time.
-      def client(&block)
-        @client ||= Savon::Client.new &block
-      end
+    def self.handle_response
+      @handle_response
+    end
 
-      # Sets the SOAP endpoint.
-      def endpoint(uri)
-        client.wsdl.endpoint = uri
+    module ClassMethods
+
+      def self.extend_object(base)
+        super
+        base.init_savon_model
       end
 
-      # Sets the target namespace.
-      def namespace(uri)
-        client.wsdl.namespace = uri
+      def init_savon_model
+        class_action_module
+        instance_action_module
       end
 
       # Accepts one or more SOAP actions and generates both class and instance methods named
       # after the given actions. Each generated method accepts an optional SOAP body Hash and
       # a block to be passed to <tt>Savon::Client#request</tt> and executes a SOAP request.
-      def actions(*args)
-        args.each do |arg|
-          define_class_action arg
-          define_instance_action arg
+      def actions(*actions)
+        actions.each do |action|
+          define_class_action action
+          define_instance_action action
         end
       end
 
     private
 
       def define_class_action(action)
-        instance_eval %Q{
+        class_action_module.module_eval <<-CODE
           def #{action.to_s.snakecase}(body = nil, &block)
-            client.request :wsdl, #{action.inspect}, :body => body, &block
+            response = client.request :wsdl, #{action.inspect}, :body => body, &block
+            Savon::Model.handle_response ? Savon::Model.handle_response.call(response) : response
           end
-        }
+        CODE
       end
 
       def define_instance_action(action)
-        class_eval %Q{
+        instance_action_module.module_eval <<-CODE
           def #{action.to_s.snakecase}(body = nil, &block)
             self.class.#{action.to_s.snakecase} body, &block
           end
-        }
+        CODE
+      end
+
+      def class_action_module
+        @class_action_module ||= Module.new do
+
+          def client(&block)
+            @client ||= Savon::Client.new &block
+          end
+
+          def endpoint(uri)
+            client.wsdl.endpoint = uri
+          end
+
+          def namespace(uri)
+            client.wsdl.namespace = uri
+          end
+
+        end.tap { |mod| extend mod }
+      end
+
+      def instance_action_module
+        @instance_action_module ||= Module.new do
+
+          def client(&block)
+            self.class.client &block
+          end
+
+          def endpoint(uri)
+            self.class.endpoint uri
+          end
+
+          def namespace(uri)
+            self.class.namespace uri
+          end
+
+        end.tap { |mod| include mod }
       end
 
     end
@@ -61,10 +100,5 @@ module Savon
       base.extend ClassMethods
     end
 
-    # Returns a memoized <tt>Savon::Client</tt> instance.
-    def client
-      self.class.client
-    end
-
   end
 end

data/savon_model.gemspec

@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
-  s.add_dependency "savon", "~> 0.8.0.beta.3"
+  s.add_dependency "savon", "~> 0.8.2"
 
-  s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "rspec", "~> 2.4.0"
+  s.add_development_dependency "autotest"
   s.add_development_dependency "mocha", "~> 0.9.8"
 
   s.files = `git ls-files`.split("\n")

data/spec/savon/model_spec.rb

@@ -2,8 +2,17 @@ require "spec_helper"
 require "savon/model"
 
 describe Savon::Model do
-  let :model do
-    Class.new { include Savon::Model }
+  let(:model) { Class.new { include Savon::Model } }
+
+  describe ".handle_response" do
+    before(:all) { model.actions :get_user, "GetAllUsers" }
+
+    it "should be used for pre-processing SOAP responses" do
+      Savon::Model.handle_response = lambda { |response| response }
+
+      model.client.stubs(:request).returns("response")
+      model.get_user.should == "response"
+    end
   end
 
   describe ".client" do
@@ -65,4 +74,63 @@ describe Savon::Model do
     end
   end
 
+  describe "#endpoint" do
+    it "should delegate to .endpoint" do
+      model.expects(:endpoint).with("http://example.com")
+      model.new.endpoint "http://example.com"
+    end
+  end
+
+  describe "#namespace" do
+    it "should delegate to .namespace" do
+      model.expects(:namespace).with("http://v1.example.com")
+      model.new.namespace "http://v1.example.com"
+    end
+  end
+
+  describe "overwriting action methods" do
+    context "(class-level)" do
+      let :supermodel do
+        supermodel = model.dup
+        supermodel.actions :get_user
+
+        def supermodel.get_user(body = nil, &block)
+          p "super"
+          super
+        end
+
+        supermodel
+      end
+
+      it "should be possible" do
+        supermodel.client.expects(:request).with(:wsdl, :get_user, :body => { :id => 1 })
+        supermodel.expects(:p).with("super")  # stupid, but works
+
+        supermodel.get_user :id => 1
+      end
+    end
+
+    context "(instance-level)" do
+      let :supermodel do
+        supermodel = model.dup
+        supermodel.actions :get_user
+        supermodel = supermodel.new
+
+        def supermodel.get_user(body = nil, &block)
+          p "super"
+          super
+        end
+
+        supermodel
+      end
+
+      it "should be possible" do
+        supermodel.client.expects(:request).with(:wsdl, :get_user, :body => { :id => 1 })
+        supermodel.expects(:p).with("super")  # stupid, but works
+
+        supermodel.get_user :id => 1
+      end
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon_model
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196261
+        hash: 59
         segments: 
         - 0
         - 8
-        - 0
-        - beta
-        - 3
-        version: 0.8.0.beta.3
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,18 +42,32 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 2
+        - 4
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: autotest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,7 +79,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Model for SOAP service oriented applications.
 email: me@rubiii.com
 executables: []
@@ -83,7 +95,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - lib/savon/model.rb
 - lib/savon_model.rb
 - savon_model.gemspec
@@ -119,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: savon_model
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: SOAP model

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }