cf-uaa-lib 1.3.7 → 1.3.8

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+
+
+

data/lib/uaa/misc.rb

@@ -60,6 +60,21 @@ class Misc
     raise BadResponse, "Invalid response from target #{target}"
   end
 
+  # Gets a base url for the associated UAA from the target server by inspecting the
+  # links returned from its info endpoint.
+  # @param [String] target The base URL of the server. For example the target could
+  #   be {https://login.cloudfoundry.com}, {https://uaa.cloudfoundry.com}, or
+  #   {http://localhost:8080/uaa}.
+  # @return [String] url of UAA (or the target itself if it didn't provide a response)
+  def self.discover_uaa(target)
+    info = server(target)
+    if info['links'] && info['links']['uaa']
+      info['links']['uaa']
+    else
+      target
+    end
+  end
+
   # Gets the key from the server that is used to validate token signatures. If
   # the server is configured to use a symetric key, the caller must authenticate
   # by providing a a +client_id+ and +client_secret+. If the server

data/lib/uaa/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    VERSION = "1.3.7"
+    VERSION = "1.3.8"
   end
 end

data/spec/misc_spec.rb

@@ -37,6 +37,18 @@ describe Misc do
     result["commit_id"].should_not be_nil
   end
 
+  it "gets UAA target" do
+    Misc.set_request_handler do |url, method, body, headers|
+      url.should == "https://login.cloudfoundry.com/login"
+      method.should == :get
+      headers["content-type"].should be_nil
+      headers["accept"].gsub(/\s/, '').should =~ /application\/json;charset=utf-8/i
+      [200, '{"links":{"uaa":"https://uaa.cloudfoundry.com"},"prompts":["one","two"]}', {"content-type" => "application/json"}]
+    end
+    result = Misc.discover_uaa("https://login.cloudfoundry.com")
+    result.should == "https://uaa.cloudfoundry.com"
+  end
+
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21137860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,15 +25,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21137860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21136940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -41,15 +36,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21136940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21136160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,15 +47,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21136160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21135460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,15 +58,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21135460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21134840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,15 +69,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21134840
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21134140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -105,15 +80,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21134140
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21133500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,15 +91,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21133500
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &21132540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,12 +102,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *21132540
 description: Client library for interacting with the CloudFoundry User Account and
   Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server so it can
   be used by webapps and command line apps to obtain access tokens to act on behalf
@@ -159,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE.TXT
@@ -193,21 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1584033744634561596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1584033744634561596
 requirements: []
 rubyforge_project: cf-uaa-lib
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Client library for CloudFoundry UAA