cfoundry 0.3.8 → 0.3.9

data/lib/cfoundry/v1/app.rb

@@ -321,18 +321,22 @@ module CFoundry::V1
 
 
     # Bind services to application.
-    def bind(*service_names)
-      update!(:services => services + service_names)
+    def bind(*instances)
+      update!(:services => services + instances.collect(&:name))
     end
 
     # Unbind services from application.
-    def unbind(*service_names)
+    def unbind(*instances)
       update!(:services =>
                 services.reject { |s|
-                  service_names.include?(s)
+                  instances.any? { |i| i.name == s }
                 })
     end
 
+    def binds?(instance)
+      services.any? { |s| s == instance.name }
+    end
+
     # Retrieve file listing under path for the first instance of the application.
     #
     # [path]

data/lib/cfoundry/v2/app.rb

@@ -33,11 +33,12 @@ module CFoundry::V2
     alias :total_instances :instances
     alias :total_instances= :instances=
 
-    alias :services :service_bindings
-    alias :services= :service_bindings=
-
     private :environment_json, :environment_json=
 
+    def services
+      service_bindings.collect(&:service_instance)
+    end
+
     def env
       @env ||= CFoundry::ChattyHash.new(
         method(:env=),
@@ -50,10 +51,17 @@ module CFoundry::V2
       hash
     end
 
+    def command # TODO v2
+      nil
+    end
+
     def debug_mode # TODO v2
       nil
     end
-    alias :console :debug_mode
+
+    def console # TODO v2
+      nil
+    end
 
     def uris # TODO v2
       []
@@ -118,16 +126,33 @@ module CFoundry::V2
     end
 
     # Bind services to application.
-    def bind(*service_names)
-      update!(:services => services + service_names)
+    def bind(*instances)
+      instances.each do |i|
+        binding = @client.service_binding
+        binding.app = self
+        binding.service_instance = i
+        binding.credentials = {} # ?
+        binding.create!
+      end
+
+      self
     end
 
     # Unbind services from application.
-    def unbind(*service_names)
-      update!(:services =>
-                services.reject { |s|
-                  service_names.include?(s)
-                })
+    def unbind(*instances)
+      service_bindings.each do |b|
+        if instances.include? b.service_instance
+          b.delete!
+        end
+      end
+
+      self
+    end
+
+    def binds?(instance)
+      service_bindings.any? { |b|
+        b.service_instance == instance
+      }
     end
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -25,8 +25,8 @@ module CFoundry::V2
         obj = opts[:as] || name
 
         define_method(name) {
-          if manifest[:entity].key? name
-            @client.send(:"make_#{obj}", manifest[:entity][name])
+          if @manifest && @manifest[:entity].key?(name)
+            @client.send(:"make_#{obj}", @manifest[:entity][name])
           else
             @client.send(
               :"#{obj}_from",
@@ -56,8 +56,8 @@ module CFoundry::V2
         define_method(plural) { |*args|
           depth, query = args
 
-          if manifest[:entity].key?(plural)
-            objs = manifest[:entity][plural]
+          if @manifest && @manifest[:entity].key?(plural) && !depth
+            objs = @manifest[:entity][plural]
 
             if query
               find_by = query.keys.first
@@ -71,7 +71,7 @@ module CFoundry::V2
           else
             @client.send(
               :"#{plural_object}_from",
-              send("#{plural}_url"),
+              "/v2/#{object_name}s/#@guid/#{plural}",
               depth || opts[:depth],
               query)
           end
@@ -130,26 +130,58 @@ module CFoundry::V2
           '\1_\2').downcase
     end
 
+    # this does a bit of extra processing to allow for
+    # `delete!' followed by `create!'
     def create!
-      @manifest =
-        @client.base.send(
-          :"create_#{object_name}",
-          self.class.defaults.merge(@manifest[:entity]))
+      payload = {}
+
+      self.class.defaults.merge(@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.all? { |x|
+                x.is_a?(Hash) && x.key?(:metadata)
+              }
+          singular = k.to_s.sub(/s$/, "")
+
+          payload[:"#{singular}_guids"] = v.collect do |x|
+            if x.is_a?(Hash) && x.key?(:metadata)
+              x[:metadata][:guid]
+            else
+              x
+            end
+          end
+        elsif k.to_s.end_with?("_json") && v.is_a?(String)
+          payload[k] = JSON.parse(v)
+        elsif k.to_s.end_with?("_url")
+        else
+          payload[k] = v
+        end
+      end
+
+      @manifest = @client.base.send(:"create_#{object_name}", payload)
 
       @guid = @manifest[:metadata][:guid]
 
+      @diff.clear
+
       true
     end
 
     def update!(diff = @diff)
       @client.base.send(:"update_#{object_name}", @guid, diff)
 
+      @diff.clear if diff == @diff
+
       @manifest = nil
     end
 
     def delete!
       @client.base.send(:"delete_#{object_name}", @guid)
 
+      @guid = nil
+
+      @diff.clear
+
       if @manifest
         @manifest.delete :metadata
       end
@@ -162,8 +194,13 @@ module CFoundry::V2
       false
     end
 
-    def ==(other)
+    def eql?(other)
       other.is_a?(self.class) && @guid == other.guid
     end
+    alias :== :eql?
+
+    def hash
+      @guid.hash
+    end
   end
 end

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client