cfoundry 0.4.8 → 0.4.9

data/lib/cfoundry/v1/service_instance.rb

@@ -1,112 +1,32 @@
-module CFoundry::V1
-  # Class for representing a user's service on a given target (via Client).
-  #
-  # Does not guarantee that the service exists; used for both service creation
-  # and retrieval, as the attributes are all lazily retrieved. Setting
-  # attributes does not perform any requests; use #update! to commit your
-  # changes.
-  class ServiceInstance
-    # Service name.
-    attr_accessor :name
-
-    # Service type (e.g. key-value).
-    attr_accessor :type
-
-    # Service vendor (redis, mysql, etc.).
-    attr_accessor :vendor
-
-    # Service version.
-    attr_accessor :version
-
-    # Service properties.
-    attr_accessor :properties
-
-    # Service tier. Usually "free" for now.
-    attr_accessor :tier
-
-    # Service metadata.
-    attr_accessor :meta
+require "cfoundry/v1/model"
 
-    # Create a Service object.
-    #
-    # You'll usually call Client#service instead.
-    def initialize(name, client, manifest = nil)
-      @name = name
-      @client = client
-      @manifest = manifest
-    end
-
-    # Show string representing the service.
-    def inspect
-      "#<ServiceInstance '#@name'>"
-    end
-
-    # Basic equality test by name.
-    def eql?(other)
-      other.is_a?(self.class) && other.name == @name
-    end
-    alias :== :eql?
+module CFoundry::V1
+  class ServiceInstance < Model
+    self.base_object_name = :service
 
-    # Delete the service from the target.
-    def delete!
-      @client.base.delete_service(@name)
-    end
+    attribute :name,       :string,   :guid => true
+    attribute :created,    :integer,  :at => [:meta, :created]
+    attribute :updated,    :integer,  :at => [:meta, :updated]
+    attribute :tags,       [:string], :at => [:meta, :tags]
+    attribute :type,       :string
+    attribute :vendor,     :string
+    attribute :version,    :string
+    attribute :tier,       :string
+    attribute :properties, :hash
 
-    # Create the service on the target.
-    #
-    # Call this after setting the various attributes.
-    def create!
-      @client.base.create_service(@manifest.merge(:name => @name))
-    end
+    define_client_methods
 
-    # Check if the service exists on the target.
-    def exists?
-      @client.base.service(@name)
-      true
-    rescue CFoundry::ServiceNotFound
-      false
-    end
+    alias_method :created_unix, :created
+    alias_method :updated_unix, :updated
 
     # Timestamp of when the service was created.
     def created
-      Time.at(meta[:created])
+      Time.at(created_unix)
     end
 
     # Timestamp of when the service was last updated.
     def updated
-      Time.at(meta[:updated])
-    end
-
-    def invalidate!
-      @manifest = nil
-    end
-
-    def eql?(other)
-      other.is_a?(self.class) && @name == other.name
-    end
-    alias :== :eql?
-
-    { :type => :type,
-      :vendor => :vendor,
-      :version => :version,
-      :properties => :properties,
-      :tier => :tier,
-      :meta => :meta
-    }.each do |meth, attr|
-      define_method(meth) do
-        manifest[attr]
-      end
-
-      define_method(:"#{meth}=") do |v|
-        @manifest ||= {}
-        @manifest[attr] = v
-      end
-    end
-
-    private
-
-    def manifest
-      @manifest ||= @client.base.service(@name)
+      Time.at(updated_unix)
     end
   end
 end

data/lib/cfoundry/v1/user.rb

@@ -1,79 +1,14 @@
-module CFoundry::V1
-  # Class for representing a user on a given target (via Client).
-  #
-  # Does not guarantee that the user exists; used for both user creation and
-  # retrieval, as the attributes are all lazily retrieved. Setting attributes
-  # does not perform any requests; use #update! to commit your changes.
-  class User
-    # User email.
-    attr_reader :email
-
-
-    # Create a User object.
-    #
-    # You'll usually call Client#user instead
-    def initialize(email, client, manifest = nil)
-      @email = email
-      @client = client
-      @manifest = manifest
-    end
+require "cfoundry/v1/model"
 
