cfoundry 2.3.5 → 2.3.6.rc1

data/lib/cfoundry/rest_client.rb

@@ -48,8 +48,7 @@ module CFoundry
     attr_reader :target
 
     attr_accessor :trace, :backtrace, :log,
-      :request_id, :token, :target,
-      :http_proxy, :https_proxy
+      :request_id, :token, :http_proxy, :https_proxy
 
     def initialize(target, token = nil)
       @target = target
@@ -59,6 +58,13 @@ module CFoundry
       @log = false
     end
 
+    def target=(target)
+      return if target == @target
+
+      @target = target
+      @token = nil
+    end
+
     def request(method, path, options = {})
       request_uri(method, construct_url(path), DEFAULT_OPTIONS.merge(options))
     end

data/lib/cfoundry/trace_helpers.rb

@@ -3,6 +3,7 @@ require "multi_json"
 
 module CFoundry
   module TraceHelpers
+    PROTECTED_ATTRIBUTES = ['Authorization']
 
     def request_trace(request)
       return nil unless request
@@ -33,7 +34,11 @@ module CFoundry
 
     def header_trace(headers)
       headers.sort.map do |key, value|
-        "  #{key} : #{value}"
+        unless PROTECTED_ATTRIBUTES.include?(key)
+          "  #{key} : #{value}"
+        else
+          "  #{key} : [PRIVATE DATA HIDDEN]"
+        end
       end
     end
   end

data/lib/cfoundry/v2/client.rb

@@ -18,7 +18,7 @@ module CFoundry::V2
     # [Space] Currently targeted space.
     attr_accessor :current_space
 
-    def_delegators :@base, :target, :token, :token=, :http_proxy, :http_proxy=,
+    def_delegators :@base, :target, :target=, :token, :token=, :http_proxy, :http_proxy=,
       :https_proxy, :https_proxy=, :trace, :trace=, :log, :log=, :info
 
     # Create a new Client for interfacing with the given target.

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/baseclient_spec.rb

@@ -80,7 +80,7 @@ describe CFoundry::BaseClient do
     end
 
     describe "#refresh_token!" do
-      let(:uaa) { stub }
+      let(:uaa) { double }
       let(:access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"a":"b"}random-bytes|) }
       let(:refresh_token) { "xyz" }
       let(:new_access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"a":"x"}random-bytes|) }
@@ -254,4 +254,17 @@ describe CFoundry::BaseClient do
       }.to raise_error(CFoundry::BadResponse, /result/)
     end
   end
+
+  describe "#target=" do
+    let(:base_client) { CFoundry::BaseClient.new }
+    let(:new_target) { "some-target-url.com"}
+
+    it "sets a new target" do
+      expect{base_client.target = new_target}.to change {base_client.target}.from("https://api.cloudfoundry.com").to(new_target)
+    end
+
+    it "sets a new target on the rest client" do
+      expect{base_client.target = new_target}.to change{base_client.rest_client.target}.from("https://api.cloudfoundry.com").to(new_target)
+    end
+  end
 end

data/spec/cfoundry/rest_client_spec.rb

@@ -368,4 +368,18 @@ describe CFoundry::RestClient do
       end
     end
   end
+
+  describe "#target=" do
+    let(:token) { "some-token" }
+
+    it "invalidates the token if the target has changed" do
+      rest_client.target = "http://some-target.com"
+      expect(rest_client.token).to be_nil
+    end
+
+    it "does not invalidate the token if the target has not changed" do
+      rest_client.target = target
+      expect(rest_client.token).to eq token
+    end
+  end
 end

data/spec/cfoundry/trace_helpers_spec.rb

@@ -47,6 +47,18 @@ describe CFoundry::TraceHelpers do
     it "returns nil if request is nil" do
       tracehelper_test_class.new.request_trace(nil).should == nil
     end
