cfoundry 0.6.1.rc4 → 0.7.0.rc1

data/lib/cfoundry/client.rb

@@ -2,14 +2,6 @@ require "cfoundry/baseclient"
 require "cfoundry/rest_client"
 require "cfoundry/auth_token"
 
-require "cfoundry/v1/app"
-require "cfoundry/v1/framework"
-require "cfoundry/v1/runtime"
-require "cfoundry/v1/service"
-require "cfoundry/v1/service_plan"
-require "cfoundry/v1/service_instance"
-require "cfoundry/v1/user"
-
 require "cfoundry/v2/app"
 require "cfoundry/v2/service"
 require "cfoundry/v2/service_binding"
@@ -24,24 +16,13 @@ require "cfoundry/v2/route"
 require "cfoundry/v2/stack"
 require "cfoundry/v2/quota_definition"
 
-require "cfoundry/v1/base"
-require "cfoundry/v1/client"
 require "cfoundry/v2/base"
 require "cfoundry/v2/client"
 
 module CFoundry
   class Client < BaseClient
     def self.new(*args)
-      target, _ = args
-
-      base = super(target)
-
-      case base.info[:version]
-      when 2
-        CFoundry::V2::Client.new(*args)
-      else
-        CFoundry::V1::Client.new(*args)
-      end
+      CFoundry::V2::Client.new(*args)
     end
   end
 end

data/lib/cfoundry/rest_client.rb

@@ -76,11 +76,14 @@ module CFoundry
       original_options = options.dup
       payload = options[:payload]
 
-      if params = options[:params]
-        if uri.query
-          uri.query += "&" + encode_params(params)
-        else
-          uri.query = encode_params(params)
+      if options[:params]
+        encoded_params = encode_params(options[:params])
+        if encoded_params.respond_to?(:empty?) ? !encoded_params.empty? : encoded_params
+          if uri.query
+            uri.query += "&" + encoded_params
+          else
+            uri.query = encoded_params
+          end
         end
       end
 

data/lib/cfoundry/v2/model.rb

@@ -93,7 +93,11 @@ module CFoundry::V2
         end
       end
 
-      @manifest = @client.base.send(:"create_#{object_name}", payload)
+      @manifest = @client.base.post("v2", plural_object_name,
+        :content => :json,
+        :accept => :json,
+        :payload => payload
+      )
 
       @guid = @manifest[:metadata][:guid]
 
@@ -103,7 +107,11 @@ module CFoundry::V2
     end
 
     def update!
-      @manifest = @client.base.send(:"update_#{object_name}", @guid, @diff)
+      @client.base.put("v2", plural_object_name, guid,
+        :content => :json,
+        :accept => :json,
+        :payload => @diff
+      )
 
       @diff.clear
 
@@ -111,7 +119,7 @@ module CFoundry::V2
     end
 
     def delete!(options = {})
-      @client.base.send(:"delete_#{object_name}", @guid, options)
+      @client.base.delete("v2", plural_object_name, guid, :params => options)
 
       @guid = nil
 

data/lib/cfoundry/v2/model_magic.rb

@@ -72,27 +72,6 @@ module CFoundry::V2
             )
           )
         end
-
-        define_method(:"create_#{singular}") do |payload|
-          post("v2", plural,
-            :content => :json,
-            :accept => :json,
-            :payload => payload
-          )
-        end
-
-        define_method(:"delete_#{singular}") do |guid, params|
-          delete("v2", plural, guid, :params => params)
-          true
-        end
-
-        define_method(:"update_#{singular}") do |guid, payload|
-          put("v2", plural, guid,
-            :content => :json,
-            :accept => :json,
-            :payload => payload
-          )
-        end
       end
 
       define_client_methods do

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.6.1.rc4".freeze
+  VERSION = "0.7.0.rc1".freeze
 end

data/spec/cfoundry/client_spec.rb

@@ -3,13 +3,7 @@ require 'spec_helper'
 describe CFoundry::Client do
   subject { CFoundry::Client.new('http://example.com') }
 
-  it "returns a v1 client when used on a v1 target" do
-    stub_request(:get, "http://example.com/info").to_return(:status => 200, :body => '{"version":1}')
-    subject.should be_a(CFoundry::V1::Client)
-  end
-
-  it "returns a v2 client when used on a v2 target" do
-    stub_request(:get, "http://example.com/info").to_return(:status => 200, :body => '{"version":2}')
+  it "returns a v2 client" do
     subject.should be_a(CFoundry::V2::Client)
   end
 end