-    # Show string representing the user.
-    def inspect
-      "#<User '#@email'>"
-    end
-
-    # Basic equality test by email.
-    def eql?(other)
-      other.is_a?(self.class) && other.email == @email
-    end
-    alias :== :eql?
-
-    # Delete the user from the target.
-    def delete!
-      @client.base.delete_user(@email)
-    end
-
-    # Create the user on the target.
-    #
-    # Call this after setting the various attributes.
-    def create!
-      @client.base.create_user(@manifest.merge(:email => @email))
-    end
-
-    # Update user attributes.
-    def update!(what = {})
-      @client.base.update_user(@email, manifest.merge(what))
-      @manifest = nil
-    end
-
-    # Check if the user exists on the target.
-    def exists?
-      @client.base.user(@email)
-      true
-    rescue CFoundry::Denied
-      false
-    end
-
-    def invalidate!
-      @manifest = nil
-    end
-
-    # Check if the user is an administrator.
-    def admin?
-      manifest[:admin]
-    end
+module CFoundry::V1
+  class User < Model
+    attribute :email,    :string, :guid => true
+    attribute :password, :string, :write_only => true
+    attribute :admin,    :boolean
 
-    # Set the user's password.
-    #
-    # Call #update! after using this.
-    def password=(str)
-      manifest[:password] = str
-    end
+    define_client_methods
 
-    def guid
-      @guid ||= @client.base.token_data[:user_id]
-    end
+    alias_method :admin?, :admin
 
     def change_password!(new, old)
       if @client.base.uaa
@@ -83,11 +18,5 @@ module CFoundry::V1
         update!
       end
     end
-
-    private
-
-    def manifest
-      @manifest ||= @client.base.user(@email)
-    end
   end
 end

data/lib/cfoundry/v2/app.rb

@@ -287,44 +287,6 @@ module CFoundry::V2
       }
     end
 
-    # Upload application's code to target. Do this after #create! and before
-    # #start!
-    #
-    # [path]
-    #   A path pointing to either a directory, or a .jar, .war, or .zip
-    #   file.
-    #
-    #   If a .vmcignore file is detected under the given path, it will be used
-    #   to exclude paths from the payload, similar to a .gitignore.
-    #
-    # [check_resources]
-    #   If set to `false`, the entire payload will be uploaded
-    #   without checking the resource cache.
-    #
-    #   Only do this if you know what you're doing.
-    def upload(path, check_resources = true)
-      unless File.exist? path
-        raise CFoundry::Error, "Invalid application path '#{path}'"
-      end
-
-      zipfile = "#{Dir.tmpdir}/#{@guid}.zip"
-      tmpdir = "#{Dir.tmpdir}/.vmc_#{@guid}_files"
-
-      FileUtils.rm_f(zipfile)
-      FileUtils.rm_rf(tmpdir)
-
-      prepare_package(path, tmpdir)
-
-      resources = determine_resources(tmpdir) if check_resources
-
-      packed = CFoundry::Zip.pack(tmpdir, zipfile)
-
-      @client.base.upload_app(@guid, packed && zipfile, resources || [])
-    ensure
-      FileUtils.rm_f(zipfile) if zipfile
-      FileUtils.rm_rf(tmpdir) if tmpdir
-    end
-
     def files(*path)
       Instance.new(self, "0", @client).files(*path)
     end
@@ -401,25 +363,5 @@ module CFoundry::V2
         @client.base.stream_file(@app.guid, @id, *path, &blk)
       end
     end
-
-    private
-
-    # Minimum size for an application payload to bother checking resources.
-    RESOURCE_CHECK_LIMIT = 64 * 1024
-
-    def determine_resources(path)
-      fingerprints, total_size = make_fingerprints(path)
-
-      return if total_size <= RESOURCE_CHECK_LIMIT
-
-      resources = @client.base.resource_match(fingerprints)
-
-      resources.each do |resource|
-        FileUtils.rm_f resource[:fn]
-        resource[:fn].sub!("#{path}/", "")
-      end
-
-      resources
-    end
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -110,7 +110,8 @@ module CFoundry::V2
     end
 
     def exists?
-      @client.base.send(object_name, @guid)
+      invalidate!
+      manifest
       true
     rescue CFoundry::NotFound
       false

data/lib/cfoundry/v2/model_magic.rb

@@ -1,3 +1,5 @@
+require "cfoundry/validator"
+
 module CFoundry::V2
   # object name -> module containing query methods
   #
@@ -150,7 +152,7 @@ module CFoundry::V2
 
       define_method(:"#{name}=") do |val|
         unless has_default && val == default
