cfoundry 1.0.0 → 1.1.0.rc1

data/lib/cfoundry.rb

@@ -1,2 +1,5 @@
 require "cfoundry/version"
+require "active_model"
 require "cfoundry/client"
+
+I18n.load_path += Dir["config/locales/*.yml"]

data/lib/cfoundry/client.rb

@@ -15,6 +15,7 @@ require "cfoundry/v2/domain"
 require "cfoundry/v2/route"
 require "cfoundry/v2/stack"
 require "cfoundry/v2/quota_definition"
+require "cfoundry/v2/app_event"
 
 require "cfoundry/v2/base"
 require "cfoundry/v2/client"

data/lib/cfoundry/v2/app.rb

@@ -31,6 +31,7 @@ module CFoundry::V2
     attribute :debug,            :string,  :default => nil
     to_many   :service_bindings
     to_many   :routes
+    to_many   :app_events
 
     scoped_to_space
 
@@ -46,6 +47,9 @@ module CFoundry::V2
 
     private :environment_json
 
+    alias :events :app_events
+    alias :events= :app_events=
+
     def instances
       @client.base.instances(@guid).collect do |i, m|
         Instance.new(self, i.to_s, @client, m)
@@ -99,36 +103,6 @@ module CFoundry::V2
     end
     alias :urls= :uris=
 
-    def create_routes(*uris)
-      uris.each do |uri|
-        host, domain_name = uri.split(".", 2)
-
-        domain =
-          @client.current_space.domains.find { |d|
-            d.name == domain_name
-          }
-
-        unless domain
-          raise CFoundry::Error, "Invalid domain '#{domain_name}'"
-        end
-
-        route = @client.routes.find { |r|
-          r.host == host && r.domain == domain
-        }
-
-        unless route
-          route = @client.route
-          route.host = host
-          route.domain = domain
-          route.space = space
-          route.create!
-        end
-
-        add_route(route)
-      end
-    end
-    alias :create_route :create_routes
-
     def uri
       if uris = @cache[:uris]
         return uris.first

data/lib/cfoundry/v2/app_event.rb

@@ -0,0 +1,12 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class AppEvent < Model
+    to_one :app
+
+    attribute :instance_guid, :string
+    attribute :instance_index, :integer
+    attribute :exit_status, :integer
+    attribute :exit_description, :string, :default => ""
+  end
+end

data/lib/cfoundry/v2/model.rb

@@ -1,10 +1,10 @@
 require "multi_json"
-
 require "cfoundry/v2/model_magic"
 
-
 module CFoundry::V2
   class Model
+    include ActiveModel::Validations
+
     @@objects = {}
 
     extend ModelMagic
@@ -64,6 +64,22 @@ module CFoundry::V2
       @changes = {}
     end
 
+    def create
+      create!
+      true
+    rescue CFoundry::APIError => e
+      if e.instance_of? CFoundry::APIError
+        errors.add(:base, :cc_client)
+      else
+        errors.add(attribute_for_error(e), e.message)
+      end
+      false
+    end
+
+    def attribute_for_error(error)
+      :base
+    end
+
     # this does a bit of extra processing to allow for
     # `delete!' followed by `create!'
     def create!
@@ -76,8 +92,8 @@ module CFoundry::V2
         if v.is_a?(Hash) && v.key?(:metadata)
           # skip; there's a _guid attribute already
         elsif v.is_a?(Array) && !v.empty? && v.all? { |x|
-                x.is_a?(Hash) && x.key?(:metadata)
-              }
+          x.is_a?(Hash) && x.key?(:metadata)
+        }
           singular = k.to_s.sub(/s$/, "")
 
           payload[:"#{singular}_guids"] = v.collect do |x|
@@ -118,10 +134,21 @@ module CFoundry::V2
       true
     end
 
+    def delete
+      delete!
+    rescue CFoundry::APIError => e
+      if e.instance_of? CFoundry::APIError
+        errors.add(:base, :cc_client)
+      else
+        errors.add(attribute_for_error(e), e.message)
+      end
+      false
+    end
+
     def delete!(options = {})
       @client.base.delete("v2", plural_object_name, guid, :params => options)
 
