savon_model 0.2.0 → 0.3.0

data/Gemfile

@@ -1,3 +1,2 @@
-source "http://gems.blau.de"
 source :rubygems
 gemspec

data/lib/savon/model.rb

@@ -1,5 +1,4 @@
 require "savon"
-require "savon/ext/response"
 
 module Savon
 
@@ -8,19 +7,7 @@ module Savon
   # Model for SOAP service oriented applications.
   module Model
 
-    VERSION = "0.2.0"
-
-    class << self
-
-      # Returns the response pattern to apply.
-      def response_pattern
-        @response_pattern ||= []
-      end
-
-      # Sets the response pattern. This is required to be an Array of Regexps or Symbols.
-      attr_writer :response_pattern
-
-    end
+    VERSION = "0.3.0"
 
     module ClassMethods
 

data/savon_model.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
-  s.add_development_dependency "savon", "~> 0.8.0.beta.1"
+  s.add_development_dependency "savon", "~> 0.8.0.beta.2"
 
   s.add_development_dependency "rspec", "~> 2.0.0"
   s.add_development_dependency "mocha", "~> 0.9.8"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon_model
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 +02:00
+date: 2010-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,14 +26,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196257
+        hash: 62196263
         segments: 
         - 0
         - 8
         - 0
         - beta
-        - 1
-        version: 0.8.0.beta.1
+        - 2
+        version: 0.8.0.beta.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -85,13 +85,9 @@ files:
 - README.md
 - Rakefile
 - autotest/discover.rb
-- lib/savon/ext/response.rb
 - lib/savon/model.rb
 - lib/savon_model.rb
 - savon_model.gemspec
-- spec/fixtures/authentication.xml
-- spec/fixtures/users.xml
-- spec/savon/ext/response_spec.rb
 - spec/savon/model_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/savon/ext/response.rb

@@ -1,42 +0,0 @@
-require "savon"
-require "savon/model"
-
-module Savon
-  module SOAP
-    class Response
-
-      # Returns the original result of <tt>Savon::SOAP::Response#to_hash</tt>.
-      def new_hash
-        @new_hash ||= response_pattern original_hash
-      end
-
-      alias_method :original_hash, :to_hash
-      alias_method :to_hash, :new_hash
-
-      # Returns the response Hash as an Array.
-      def to_array
-        @array ||= begin
-          array = to_hash.kind_of?(Array) ? to_hash : [to_hash]
-          array.compact
-        end
-      end
-
-    private
-
-      def response_pattern(hash)
-        return hash if Model.response_pattern.blank?
-        
-        Model.response_pattern.inject(hash) do |memo, pattern|
-          key = case pattern
-            when Regexp then memo.keys.find { |key| key.to_s =~ pattern }
-            else             memo.keys.find { |key| key.to_s == pattern.to_s }
-          end
-          
-          return unless key
-          memo[key]
-        end
-      end
-
-    end
-  end
-end

data/spec/fixtures/authentication.xml

@@ -1,14 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <ns2:authenticateResponse xmlns:ns2="http://v1_0.ws.user.example.com">
-      <return>
-        <authenticationValue>
-          <token>a68d1d6379b62ff339a0e0c69ed4d9cf</token>
-          <tokenHash>AAAJxA;cIedoT;mY10ExZwG6JuKgp2OYKxow==</tokenHash>
-          <client>radclient</client>
-        </authenticationValue>
-        <success>true</success>
-      </return>
-    </ns2:authenticateResponse>
-  </soap:Body>
-</soap:Envelope>

data/spec/fixtures/users.xml

@@ -1,18 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-  <soap:Body>
-    <ns2:getAllUsersResponse xmlns:ns2="http://v1_0.ws.user.example.com">
-      <return>
-        <id>1</id>
-        <name>Thilko</name>
-      </return>
-      <return>
-        <id>2</id>
-        <name>Peter</name>
-      </return>
-      <return>
-        <id>3</id>
-        <name>Alex</name>
-      </return>
-    </ns2:getAllUsersResponse>
-  </soap:Body>
-</soap:Envelope>

data/spec/savon/ext/response_spec.rb

@@ -1,76 +0,0 @@
-require "spec_helper"
-require "savon/ext/response"
-
-describe Savon::SOAP::Response do
-  let(:response) { Savon::SOAP::Response.new http_response(:authentication) }
-  let(:users_response) { Savon::SOAP::Response.new http_response(:users) }
-
-  describe "#original_hash" do
-    it "should return the original Hash" do
-      response.original_hash[:authenticate_response].should be_a(Hash)
-    end
-  end
-
-  describe "#to_hash" do
-    it "should memoize the result" do
-      response.to_hash.should equal(response.to_hash)
-    end
-
-    context "without response pattern" do
-      it "should return the original Hash" do
-        response.to_hash[:authenticate_response].should be_a(Hash)
-      end
-    end
-
-    context "with response pattern" do
-      around do |example|
-        Savon::Model.response_pattern = [/.+_response/, :return]
-        example.run
-        Savon::Model.response_pattern = nil
-      end
-
-      it "should apply the response pattern" do
-        response.to_hash[:success].should be_true
-      end
-    end
-
-    context "with unmatched response pattern" do
-      around do |example|
-        Savon::Model.response_pattern = [:unmatched, :pattern]
-        example.run
-        Savon::Model.response_pattern = nil
-      end
-
-      it "should apply the response pattern" do
-        response.to_hash.should be_nil
-      end
-    end
-  end
-
-  describe "#to_array" do
-    around do |example|
-      Savon::Model.response_pattern = [/.+_response/, :return]
-      example.run
-      Savon::Model.response_pattern = nil
-    end
-
-    it "should return an Array for a single response element" do
-      response.to_array.should be_an(Array)
-      response.to_array.first[:success].should be_true
-    end
-
-    it "should memoize the result" do
-      response.to_array.should equal(response.to_array)
-    end
-
-    it "should return an Array for multiple response element" do
-      users_response.to_array.should be_an(Array)
-      users_response.to_array.should have(3).items
-    end
-  end
-
-  def http_response(fixture)
-    HTTPI::Response.new 200, {}, File.read("spec/fixtures/#{fixture}.xml")
-  end
-
-end