wasabi 2.5.1 → 3.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0 (2012-12-17)
+
+* Updated to HTTPI 2.0 to play nicely with Savon 2.0.
+
 ## 2.5.1 (2012-08-22)
 
 * Fix: [#14](https://github.com/rubiii/wasabi/issues/14) fixes an issue where

data/Rakefile

@@ -3,11 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
-# http://stackoverflow.com/q/5771758/279024
-task :require_ruby_18 do
-  raise "This must be run on Ruby 1.8" unless RUBY_VERSION =~ /^1\.8/
-end
-task :release => [:require_ruby_18]
+task :release
 
 task :default => :spec
 task :test => :spec

data/lib/wasabi/document.rb

@@ -110,7 +110,7 @@ module Wasabi
     # Returns the raw WSDL document.
     # Can be used as a hook to extend the library.
     def xml
-      @xml ||= Resolver.new(document, request).xml
+      @xml ||= Resolver.new(document, request).resolve
     end
 
     # Parses the WSDL document and returns the <tt>Wasabi::Parser</tt>.

data/lib/wasabi/resolver.rb

@@ -9,37 +9,38 @@ module Wasabi
 
     class HTTPError < StandardError; end
 
+    URL = /^http[s]?:/
+    XML = /^</
+
     def initialize(document, request = nil)
       @document = document
-      @request = request
+      @request  = request || HTTPI::Request.new
     end
 
-    def xml
-      raise ArgumentError, "Wasabi is missing a document to resolve" unless @document
+    attr_reader :document, :request
+
+    def resolve
+      raise ArgumentError, "Unable to resolve: #{document.inspect}" unless document
 
-      case @document
-        when /^http[s]?:/ then from_remote
-        when /^</         then @document
-        else                   from_fs
+      case document
+        when URL then load_from_remote
+        when XML then document
+        else          load_from_disc
       end
     end
 
     private
 
-    def from_remote
+    def load_from_remote
+      request.url = document
       response = HTTPI.get(request)
-      raise HTTPError.new(response) if response.error?
-      response.body
-    end
 
-    def request
-      @request ||= HTTPI::Request.new
-      @request.url = @document
-      @request
+      raise HTTPError, response if response.error?
+      response.body
     end
 
-    def from_fs
-      File.read(@document)
+    def load_from_disc
+      File.read(document)
     end
 
   end

data/lib/wasabi/version.rb

@@ -1,5 +1,5 @@
 module Wasabi
 
-  VERSION = "2.5.1"
+  VERSION = "3.0.0"
 
 end

data/spec/wasabi/resolver_spec.rb

@@ -2,20 +2,20 @@ require "spec_helper"
 
 describe Wasabi::Resolver do
 
-  describe "#xml" do
+  describe "#resolve" do
     it "resolves remote documents" do
       HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
-      xml = Wasabi::Resolver.new("http://example.com?wsdl").xml
+      xml = Wasabi::Resolver.new("http://example.com?wsdl").resolve
       xml.should == "wsdl"
     end
 
-    it "resolves remote documents" do
-      xml = Wasabi::Resolver.new(fixture(:authentication).path).xml
+    it "resolves local documents" do
+      xml = Wasabi::Resolver.new(fixture(:authentication).path).resolve
       xml.should == fixture(:authentication).read
     end
 
     it "simply returns raw XML" do
-      xml = Wasabi::Resolver.new("<xml/>").xml
+      xml = Wasabi::Resolver.new("<xml/>").resolve
       xml.should == "<xml/>"
     end
   end

data/wasabi.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = s.name
 
-  s.add_dependency "httpi",    "~> 1.0"
+  s.add_dependency "httpi",    "~> 2.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 
   s.add_development_dependency "rake",  "~> 0.9"

metadata

@@ -1,93 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wasabi
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 3.0.0
   prerelease: 
-  segments: 
-  - 2
-  - 5
-  - 1
-  version: 2.5.1
 platform: ruby
-authors: 
+authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-12-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpi
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  version_requirements: *id001
-  name: httpi
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  version_requirements: *id002
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: nokogiri
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 10
-        version: "2.10"
-  version_requirements: *id004
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
 description: A simple WSDL parser
-email: 
+email:
 - me@rubiii.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -141,38 +135,35 @@ files:
 - wasabi.gemspec
 homepage: https://github.com/rubiii/wasabi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2903585129880410612
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2903585129880410612
 requirements: []
-
 rubyforge_project: wasabi
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple WSDL parser
-test_files: 
+test_files:
 - spec/fixtures/authentication.wsdl
 - spec/fixtures/geotrust.wsdl
 - spec/fixtures/import_port_types.wsdl