cfoundry 0.6.1.rc3 → 0.6.1.rc4

data/lib/cfoundry/client.rb

@@ -22,6 +22,7 @@ require "cfoundry/v2/space"
 require "cfoundry/v2/domain"
 require "cfoundry/v2/route"
 require "cfoundry/v2/stack"
+require "cfoundry/v2/quota_definition"
 
 require "cfoundry/v1/base"
 require "cfoundry/v1/client"

data/lib/cfoundry/v2/app.rb

@@ -175,6 +175,21 @@ module CFoundry::V2
       true
     end
 
+    def stream_update_log(log_url)
+      offset = 0
+
+      while true
+        begin
+          @client.stream_url(log_url + "&tail&tail_offset=#{offset}") do |out|
+            offset += out.size
+            yield out
+          end
+        rescue Timeout::Error
+        end
+      end
+    rescue CFoundry::APIError
+    end
+
     # Determine application health.
     #
     # If all instances are running, returns "RUNNING". If only some are

data/lib/cfoundry/v2/model.rb

@@ -110,8 +110,8 @@ module CFoundry::V2
       true
     end
 
-    def delete!
-      @client.base.send(:"delete_#{object_name}", @guid)
+    def delete!(options = {})
+      @client.base.send(:"delete_#{object_name}", @guid, options)
 
       @guid = nil
 

data/lib/cfoundry/v2/model_magic.rb

@@ -58,27 +58,40 @@ module CFoundry::V2
 
       define_base_client_methods do
         define_method(singular) do |guid, *args|
-          get("v2", plural, guid, :accept => :json,
-              :params => ModelMagic.params_from(args))
+          get("v2", plural, guid,
+            :accept => :json,
+            :params => ModelMagic.params_from(args)
+          )
+        end
+
+        define_method(plural) do |*args|
+          all_pages(
+            get("v2", plural,
+              :accept => :json,
+              :params => ModelMagic.params_from(args)
+            )
+          )
         end
 
         define_method(:"create_#{singular}") do |payload|
-          post("v2", plural, :content => :json, :accept => :json, :payload => payload)
+          post("v2", plural,
+            :content => :json,
+            :accept => :json,
+            :payload => payload
+          )
         end
 
-        define_method(:"delete_#{singular}") do |guid|
-          delete("v2", plural, guid)
+        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
-
-        define_method(plural) do |*args|
-          all_pages(
-            get("v2", plural, :accept => :json,
-                :params => ModelMagic.params_from(args)))
+          put("v2", plural, guid,
+            :content => :json,
+            :accept => :json,
+            :payload => payload
+          )
         end
       end
 

data/lib/cfoundry/v2/organization.rb

@@ -10,6 +10,9 @@ module CFoundry::V2
     to_many   :billing_managers, :as => :user
     to_many   :auditors, :as => :user
 
+    to_one    :quota_definition
+    attribute :billing_enabled, :boolean
+
     queryable_by :name, :space_guid, :user_guid, :manager_guid,
       :billing_manager_guid, :auditor_guid
   end

data/lib/cfoundry/v2/quota_definition.rb

@@ -0,0 +1,12 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class QuotaDefinition < Model
+    attribute :name,                       :string
+    attribute :non_basic_services_allowed, :boolean
+    attribute :total_services,             :integer
+    attribute :memory_limit,               :integer
+
+    queryable_by :name
+  end
+end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/app_spec.rb

@@ -141,4 +141,82 @@ describe CFoundry::V2::App do
       end
     end
   end
+
+  describe "#stream_update_log" do
+    let(:client) { fake_client }
+    let(:base_url) { "http://example.com/log" }
+
+    subject { described_class.new(nil, client) }
+
+    def mock_log(url = anything)
+      mock(client).stream_url(url) do |_, blk|
+        blk.call(yield)
+      end.ordered
+    end
+
+    def stub_log(url = anything)
+      stub(client).stream_url(url) do |_, blk|
+        blk.call(yield)
+      end.ordered
+    end
+
+    it "yields chunks from the response to the block" do
+      mock_log { "a" }
+      mock_log { "b" }
+      mock_log { raise CFoundry::NotFound }
+
+      chunks = []
+      subject.stream_update_log(base_url) do |chunk|
+        chunks << chunk
+      end
+
+      expect(chunks).to eq(%w(a b))
+    end
+
+    it "retries when the connection times out" do
+      mock_log { raise Timeout::Error }
+      mock_log { "a" }
+      mock_log { raise Timeout::Error }
+      mock_log { "b" }
+      mock_log { raise Timeout::Error }
+      mock_log { raise CFoundry::NotFound }
+
+      chunks = []
+      subject.stream_update_log(base_url) do |chunk|
+        chunks << chunk
+      end
+
+      expect(chunks).to eq(%w(a b))
+    end
+
+    it "tracks the offset to stream from" do
+      url = "#{base_url}&tail&tail_offset="
+
+      mock_log("#{url}0") { "a" }
+      mock_log("#{url}1") { raise Timeout::Error }
+      mock_log("#{url}1") { "b" }
+      mock_log("#{url}2") { raise CFoundry::NotFound }
+
+      chunks = []
+      subject.stream_update_log(base_url) do |chunk|
+        chunks << chunk
+      end
+
+      expect(chunks).to eq(%w(a b))
+    end
+
+    it "stops when the endpoint disappears" do
+      mock_log { "a" }
+      mock_log { "b" }
+      mock_log { raise CFoundry::NotFound }
+      stub_log { "c" }
+
+      chunks = []
+      subject.stream_update_log(base_url) do |chunk|
+        chunks << chunk
+      end
+
+      expect(chunks).to eq(%w(a b))
+    end
+  end
 end

