cfoundry 0.5.3.rc6 → 0.5.3.rc7

data/lib/cfoundry/baseclient.rb

@@ -13,7 +13,7 @@ module CFoundry
 
     def_delegators :rest_client, :target, :target=, :token,
       :proxy, :proxy=, :trace, :backtrace, :backtrace=,
-      :log, :log=
+      :log, :log=, :http_proxy, :http_proxy=, :https_proxy, :https_proxy=
 
     def initialize(target = "https://api.cloudfoundry.com", token = nil)
       @rest_client = CFoundry::RestClient.new(target, token)

data/lib/cfoundry/concerns/login_helpers.rb

@@ -3,11 +3,23 @@ require "base64"
 module CFoundry
   module LoginHelpers
     def login_prompts
-      @base.uaa.prompts
+      if @base.uaa
+        @base.uaa.prompts
+      else
+        {
+          :username => ["text", "Email"],
+          :password => ["password", "Password"]
+        }
+      end
     end
 
     def login(username, password)
-      @base.token = AuthToken.from_uaa_token_info(@base.uaa.authorize(username, password))
+      @base.token =
+        if @base.uaa
+          AuthToken.from_uaa_token_info(@base.uaa.authorize(username, password))
+        else
+          AuthToken.new(@base.create_token({:password => password}, username)[:token])
+        end
     end
   end
-end
+end

data/lib/cfoundry/rest_client.rb

@@ -24,7 +24,7 @@ module CFoundry
 
     attr_reader :target
 
-    attr_accessor :trace, :backtrace, :log, :request_id, :token, :target, :proxy
+    attr_accessor :trace, :backtrace, :log, :request_id, :token, :target, :proxy, :http_proxy, :https_proxy
 
     def initialize(target, token = nil)
       @target = target
@@ -115,17 +115,11 @@ module CFoundry
 
       add_headers(request, headers)
 
-      # TODO: test http proxies
-      http = Net::HTTP.new(uri.host, uri.port)
+      http = create_http(uri)
 
       # TODO remove this when staging returns streaming responses
       http.read_timeout = 300
 
-      if uri.is_a?(URI::HTTPS)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
       before = Time.now
       http.start do
         response = http.request(request)
@@ -156,6 +150,27 @@ module CFoundry
       raise InvalidTarget.new(@target)
     end
 
+    def create_http(uri)
+      if (uri.instance_of?(URI::HTTP) && http_proxy) || (uri.instance_of?(URI::HTTPS) && https_proxy)
+        if uri.instance_of?(URI::HTTP)
+          http_proxy_uri = URI.parse(http_proxy)
+        else
+          http_proxy_uri = URI.parse(https_proxy)
+        end
+        http_proxy_user, http_proxy_pass = http_proxy_uri.userinfo.split(/:/) if http_proxy_uri.userinfo
+        http = Net::HTTP::Proxy(http_proxy_uri.host, http_proxy_uri.port, http_proxy_user, http_proxy_pass).new(uri.host, uri.port)
+      else
+        http = Net::HTTP.new(uri.host, uri.port)
+      end
+
+      if uri.is_a?(URI::HTTPS)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      return http
+    end
+
     def construct_url(path)
       uri = URI.parse(path)
       return path if uri.scheme

data/lib/cfoundry/v1/client.rb

@@ -46,6 +46,26 @@ module CFoundry::V1
       @base.proxy = email
     end
 
+    # Current http proxy URI. Usually nil.
+    def http_proxy
+      @base.http_proxy
+    end
+
+    # Set the http proxy URI.
+    def http_proxy=(uri)
+      @base.http_proxy = uri
+    end
+
+    # Current https proxy URI. Usually nil.
+    def https_proxy
+      @base.https_proxy
+    end
+
+    # Set the https proxy URI.
+    def https_proxy=(uri)
+      @base.https_proxy = uri
+    end
+
     # Is the client tracing API requests?
     def trace
       @base.trace

data/lib/cfoundry/v2/client.rb

@@ -54,6 +54,26 @@ module CFoundry::V2
       @base.proxy = email
     end
 
+    # Current http proxy URI. Usually nil.
+    def http_proxy
+      @base.http_proxy
+    end
+
+    # Set the http proxy URI.
+    def http_proxy=(uri)
+      @base.http_proxy = uri
+    end
+
+    # Current https proxy URI. Usually nil.
+    def https_proxy
+      @base.https_proxy
+    end
+
+    # Set the https proxy URI.
+    def https_proxy=(uri)
+      @base.https_proxy = uri
+    end
+
     # Is the client tracing API requests?
     def trace
       @base.trace

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.5.3.rc6".freeze
+  VERSION = "0.5.3.rc7".freeze
 end

data/spec/cfoundry/rest_client_spec.rb

