cfoundry 0.3.23 → 0.3.24

data/lib/cfoundry/uaaclient.rb

@@ -9,7 +9,7 @@ module CFoundry
         client_id = "vmc")
       @target = target
       @client_id = client_id
-      @redirect_uri = "http://uaa.cloudfoundry.com/redirect/vmc"
+      @redirect_uri = "https://uaa.cloudfoundry.com/redirect/vmc"
     end
 
     def prompts

data/lib/cfoundry/v2/app.rb

@@ -17,17 +17,17 @@ module CFoundry::V2
   class App < Model
     include CFoundry::UploadHelpers
 
-    attribute :name
-    attribute :production
+    attribute :name,             :string
+    attribute :production,       :boolean, :default => false
     to_one    :space
     to_one    :runtime
     to_one    :framework
-    attribute :environment_json,    :default => {}
-    attribute :memory,              :default => 256
-    attribute :instances,           :default => 1
-    attribute :file_descriptors,    :default => 256
-    attribute :disk_quota,          :default => 256
-    attribute :state,               :default => "STOPPED"
+    attribute :environment_json, :hash,    :default => {}
+    attribute :memory,           :integer, :default => 256
+    attribute :instances,        :integer, :default => 1
+    attribute :file_descriptors, :integer, :default => 256
+    attribute :disk_quota,       :integer, :default => 256
+    attribute :state,            :integer, :default => "STOPPED"
     to_many   :service_bindings
 
     alias :total_instances :instances

data/lib/cfoundry/v2/domain.rb

@@ -2,7 +2,7 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class Domain < Model
-    attribute :name
+    attribute :name, :string
     to_one    :organization
   end
 end

data/lib/cfoundry/v2/framework.rb

@@ -2,8 +2,8 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class Framework < Model
-    attribute :name
-    attribute :description
+    attribute :name, :string
+    attribute :description, :string
     to_many   :apps
 
     def detection

data/lib/cfoundry/v2/model.rb

@@ -3,19 +3,57 @@ require "multi_json"
 module CFoundry::V2
   class Model
     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 "invalid attribute; expected #{type.inspect} but got #{val.inspect}"
+        end
+      end
+
       def defaults
         @defaults ||= {}
       end
 
-      def attribute(name, opts = {})
+      def attribute(name, type, opts = {})
         default = opts[:default] || nil
-        defaults[name] = default if default
+
+        has_default = opts.key?(:default)
+        defaults[name] = default if has_default
 
         define_method(name) {
           manifest[:entity][name] || default
         }
 
         define_method(:"#{name}=") { |val|
+          unless has_default && val == default
+            Model.validate_type(val, type)
+          end
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][name] = val
@@ -25,6 +63,7 @@ module CFoundry::V2
 
       def to_one(name, opts = {})
         obj = opts[:as] || name
+        kls = obj.to_s.capitalize
 
         define_method(name) {
           if @manifest && @manifest[:entity].key?(name)
@@ -42,6 +81,8 @@ module CFoundry::V2
         }
 
         define_method(:"#{name}=") { |x|
+          Model.validate_type(x, CFoundry::V2.const_get(kls))
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{name}_guid"] =
@@ -51,6 +92,7 @@ module CFoundry::V2
 
       def to_many(plural, opts = {})
         singular = plural.to_s.sub(/s$/, "").to_sym
+        kls = singular.to_s.capitalize
 
         object = opts[:as] || singular
         plural_object = :"#{object}s"
@@ -85,6 +127,8 @@ module CFoundry::V2
 
         # TODO: these are hacky
         define_method(:"add_#{singular}") { |x|
+          Model.validate_type(x, CFoundry::V2.const_get(kls))
+
           @client.base.request_path(
             :put,
             ["v2", "#{object_name}s", @guid, plural, x.guid],
@@ -99,6 +143,8 @@ module CFoundry::V2
         }
 
         define_method(:"#{plural}=") { |xs|
+          Model.validate_type(x, [CFoundry::V2.const_get(kls)])
+
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{singular}_guids"] =

data/lib/cfoundry/v2/organization.rb

@@ -2,7 +2,7 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class Organization < Model
-    attribute :name
+    attribute :name, :string
     to_many   :spaces
     to_many   :domains
     to_many   :users

data/lib/cfoundry/v2/runtime.rb

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

data/lib/cfoundry/v2/service.rb

@@ -2,15 +2,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
+    attribute :label, String
+    attribute :provider, String
+    attribute :url, :url
+    attribute :description, String
+    attribute :version, String
+    attribute :info_url, :url
+    attribute :acls, { "users" => [String], "wildcards" => [String] },
+      :default => nil
+    attribute :timeout, Integer, :default => nil
+    attribute :active, :boolean, :default => false
     to_many   :service_plans
   end
 end

data/lib/cfoundry/v2/service_auth_token.rb

@@ -2,8 +2,8 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class ServiceAuthToken < Model
-    attribute :label
-    attribute :provider
-    attribute :token
+    attribute :label, :string
+    attribute :provider, :string
+    attribute :token, :string
   end
 end

data/lib/cfoundry/v2/service_instance.rb

@@ -2,7 +2,7 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class ServiceInstance < Model
-    attribute :name
+    attribute :name, :string
     to_one    :space
     to_one    :service_plan
     to_many   :service_bindings

data/lib/cfoundry/v2/service_plan.rb

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

data/lib/cfoundry/v2/space.rb

@@ -2,7 +2,7 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class Space < Model
-    attribute :name
+    attribute :name, :string
     to_one    :organization
     to_many   :developers, :as => :user
     to_many   :managers, :as => :user

data/lib/cfoundry/v2/user.rb

@@ -9,10 +9,10 @@ module CFoundry::V2
     to_many   :audited_organizations, :as => :organization
     to_many   :managed_spaces, :as => :space
     to_many   :audited_spaces, :as => :space
-    attribute :admin
+    attribute :admin, :boolean
     to_one    :default_space, :as => :space
 
-    attribute :guid # guid is explicitly set for users
+    attribute :guid, :string # guid is explicitly set for users
 
     def guid
       @guid

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 35
   prerelease: 
   segments: 
   - 0
   - 3
-  - 23
-  version: 0.3.23
+  - 24
+  version: 0.3.24
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -71,12 +71,15 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -85,12 +88,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 35
         segments: 
+        - 2
+        - 11
         - 0
-        version: "0"
+        version: 2.11.0
   type: :development
   version_requirements: *id005
 description: