cfoundry 0.2.2 → 0.3.0

data/lib/cfoundry/v2/organization.rb

@@ -0,0 +1,15 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class Organization < Model
+    attribute :name
+    to_many   :app_spaces
+    to_many   :domains
+    to_many   :users
+    to_many   :managers, :as => :user
+    to_many   :billing_managers, :as => :user
+    to_many   :auditors, :as => :user
+
+    alias :spaces :app_spaces
+  end
+end

data/lib/cfoundry/v2/runtime.rb

@@ -0,0 +1,9 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class Runtime < Model
+    attribute :name
+    attribute :description
+    to_many   :apps
+  end
+end

data/lib/cfoundry/v2/service.rb

@@ -0,0 +1,16 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class Service < Model
+    attribute :label
+    attribute :provider
+    attribute :url
+    attribute :description
+    attribute :version
+    attribute :info_url
+    attribute :acls
+    attribute :timeout
+    attribute :active
+    to_many   :service_plans
+  end
+end

data/lib/cfoundry/v2/service_instance.rb

@@ -0,0 +1,12 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class ServiceInstance < Model
+    attribute :name
+    to_one    :app_space
+    to_one    :service_plan
+    to_many   :service_bindings
+    attribute :credentials
+    attribute :vendor_data, :default => ""
+  end
+end

data/lib/cfoundry/v2/service_plan.rb

@@ -0,0 +1,10 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class ServicePlan < Model
+    attribute :name
+    attribute :description
+    to_one    :service
+    to_many   :service_instances
+  end
+end

data/lib/cfoundry/v2/space.rb

@@ -0,0 +1,13 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class AppSpace < Model
+    attribute :name
+    to_one    :organization
+    to_many   :developers, :as => :user
+    to_many   :managers, :as => :user
+    to_many   :auditors, :as => :user
+    to_many   :apps
+    to_many   :domains
+  end
+end

data/lib/cfoundry/v2/user.rb

@@ -0,0 +1,50 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class User < Model
+    to_many   :app_spaces
+    to_many   :organizations
+    to_many   :managed_organizations, :as => :organization
+    to_many   :billing_managed_organizations, :as => :organization
+    to_many   :audited_organizations, :as => :organization
+    to_many   :managed_app_spaces, :as => :app_space
+    to_many   :audited_app_spaces, :as => :app_space
+    attribute :admin
+    to_one    :default_app_space, :as => :app_space
+
+    attribute :guid # guid is explicitly set for users
+
+    alias :admin? :admin
+
+    alias :spaces :app_spaces
+    alias :managed_spaces :managed_app_spaces
+    alias :audited_spaces :audited_app_spaces
+    alias :default_space :default_app_space
+
+    # optional metadata from UAA
+    attr_accessor :emails, :name
+
+    def email
+      return unless @emails && @emails.first
+      @emails.first[:value]
+    end
+
+    def given_name
+      return unless @name && @name[:givenName] != email
+      @name[:givenName]
+    end
+
+    def family_name
+      return unless @name && @name[:familyName] != email
+      @name[:familyName]
+    end
+
+    def full_name
+      if @name && @name[:fullName]
+        @name[:fullName]
+      elsif given_name && family_name
+        "#{given_name} #{family_name}"
+      end
+    end
+  end
+end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -105,12 +105,31 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
-- lib/cfoundry/app.rb
+- lib/cfoundry/baseclient.rb
 - lib/cfoundry/client.rb
 - lib/cfoundry/errors.rb
-- lib/cfoundry/restclient.rb
-- lib/cfoundry/service.rb
-- lib/cfoundry/user.rb
+- lib/cfoundry/uaaclient.rb
+- lib/cfoundry/v1/app.rb
+- lib/cfoundry/v1/base.rb
+- lib/cfoundry/v1/client.rb
+- lib/cfoundry/v1/framework.rb
+- lib/cfoundry/v1/runtime.rb
+- lib/cfoundry/v1/service.rb
+- lib/cfoundry/v1/service_instance.rb
+- lib/cfoundry/v1/user.rb
+- lib/cfoundry/v2/app.rb
+- lib/cfoundry/v2/base.rb
+- lib/cfoundry/v2/client.rb
+- lib/cfoundry/v2/domain.rb
+- lib/cfoundry/v2/framework.rb
+- lib/cfoundry/v2/model.rb
+- lib/cfoundry/v2/organization.rb
+- lib/cfoundry/v2/runtime.rb
+- lib/cfoundry/v2/service.rb
+- lib/cfoundry/v2/service_instance.rb
+- lib/cfoundry/v2/service_plan.rb
+- lib/cfoundry/v2/space.rb
+- lib/cfoundry/v2/user.rb
 - lib/cfoundry/version.rb
 - lib/cfoundry/zip.rb
 - lib/cfoundry.rb
@@ -154,4 +173,3 @@ test_files:
 - spec/client_spec.rb
 - spec/helpers.rb
 - spec/Rakefile
-has_rdoc: 

data/lib/cfoundry/restclient.rb