data/spec/cfoundry/rest_client_spec.rb

@@ -76,6 +76,28 @@ describe CFoundry::RestClient do
         end
       end
 
+      context "when params are passed" do
+        context "when params is an empty hash" do
+          let(:options) { { :params => {} } }
+
+          it "does not add a query string delimiter (the question mark)" do
+            request_stub = stub_request(:get, "https://api.cloudfoundry.com/some-path")
+            subject
+            expect(request_stub).to have_been_requested
+          end
+        end
+
+        context "when params has values" do
+          let(:options) { { :params => { "key" => "value" } } }
+
+          it "appends a query string and delimiter" do
+            request_stub = stub_request(:get, "https://api.cloudfoundry.com/some-path?key=value")
+            subject
+            expect(request_stub).to have_been_requested
+          end
+        end
+      end
+
       context 'and the token is set' do
         let(:token_header) { "bearer something" }
         let(:token) { CFoundry::AuthToken.new(token_header) }
@@ -138,10 +160,6 @@ describe CFoundry::RestClient do
       end
     end
 
-    describe 'payload' do
-
-    end
-
     describe 'errors' do
       context "when the target refuses the connection" do
         let(:target) { "http://localhost:2358974958" }

data/spec/cfoundry/v2/model_magic_spec.rb

@@ -93,20 +93,19 @@ describe CFoundry::V2::ModelMagic do
 
         subject { myobject }
 
-        it "stores it in the diff under the json key" do
-          mock(client.base).update_my_fake_model(subject.guid, :not_foo => 123)
+        it "uses the 'at' value in the update payload" do
+          mock(client.base).put("v2", :my_fake_models, subject.guid, hash_including(:payload => {:not_foo => 123}))
           subject.foo = 123
           subject.update!
         end
 
-        it "stores it in the manifest under the json key" do
+        it "uses the 'at' value in the create payload" do
           subject.foo = 123
 
-          mock(client.base).create_my_fake_model(:not_foo => 123) do
-            { :metadata => { :guid => guid },
-              :entity => { :not_foo => 123 }
-            }
-          end
+          mock(client.base).post(
+            "v2", :my_fake_models,
+            hash_including(:payload => {:not_foo => 123})
+          ) { {:metadata => {}} }
 
           subject.create!
         end

data/spec/cfoundry/v2/model_spec.rb

@@ -3,15 +3,77 @@ require "spec_helper"
 describe CFoundry::V2::Model do
   let(:client) { fake_client }
   let(:guid) { random_string("my-object-guid") }
+  let(:manifest) { {:metadata => {:foo => "bar"}} }
+  let(:klass) {
+    fake_model do
+      attribute :foo, :string, :read => :x, :write => [:y, :z]
+    end
+  }
+
+  subject { klass.new(guid, client, manifest) }
+
+  describe "#create!" do
+    before do
+      stub(client.base).post {
+        {:metadata => {:guid => "123"}}
+      }
+      subject.foo = "bar"
+    end
+
+    it "posts to the model's create url with appropriate arguments" do
+      mock(client.base).post("v2", :my_fake_models,
+        :content => :json,
+        :accept => :json,
+        :payload => {:foo => "bar"}
+      ) { {:metadata => {}} }
+      subject.create!
+    end
+
+    it "clears diff" do
+      subject.diff.should be_present
+      subject.create!
+      subject.diff.should_not be_present
+    end
+
+    it "sets manifest from the response" do
+      subject.create!
+      subject.manifest.should == {:metadata => {:guid => "123"}}
+    end
+
+    it "sets guid from the response metadata" do
+      subject.create!
+      subject.guid.should == "123"
+    end
+  end
+
+  describe "#update!" do
+    before do
+      stub(client.base).put
+      subject.foo = "bar"
+    end
 
-  subject { described_class.new(guid, client) }
+    it "updates using the client with the v2 api, its plural model name, object guid, and diff object" do
+      mock(client.base).put("v2", :my_fake_models, guid,
+        :content => :json,
+        :accept => :json,
+        :payload => {:foo => "bar"}
+      )
+      subject.update!
+    end
+
+    it "clears diff" do
+      subject.diff.should be_present
+      subject.update!
+      subject.diff.should_not be_present
+    end
+  end
 
   describe "#delete!" do