+
+    context "with protected attributes" do
+      let(:header_trace) { "REQUEST_HEADERS:\n  Authorization : [PRIVATE DATA HIDDEN]" }
+      let(:request) do
+        {
+            :method => "GET",
+            :url => "http://api.cloudfoundry.com/foo",
+            :headers => { 'Authorization' => "SECRET STUFF" }
+        }
+      end
+      include_examples "request_trace tests"
+    end
   end
 
 

data/spec/cfoundry/v2/client_spec.rb

@@ -60,16 +60,28 @@ module CFoundry
       end
 
       describe "#login" do
-        include_examples "client login" do
-          it 'sets the current organization to nil' do
-            client.current_organization = "org"
-            expect { subject }.to change { client.current_organization }.from("org").to(nil)
-          end
+        include_examples "client login"
 
-          it 'sets the current space to nil' do
-            client.current_space = "space"
-            expect { subject }.to change { client.current_space }.from("space").to(nil)
-          end
+        it 'sets the current organization to nil' do
+          client.current_organization = "org"
+          expect { subject }.to change { client.current_organization }.from("org").to(nil)
+        end
+
+        it 'sets the current space to nil' do
+          client.current_space = "space"
+          expect { subject }.to change { client.current_space }.from("space").to(nil)
+        end
+      end
+
+      describe "#target=" do
+        let(:new_target) { "some-target-url.com"}
+
+        it "sets a new target" do
+          expect{client.target = new_target}.to change {client.target}.from("http://api.cloudfoundry.com").to(new_target)
+        end
+
+        it "sets a new target on the base client" do
+          expect{client.target = new_target}.to change{client.base.target}.from("http://api.cloudfoundry.com").to(new_target)
         end
       end
     end

data/spec/integration/client_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe CFoundry::V2::Client do
+  before do
+    WebMock.allow_net_connect!
+  end
+
+  let(:a1_domain) { "a1.cf-app.com" }
+  let(:prod_domain) { "run.pivotal.io" }
+
+  describe "setting a new target" do
+    it "switches the target cc" do
+      client = CFoundry::V2::Client.new("http://api." + a1_domain)
+      auth_endpoint = client.info[:authorization_endpoint]
+      expect(auth_endpoint).to match a1_domain
+
+      client.target = "http://api." + prod_domain
+      auth_endpoint = client.info[:authorization_endpoint]
+      expect(auth_endpoint).to match prod_domain
+    end
+
+    if ENV["CF_V2_RUN_INTEGRATION"]
+      it "requires a re-login" do
+        client = CFoundry::V2::Client.new("http://api." + a1_domain)
+        client.login(ENV["CF_V2_TEST_USER"], ENV["CF_V2_TEST_PASSWORD"])
+        client.quota_definitions # Getting quota definitions will always be the shortest request that requires auth
+
+        client.target = nil
+        client.target = "http://api." + a1_domain
+        expect { client.quota_definitions }.to raise_error(CFoundry::InvalidAuthToken)
+
+        client.login(ENV["CF_V2_TEST_USER"], ENV["CF_V2_TEST_PASSWORD"])
+        client.quota_definitions
+      end
+    end
+  end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.3.5
-  prerelease: 
+  version: 2.3.6.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -395,6 +395,7 @@ files:
 - spec/fixtures/fake_cc_user.json
 - spec/fixtures/fake_cc_user_organizations.json
 - spec/fixtures/fake_cc_user_with_managers.json
+- spec/integration/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
 - spec/support/shared_examples/cc_api_stub_request_examples.rb
@@ -415,16 +416,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3146471824032498517
+      hash: -59622661081407862
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3146471824032498517
+      version: 1.3.1
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -524,6 +522,7 @@ test_files:
 - spec/fixtures/fake_cc_user.json
 - spec/fixtures/fake_cc_user_organizations.json
 - spec/fixtures/fake_cc_user_with_managers.json
+- spec/integration/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
 - spec/support/shared_examples/cc_api_stub_request_examples.rb