@@ -1,260 +0,0 @@
-require "restclient"
-require "json"
-
-require "cfoundry/errors"
-
-
-module CFoundry
-  class RESTClient # :nodoc:
-    attr_accessor :target, :token, :proxy, :trace
-
-    def initialize(
-        target = "http://api.cloudfoundry.com",
-        token = nil)
-      @target = target
-      @token = token
-    end
-
-    # Cloud metadata
-    def info
-      json_get("info")
-    end
-
-    def system_services
-      json_get("info", "services")
-    end
-
-    def system_runtimes
-      json_get("info", "runtimes")
-    end
-
-    # Users
-    def users
-      json_get("users")
-    end
-
-    def create_user(payload)
-      post(payload.to_json, "users")
-    end
-
-    def user(email)
-      json_get("users", email)
-    end
-
-    def delete_user(email)
-      delete("users", email)
-      true
-    end
-
-    def update_user(email, payload)
-      put(payload.to_json, "users", email)
-    end
-
-    def create_token(payload, email)
-      json_post(payload.to_json, "users", email, "tokens")
-    end
-
-    # Applications
-    def apps
-      json_get("apps")
-    end
-
-    def create_app(payload)
-      json_post(payload.to_json, "apps")
-    end
-
-    def app(name)
-      json_get("apps", name)
-    end
-
-    def instances(name)
-      json_get("apps", name, "instances")["instances"]
-    end
-
-    def files(name, instance, *path)
-      get("apps", name, "instances", instance, "files", *path)
-    end
-    alias :file :files
-
-    def update_app(name, payload)
-      put(payload.to_json, "apps", name)
-    end
-
-    def delete_app(name)
-      delete("apps", name)
-      true
-    end
-
-    def stats(name)
-      json_get("apps", name, "stats")
-    end
-
-    def check_resources(fingerprints)
-      json_post(fingerprints.to_json, "resources")
-    end
-
-    def upload_app(name, zipfile, resources = [])
-      payload = {
-        :_method => "put",
-        :resources => resources.to_json,
-        :multipart => true,
-        :application =>
-          if zipfile.is_a? File
-            zipfile
-          elsif zipfile.is_a? String
-            File.new(zipfile, "rb")
-          end
-      }
-
-      post(payload, "apps", name, "application")
-    rescue RestClient::ServerBrokeConnection
-      retry
-    end
-
-    # Services
-    def services
-      json_get("services")
-    end
-
-    def create_service(manifest)
-      json_post(manifest.to_json, "services")
-    end
-
-    def service(name)
-      json_get("services", name)
-    end
-
-    def delete_service(name)
-      delete("services", name)
-      true
-    end
-
-  private
-    def request(type, segments, options = {})
-      headers = {}
-      headers["AUTHORIZATION"] = @token if @token
-      headers["PROXY-USER"] = @proxy if @proxy
-      headers["Content-Type"] = "application/json" # TODO: probably not always
-                                                   #       and set Accept
-      headers["Content-Length"] =
-        options[:payload] ? options[:payload].size : 0
-
-      req = options.dup
-      req[:method] = type
-      req[:url] = url(segments)
-      req[:headers] = headers.merge(req[:headers] || {})
-
-      json = req.delete :json
-
-      RestClient::Request.execute(req) do |response, request|
-        if @trace
-          puts '>>>'
-          puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
-          puts "REQUEST: #{req[:method]} #{req[:url]}"
-          puts "RESPONSE_HEADERS:"
-          response.headers.each do |key, value|
-            puts "    #{key} : #{value}"
-          end
-          puts "REQUEST_HEADERS:"
-          request.headers.each do |key, value|
-            puts "    #{key} : #{value}"
-          end
-          puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
-          puts "RESPONSE: [#{response.code}]"
-          begin
-            puts JSON.pretty_generate(JSON.parse(response.body))
-          rescue
-            puts "#{response.body}"
-          end
-          puts '<<<'
-        end
-
-        case response.code
-        when 200, 204, 302
-          if json
-            if response.code == 204
-              raise "Expected JSON response, got 204 No Content"
-            end
-
-            JSON.parse response
-          else
-            response
-          end
-
-        # TODO: figure out how/when the CC distinguishes these
-        when 400, 403
-          info = JSON.parse response
-          raise Denied.new(
-            info["code"],
-            info["description"])
-
-        when 404
-          raise NotFound
-
-        when 411, 500, 504
-          begin
-            raise_error(JSON.parse(response))
-          rescue JSON::ParserError
-            raise BadResponse.new(response.code, response)
-          end
-
-        else
-          raise BadResponse.new(response.code, response)
-        end
-      end
-    rescue SocketError, Errno::ECONNREFUSED => e
-      raise TargetRefused, e.message
-    end
-
-    def raise_error(info)
-      case info["code"]
-      when 402
-        raise UploadFailed.new(info["description"])
-      else
-        raise APIError.new(info["code"], info["description"])
-      end
-    end
-
-    def get(*path)
-      request(:get, path)
-    end
-
-    def delete(*path)
-      request(:delete, path)
-    end
-
-    def post(payload, *path)
-      request(:post, path, :payload => payload)
-    end
-
-    def put(payload, *path)
-      request(:put, path, :payload => payload)
-    end
-
-    def json_get(*path)
-      request(:get, path, :json => true)
-    end
-
-    def json_delete(*path)
-      request(:delete, path, :json => true)
-    end
-
-    def json_post(payload, *path)
-      request(:post, path, :payload => payload, :json => true)
-    end
-
-    def json_put(payload, *path)
-      request(:put, path, :payload => payload, :json => true)
-    end
-
-    def url(segments)
-      "#@target/#{safe_path(segments)}"
-    end
-
-    def safe_path(*segments)
-      segments.flatten.collect { |x|
-        URI.encode x.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
-      }.join("/")
-    end
-  end
-end