cfoundry 0.4.8 → 0.4.9

data/lib/cfoundry/v1/base.rb

@@ -7,6 +7,8 @@ require "cfoundry/errors"
 
 module CFoundry::V1
   class Base < CFoundry::BaseClient
+    include BaseClientMethods
+
     attr_accessor :target, :token, :proxy, :trace, :backtrace, :log
 
     def initialize(
@@ -46,45 +48,12 @@ module CFoundry::V1
     end
 
     # Users
-    def users
-      get("users", :accept => :json)
-    end
-
-    def create_user(payload)
-      post(payload, "users", :content => :json)
-    end
-
-    def user(email)
-      get("users", email, :accept => :json)
-    end
-
-    def delete_user(email)
-      delete("users", email, :accept => :json)
-      true
-    end
-
-    def update_user(email, payload)
-      put(payload, "users", email, :content => :json)
-    end
-
     def create_token(payload, email)
       post(payload, "users", email, "tokens",
            :content => :json, :accept => :json)
     end
 
     # Applications
-    def apps
-      get("apps", :accept => :json)
-    end
-
-    def create_app(payload)
-      post(payload, "apps", :content => :json, :accept => :json)
-    end
-
-    def app(name)
-      get("apps", name, :accept => :json)
-    end
-
     def instances(name)
       get("apps", name, "instances", :accept => :json)[:instances]
     end
@@ -98,20 +67,11 @@ module CFoundry::V1
     end
     alias :file :files
 
-    def update_app(name, payload)
-      put(payload, "apps", name, :content => :json)
-    end
-
-    def delete_app(name)
-      delete("apps", name)
-      true
-    end
-
     def stats(name)
       get("apps", name, "stats", :accept => :json)
     end
 
-    def check_resources(fingerprints)
+    def resource_match(fingerprints)
       post(fingerprints, "resources", :content => :json, :accept => :json)
     end
 
@@ -134,24 +94,6 @@ module CFoundry::V1
       retry
     end
 
-    # Services
-    def services
-      get("services", :accept => :json)
-    end
-
-    def create_service(manifest)
-      post(manifest, "services", :content => :json, :accept => :json)
-    end
-
-    def service(name)
-      get("services", name, :accept => :json)
-    end
-
-    def delete_service(name)
-      delete("services", name, :accept => :json)
-      true
-    end
-
     private
 
     def handle_response(response, accept)

data/lib/cfoundry/v1/client.rb

@@ -1,15 +1,10 @@
-require "cfoundry/v1/base"
-require "cfoundry/v1/app"
-require "cfoundry/v1/service"
-require "cfoundry/v1/service_instance"
-require "cfoundry/v1/user"
-
-
 module CFoundry::V1
   # 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
+
     attr_reader :base
 
     # Create a new Client for interfacing with the given target.
@@ -93,7 +88,7 @@ module CFoundry::V1
     end
 
     # Retrieve available services.
-    def services(depth = 0, query = {})
+    def services(options = {})
       services = []
 
       @base.system_services.each do |type, vendors|
@@ -105,7 +100,7 @@ module CFoundry::V1
 
                 services <<
                   Service.new(vendor.to_s, ver.to_s, meta[:description],
-                              type, provider.to_s, state && state.first)
+                              type.to_s, provider.to_s, state && state.first)
               end
             end
           end
@@ -116,7 +111,7 @@ module CFoundry::V1
     end
 
     # Retrieve available runtimes.
-    def runtimes(depth = 1, query = {})
+    def runtimes(options = {})
       runtimes = []
 
       @base.system_runtimes.each do |name, meta|
@@ -127,12 +122,16 @@ module CFoundry::V1
       runtimes
     end
 
+    def runtime(name)
+      Runtime.new(name)
+    end
+
     def runtime_by_name(name)
       runtimes.find { |r| r.name == name }
     end
 
     # Retrieve available frameworks.
-    def frameworks(depth = 1, query = {})
+    def frameworks(options = {})
       fs = info[:frameworks]
       return unless fs
 
@@ -149,28 +148,12 @@ module CFoundry::V1
       frameworks
     end
 
