cfoundry 4.3.2.rc1 → 4.3.3

data/lib/cc_api_stub/applications.rb

@@ -5,7 +5,7 @@ module CcApiStub
     class << self
       def succeed_to_load(options={})
         response_body = Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
-        stub_get(object_endpoint, {}, response(200, response_body))
+        stub_get(object_endpoint(options[:id]), {}, response(200, response_body))
       end
 
       def succeed_to_create
@@ -15,7 +15,7 @@ module CcApiStub
 
       def succeed_to_update(options={})
         response_body = Helper.load_fixtures(:fake_cc_application, options)
-        stub_put(object_endpoint, nil, response(200, response_body))
+        stub_put(object_endpoint(options[:id]), nil, response(200, response_body))
       end
 
       def succeed_to_map_route
@@ -45,8 +45,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint
-        %r{/v2/apps/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/apps/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/domains.rb

@@ -24,8 +24,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint
-        %r{/v2/domains/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/domains/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/helper.rb

@@ -91,16 +91,16 @@ module CcApiStub
     end
 
     def succeed_to_load(options={})
-      response_body = CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
-      stub_get(object_endpoint, {}, response(200, response_body))
+      response_body = options[:response] || CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
+      stub_get(object_endpoint(options[:id]), {}, response(200, response_body))
     end
 
-    def fail_to_load
-      stub_get(object_endpoint, {}, response(500))
+    def fail_to_load(options = {})
+      stub_get(object_endpoint(options[:id]), {}, response(500))
     end
 
     def succeed_to_load_many(options={})
-      response_body = CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name.pluralize}", options)
+      response_body = options[:response] || CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name.pluralize}", options)
       stub_get(collection_endpoint, {}, response(200, response_body))
     end
 
@@ -118,12 +118,12 @@ module CcApiStub
       stub_post(collection_endpoint, {}, response(201, response_body))
     end
 
-    def succeed_to_update(attributes = {})
-      stub_put(object_endpoint, nil, response(200, {}))
+    def succeed_to_update(options = {})
+      stub_put(object_endpoint(options[:id]), nil, response(200, {}))
     end
 
-    def succeed_to_delete
-      stub_delete(object_endpoint, nil, response(200))
+    def succeed_to_delete(options = {})
+      stub_delete(object_endpoint(options[:id]), nil, response(200))
     end
 
     alias_method :succeed_to_leave, :succeed_to_delete

data/lib/cc_api_stub/organization_users.rb

@@ -3,18 +3,18 @@ module CcApiStub
     extend Helper
 
     class << self
-      def succeed_to_delete
-        stub_delete(object_endpoint, {}, response(200, ""))
+      def succeed_to_delete(options = {})
+        stub_delete(object_endpoint(options[:id]), {}, response(200, ""))
       end
 
-      def fail_to_delete
-        stub_delete(object_endpoint, {}, response(500))
+      def fail_to_delete(options = {})
+        stub_delete(object_endpoint(options[:id]), {}, response(500))
       end
 
       private
 