-      @guid = nil
+      @deleted = true
 
       @diff.clear
 
@@ -132,6 +159,14 @@ module CFoundry::V2
       true
     end
 
+    def to_key
+      persisted? ? [@guid] : nil
+    end
+
+    def persisted?
+      @guid && !@deleted
+    end
+
     def exists?
       invalidate!
       manifest
@@ -147,6 +182,7 @@ module CFoundry::V2
     def eql?(other)
       other.is_a?(self.class) && @guid == other.guid
     end
+
     alias :== :eql?
 
     def hash

data/lib/cfoundry/v2/route.rb

@@ -3,6 +3,9 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class Route < Model
     attribute :host, :string
+    validates_format_of :host, :with => /\A[a-z]+([a-z0-9\-]*[a-z0-9]+)?\Z/i
+    validates_length_of :host, :maximum => 63
+    validates_presence_of :domain
     to_one    :domain
     to_one    :space
 
@@ -11,5 +14,11 @@ module CFoundry::V2
     def name
       "#{host}.#{domain.name}"
     end
+
+    private
+
+    def attribute_for_error(error)
+      error.is_a?(CFoundry::RouteHostTaken) ? :host : :base
+    end
   end
 end

data/lib/cfoundry/validator.rb

@@ -2,11 +2,13 @@ module CFoundry
   module Validator
     class << self
       def value_matches?(val, type)
+        return true if val.nil?
+
         case type
         when Class
           val.is_a?(type)
         when Regexp
-          val.is_a?(String) && val =~ type
+          val.is_a?(String) && !!(val =~ type)
         when :url
           value_matches?(val, URI::regexp(%w(http https)))
         when :https_url

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/app_event_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+
+describe CFoundry::V2::AppEvent do
+  let(:client) { fake_client }
+
+  let(:app) { fake :app }
+
+  subject { described_class.new("app-event-1", client) }
+
+  it "has an app" do
+    subject.app = app
+    expect(subject.app).to eq(app)
+  end
+
+  describe "#instance_guid" do
+    it "has an instance guid" do
+      subject.instance_guid = "foo"
+      expect(subject.instance_guid).to eq("foo")
+    end
+
+    context "when an invalid value is assigned" do
+      it "raises a Mismatch exception" do
+        expect {
+          subject.instance_guid = 123
+        }.to raise_error(CFoundry::Mismatch)
+      end
+    end
+  end
+
+  describe "#instance_index" do
+    it "has an instance index" do
+      subject.instance_index = 123
+      expect(subject.instance_index).to eq(123)
+    end
+
+    context "when an invalid value is assigned" do
+      it "raises a Mismatch exception" do
+        expect {
+          subject.instance_index = "wrong"
+        }.to raise_error(CFoundry::Mismatch)
+      end
+    end
+  end
+
+  describe "#exit_status" do
+    it "has an instance index" do
+      subject.exit_status = 123
+      expect(subject.exit_status).to eq(123)
+    end
+
+    context "when an invalid value is assigned" do
+      it "raises a Mismatch exception" do
+        expect {
+          subject.exit_status = "wrong"
+        }.to raise_error(CFoundry::Mismatch)
+      end
+    end
+  end
+
+  describe "#exit_description" do
+    it "defaults to an empty string" do
+      expect(subject.fake.exit_description).to eq("")
+    end
+
+    it "has an instance guid" do
+      subject.exit_description = "foo"
+      expect(subject.exit_description).to eq("foo")
+    end
+
+    context "when an invalid value is assigned" do
+      it "raises a Mismatch exception" do
+        expect {
+          subject.exit_description = 123
+        }.to raise_error(CFoundry::Mismatch)
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/app_spec.rb

@@ -3,6 +3,25 @@ require "spec_helper"
 describe CFoundry::V2::App do
   let(:client) { fake_client }
 