-    def framework_by_name(name)
-      frameworks.find { |f| f.name == name }
+    def framework(name)
+      Framework.new(name)
     end
 
-    # Retrieve user list. Admin-only.
-    def users(depth = 1, query = {})
-      @base.users.collect do |json|
-        User.new(
-          json[:email],
-          self,
-          { :email => json[:email],
-            :admin => json[:admin] })
-      end
-    end
-
-    # Construct a User object. The return value is lazy, and no requests are
-    # made from this alone.
-    #
-    # This should be used for both user creation (after calling User#create!)
-    # and retrieval.
-    def user(email)
-      User.new(email, self)
+    def framework_by_name(name)
+      frameworks.find { |f| f.name == name }
     end
 
     # Create a user on the target and return a User object representing them.
@@ -217,48 +200,5 @@ module CFoundry::V1
     def logged_in?
       !!@base.token
     end
-
-
-    # Retreive all of the current user's applications.
-    def apps(depth = 1, query = {})
-      @base.apps.collect do |json|
-        App.new(json[:name], self, json)
-      end
-    end
-
-    # Construct an App object. The return value is lazy, and no requests are
-    # made from this method alone.
-    #
-    # This should be used for both app creation (after calling App#create!)
-    # and retrieval.
-    def app(name = nil)
-      App.new(name, self)
-    end
-
-    def app_by_name(name)
-      app = app(name)
-      app if app.exists?
-    end
-
-    # Retrieve all of the current user's services.
-    def service_instances(depth = 1, query = {})
-      @base.services.collect do |json|
-        ServiceInstance.new(json[:name], self, json)
-      end
-    end
-
-    # Construct a Service object. The return value is lazy, and no requests are
-    # made from this method alone.
-    #
-    # This should be used for both service creation (after calling
-    # Service#create!) and retrieval.
-    def service_instance(name = nil)
-      ServiceInstance.new(name, self)
-    end
-
-    def service_instance_by_name(name)
-      service = service_instance(name)
-      service if service.exists?
-    end
   end
 end

data/lib/cfoundry/v1/model.rb

@@ -0,0 +1,153 @@
+require "multi_json"
+
+require "cfoundry/v1/model_magic"
+
+
+module CFoundry::V1
+  class Model
+    extend ModelMagic
+
+    class << self
+      attr_writer :object_name, :base_object_name
+
+      def object_name
+        @object_name ||=
+          name.split("::").last.gsub(
+            /([a-z])([A-Z])/,
+            '\1_\2').downcase.to_sym
+      end
+
+      def base_object_name
+        @base_object_name ||= object_name
+      end
+    end
+
+    attr_accessor :guid, :changes
+
+    def initialize(guid, client, manifest = nil)
+      @guid = guid
+      @client = client
+      @manifest = manifest
+      @changes = {}
+    end
+
+    def manifest
+      @manifest ||= @client.base.send(base_object_name, @guid)
+    end
+
+    def changed?
+      !@changes.empty?
+    end
+
+    def inspect
+      "\#<#{self.class.name} '#@guid'>"
+    end
+
+    def object_name
+      @object_name ||= self.class.object_name
+    end
+
+    def base_object_name
+      @base_object_name ||= self.class.base_object_name
+    end
+
+    def guid_name
+      self.class.guid_name
+    end
+
+    def invalidate!
+      @manifest = nil
+      @changes = {}
+    end
+
+    def create!
+      @manifest = @client.base.send(:"create_#{base_object_name}", write_manifest)
+
+      @guid = read_manifest[guid_name]
+
+      true
+    end
+
+    def update!
+      @client.base.send(:"update_#{base_object_name}", @guid, write_manifest)
+
+      invalidate!
+
+      true
+    end
+
+    def delete!
+      @client.base.send(:"delete_#{base_object_name}", @guid)
+
+      @guid = nil
+
+      true
+    end
+
+    def exists?
+      invalidate!
+      manifest
+      true
+    rescue CFoundry::NotFound
+      false
+    end
+
+    def read_manifest
+      read = {}
+
+      self.class.read_locations.each do |name, where|
+        found, val = find_path(manifest, where)
+        read[name] = val if found
+      end
+
+      read[guid_name] = @guid
+
+      read
+    end
+
+    def find_path(hash, path)
+      return [false, nil] unless hash
+
+      first, *rest = path
+      return [false, nil] unless hash.key?(first)
+
+      here = hash[first]
+
+      if rest.empty?
+        [true, here]
+      else
+        find_path(here, rest)
+      end
+    end
+
+    def write_manifest(body = read_manifest, onto = {})
+      onto[guid_name] = @guid
+
+      self.class.write_locations.each do |what, where|
+        put(body[what], onto, where) if body.key?(what)
+      end
+
+      onto
+    end
+
+    def put(what, where, path)
+      if path.size == 1
+        where[path.last] = what
+      elsif name = path.first
+        where[name] ||= {}
+        put(what, where[name], path[1..-1])
+      end
+
+      nil
+    end
+
+    def eql?(other)
+      other.is_a?(self.class) && @guid == other.guid
+    end
+    alias :== :eql?
+
+    def hash
+      @guid.hash
+    end
+  end
+end

