cf-uaa-lib 1.3.10 → 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # CloudFoundry UAA Gem
 
+[![Gem Version](https://badge.fury.io/rb/cf-uaa-lib.png)](http://badge.fury.io/rb/cf-uaa-lib)
+
 Client gem for interacting with the [CloudFoundry UAA server](https://github.com/cloudfoundry/uaa)
 
 For documentation see: https://rubygems.org/gems/cf-uaa-lib

data/lib/uaa.rb

@@ -12,7 +12,7 @@
 #++
 
 require "uaa/version"
-require "uaa/misc"
+require "uaa/info"
 require "uaa/token_issuer"
 require "uaa/token_coder"
 require "uaa/scim"

data/lib/uaa/http.rb

@@ -14,6 +14,7 @@
 require 'base64'
 require 'net/http'
 require 'uaa/util'
+require 'uaa/proxy_options'
 
 module CF::UAA
 
@@ -42,6 +43,13 @@ class InvalidToken < TargetError; end
 
 # Utility accessors and methods for objects that want to access JSON web APIs.
 module Http
+  include ProxyOptions
+
+  def self.included(base)
+    base.class_eval do
+      attr_accessor :http_proxy, :https_proxy
+    end
+  end
 
   # Sets the current logger instance to recieve error messages.
   # @param [Logger] logr
@@ -144,15 +152,7 @@ module Http
     uri = URI.parse(url)
     req = reqtype.new(uri.request_uri)
     headers.each { |k, v| req[k] = v }
-    http_key = "#{uri.scheme}://#{uri.host}:#{uri.port}"
-    @http_cache ||= {}
-    unless http = @http_cache[http_key]
-      @http_cache[http_key] = http = Net::HTTP.new(uri.host, uri.port)
-      if uri.is_a?(URI::HTTPS)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-    end
+    http = http_request(uri)
     reply, outhdrs = http.request(req, body), {}
     reply.each_header { |k, v| outhdrs[k] = v }
     [reply.code.to_i, reply.body, outhdrs]
@@ -163,6 +163,21 @@ module Http
     raise HTTPException, "HTTP exception: #{e.class}: #{e}"
   end
 
+  def http_request(uri)
+    cache_key = URI.join(uri.to_s, "/")
+    @http_cache ||= {}
+    return @http_cache[cache_key] if @http_cache[cache_key]
+
+    http = Net::HTTP.new(uri.host, uri.port, *proxy_options_for(uri))
+
+    if uri.is_a?(URI::HTTPS)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+
+    @http_cache[cache_key] = http
+  end
+
 end
 
 end

data/lib/uaa/{misc.rb → info.rb}

@@ -17,15 +17,30 @@ module CF::UAA
 
 # Provides interfaces to various UAA endpoints that are not in the context
 # of an overall class of operations like SCIM resources or OAuth2 tokens.
-class Misc
+class Info
+  include Http
 
-  class << self
-    include Http
+  attr_accessor :target
+  attr_reader :key_style
+
+  # @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}.
+  # @param [Hash] options can be
+  #   * +:symbolize_keys+, If set to true, response hashes will have symbols for their keys, otherwise
+  #     string keys are returned.
+  def initialize(target, options = {})
+    self.target = target
+    self.symbolize_keys = options[:symbolize_keys]
+    self.http_proxy = options[:http_proxy]
+    self.https_proxy = options[:https_proxy]
   end
 
   # sets whether the keys in returned hashes should be symbols.
   # @return [Boolean] the new state
-  def self.symbolize_keys=(bool) !!(@key_style = bool ? :sym : nil) end
+  def symbolize_keys=(bool)
+    @key_style = bool ? :sym : nil
+  end
 
   # Gets information about the user authenticated by the token in the
   # +auth_header+. It GETs from the +target+'s +/userinfo+ endpoint and
@@ -36,38 +51,32 @@ class Misc
   # @param (see Misc.server)
   # @param [String] auth_header see {TokenInfo#auth_header}
   # @return [Hash]
-  def self.whoami(target, auth_header)
-    json_get(target, "/userinfo?schema=openid", @key_style, "authorization" => auth_header)
+  def whoami(auth_header)
+    json_get(target, "/userinfo?schema=openid", key_style, "authorization" => auth_header)
   end
 
   # Gets various monitoring and status variables from the server.
   # Authenticates using +name+ and +pwd+ for basic authentication.
   # @param (see Misc.server)
   # @return [Hash]
-  def self.varz(target, name, pwd)
-    json_get(target, "/varz", @key_style, "authorization" => Http.basic_auth(name, pwd))
+  def varz(name, pwd)
+    json_get(target, "/varz", key_style, "authorization" => Http.basic_auth(name, pwd))
   end
 
   # Gets basic information about the target server, including version number,
   # commit ID, and links to API endpoints.
-  # @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 [Hash]
-  def self.server(target)
-    reply = json_get(target, '/login', @key_style)
+  def server
+    reply = json_get(target, '/login', key_style)
     return reply if reply && (reply[:prompts] || reply['prompts'])
     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)
+  def discover_uaa
+    info = server
     links = info['links'] || info[:links]
     uaa = links && (links['uaa'] || links[:uaa])
 
@@ -81,10 +90,10 @@ class Misc
   # public key and +client_id+ must be nil.
   # @param (see Misc.server)
   # @return [Hash]
-  def self.validation_key(target, client_id = nil, client_secret = nil)
+  def validation_key(client_id = nil, client_secret = nil)
     hdrs = client_id && client_secret ?
         { "authorization" => Http.basic_auth(client_id, client_secret)} : {}
-    json_get(target, "/token_key", @key_style, hdrs)
+    json_get(target, "/token_key", key_style, hdrs)
   end
 
   # Sends +token+ to the server to validate and decode. Authenticates with
@@ -96,9 +105,9 @@ class Misc
   #   also {TokenInfo}.
   # @param [String] token_type as retrieved by {TokenIssuer}. See {TokenInfo}.
   # @return [Hash] contents of the token
-  def self.decode_token(target, client_id, client_secret, token, token_type = "bearer", audience_ids = nil)
+  def decode_token(client_id, client_secret, token, token_type = "bearer", audience_ids = nil)
     reply = json_get(target, "/check_token?token_type=#{token_type}&token=#{token}",
-        @key_style, "authorization" => Http.basic_auth(client_id, client_secret))
+        key_style, "authorization" => Http.basic_auth(client_id, client_secret))
     auds = Util.arglist(reply[:aud] || reply['aud'])
     if audience_ids && (!auds || (auds & audience_ids).empty?)
       raise AuthError, "invalid audience: #{auds.join(' ')}"
@@ -110,8 +119,8 @@ class Misc
   # an indication of what strength is required.
   # @param (see Misc.server)
   # @return [Hash]
-  def self.password_strength(target, password)
-    json_parse_reply(@key_style, *request(target, :post, '/password/score',
+  def password_strength(password)
+    json_parse_reply(key_style, *request(target, :post, '/password/score',
         Util.encode_form(:password => password), "content-type" => Http::FORM_UTF8,
         "accept" => Http::JSON_UTF8))
   end

data/lib/uaa/proxy_options.rb

@@ -0,0 +1,17 @@
+module CF::UAA
+  module ProxyOptions
+    def proxy_options_for(uri)
+      ssl = uri.is_a?(URI::HTTPS)
+      proxy_to_use = (ssl ? https_proxy : http_proxy)
+
+      if proxy_to_use
+        proxy_to_use = "proto://#{proxy_to_use}" unless proxy_to_use =~ /:\/\//
+        proxy_uri = URI.parse(proxy_to_use)
+        proxy_user, proxy_password = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
+        [proxy_uri.host, proxy_uri.port, proxy_user, proxy_password]
+      else
+        []
+      end
+    end
+  end
+end

data/lib/uaa/scim.rb

@@ -99,6 +99,8 @@ class Scim
   def initialize(target, auth_header, options = {})
     @target, @auth_header = target, auth_header
     @key_style = options[:symbolize_keys] ? :downsym : :down
+    self.http_proxy = options[:http_proxy]
+    self.https_proxy = options[:https_proxy]
   end
 
   # Convenience method to get the naming attribute, e.g. userName for user,

data/lib/uaa/token_issuer.rb

@@ -109,6 +109,8 @@ class TokenIssuer
     @target, @client_id, @client_secret = target, client_id, client_secret
     @token_target = options[:token_target] || target
     @key_style = options[:symbolize_keys] ? :sym : nil
+    self.http_proxy = options[:http_proxy]
+    self.https_proxy = options[:https_proxy]
   end
 
   # Allows an app to discover what credentials are required for

data/lib/uaa/version.rb

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

data/spec/http_spec.rb

@@ -19,19 +19,36 @@ module CF::UAA
 
 describe Http do
 
-  include Http
-  include SpecHelper
+  class HttpTest
+    include Http
+
+    public :http_get
+  end
+
+  let(:http_instance) { HttpTest.new }
 
   it "sets a request handler" do
-    set_request_handler do |url, method, body, headers|
+    http_instance.set_request_handler do |url, method, body, headers|
       [200, "body", {"content-type" => "text/plain"}]
     end
-    status, body, resp_headers = http_get("http://example.com")
+    status, body, resp_headers = http_instance.http_get("http://example.com")
     status.should == 200
     body.should == "body"
     resp_headers["content-type"].should == "text/plain"
   end
 
+  it "utilizes proxy settings if given" do
+    reply_double = double('http reply', each_header: {}).as_null_object
+    http_double = double('http', request: reply_double, new: nil)
+    Net::HTTP.stub(:new).and_return(http_double)
+    http_instance.http_proxy = 'user:password@http-proxy.example.com:1234'
+    http_instance.https_proxy = 'user:password@https-proxy.example.com:1234'
+
+    http_instance.http_get("http://example.com")
+
+    expect(Net::HTTP).to have_received(:new).with(anything, anything, 'http-proxy.example.com', 1234, 'user', 'password')
+  end
+
 end
 
 end

data/spec/info_spec.rb

@@ -0,0 +1,118 @@
+#--
+# Cloud Foundry 2012.02.03 Beta
+# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
+#
+# This product is licensed to you under the Apache License, Version 2.0 (the "License").
+# You may not use this product except in compliance with the License.
+#
+# This product includes a number of subcomponents with
+# separate copyright notices and license terms. Your use of these
+# subcomponents is subject to the terms and conditions of the
+# subcomponent's license, as noted in the LICENSE file.
+#++
+
+require 'spec_helper'
+require 'uaa/info'
+
+module CF::UAA
+
+  describe Info do
+    let(:options) { {} }
+    let(:uaa_info) { Info.new(target, options) }
+    let(:target) { "https://login.cloudfoundry.com" }
+    let(:authorization) { nil }
+
+    before do
+      uaa_info.set_request_handler do |url, method, body, headers|
+        url.should == target_url
+        method.should == :get
+        headers["content-type"].should be_nil
+        headers["accept"].gsub(/\s/, '').should =~ /application\/json;charset=utf-8/i
+        headers["authorization"].should == authorization
+        [200, response_body, {"content-type" => "application/json"}]
+      end
+    end
+
+    describe "initialize" do
+      let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+
+      it "sets proxy information" do
+        uaa_info.http_proxy.should == 'http-proxy.com'
+        uaa_info.https_proxy.should == 'https-proxy.com'
+      end
+    end
+
+    describe "getting server info" do
+      let(:target_url) { "https://login.cloudfoundry.com/login" }
+      let(:response_body) { '{"commit_id":"12345","prompts":["one","two"]}' }
+
+      it "gets server info" do
+        result = uaa_info.server
+        result["prompts"].should_not be_nil
+        result["commit_id"].should_not be_nil
+      end
+
+      context "with symbolize_keys keys true" do
+        let(:options) { {:symbolize_keys => true} }
+
+        it "gets server info" do
+          result = uaa_info.server
+          result[:prompts].should_not be_nil
+          result[:commit_id].should_not be_nil
+        end
+      end
+    end
+
+    describe "getting UAA target" do
+      let(:target) { "https://login.cloudfoundry.com" }
+      let(:target_url) { "https://login.cloudfoundry.com/login" }
+      let(:response_body) { '{"links":{"uaa":"https://uaa.cloudfoundry.com"},"prompts":["one","two"]}' }
+
+      it "gets UAA target" do
+        result = uaa_info.discover_uaa
+        result.should == "https://uaa.cloudfoundry.com"
+      end
+
+      context "when there is no 'links' key present" do
+        let(:target) { "https://uaa.cloudfoundry.com" }
+        let(:target_url) { "https://uaa.cloudfoundry.com/login" }
+        let(:response_body) { '{ "prompts" : ["one","two"]} ' }
+
+        it "returns the target url" do
+          result = uaa_info.discover_uaa
+          result.should == "https://uaa.cloudfoundry.com"
+        end
+      end
+
+      context "with symbolize_keys keys true" do
+        let(:options) { {:symbolize_keys => true} }
+
+        it "gets UAA target" do
+          result = uaa_info.discover_uaa
+          result.should == "https://uaa.cloudfoundry.com"
+        end
+      end
+    end
+
+    describe "whoami" do
+      let(:target_url) { "https://login.cloudfoundry.com/userinfo?schema=openid" }
+      let(:response_body) { '{"user_id":"1111-1111-1111-1111","user_name":"user","given_name":"first","family_name":"last","name":"first last","email":"email@example.com"}' }
+      let(:authorization) { 'authentication_token' }
+
+      it "returns the user info" do
+        result = uaa_info.whoami(authorization)
+        result['email'].should == 'email@example.com'
+      end
+    end
+
+    describe "validation_key" do
+      let(:target_url) { "https://login.cloudfoundry.com/token_key" }
+      let(:response_body) { '{"alg":"SHA256withRSA","value":"-----BEGIN PUBLIC KEY-----\nabc123\n-----END PUBLIC KEY-----\n"}' }
+
+      it "returns the key data" do
+        result = uaa_info.validation_key(authorization)
+        result['alg'].should == 'SHA256withRSA'
+      end
+    end
+  end
+end

data/spec/scim_spec.rb

@@ -17,13 +17,12 @@ require 'uaa/scim'
 module CF::UAA
 
 describe Scim do
+  let(:options) { {} }
 
-  include SpecHelper
-
-  before :all do
+  before do
     #Util.default_logger(:trace)
     @authheader, @target = "bEareR xyz", "https://test.target"
-    @scim = Scim.new(@target, @authheader)
+    @scim = Scim.new(@target, @authheader, options)
   end
 
   subject { @scim }
@@ -36,6 +35,15 @@ describe Scim do
     headers["authorization"].should =~ /^(?i:bearer)\s+xyz$/
   end
 
+  describe "initialize" do
+    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+
+    it "sets proxy information" do
+      subject.http_proxy.should == 'http-proxy.com'
+      subject.https_proxy.should == 'https-proxy.com'
+    end
+  end
+
   it "adds an object" do
     subject.set_request_handler do |url, method, body, headers|
       url.should == "#{@target}/Users"

data/spec/spec_helper.rb

@@ -22,7 +22,4 @@ if ENV['COVERAGE']
   SimpleCov.start
 end
 
-require 'rspec'
-
-module SpecHelper
-end
+require 'rspec'

data/spec/token_issuer_spec.rb

@@ -19,15 +19,24 @@ module CF::UAA
 
 describe TokenIssuer do
 
-  include SpecHelper
+  let(:options) { {} }
 
-  before :all do
+  before do
     #Util.default_logger(:trace)
-    @issuer = TokenIssuer.new("http://test.uaa.target", "test_client", "test_secret")
+    @issuer = TokenIssuer.new("http://test.uaa.target", "test_client", "test_secret", options)
   end
 
   subject { @issuer }
 
+  describe "initialize" do
+    let(:options) { {:http_proxy => 'http-proxy.com', :https_proxy => 'https-proxy.com'} }
+
+    it "sets proxy information" do
+      subject.http_proxy.should == 'http-proxy.com'
+      subject.https_proxy.should == 'https-proxy.com'
+    end
+  end
+
   context "with client credentials grant" do
 
     it "gets a token with client credentials" do

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cf-uaa-lib
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 10
-  version: 1.3.10
 platform: ruby
-authors: 
+authors:
 - Dave Syer
 - Dale Olds
 - Joel D'sa
@@ -18,135 +13,111 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &74137320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *74137320
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &74137000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *74137000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &74136670 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *74136670
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &74136380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *74136380
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &74135650 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov-rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *74135650
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: &74135270 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ci_reporter
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *74135270
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: &74134990 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *74134990
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &74134660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-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 of users.  The tokens can then be used to access protected resources in a Resource Server.  This library is for use by UAA client applications or resource servers.
-email: 
+  prerelease: false
+  version_requirements: *74134660
+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
+  of users.  The tokens can then be used to access protected resources in a Resource
+  Server.  This library is for use by UAA client applications or resource servers.
+email:
 - dsyer@vmware.com
 - olds@vmware.com
 - jdsa@vmware.com
 - vidya@vmware.com
 - ltaylor@vmware.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -158,51 +129,42 @@ files:
 - cf-uaa-lib.gemspec
 - lib/uaa.rb
 - lib/uaa/http.rb
-- lib/uaa/misc.rb
+- lib/uaa/info.rb
+- lib/uaa/proxy_options.rb
 - lib/uaa/scim.rb
 - lib/uaa/token_coder.rb
 - lib/uaa/token_issuer.rb
 - lib/uaa/util.rb
 - lib/uaa/version.rb
 - spec/http_spec.rb
+- spec/info_spec.rb
 - spec/integration_spec.rb
-- spec/misc_spec.rb
 - spec/scim_spec.rb
 - spec/spec_helper.rb
 - spec/token_coder_spec.rb
 - spec/token_issuer_spec.rb
 homepage: https://github.com/cloudfoundry/cf-uaa-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: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cf-uaa-lib
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Client library for CloudFoundry UAA
 test_files: []
-

data/spec/misc_spec.rb

@@ -1,94 +0,0 @@
-#--
-# Cloud Foundry 2012.02.03 Beta
-# Copyright (c) [2009-2012] VMware, Inc. All Rights Reserved.
-#
-# This product is licensed to you under the Apache License, Version 2.0 (the "License").
-# You may not use this product except in compliance with the License.
-#
-# This product includes a number of subcomponents with
-# separate copyright notices and license terms. Your use of these
-# subcomponents is subject to the terms and conditions of the
-# subcomponent's license, as noted in the LICENSE file.
-#++
-
-require 'spec_helper'
-require 'uaa/misc'
-
-module CF::UAA
-
-  describe Misc do
-
-    include SpecHelper
-
-    before :all do
-      #Util.default_logger(:trace)
-    end
-
-    before do
-      Misc.set_request_handler do |url, method, body, headers|
-        url.should == target_url
-        method.should == :get
-        headers["content-type"].should be_nil
-        headers["accept"].gsub(/\s/, '').should =~ /application\/json;charset=utf-8/i
-        [200, response_body, {"content-type" => "application/json"}]
-      end
-    end
-
-    describe "getting server info" do
-      let(:target_url) { "https://uaa.cloudfoundry.com/login" }
-      let(:response_body) { '{"commit_id":"12345","prompts":["one","two"]}' }
-
-      it "gets server info" do
-        result = Misc.server("https://uaa.cloudfoundry.com")
-        result["prompts"].should_not be_nil
-        result["commit_id"].should_not be_nil
-      end
-
-      context "with symbol keys" do
-        around do |example|
-          CF::UAA::Misc.symbolize_keys = true
-          example.call
-          CF::UAA::Misc.symbolize_keys = false
-        end
-
-        it "gets server info" do
-          result = Misc.server("https://uaa.cloudfoundry.com")
-          result[:prompts].should_not be_nil
-          result[:commit_id].should_not be_nil
-        end
-      end
-    end
-
-    describe "getting UAA target" do
-      let(:target_url) { "https://login.cloudfoundry.com/login" }
-      let(:response_body) { '{"links":{"uaa":"https://uaa.cloudfoundry.com"},"prompts":["one","two"]}' }
-
-      it "gets UAA target" do
-        result = Misc.discover_uaa("https://login.cloudfoundry.com")
-        result.should == "https://uaa.cloudfoundry.com"
-      end
-
-      context "when there is no 'links' key present" do
-        let(:response_body) { '{ "prompts" : ["one","two"]} ' }
-
-        it "returns the login url" do
-          result = Misc.discover_uaa("https://login.cloudfoundry.com")
-          result.should == "https://login.cloudfoundry.com"
-        end
-      end
-
-      context "with symbol keys" do
-        around do |example|
-          CF::UAA::Misc.symbolize_keys = true
-          example.call
-          CF::UAA::Misc.symbolize_keys = false
-        end
-
-        it "gets UAA target" do
-          result = Misc.discover_uaa("https://login.cloudfoundry.com")
-          result.should == "https://uaa.cloudfoundry.com"
-        end
-      end
-    end
-  end
-end