@@ -278,4 +278,75 @@ describe CFoundry::RestClient do
       end
     end
   end
+
+  describe '#create_http' do
+    subject { rest_client.send(:create_http, URI.parse(target_uri)) }
+    let(:target_uri) { "http://cloudfoundry.com" }
+
+    context "when no proxy URI is set" do
+      it "should return an instance of the plain Net:HTTP class" do
+        expect(subject).to be_instance_of(Net::HTTP)
+        expect(subject.use_ssl?).to be_false
+        expect(subject.proxy?).to_not be_true
+      end
+    end
+
+    context "when the target is an https URI" do
+      let(:target_uri) { "https://cloudfoundry.com" }
+      it "should return an instance of the plain Net:HTTP class with use_ssl" do
+        expect(subject).to be_instance_of(Net::HTTP)
+        expect(subject.use_ssl?).to be_true
+        expect(subject.proxy?).to_not be_true
+      end
+    end
+
+    context "when a http proxy URI without user/password is set " do
+      before { rest_client.http_proxy = "http://exapmle.com:8080" }
+      it "should return an instance of the proxy class" do
+        expect(subject.proxy?).to be_true
+        expect(subject.proxy_address).to eql("exapmle.com")
+        expect(subject.proxy_port).to eql(8080)
+      end
+    end
+
+    context "when a http proxy URI with user/password is set " do
+      before { rest_client.http_proxy = "http://user:pass@exapmle.com:8080" }
+      it "should return an instance of the proxy class" do
+        expect(subject.proxy?).to be_true
+        expect(subject.proxy_user).to eql("user")
+        expect(subject.proxy_pass).to eql("pass")
+      end
+    end
+
+    context "when a https proxy URI is set and the target is an https URI" do
+      let(:target_uri) { "https://cloudfoundry.com" }
+      before { rest_client.https_proxy = "http://exapmle.com:8080" }
+      it "should return an instance of the proxy class" do
+        expect(subject.proxy?).to be_true
+      end
+    end
+
+    context "when a https proxy URI is set and the target is an http URI" do
+      let(:target_uri) { "http://cloudfoundry.com" }
+      before { rest_client.https_proxy = "http://exapmle.com:8080" }
+      it "should return an instance of the plain Net:HTTP class" do
+        expect(subject.proxy?).to be_nil
+      end
+    end
+
+    context "when a http proxy URI is set and the target is an https URI" do
+      let(:target_uri) { "https://cloudfoundry.com" }
+      before { rest_client.http_proxy = "http://exapmle.com:8080" }
+      it "should return an instance of the plain Net:HTTP class" do
+        expect(subject.proxy?).to be_nil
+      end
+    end
+
+    context "when an invalid proxy URI is set" do
+      before { rest_client.http_proxy = "invalid URI" }
+      it "should raise an error" do
+        expect { subject }.to raise_error(URI::InvalidURIError)
+      end
+    end
+  end
 end

data/spec/cfoundry/v1/client_spec.rb

@@ -9,9 +9,11 @@ describe CFoundry::V1::Client do
 
   describe "#login" do
     include_examples "client login"
+    include_examples "client login without UAA"
   end
 
   describe "#login_prompts" do
     include_examples "client login prompts"
+    include_examples "client login prompts without UAA"
   end
-end
+end

data/spec/support/shared_examples/client_login_examples.rb

@@ -43,4 +43,42 @@ shared_examples_for 'client login' do
     expect(client.token).to be_a(CFoundry::AuthToken)
     expect(client.token.auth_header).to eq("bearer #{access_token}")
   end
-end
+end
+
+shared_examples_for 'client login prompts without UAA' do
+  let(:prompts) do
+    {
+      :user_id => ["text", "User ID"],
+      :pin => ["password", "Your 8-digit Pin #"]
+    }
+  end
+
+  subject { client.login_prompts }
+
+  it 'returns the prompts without UAA' do
+    expect(subject).to eq(prompts)
+  end
+end
+
+shared_examples_for 'client login without UAA' do
+  let(:email) { 'test@test.com' }
+  let(:password) { 'secret' }
+  let(:access_token) { "some-access-token" }
+
+  before do
+    stub(client.base).create_token { access_token }
+  end
+
+  subject { client.login(email, password) }
+
+  it 'returns a CC token' do
+    expect(subject).to be_a(CFoundry::AuthToken)
+    expect(subject.auth_header).to eq("bearer #{access_token}")
+  end
+
+  it 'saves the data as the token' do
+    subject
+    expect(client.token).to be_a(CFoundry::AuthToken)
+    expect(client.token.auth_header).to eq("bearer #{access_token}")
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 1327074651
+  hash: 3084491997
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 6
-  version: 0.5.3.rc6
+  - 7
+  version: 0.5.3.rc7
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 Z
+date: 2013-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post