-      def object_endpoint
-        %r{/v2/organizations/[^/]+/users/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/organizations/[^/]+/users/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/organizations.rb

@@ -58,8 +58,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint
-        %r{/v2/organizations/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/organizations/#{id}[^/]+$}
       end
 
       def collection_endpoint

data/lib/cc_api_stub/routes.rb

@@ -18,8 +18,8 @@ module CcApiStub
         %r{/v2/routes/?.*$}
       end
 
-      def object_endpoint
-        %r{/v2/routes/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/routes/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/service_bindings.rb

@@ -10,8 +10,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint
-        %r{/v2/service_bindings/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/service_bindings/#{id}[^/]+$}
       end
 
       def collection_endpoint

data/lib/cc_api_stub/service_instances.rb

@@ -10,8 +10,8 @@ module CcApiStub
 
       private
 
-      def object_endpoint
-        %r{/v2/service_instances/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/service_instances/#{id}[^/]+$}
       end
 
       def collection_endpoint

data/lib/cc_api_stub/spaces.rb

@@ -5,7 +5,7 @@ module CcApiStub
     class << self
       def succeed_to_load(options={})
         response_body = Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
-        stub_get(object_endpoint, {}, response(200, response_body))
+        stub_get(object_endpoint(options[:id]), {}, response(200, response_body))
       end
 
       def succeed_to_create
@@ -41,8 +41,8 @@ module CcApiStub
         %r{/v2/spaces$}
       end
 
-      def object_endpoint
-        %r{/v2/spaces/[^/]+$}
+      def object_endpoint(id = nil)
+        %r{/v2/spaces/#{id}[^/]+$}
       end
     end
   end

data/lib/cc_api_stub/users.rb

@@ -39,8 +39,8 @@ module CcApiStub
         stub_get(%r{/v2/users/[^/]+/summary(\?inline-relations-depth=\d)?$}, {}, response(200, response_body))
       end
 
-      def fail_to_find
-        stub_get(object_endpoint, {}, response(404, {:code => 20003, :description => "The user could not be found"}))
+      def fail_to_find(options = {})
+        stub_get(object_endpoint(options[:id]), {}, response(404, {:code => 20003, :description => "The user could not be found"}))
       end
 
       def succeed_to_create
@@ -52,12 +52,12 @@ module CcApiStub
         CcApiStub::Helper.fail_request(:post, 500, {}, /users/)
       end
 
-      def succeed_to_replace_permissions
-        stub_put(object_endpoint, {}, response(200, ""))
+      def succeed_to_replace_permissions(options = {})
+        stub_put(object_endpoint(options[:id]), {}, response(200, ""))
       end
 
-      def fail_to_replace_permissions
-        stub_put(object_endpoint, {}, response(500))
+      def fail_to_replace_permissions(options = {})
+        stub_put(object_endpoint(options[:id]), {}, response(500))
       end
 
       def organizations_fixture
@@ -77,8 +77,8 @@ module CcApiStub
         %r{/v2/users$}
       end
 
-      def object_endpoint
-        %r{/v2/users/[^/]+(/summary)?}
+      def object_endpoint(id = nil)
+        %r{/v2/users/#{id}[^/]+(/summary)?}
       end
     end
   end

data/lib/cfoundry/v2/base.rb

@@ -36,6 +36,7 @@ module CFoundry::V2
     def files(guid, instance, *path)
       get("v2", "apps", guid, "instances", instance, "files", *path)
     end
+
     alias :file :files
 
     def stream_file(guid, instance, *path, &blk)
@@ -68,14 +69,20 @@ module CFoundry::V2
           :return_response => true)
     end
 
-    def all_pages(paginated)
-      payload = paginated[:resources]
+    def for_each(paginated, &block)
+      paginated[:resources].each &block
 
       while next_page = paginated[:next_url]
         paginated = get(next_page, :accept => :json)
-        payload += paginated[:resources]
+        paginated[:resources].each &block
       end
+    end
 
+    def all_pages(paginated)
+      payload = []
+      for_each(paginated) do |resource|
+        payload << resource
+      end
       payload
     end
   end

data/lib/cfoundry/v2/model_magic/client_extensions.rb

@@ -38,6 +38,18 @@ module CFoundry
                 :params => ModelMagic.params_from(args)
               )
             end
+
+            #
+            # def client.MODELs_for_each
+            #
+            define_method(:"#{plural}_for_each") do |*args, &block|
+              for_each(get("v2", plural,
+                  :accept => :json,
+                  :params => ModelMagic.params_from(args)
+                ),
+                &block
+              )
+            end
           end
 
 
@@ -94,6 +106,16 @@ module CFoundry
               }
             end
 
+            #
+            # def client.MODELs_for_each
+            #
+            define_method(:"#{plural}_for_each") do |*args, &block|
+              @base.send(:"#{plural}_for_each", *args) do |json|
+                result = send(:"make_#{singular}", json)
+                block.call(result)
+              end
+            end
+
             #
             # def client.MODEL_from
             #

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v2/model_spec.rb

@@ -384,6 +384,33 @@ module CFoundry
           end
         end
       end
+
+      describe "for_each" do
+
+        before do
+          WebMock.stub_request(:get, /v2\/test_models/).to_return(:body => {
+              "prev_url" => nil,
+              "next_url" => "/v2/test_models?&page=2&results-per-page=50",
+              "resources" => [{:metadata => {:guid => '1'}}, {:metadata => {:guid => '2'}}]
+          }.to_json).times(1)
+
+          WebMock.stub_request(:get, /v2\/test_models\?page=2&results-per-page=50/).to_return(:body => {
+              "prev_url" => nil,
+              "next_url" => nil,
+              "resources" => [{:metadata => {:guid => '3'}}]
+          }.to_json).times(1)
+        end
+
+        it "yields each page to the given the block" do
+          results = []
+          client.test_models_for_each do |test_model|
+            results << test_model
+          end
+          results.collect {|r| r.guid}.should == %w{1 2 3}
+          results.first.should be_a TestModel
+        end
+      end
+
     end
   end
 end

data/vendor/errors/README.md

@@ -1,3 +1,4 @@
-# errors
+cf-errors
+=========
 
-Shared error codes and messages for Cloud Foundry
+Shared error codes and messages for Cloud Foundry

data/vendor/errors/v2.yml

@@ -153,21 +153,6 @@
   http_code: 400
   message: "The service instance cannot be created because paid service plans are not allowed."
 
-60008:
-  name: ServiceInstanceDuplicateNotAllowed
-  http_code: 400
-  message: "An instance of this service is already present in this space.  Some services only support one instance per space."
-
-60009:
-  name: ServiceInstanceNameTooLong
-  http_code: 400
-  message: "You have requested an invalid service instance name.  Names are limited to 50 characters."
-
-60010:
-  name: ServiceInstanceOrganizationNotAuthorized
-  http_code: 403
-  message: A service instance for the selected plan cannot be created in this organization. The plan is visible because another organization you belong to has access to it.
-
 70001:
   name: RuntimeInvalid
   http_code: 400
@@ -218,11 +203,6 @@
   http_code: 404
   message: "The service binding could not be found: %s"
 
-90005:
-  name: UnbindableService
-  http_code: 400
-  message: "The service doesn't support binding."
-
 100001:
   name: AppInvalid
   http_code: 400
@@ -243,11 +223,6 @@
   http_code: 400
   message: "You have exceeded your organization's memory limit. Please login to your account and upgrade. If you are trying to scale down and you are receiving this error, you can either delete an app or contact support."
 
-100006:
-  name: AppMemoryInvalid
-  http_code: 400
-  message: "You have specified an invalid amount of memory for your application."
-
 110001:
   name: ServicePlanInvalid
   http_code: 400
@@ -378,11 +353,6 @@
   http_code: 400
   message: "Billing event query start_date and/or end_date are missing or invalid"
 
-230002:
-  name: EventNotFound
-  http_code: 404
-  message: "Event could not be found: %s"
-
 240001:
   name: QuotaDefinitionNotFound
   http_code: 404
@@ -412,28 +382,3 @@
   name: StackNotFound
   http_code: 404
   message: "The stack could not be found: %s"
-
-260001:
-  name: ServicePlanVisibilityInvalid
-  http_code: 400
-  message: "Service Plan Visibility is invalid: %s"
-
-260002:
-  name: ServicePlanVisibilityAlreadyExists
-  http_code: 400
-  message: "This combination of ServicePlan and Organization is already taken: %s"
-
-270001:
-  name: ServiceBrokerInvalid
-  http_code: 400
-  message: "Service Broker is invalid: %s"
-
-270002:
-  name: ServiceBrokerNameTaken
-  http_code: 400
-  message: "The service broker name is taken: %s"
-
-270003:
-  name: ServiceBrokerUrlTaken
-  http_code: 400
-  message: "The service broker url is taken: %s"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.3.2.rc1
-  prerelease: 6
+  version: 4.3.3
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -449,13 +449,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1896093328470718340
+      hash: -4449691735648661788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4449691735648661788
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25