-          ModelMagic.validate_type(val, type)
+          CFoundry::Validator.validate_type(val, type)
         end
 
         @cache[name] = val
@@ -209,7 +211,7 @@ module CFoundry::V2
         klass = CFoundry::V2.const_get(kls)
 
         unless has_default && val == default
-          ModelMagic.validate_type(val, klass)
+          CFoundry::Validator.validate_type(val, klass)
         end
 
         @manifest ||= {}
@@ -284,7 +286,7 @@ module CFoundry::V2
       end
 
       define_method(:"add_#{singular}") do |x|
-        ModelMagic.validate_type(x, CFoundry::V2.const_get(kls))
+        CFoundry::Validator.validate_type(x, CFoundry::V2.const_get(kls))
 
         if cache = @cache[plural]
           cache << x unless cache.include?(x)
@@ -297,7 +299,7 @@ module CFoundry::V2
       end
 
       define_method(:"remove_#{singular}") do |x|
-        ModelMagic.validate_type(x, CFoundry::V2.const_get(kls))
+        CFoundry::Validator.validate_type(x, CFoundry::V2.const_get(kls))
 
         if cache = @cache[plural]
           cache.delete(x)
@@ -312,7 +314,7 @@ module CFoundry::V2
       define_method(:"#{plural}=") do |xs|
         klass = CFoundry::V2.const_get(kls)
 
-        ModelMagic.validate_type(xs, [klass])
+        CFoundry::Validator.validate_type(xs, [klass])
 
         @manifest ||= {}
         @manifest[:entity] ||= {}
@@ -411,56 +413,22 @@ module CFoundry::V2
       end
     end
 
-    class << self
-      def value_matches?(val, type)
-        case type
-        when Class
-          val.is_a?(type)
-        when Regexp
-          val.is_a?(String) && val =~ type
-        when :url
-          value_matches?(val, URI::regexp(%w(http https)))
-        when :https_url
-          value_matches?(val, URI::regexp("https"))
-        when :boolean
-          val.is_a?(TrueClass) || val.is_a?(FalseClass)
-        when Array
-          val.all? do |x|
-            value_matches?(x, type.first)
-          end
-        when Hash
-          val.is_a?(Hash) &&
-            type.all? { |name, subtype|
-              val.key?(name) && value_matches?(val[name], subtype)
-            }
-        else
-          val.is_a?(Object.const_get(type.to_s.capitalize))
-        end
-      end
-
-      def validate_type(val, type)
-        unless value_matches?(val, type)
-          raise CFoundry::Mismatch.new(type, val)
+    def self.params_from(args)
+      options, _ = args
+      options ||= {}
+      options[:depth] ||= 1
+
+      params = {}
+      options.each do |k, v|
+        case k
+        when :depth
+          params[:"inline-relations-depth"] = v
+        when :query
+          params[:q] = v.join(":")
         end
       end
 
-      def params_from(args)
-        options, _ = args
-        options ||= {}
-        options[:depth] ||= 1
-
-        params = {}
-        options.each do |k, v|
-          case k
-          when :depth
-            params[:"inline-relations-depth"] = v
-          when :query
-            params[:q] = v.join(":")
-          end
-        end
-
-        params
-      end
+      params
     end
   end
 end

data/lib/cfoundry/validator.rb

@@ -0,0 +1,37 @@
+module CFoundry
+  module Validator
+    class << self
+      def value_matches?(val, type)
+        case type
+        when Class
+          val.is_a?(type)
+        when Regexp
+          val.is_a?(String) && val =~ type
+        when :url
+          value_matches?(val, URI::regexp(%w(http https)))
+        when :https_url
+          value_matches?(val, URI::regexp("https"))
+        when :boolean
+          val.is_a?(TrueClass) || val.is_a?(FalseClass)
+        when Array
+          val.all? do |x|
+            value_matches?(x, type.first)
+          end
+        when Hash
+          val.is_a?(Hash) &&
+            type.all? { |name, subtype|
+              val.key?(name) && value_matches?(val[name], subtype)
+            }
+        else
+          val.is_a?(Object.const_get(type.to_s.capitalize))
+        end
+      end
+
+      def validate_type(val, type)
+        unless value_matches?(val, type)
+          raise CFoundry::Mismatch.new(type, val)
+        end
+      end
+    end
+  end
+end