data/spec/cfoundry/v2/model_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+describe CFoundry::V2::Model do
+  let(:client) { fake_client }
+  let(:guid) { random_string("my-object-guid") }
+
+  subject { described_class.new(guid, client) }
+
+  describe "#delete!" do
+    before { stub(client.base).delete_model }
+
+    context "without options" do
+      it "sends delete with the object guid and an empty hash" do
+        mock(client.base).delete_model(guid, {})
+        subject.delete!
+      end
+    end
+
+    context "with options" do
+      it "sends delete with the object guid and options" do
+        options = {:excellent => "billandted"}
+        mock(client.base).delete_model(guid, options)
+
+        subject.delete!(options)
+      end
+    end
+
+    it "clears its guid" do
+      subject.guid.should be_present
+      subject.delete!
+      subject.guid.should_not be_present
+    end
+  end
+end

data/spec/cfoundry/v2/organization_spec.rb

@@ -3,13 +3,28 @@ require "spec_helper"
 describe CFoundry::V2::Organization do
   let(:client) { fake_client }
 
-  describe 'summarization' do
+  subject { CFoundry::V2::Organization.new("organization-1", client) }
+
+  describe "summarization" do
     let(:mymodel) { CFoundry::V2::Organization }
     let(:myobject) { fake(:organization) }
     let(:summary_attributes) { { :name => "fizzbuzz" } }
 
     subject { myobject }
 
-    it_behaves_like 'a summarizeable model'
+    it_behaves_like "a summarizeable model"
+  end
+
+  it "has quota_definition" do
+    quota = fake(:quota_definition)
+    subject.quota_definition = quota
+    expect(subject.quota_definition).to eq(quota)
+  end
+
+  it "has billing_enabled" do
+    [true, false].each do |v|
+      subject.billing_enabled = v
+      expect(subject.billing_enabled).to eq(v)
+    end
   end
 end

data/spec/cfoundry/v2/quota_definition_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+describe CFoundry::V2::QuotaDefinition do
+  let(:client) { fake_client }
+
+  subject { CFoundry::V2::QuotaDefinition.new("quota-definition-1", client) }
+
+  it "has guid" do
+    expect(subject.guid).to eq("quota-definition-1")
+  end
+
+  it "has name" do
+    subject.name = "name"
+    expect(subject.name).to eq("name")
+  end
+
+  it "has non_basic_services_allowed" do
+    [true, false].each do |v|
+      subject.non_basic_services_allowed = v
+      expect(subject.non_basic_services_allowed).to eq(v)
+    end
+  end
+
+  it "has total_services" do
+    [0, 1].each do |v|
+      subject.total_services = v
+      expect(subject.total_services).to eq(v)
+    end
+  end
+
+  it "has total_services" do
+    [0, 1].each do |v|
+      subject.total_services = v
+      expect(subject.total_services).to eq(v)
+    end
+  end
+
+  describe "querying" do
+    let(:foo) { fake(:quota_definition, :name => "foo") }
+    let(:bar) { fake(:quota_definition, :name => "bar") }
+    let(:baz) { fake(:quota_definition, :name => "baz") }
+
+    let(:quota_definitions) { [foo, bar, baz] }
+
+    let(:client) { fake_client :quota_definitions => quota_definitions }
+
+    it "is queryable by name" do
+      quota = quota_definitions.last
+      expect(client.quota_definition_by_name("bar")).to eq(bar)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 0.6.1.rc3
+  version: 0.6.1.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -225,6 +225,7 @@ files:
 - lib/cfoundry/v2/model.rb
 - lib/cfoundry/v2/model_magic.rb
 - lib/cfoundry/v2/organization.rb
+- lib/cfoundry/v2/quota_definition.rb
 - lib/cfoundry/v2/route.rb
 - lib/cfoundry/v2/service.rb
 - lib/cfoundry/v2/service_auth_token.rb
@@ -270,7 +271,9 @@ files:
 - spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/domain_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
+- spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
+- spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/fakes/app_fake.rb
 - spec/fakes/domain_fake.rb
@@ -349,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 808997924378056031
+      hash: 163727160375400133
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -392,7 +395,9 @@ test_files:
 - spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/domain_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
+- spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
+- spec/cfoundry/v2/quota_definition_spec.rb
 - spec/cfoundry/v2/space_spec.rb
 - spec/fakes/app_fake.rb
 - spec/fakes/domain_fake.rb