+  subject { described_class.new("app-1", client) }
+
+  describe "#events" do
+    let(:events) { [fake(:app_event)] }
+
+    it "has events" do
+      subject.events = events
+      expect(subject.events).to eq(events)
+    end
+
+    context "when an invalid value is assigned" do
+      it "raises a Mismatch exception" do
+        expect {
+          subject.events = [fake(:organization)]
+        }.to raise_error(CFoundry::Mismatch)
+      end
+    end
+  end
+
   describe "environment" do
     let(:app) { fake :app, :env => { "FOO" => "1" } }
 

data/spec/cfoundry/v2/model_spec.rb

@@ -7,11 +7,58 @@ describe CFoundry::V2::Model do
   let(:klass) {
     fake_model do
       attribute :foo, :string, :read => :x, :write => [:y, :z]
+
+      def attribute_for_error(e)
+        e.error_code == 1 ? :foo : :base
+      end
     end
   }
 
   subject { klass.new(guid, client, manifest) }
 
+  describe "create" do
+    it "uses #create!" do
+      mock(subject).create!
+      subject.create
+    end
+
+    context "without errors" do
+      it "returns true" do
+        mock(subject).create!
+        subject.create.should == true
+      end
+    end
+
+    context "with errors" do
+      before do
+        stub(subject.class).model_name { ActiveModel::Name.new(subject, nil, "abstract_model") }
+        stub(subject).create! { raise CFoundry::APIError.new("HELP") }
+      end
+
+      it "does not raise an exception" do
+        expect { subject.create }.to_not raise_error
+      end
+
+      it "returns false" do
+        subject.create.should == false
+      end
+
+      context "without model-specific errors" do
+        it "adds generic base error " do
+          subject.create
+          subject.errors.full_messages.first.should =~ /cloud controller reported an error/i
+        end
+      end
+
+      context "with model-specific errors" do
+        it "does not set the generic error on base" do
+          subject.create
+          subject.errors.size.should == 1
+        end
+      end
+    end
+  end
+
   describe "#create!" do
     before do
       stub(client.base).post {
@@ -68,6 +115,49 @@ describe CFoundry::V2::Model do
     end
   end
 
+  describe "delete" do
+    it "uses #delete!" do
+      mock(subject).delete! { true }
+      subject.delete
+    end
+
+    context "without errors" do
+      it "returns true" do
+        mock(subject).delete! { true }
+        subject.delete.should == true
+      end
+    end
+
+    context "with errors" do
+      before do
+        stub(subject.class).model_name { ActiveModel::Name.new(subject, nil, "abstract_model") }
+        stub(subject).delete! { raise CFoundry::APIError.new("HELP") }
+      end
+
+      it "does not raise an exception" do
+        expect { subject.delete }.to_not raise_error
+      end
+
+      it "returns false" do
+        subject.delete.should == false
+      end
+
+      context "without model-specific errors" do
+        it "adds generic base error " do
+          subject.delete
+          subject.errors.full_messages.first.should =~ /cloud controller reported an error/i
+        end
+      end
+
+      context "with model-specific errors" do
+        it "does not set the generic error on base" do
+          subject.delete
+          subject.errors.size.should == 1
+        end
+      end
+    end
+  end
+
   describe "#delete!" do
     before { stub(client.base).delete }
 
@@ -87,12 +177,6 @@ describe CFoundry::V2::Model do
       end
     end
 
-    it "clears its guid" do
-      subject.guid.should be_present
-      subject.delete!
-      subject.guid.should_not be_present
-    end
-
     it "clears its manifest metadata" do
       subject.manifest.should have_key(:metadata)
       subject.delete!
@@ -113,6 +197,48 @@ describe CFoundry::V2::Model do
         ex.message.should_not =~ /\?/
       end
     end
+  end
+
+  describe "#to_key" do
+    context "when persisted" do
+      it "returns an enumerable containing the guid" do
+        subject.to_key.should respond_to(:each)
+        subject.to_key.first.should == guid
+      end
+    end
+
+    context "when not persisted" do
+      let(:guid) { nil }
 
+      it "returns nil" do
+        subject.to_key.should be_nil
+      end
+    end
+  end
+
+  describe "#persisted?" do
+    context "on a new object" do
+      let(:guid) { nil }
+      it "returns false" do
+        subject.should_not be_persisted
+      end
+    end
+
+    context "on an object with a guid" do
+      it "returns false" do
+        subject.should be_persisted
+      end
+    end
+
+    context "on an object that has been deleted" do
+      before do
+        stub(client.base).delete
+        subject.delete
+      end
+
+      it "returns false" do
+        subject.should_not be_persisted
+      end
+    end
   end
 end

data/spec/cfoundry/v2/route_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module CFoundry::V2
+  describe Route do
+    subject { Route.new(nil, nil) }
+
+    describe "validations" do
+      it { should validate_presence_of(:domain) }
+
+      # http://tools.ietf.org/html/rfc1035
+      it "only allows host names according to RFC1035" do
+        message = "can only include a-z, 0-9 and -"
+
+        subject.should allow_value("a", "starts-with-letter", "includes-9-digits", "ends-with-letter",
+          "ends-with-digit-9", "can--have--consecutive---dashes", "allows-UPPERCASE-chars").for(:host)
+
+        ["-must-start-with-letter", "9must-start-with-letter", "must-not-end-with-dash-", "must-not-include-punctuation-chars-@\#$%^&*()",
+          "must-not-include-special-chars-ä", "must.not.include.dots"].each do |bad_value|
+          subject.should_not allow_value(bad_value).for(:host).with_message(message)
+        end
+
+        subject.should ensure_length_of(:host).is_at_most(63)
+      end
+    end
+
+    describe "errors" do
+      before do
+        stub(subject).create! { raise CFoundry::RouteHostTaken.new("the host is taken", 210003) }
+      end
+
+      it "populates errors on host" do
+        subject.create
+        subject.errors[:host].first.should =~ /the host is taken/i
+      end
+    end
+  end
+end

data/spec/cfoundry/validator_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe CFoundry::Validator do
+  subject { described_class }
+
+  describe 'value_matches?' do
+    it 'returns true on nil values' do
+      subject.value_matches?(nil, :something).should be_true
+    end
+
+    context 'with a type of Class' do
+      it 'returns true when value is of type class' do
+        subject.value_matches?(1, Integer).should be_true
+      end
+    end
+
+    context 'with a Regex' do
+      it 'returns true when the regex matches' do
+        subject.value_matches?('value', /lue/).should == true
+      end
+    end
+
+    context 'with type of url' do
+      it 'requires http or https urls' do
+        subject.value_matches?('http:whatever', :url).should be_true
+        subject.value_matches?('https:whatever', :url).should be_true
+        subject.value_matches?('htt_no:whatever', :url).should be_false
+      end
+    end
+
+    context 'with type of https_url' do
+      it 'requires http or https urls' do
+        subject.value_matches?('https:whatever', :https_url).should be_true
+        subject.value_matches?('http:whatever', :https_url).should be_false
+      end
+    end
+
+    context 'with type boolean' do
+      it 'returns true on presence of true or false' do
+        subject.value_matches?(true, :boolean).should be_true
+        subject.value_matches?(false, :boolean).should be_true
+        subject.value_matches?('no boolean', :boolean).should be_false
+      end
+    end
+
+    context 'with an Array' do
+      it 'returns true when all elements are of same type' do
+        subject.value_matches?(['https:whatever'], [String]).should be_true
+        subject.value_matches?(['https:whatever'], [Integer]).should be_false
+      end
+    end
+
+    context 'with a hash' do
+      it 'returns true when specified types match' do
+        subject.value_matches?({:name => "thing"}, {:name => String}).should be_true
+        subject.value_matches?({:name => "thing", :unspecified => 1}, {:name => String}).should be_true
+        subject.value_matches?({:name => 1}, {:name => String}).should be_false
+      end
+    end
+
+    it 'returns true when type is nil' do
+      subject.value_matches?('some value', nil).should be_true
+    end
+
+    context 'with a symbol' do
+      it 'returns true when the value is of specified type' do
+        subject.value_matches?('some value', :string).should be_true
+        subject.value_matches?('some value', :integer).should be_false
+      end
+    end
+  end
+
+  describe 'validate_type' do
+    it 'passes validation with a nil value' do
+      expect {
+      subject.validate_type(nil, :whatever)
+      }.to_not raise_error
+    end
+
+    it 'passes validation when the value matches' do
+      expect {
+        subject.validate_type('string', :string)
+      }.to_not raise_error
+    end
+
+    it 'raises a validation error when value does not match' do
+      expect {
+        subject.validate_type('string', :integer)
+      }.to raise_error(CFoundry::Mismatch)
+    end
+  end
+end

data/spec/fixtures/fake_cc_route.json

@@ -0,0 +1,16 @@
+{
+  "metadata": {
+    "guid": "route-id-1",
+    "url": "/v2/routes/route-id-1",
+    "created_at": "2013-05-16 20:03:48 +0000",
+    "updated_at": null
+  },
+  "entity": {
+    "host": "route-1",
+    "domain_guid": "domain-id-1",
+    "space_guid": "space-id-1",
+    "apps_url": "/v2/routes/route-id-1/apps",
+    "domain_url": "/v2/domains/domain-id-1",
+    "space_url": "/v2/spaces/space-id-1"
+  }
+}

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require "timecop"
 require "active_support"
 require "active_support/core_ext"
 require "cc_api_stub"
+require "shoulda/matchers/integrations/rspec" # requiring all of shoulda matchers makes test unit run
 
 Dir[File.expand_path('../{support,fakes}/**/*.rb', __FILE__)].each do |file|
   require file

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -76,6 +76,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,13 +205,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +219,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 1.5.6
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -240,6 +256,7 @@ files:
 - lib/cfoundry/uaaclient.rb
 - lib/cfoundry/upload_helpers.rb
 - lib/cfoundry/v2/app.rb
+- lib/cfoundry/v2/app_event.rb
 - lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
 - lib/cfoundry/v2/domain.rb
@@ -284,6 +301,7 @@ files:
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
+- spec/cfoundry/v2/app_event_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
@@ -292,7 +310,9 @@ files:
 - spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
+- spec/cfoundry/v2/route_spec.rb
 - spec/cfoundry/v2/space_spec.rb
+- spec/cfoundry/validator_spec.rb
 - spec/fakes/app_fake.rb
 - spec/fakes/domain_fake.rb
 - spec/fakes/framework_fake.rb
@@ -336,6 +356,7 @@ files:
 - spec/fixtures/fake_cc_organization_search.json
 - spec/fixtures/fake_cc_organization_summary.json
 - spec/fixtures/fake_cc_organization_users.json
+- spec/fixtures/fake_cc_route.json
 - spec/fixtures/fake_cc_runtimes.json
 - spec/fixtures/fake_cc_service_binding.json
 - spec/fixtures/fake_cc_service_bindings.json
@@ -369,16 +390,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4102208981056569022
+      hash: -1889885215026340519
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
@@ -404,6 +425,7 @@ test_files:
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
+- spec/cfoundry/v2/app_event_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
@@ -412,7 +434,9 @@ test_files:
 - spec/cfoundry/v2/model_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/quota_definition_spec.rb
+- spec/cfoundry/v2/route_spec.rb
 - spec/cfoundry/v2/space_spec.rb
+- spec/cfoundry/validator_spec.rb
 - spec/fakes/app_fake.rb
 - spec/fakes/domain_fake.rb
 - spec/fakes/framework_fake.rb
@@ -456,6 +480,7 @@ test_files:
 - spec/fixtures/fake_cc_organization_search.json
 - spec/fixtures/fake_cc_organization_summary.json
 - spec/fixtures/fake_cc_organization_users.json
+- spec/fixtures/fake_cc_route.json
 - spec/fixtures/fake_cc_runtimes.json
 - spec/fixtures/fake_cc_service_binding.json
 - spec/fixtures/fake_cc_service_bindings.json