data/lib/cfoundry/v1/model_magic.rb

@@ -0,0 +1,114 @@
+require "cfoundry/validator"
+
+module CFoundry::V1
+  module BaseClientMethods
+  end
+
+  module ClientMethods
+  end
+
+  module ModelMagic
+    attr_accessor :guid_name
+
+    def read_locations
+      @read_locations ||= {}
+    end
+
+    def write_locations
+      @write_locations ||= {}
+    end
+
+    def define_client_methods(klass = self)
+      singular = klass.object_name
+      plural = :"#{singular}s"
+
+      base_singular = klass.base_object_name
+      base_plural = :"#{base_singular}s"
+
+      BaseClientMethods.module_eval do
+        define_method(base_singular) do |guid|
+          get(base_plural, guid, :accept => :json)
+        end
+
+        define_method(:"create_#{base_singular}") do |payload|
+          post(payload, base_plural, :content => :json, :accept => :json)
+        end
+
+        define_method(:"delete_#{base_singular}") do |guid|
+          delete(base_plural, guid)
+          true
+        end
+
+        define_method(:"update_#{base_singular}") do |guid, payload|
+          put(payload, base_plural, guid, :content => :json)
+        end
+
+        define_method(base_plural) do |*args|
+          get(base_plural, :accept => :json)
+        end
+      end
+
+      ClientMethods.module_eval do
+        if klass.guid_name
+          define_method(:"#{singular}_by_#{klass.guid_name}") do |guid|
+            obj = send(singular, guid)
+            obj if obj.exists?
+          end
+        end
+
+        define_method(singular) do |*args|
+          guid, _ = args
+          klass.new(guid, self)
+        end
+
+        define_method(plural) do |*args|
+          options, _ = args
+          options ||= {}
+
+          @base.send(base_plural).collect do |json|
+            klass.new(json[klass.guid_name], self, json)
+          end
+        end
+      end
+    end
+
+    def attribute(name, type, opts = {})
+      default = opts[:default]
+      is_guid = opts[:guid]
+      read_only = opts[:read_only]
+      write_only = opts[:write_only]
+      has_default = opts.key?(:default)
+
+      read_locations[name] = Array(opts[:read] || opts[:at] || name)
+      write_locations[name] = Array(opts[:write] || opts[:at] || name)
+
+      self.guid_name = name if is_guid
+
+      unless write_only
+        define_method(name) do
+          return @guid if @guid && is_guid
+
+          read = read_manifest
+          read.key?(name) ? read[name] : default
+        end
+      end
+
+      return if read_only
+
+      define_method(:"#{name}=") do |val|
+        unless has_default && val == default
+          CFoundry::Validator.validate_type(val, type)
+        end
+
+        @guid = val if is_guid
+
+        @manifest ||= {}
+
+        old = read_manifest[name]
+        @changes[name] = [old, val] if old != val
+
+        put(val, @manifest, self.class.write_locations[name])
+      end
+    end
+  end
+end