-    before { stub(client.base).delete_model }
+    before { stub(client.base).delete }
 
     context "without options" do
-      it "sends delete with the object guid and an empty hash" do
-        mock(client.base).delete_model(guid, {})
+      it "deletes using the client with the v2 api, its plural model name, object guid, and empty params hash" do
+        mock(client.base).delete("v2", :my_fake_models, guid, :params => {})
         subject.delete!
       end
     end
@@ -19,7 +81,7 @@ describe CFoundry::V2::Model do
     context "with options" do
       it "sends delete with the object guid and options" do
         options = {:excellent => "billandted"}
-        mock(client.base).delete_model(guid, options)
+        mock(client.base).delete("v2", :my_fake_models, guid, :params => options)
 
         subject.delete!(options)
       end
@@ -30,5 +92,27 @@ describe CFoundry::V2::Model do
       subject.delete!
       subject.guid.should_not be_present
     end
+
+    it "clears its manifest metadata" do
+      subject.manifest.should have_key(:metadata)
+      subject.delete!
+      subject.manifest.should_not have_key(:metadata)
+    end
+
+    it "clears the diff" do
+      subject.foo = "bar"
+      subject.diff.should be_present
+      subject.delete!
+      subject.diff.should_not be_present
+    end
+
+    it "delete me" do
+      begin
+        subject.delete!
+      rescue => ex
+        ex.message.should_not =~ /\?/
+      end
+    end
+
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,5 @@ end
 
 RSpec.configure do |c|
   c.include Fake::FakeMethods
-  c.include V1Fake::FakeMethods
   c.mock_with :rr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc4
+  version: 0.7.0.rc1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -207,17 +207,6 @@ files:
 - lib/cfoundry/trace_helpers.rb
 - lib/cfoundry/uaaclient.rb
 - lib/cfoundry/upload_helpers.rb
-- lib/cfoundry/v1/app.rb
-- lib/cfoundry/v1/base.rb
-- lib/cfoundry/v1/client.rb
-- lib/cfoundry/v1/framework.rb
-- lib/cfoundry/v1/model.rb
-- lib/cfoundry/v1/model_magic.rb
-- lib/cfoundry/v1/runtime.rb
-- lib/cfoundry/v1/service.rb
-- lib/cfoundry/v1/service_instance.rb
-- lib/cfoundry/v1/service_plan.rb
-- lib/cfoundry/v1/user.rb
 - lib/cfoundry/v2/app.rb
 - lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
@@ -263,9 +252,6 @@ files:
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
-- spec/cfoundry/v1/base_spec.rb
-- spec/cfoundry/v1/client_spec.rb
-- spec/cfoundry/v1/model_magic_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
@@ -337,7 +323,6 @@ files:
 - spec/support/shared_examples/cc_api_stub_request_examples.rb
 - spec/support/shared_examples/client_login_examples.rb
 - spec/support/shared_examples/model_summary_examples.rb
-- spec/support/v1_fake_helper.rb
 homepage: http://github.com/cloudfoundry/vmc-lib
 licenses: []
 post_install_message: 
@@ -352,7 +337,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 163727160375400133
+      hash: 3268215508581398236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -387,9 +372,6 @@ test_files:
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
-- spec/cfoundry/v1/base_spec.rb
-- spec/cfoundry/v1/client_spec.rb
-- spec/cfoundry/v1/model_magic_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
@@ -461,4 +443,3 @@ test_files:
 - spec/support/shared_examples/cc_api_stub_request_examples.rb
 - spec/support/shared_examples/client_login_examples.rb
 - spec/support/shared_examples/model_summary_examples.rb
-- spec/support/v1_fake_helper.rb

data/lib/cfoundry/v1/app.rb

