cfoundry 0.4.21 → 0.5.0

data/lib/cfoundry/v2/client.rb

@@ -1,9 +1,11 @@
+require File.expand_path("../../concerns/login_helpers", __FILE__)
+
 module CFoundry::V2
   # The primary API entrypoint. Wraps a BaseClient to provide nicer return
   # values. Initialize with the target and, optionally, an auth token. These
   # are the only two internal states.
   class Client
-    include ClientMethods
+    include ClientMethods, CFoundry::LoginHelpers
 
     # Internal BaseClient instance. Normally won't be touching this.
     attr_reader :base
@@ -22,6 +24,10 @@ module CFoundry::V2
       @base = Base.new(target, token)
     end
 
+    def version
+      2
+    end
+
     # The current target URL of the client.
     def target
       @base.target
@@ -76,9 +82,10 @@ module CFoundry::V2
 
     # The currently authenticated user.
     def current_user
-      if guid = @base.token_data[:user_id]
+      token_data = @base.token.token_data
+      if guid = token_data[:user_id]
         user = user(guid)
-        user.emails = [{ :value => @base.token_data[:email] }]
+        user.emails = [{ :value => token_data[:email] }]
         user
       end
     end
@@ -88,36 +95,18 @@ module CFoundry::V2
       @base.info
     end
 
-    # Login prompts
-    def login_prompts
-      if @base.uaa
-        @base.uaa.prompts
-      else
-        { :username => ["text", "Email"],
-          :password => ["password", "Password"]
-        }
-      end
-    end
-
-    # Authenticate with the target. Sets the client token.
-    #
-    # Credentials is a hash, typically containing :username and :password
-    # keys.
-    #
-    # The values in the hash should mirror the prompts given by
-    # `login_prompts`.
-    def login(credentials)
+    def login(username, password)
       @current_organization = nil
       @current_space = nil
+      super
+    end
 
-      @base.token =
-        if @base.uaa
-          @base.uaa.authorize(credentials)
-        else
-          @base.create_token(
-            { :password => credentials[:password] },
-            credentials[:username])[:token]
-        end
+    def register(email, password)
+      uaa_user = @base.uaa.add_user(email, password)
+      cc_user = user
+      cc_user.guid = uaa_user['id']
+      cc_user.create!
+      cc_user
     end
 
     # Clear client token. No requests are made for this.

data/lib/cfoundry/v2/domain.rb

@@ -3,12 +3,9 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class Domain < Model
     attribute :name, :string
-    attribute :wildcard, :boolean, :default => true
+    attribute :wildcard, :boolean
     to_one    :owning_organization, :as => :organization, :default => nil
 
     queryable_by :name, :owning_organization_guid, :space_guid
-
-    # hide wildcard support for now
-    private :wildcard=
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -72,7 +72,7 @@ module CFoundry::V2
       @manifest ||= {}
       @manifest[:entity] ||= {}
 
