cfoundry 0.5.1.rc1 → 0.5.1.rc2

data/lib/cfoundry/errors.rb

@@ -3,10 +3,10 @@ require "multi_json"
 
 module CFoundry
   # Base class for CFoundry errors (not from the server).
-  class Error < RuntimeError;
+  class Error < RuntimeError
   end
 
-  class Deprecated < Error;
+  class Deprecated < Error
   end
 
   class Mismatch < Error
@@ -20,6 +20,18 @@ module CFoundry
     end
   end
 
+  class InvalidTarget < Error
+    attr_reader :target
+
+    def initialize(target)
+      @target = target
+    end
+
+    def to_s
+      "Invalid target URI: #{@target}"
+    end
+  end
+
   class TargetRefused < Error
     # Error message.
     attr_reader :message

data/lib/cfoundry/rest_client.rb

@@ -68,6 +68,10 @@ module CFoundry
     def request_uri(method, uri, options = {})
       uri = URI.parse(uri)
 
+      unless uri.is_a?(URI::HTTP)
+        raise InvalidTarget.new(@target)
+      end
+
       # keep original options in case there's a redirect to follow
       original_options = options.dup
       payload = options[:payload]
@@ -148,6 +152,8 @@ module CFoundry
       raise Timeout.new(method, uri, e)
     rescue SocketError, Errno::ECONNREFUSED => e
       raise TargetRefused, e.message
+    rescue URI::InvalidURIError
+      raise InvalidTarget.new(@target)
     end
 
     def construct_url(path)

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.5.1.rc1".freeze
+  VERSION = "0.5.1.rc2".freeze
 end

data/spec/cfoundry/errors_spec.rb

@@ -12,6 +12,14 @@ describe 'Errors' do
     its(:parent) { should eq parent }
   end
 
+  describe CFoundry::InvalidTarget do
+    let(:target) { "http://--foo-bar" }
+    subject { CFoundry::InvalidTarget.new(target) }
+
+    its(:to_s) { should eq "Invalid target URI: #{target}"}
+    its(:target) { should eq target }
+  end
+
   describe CFoundry::APIError do
     let(:request) { { :method => "GET", :url => "http://api.cloudfoundry.com/foo", :headers => {} } }
     let(:response_body) { "NOT FOUND" }

data/spec/cfoundry/rest_client_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe CFoundry::RestClient do
   let(:token) { nil }
-  let(:rest_client) { CFoundry::RestClient.new("https://api.cloudfoundry.com", token) }
+  let(:target) { "https://api.cloudfoundry.com" }
+  let(:rest_client) { CFoundry::RestClient.new(target, token) }
 
   describe '#request' do
     let(:path) { "some-path" }
-    let(:url) { "https://api.cloudfoundry.com/some-path" }
+    let(:url) { "#{target}/#{path}" }
     let(:method) { "GET" }
     let(:options) { {} }
 
@@ -142,6 +143,30 @@ describe CFoundry::RestClient do
     end
 
     describe 'errors' do
+      context "when the target refuses the connection" do
+        let(:target) { "http://localhost:2358974958" }
+
+        it "raises CFoundry::TargetRefused" do
+          stub_request(:get, url).to_raise(Errno::ECONNREFUSED)
+          expect { subject }.to raise_error(CFoundry::TargetRefused)
+        end
+      end
+
+      context "when the target is not a HTTP(S) URI" do
+        let(:target) { "ftp://foo-bar.com" }
+
+        it "raises CFoundry::InvalidTarget" do
+          expect { subject }.to raise_error(CFoundry::InvalidTarget)
+        end
+      end
+
+      context "when the target URI is invalid" do
+        let(:target) { "@#*#^! rubby" }
+
+        it "raises CFoundry::InvalidTarget" do
+          expect { subject }.to raise_error(CFoundry::InvalidTarget)
+        end
+      end
     end
 
     describe "the return value" do

metadata

@@ -1,184 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cfoundry
-version: !ruby/object:Gem::Version 
-  hash: 3470363275
+version: !ruby/object:Gem::Version
+  version: 0.5.1.rc2
   prerelease: 6
-  segments: 
-  - 0
-  - 5
-  - 1
-  - rc
-  - 1
-  version: 0.5.1.rc1
 platform: ruby
-authors: 
+authors:
 - Cloud Foundry Team
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  name: multipart-post
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  prerelease: false
-  type: :runtime
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: cf-uaa-lib
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 9
-        version: "1.9"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
   name: webmock
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
   name: rr
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: timecop
-  requirement: *id010
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - vcap-dev@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - Rakefile
 - lib/cfoundry/auth_token.rb
@@ -269,40 +269,29 @@ files:
 - spec/support/v1_fake_helper.rb
 homepage: http://github.com/cloudfoundry/vmc-lib
 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: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: cfoundry
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
-test_files: 
+test_files:
 - spec/cfoundry/auth_token_spec.rb
 - spec/cfoundry/baseclient_spec.rb
 - spec/cfoundry/client_spec.rb