@@ -1,363 +0,0 @@
-require "cfoundry/upload_helpers"
-require "cfoundry/chatty_hash"
-
-require "cfoundry/v1/model"
-
-module CFoundry::V1
-  class App < Model
-    include CFoundry::UploadHelpers
-
-    attribute :name,      :string,   :guid => true
-    attribute :instances, :integer
-    attribute :state,     :string
-    attribute :created,   :integer,  :at => [:meta, :created], :read_only => true
-    attribute :version,   :integer,  :at => [:meta, :version], :read_only => true
-    attribute :framework, :string,   :at => [:staging, :model]
-    attribute :runtime,   :string,   :at => [:staging, :stack]
-    attribute :command,   :string,   :at => [:staging, :command]
-    attribute :memory,    :integer,  :at => [:resources, :memory]
-    attribute :disk,      :integer,  :at => [:resources, :disk]
-    attribute :fds,       :integer,  :at => [:resources, :fds]
-    attribute :env,       [:string], :default => []
-    attribute :uris,      [:string], :default => []
-    attribute :services,  [:string], :default => []
-
-    attribute :console, :boolean, :default => false,
-              :read => [:meta, :console], :write => :console
-
-    attribute :debug, :string, :default => nil, :read => [:meta, :debug],
-              :write => :debug
-
-    attribute :running_instances, :integer, :read => :runningInstances,
-              :read_only => true
-
-
-    define_client_methods
-
-
-    alias_method :total_instances, :instances
-    alias_method :total_instances=, :instances=
-
-    alias_method :debug_mode, :debug
-    alias_method :debug_mode=, :debug=
-
-    alias_method :framework_name, :framework
-    alias_method :framework_name=, :framework=
-
-    alias_method :runtime_name, :runtime
-    alias_method :runtime_name=, :runtime=
-
-    alias_method :service_names, :services
-    alias_method :service_names=, :services=
-
-    alias_method :status, :state
-    alias_method :status=, :state=
-
-    alias_method :urls, :uris
-    alias_method :urls=, :uris=
-
-    alias_method :env_array, :env
-    alias_method :env_array=, :env=
-
-    def framework
-      @client.framework(framework_name)
-    end
-
-    def framework=(obj)
-      set_named(:framework, obj)
-    end
-
-    def runtime
-      @client.runtime(runtime_name)
-    end
-
-    def runtime=(obj)
-      set_named(:runtime, obj)
-    end
-
-    def services
-      service_names.collect { |name| @client.service_instance(name) }
-    end
-
-    def services=(objs)
-      set_many_named(:service, objs)
-    end
-
-
-    # Retrieve all of the instances of the app, as Instance objects.
-    def instances
-      @client.base.instances(@guid).collect do |m|
-        Instance.new(self, m[:index].to_s, @client, m)
-      end
-    end
-
-    # Retrieve crashed instances
-    def crashes
-      @client.base.crashes(@guid).collect do |i|
-        Instance.new(self, i[:instance].to_s, @client, i)
-      end
-    end
-
-    # Retrieve application statistics, e.g. CPU load and memory usage.
-    def stats
-      stats = {}
-
-      @client.base.stats(@guid).each do |idx, info|
-        stats[idx.to_s] = info
-      end
-
-      stats
-    end
-
-    # Stop the application.
-    def stop!
-      self.state = "STOPPED"
-      update!
-    end
-
-    # Start the application.
-    def start!(async = false)
-      self.state = "STARTED"
-      update!
-    end
-
-    # Restart the application.
-    def restart!(async = false)
-      stop!
-      start!
-    end
-
-    def update!(async = false)
-      super()
-    end
-
-    # Determine application health.
-    #
-    # If all instances are running, returns "RUNNING". If only some are
-    # started, returns the precentage of them that are healthy.
-    #
-    # Otherwise, returns application's status.
-    def health
-      s = state
-      if s == "STARTED"
-        healthy_count = running_instances
-        expected = total_instances
-
-        if healthy_count && expected > 0
-          ratio = healthy_count / expected.to_f
-          if ratio == 1.0
-            "RUNNING"
-          else
-            "#{(ratio * 100).to_i}%"
-          end
-        else
-          "N/A"
-        end
-      else
-        s
-      end
-    end
-
-    # Check that all application instances are running.
-    def healthy?
-      # invalidate cache so the check is fresh
-      invalidate!
-      health == "RUNNING"
-    end
-    alias_method :running?, :healthy?
-
-    # Is the application stopped?
-    def stopped?
-      state == "STOPPED"
-    end
-
-    # Is the application started?
-    #
-    # Note that this does not imply that all instances are running. See
-    # #healthy?
-    def started?
-      state == "STARTED"
-    end
-
-
-    # Shortcut for uris[0]
-    def uri
-      uris[0]
-    end
-
-    # Shortcut for uris = [x]
-    def uri=(x)
-      self.uris = [x]
-    end
-
-    alias_method :url, :uri
-    alias_method :url=, :uri=
-
-    def env
-      e = env_array || []
-
-      env = {}
-      e.each do |pair|
-        name, val = pair.split("=", 2)
-        env[name] = val
-      end
-
-      CFoundry::ChattyHash.new(method(:env=), env)
-    end
-
-    def env=(hash)
-      unless hash.is_a?(Array)
-        hash = hash.collect { |k, v| "#{k}=#{v}" }
-      end
-
-      self.env_array = hash
-    end
-
-    def services
-      service_names.collect do |name|
-        @client.service_instance(name)
-      end
-    end
-
-    def services=(instances)
-      self.service_names = instances.collect(&:name)
-    end
-
-
-    # Bind services to application.
-    def bind(*instances)
-      self.services += instances
-      update!
-    end
-
-    # Unbind services from application.
-    def unbind(*instances)
-      self.services -= instances
-      update!
-    end
-
-    def binds?(instance)
-      services.include? instance
-    end
-
-    # Retrieve file listing under path for the first instance of the application.
-    #
-    # [path]
-    #   A sequence of strings representing path segments.
-    #
-    #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
-    def files(*path)
-      Instance.new(self, "0", @client).files(*path)
-    end
-
-    # Retrieve file contents for the first instance of the application.
-    #
-    # [path]
-    #   A sequence of strings representing path segments.
-    #
-    #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
-    def file(*path)
-      Instance.new(self, "0", @client).file(*path)
-    end
-
-    private
-
-    def set_named(attr, val)
-      res = send(:"#{attr}_name=", val.name)
-
-      if @changes.key?(attr)
-        old, new = @changes[attr]
-        @changes[attr] = [@client.send(attr, old), val]
-      end
-
-      res
-    end
-
-    def set_many_named(attr, vals)
-      res = send(:"#{attr}_names=", val.collect(&:name))
-
-      if @changes.key?(attr)
-        old, new = @changes[attr]
-        @changes[attr] = [old.collect { |o| @client.send(attr, o) }, vals]
-      end
-
-      vals
-    end
-
-    # Class represnting a running instance of an application.
-    class Instance
-      # The application this instance belongs to.
-      attr_reader :app
-
-      # Application instance number.
-      attr_reader :id
-
-      # Create an Instance object.
-      #
-      # You'll usually call App#instances instead
-      def initialize(app, id, client, manifest = {})
-        @app = app
-        @id = id
-        @client = client
-        @manifest = manifest
-      end
-
-      # Show string representing the application instance.
-      def inspect
-        "#<App::Instance '#{@app.name}' \##@id>"
-      end
-
-      # Instance state.
-      def state
-        @manifest[:state]
-      end
-      alias_method :status, :state
-
-      # Instance start time.
-      def since
-        Time.at(@manifest[:since])
-      end
-
-      # Instance debugger data. If instance is in debug mode, returns a hash
-      # containing :ip and :port keys.
-      def debugger
-        return unless @manifest[:debug_ip] and @manifest[:debug_port]
-
-        { :ip => @manifest[:debug_ip],
-          :port => @manifest[:debug_port]
-        }
-      end
-
-      # Instance console data. If instance has a console, returns a hash
-      # containing :ip and :port keys.
-      def console
-        return unless @manifest[:console_ip] and @manifest[:console_port]
-
-        { :ip => @manifest[:console_ip],
-          :port => @manifest[:console_port]
-        }
-      end
-
-      # True if instance is starting or running, false if it's down or
-      # flapping.
-      def healthy?
-        case state
-        when "STARTING", "RUNNING"
-          true
-        when "DOWN", "FLAPPING"
-          false
-        end
-      end
-
-      def files(*path)
-        @client.base.files(@app.name, @id, *path).split("\n").collect do |entry|
-          path + [entry.split(/\s+/, 2)[0]]
-        end
-      end
-
-      def file(*path)
-        @client.base.files(@app.name, @id, *path)
-      end
-    end
-  end
-end