-      self.class.defaults.merge(@manifest[:entity]).each do |k, v|
+      @manifest[:entity].each do |k, v|
         if v.is_a?(Hash) && v.key?(:metadata)
           # skip; there's a _guid attribute already
         elsif v.is_a?(Array) && !v.empty? && v.all? { |x|
@@ -87,8 +87,6 @@ module CFoundry::V2
               x
             end
           end
-        elsif k.to_s.end_with?("_json") && v.is_a?(String)
-          payload[k] = MultiJson.load(v)
         elsif k.to_s.end_with?("_url")
         else
           payload[k] = v

data/lib/cfoundry/v2/model_magic.rb

@@ -63,7 +63,7 @@ module CFoundry::V2
         end
 
         define_method(:"create_#{singular}") do |payload|
-          post(payload, "v2", plural, :content => :json, :accept => :json)
+          post("v2", plural, :content => :json, :accept => :json, :payload => payload)
         end
 
         define_method(:"delete_#{singular}") do |guid|
@@ -72,7 +72,7 @@ module CFoundry::V2
         end
 
         define_method(:"update_#{singular}") do |guid, payload|
-          put(payload, "v2", plural, guid, :content => :json, :accept => :json)
+          put("v2", plural, guid, :content => :json, :accept => :json, :payload => payload)
         end
 
         define_method(plural) do |*args|
@@ -118,8 +118,7 @@ module CFoundry::V2
         define_method(:"#{singular}_from") do |path, *args|
           send(
             :"make_#{singular}",
-            @base.request_path(
-              Net::HTTP::Get,
+            @base.get(
               path,
               :accept => :json,
               :params => ModelMagic.params_from(args)))
@@ -127,8 +126,7 @@ module CFoundry::V2
 
         define_method(:"#{plural}_from") do |path, *args|
           objs = @base.all_pages(
-            @base.request_path(
-              Net::HTTP::Get,
+            @base.get(
               path,
               :accept => :json,
               :params => ModelMagic.params_from(args)))
@@ -151,6 +149,7 @@ module CFoundry::V2
 
     def attribute(name, type, opts = {})
       attributes[name] = opts
+      json_name = opts[:at] || name
 
       default = opts[:default]
 
@@ -162,8 +161,8 @@ module CFoundry::V2
         return @cache[name] if @cache.key?(name)
 
         @cache[name] =
-          if manifest[:entity].key?(name)
-            manifest[:entity][name]
+          if manifest[:entity].key?(json_name)
+            manifest[:entity][json_name]
           else
             default
           end
@@ -179,11 +178,11 @@ module CFoundry::V2
         @manifest ||= {}
         @manifest[:entity] ||= {}
 
-        old = @manifest[:entity][name]
+        old = @manifest[:entity][json_name]
         @changes[name] = [old, val] if old != val
-        @manifest[:entity][name] = val
+        @manifest[:entity][json_name] = val
 
-        @diff[name] = val
+        @diff[json_name] = val
       end
     end
 
@@ -314,10 +313,7 @@ module CFoundry::V2
           cache << x unless cache.include?(x)
         end
 
-        @client.base.request_path(
-          Net::HTTP::Put,
-          ["v2", plural_object_name, @guid, plural, x.guid],
-          :accept => :json)
+        @client.base.put("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
       end
 
       define_method(:"remove_#{singular}") do |x|
@@ -329,10 +325,7 @@ module CFoundry::V2
           cache.delete(x)
         end
 
-        @client.base.request_path(
-          Net::HTTP::Delete,
-          ["v2", plural_object_name, @guid, plural, x.guid],
-          :accept => :json)
+        @client.base.delete("v2", plural_object_name, @guid, plural, x.guid, :accept => :json)
       end
 
       define_method(:"#{plural}=") do |xs|
@@ -367,10 +360,7 @@ module CFoundry::V2
 
     def has_summary(actions = {})
       define_method(:summary) do
-        @client.base.request_path(
-          Net::HTTP::Get,
-          ["v2", plural_object_name, @guid, "summary"],
-          :accept => :json)
+        @client.base.get("v2", plural_object_name, @guid, "summary", :accept => :json)
       end
 
       define_method(:summarize!) do |*args|

data/lib/cfoundry/version.rb

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

data/lib/cfoundry/zip.rb

@@ -5,7 +5,7 @@ module CFoundry
   # to use system zip command if necessary.
   module Zip
     # Directory entries to exclude from packing.
-    PACK_EXCLUSION_GLOBS = ['..', '.', '*~', '#*#', '*.log']
+    PACK_EXCLUSION_GLOBS = %w(.. . *~ #*# *.log)
 
     module_function
 

data/spec/cfoundry/auth_token_spec.rb

@@ -0,0 +1,77 @@
+require "base64"
+require "spec_helper"
+
+describe CFoundry::AuthToken do
+  describe ".from_uaa_token_info" do
+    let(:access_token) { Base64.encode64('{"algo": "h1234"}{"user_id": "a6", "email": "a@b.com"}random-bytes') }
+    let(:info_hash) do
+      {
+        :token_type => "bearer",
+        :access_token => access_token,
+        :refresh_token => "some-refresh-token"
+      }
+    end
+
+
+    let(:token_info) { CF::UAA::TokenInfo.new(info_hash) }
+
+    subject { CFoundry::AuthToken.from_uaa_token_info(token_info) }
+
+    describe "#auth_header" do
+      its(:auth_header) { should eq "bearer #{access_token}" }
+    end
+
+    describe "#to_hash" do
+      let(:result_hash) do
+        {
+          :token => "bearer #{access_token}",
+          :refresh_token => "some-refresh-token"
+        }
+      end
+
+      its(:to_hash) { should eq result_hash }
+    end
+
+    describe "#token_data" do
+      context "when the access token is encoded as expected" do
+        its(:token_data) { should eq({ :user_id => "a6", :email => "a@b.com"}) }
+      end
+
+      context "when the access token is not encoded as expected" do
+        let(:access_token) { Base64.encode64('random-bytes') }
+        its(:token_data) { should eq({}) }
+      end
+
+      context "when the access token contains invalid json" do
+        let(:access_token) { Base64.encode64('{"algo": "h1234"}{"user_id", "a6", "email": "a@b.com"}random-bytes') }
+        its(:token_data) { should eq({}) }
+      end
+    end
+  end
+
+  describe ".from_hash(hash)" do
+    let(:token_data) { '{"baz":"buzz"}' }
+    let(:token) { Base64.encode64("{\"foo\":1}#{token_data}") }
+
+    let(:hash) do
+      {
+        :token => "bearer #{token}",
+        :refresh_token => "some-refresh-token"
+      }
+    end
+
+    subject { CFoundry::AuthToken.from_hash(hash) }
+
+    describe "#auth_header" do
+      its(:auth_header) { should eq("bearer #{token}") }
+    end
+
+    describe "#to_hash" do
+      its(:to_hash) { should eq(hash) }
+    end
+
+    describe "#token_data" do
+      its(:token_data) { should eq({ :baz => "buzz" }) }
+    end
+  end
+end

data/spec/cfoundry/baseclient_spec.rb

@@ -1,51 +1,75 @@
 require 'spec_helper'
 
 describe CFoundry::BaseClient do
-  let(:base) { CFoundry::BaseClient.new("https://api.cloudfoundry.com") }
+  subject { CFoundry::BaseClient.new }
 
-  describe '#request_uri' do
-    subject { base.request_uri URI.parse(base.target + "/foo"), Net::HTTP::Get }
-
-    context 'when a timeout exception occurs' do
-      before { stub_request(:get, 'https://api.cloudfoundry.com/foo').to_raise(::Timeout::Error) }
+  describe "#request" do
+    before do
+      stub(subject).handle_response(anything, anything, anything)
+    end
 
-      it 'raises the correct error' do
-        expect { subject }.to raise_error CFoundry::Timeout, "GET https://api.cloudfoundry.com/foo timed out"
+    context "when given multiple segments" do
+      it "encodes the segments and joins them with '/'" do
+        mock(subject).request_raw("GET", "foo/bar%2Fbaz", {})
+        subject.request("GET", "foo", "bar/baz")
       end
     end
 
-    context 'when an HTTPNotFound error occurs' do
-      before {
-
-        stub_request(:get, 'https://api.cloudfoundry.com/foo').to_return :status => 404,
-        :body => "NOT FOUND"
-      }
+    context "when the first segment starts with a '/'" do
+      context "and there's only one segment" do
+        it "requests with the segment unaltered" do
+          mock(subject).request_raw("GET", "/v2/apps", {})
+          subject.request("GET", "/v2/apps")
+        end
+      end
 
-      it 'raises the correct error' do
-        expect {subject}.to raise_error CFoundry::NotFound, "404: NOT FOUND"
+      context "and there's more than one segment" do
+        it "encodes the segments and joins them with '/'" do
+          mock(subject).request_raw("GET", "%2Ffoo/bar%2Fbaz", {})
+          subject.request("GET", "/foo", "bar/baz")
+        end
       end
     end
+  end
 
+  describe "UAAClient" do
+    before do
+      stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+    end
 
-    context 'when an HTTPForbidden error occurs' do
-      before {
-        stub_request(:get, 'https://api.cloudfoundry.com/foo').to_return :status => 403,
-          :body => "NONE SHALL PASS"
-      }
+    describe "#uaa" do
+      it "creates a UAAClient on the first call" do
+        expect(subject.uaa).to be_a CFoundry::UAAClient
+      end
+
+      it "returns the same object on later calls" do
+        uaa = subject.uaa
+        expect(subject.uaa).to eq uaa
+      end
 
-      it 'raises the correct error' do
-        expect {subject}.to raise_error CFoundry::Denied, "403: NONE SHALL PASS"
+      it "has the same AuthToken as BaseClient" do
+        token = CFoundry::AuthToken.new(nil)
+        stub(subject).token { token }
+        expect(subject.uaa.token).to eq token
       end
     end
 
-    context "when any other type of error occurs" do
-      before {
-        stub_request(:get, 'https://api.cloudfoundry.com/foo').to_return :status => 411,
-          :body => "NOT LONG ENOUGH"
-      }
+    describe "#token=" do
+      it "propagates the change to #uaa" do
+        subject.uaa
+        expect(subject.uaa.token).to eq subject.token
+        subject.token = CFoundry::AuthToken.new(nil)
+        expect(subject.uaa.token).to eq subject.token
+      end
+    end
 
-      it 'raises the correct error' do
-        expect {subject}.to raise_error CFoundry::BadResponse, "411: NOT LONG ENOUGH"
+    describe "#trace=" do
+      it "propagates the change to #uaa" do
+        subject.uaa
+        subject.trace = true
+        expect(subject.uaa.trace).to eq true
+        subject.trace = false
+        expect(subject.uaa.trace).to eq false
       end
     end
   end

data/spec/cfoundry/errors_spec.rb

@@ -4,23 +4,20 @@ describe 'Errors' do
   describe CFoundry::Timeout do
     let(:parent) { Timeout::Error.new }
 
-    subject { CFoundry::Timeout.new(Net::HTTP::Post, '/blah', parent) }
+    subject { CFoundry::Timeout.new("POST", '/blah', parent) }
 
     its(:to_s) { should eq "POST /blah timed out" }
-    its(:method) { should eq Net::HTTP::Post }
+    its(:method) { should eq "POST" }
     its(:uri) { should eq '/blah' }
     its(:parent) { should eq parent }
   end
 
   describe CFoundry::APIError do
-    let(:request) { Net::HTTP::Get.new("http://api.cloudfoundry.com/foo") }
-    let(:response) { Net::HTTPNotFound.new("foo", 404, "bar")}
+    let(:request) { { :method => "GET", :url => "http://api.cloudfoundry.com/foo", :headers => {} } }
     let(:response_body) { "NOT FOUND" }
-    subject { CFoundry::APIError.new(request, response) }
+    let(:response) { { :status => 404, :headers => {}, :body => response_body } }
 
-    before do
-      stub(response).body {response_body}
-    end
+    subject { CFoundry::APIError.new(nil, nil, request, response) }
 
     its(:to_s) { should eq "404: NOT FOUND" }
 
@@ -35,7 +32,7 @@ describe 'Errors' do
         let(:response_body) { "{\"description\":\"Something went wrong\"}"}
 
         it "sets description to description field in parsed JSON" do
-          CFoundry::APIError.new(request, response).description.should == "Something went wrong"
+          CFoundry::APIError.new(nil, nil, request, response).description.should == "Something went wrong"
         end
       end
 
@@ -45,12 +42,12 @@ describe 'Errors' do
         let(:response_body) { "Some plain text"}
 
         it "sets description to body text" do
-          CFoundry::APIError.new(request, response).description.should == "Some plain text"
+          CFoundry::APIError.new(nil, nil, request, response).description.should == "Some plain text"
         end
       end
 
       it "allows override of description" do
-        CFoundry::APIError.new(request, response, "My description").description.should == "My description"
+        CFoundry::APIError.new("My description", nil, request, response).description.should == "My description"
       end
 
     end
@@ -64,11 +61,11 @@ describe 'Errors' do
     end
 
     it "sets error code to response error code by default" do
-      CFoundry::APIError.new(request, response).error_code.should == 404
+      CFoundry::APIError.new(nil, nil, request, response).error_code.should == 404
     end
 
     it "allows override of error code" do
-      CFoundry::APIError.new(request, response, nil, 303).error_code.should == 303
+      CFoundry::APIError.new(nil, 303, request, response).error_code.should == 303
     end
 
   end