cfoundry 2.3.2 → 2.3.3

data/lib/cfoundry/baseclient.rb

@@ -98,7 +98,14 @@ module CFoundry
     def stream_url(url, &blk)
       uri = URI.parse(url)
 
-      Net::HTTP.start(uri.host, uri.port) do |http|
+      opts = {}
+      
+      if uri.scheme == "https"
+        opts[:use_ssl] = true
+        opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE 
+      end
+
+      Net::HTTP.start(uri.host, uri.port, opts) do |http|
         http.read_timeout = 5
 
         req = Net::HTTP::Get.new(uri.request_uri)

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

@@ -64,9 +64,22 @@ module CFoundry
               elsif klass.scoped_organization && current_organization
                 current_organization.send(plural, *args)
               else
-                @base.send(plural, *args).collect do |json|
+                prefiltered = @base.send(plural, *args).collect do |json|
                   send(:"make_#{singular}", json)
                 end
+
+                filtered = prefiltered
+                if args && args[0]
+                  opts = args[0]
+                  if opts[:query]
+                    filtered.select! do |obj|
+                      key = opts[:query][0].to_s
+                      value = opts[:query][1]
+                      obj.send(key) == value
+                    end
+                  end
+                end
+                filtered
               end
             end
 
@@ -121,4 +134,4 @@ module CFoundry
       end
     end
   end
-end
+end

data/lib/cfoundry/version.rb

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

data/lib/tasks/gem_release.rake

@@ -7,6 +7,7 @@ namespace :gem do
     old_version = gem_version
 
     sh! "gem bump --version #{version} --no-commit"
+    sh! "git add lib/cfoundry/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"
     generate_release_notes(old_version)
@@ -38,4 +39,4 @@ namespace :gem do
     end
     Gem::Specification.load("cfoundry.gemspec").version.to_s
   end
-end
+end

data/spec/cfoundry/baseclient_spec.rb

@@ -206,6 +206,18 @@ describe CFoundry::BaseClient do
       expect(chunks).to eq(["result"])
     end
 
+    it "handles https" do
+      stub_request(:get, "https://example.com/something").to_return(
+        :body => "https result")
+
+      chunks = []
+      subject.stream_url("https://example.com/something") do |chunk|
+        chunks << chunk
+      end
+
+      expect(chunks).to eq(["https result"])
+    end
+
     it "raises NotFound if response is 404" do
       stub_request(:get, "http://example.com/something").to_return(
         :status => 404, :body => "result")

data/spec/cfoundry/v2/organization_spec.rb

@@ -11,6 +11,126 @@ module CFoundry
         let(:summary_attributes) { {:name => "fizzbuzz"} }
       end
 
+      describe "Querying" do
+        describe "by :name" do
+          let(:query_param) { "My Org" }
+
+          let(:matching_org) do
+            org = CcApiStub::Helper.load_fixtures("fake_cc_organization").symbolize_keys
+            org[:metadata] = org[:metadata].symbolize_keys
+            org[:entity] = org[:entity].symbolize_keys
+
+            org[:entity][:name] = query_param
+            org
+          end
+
+          let(:non_matching_org) do
+            org = CcApiStub::Helper.load_fixtures("fake_cc_organization").symbolize_keys
+            org[:metadata] = org[:metadata].symbolize_keys
+            org[:entity] = org[:entity].symbolize_keys
+            org[:metadata][:guid] = "organization-id-2"
+
+            org[:entity][:name] = "organization-name-2"
+            org
+          end
+
+          context "when there are two orgs and one match" do
+            before do
+              client.base.stub(:organizations).and_return([non_matching_org, matching_org])
+            end
+
+            context "when queried with #organizations" do
+              subject { client.organizations(:query => [:name, query_param]) }
+
+              it "returns the org with the given name" do
+                expect(subject.size).to eq 1
+                expect(subject[0].name).to eq query_param
+              end
+            end
+
+            context "when queried with #organzations_by_name" do
+              subject { client.organizations_by_name(query_param) }
+
+              it "returns the org with the given name" do
+                expect(subject.size).to eq 1
+                expect(subject[0].name).to eq query_param
+              end
+            end
+
+            context "when queried with #organization_by_name" do
+              subject { client.organization_by_name(query_param) }
+
+              it "returns the org with the given name" do
+                expect(subject).to be_a CFoundry::V2::Organization
+                expect(subject.name).to eq query_param
+              end
+            end
+          end
+
+          context "when there are orgs but no matches" do
+            before do
+              client.base.stub(:organizations).and_return([non_matching_org])
+            end
+
+            context "when queried with #organizations" do
+              subject { client.organizations(:query => [:name, query_param]) }
+
+              it "returns an empty list" do
+                expect(subject).to be_empty
+              end
+            end
+
+            context "when queried with #organzations_by_name" do
+              subject { client.organizations_by_name(query_param) }
+
+              it "returns an empty list" do
+                expect(subject).to be_empty
+              end
+            end
+
+            context "when queried with #organization_by_name" do
+              subject { client.organization_by_name(query_param) }
+
+              it "returns nil" do
+                expect(subject).to be nil
+              end
+            end
+
+          end
+
+          context "when there are no orgs" do
+            before do
+              client.base.stub(:organizations).and_return([])
+            end
+
+            context "when queried with #organizations" do
+              subject { client.organizations(:query => [:name, query_param]) }
+
+              it "returns an empty list" do
+                expect(subject).to be_empty
+              end
+            end
+
+            context "when queried with #organzations_by_name" do
+              subject { client.organizations_by_name(query_param) }
+
+              it "returns an empty list" do
+                expect(subject).to be_empty
+              end
+            end
+
+            context "when queried with #organization_by_name" do
+              subject { client.organization_by_name(query_param) }
+
+              it "returns nil" do
+                expect(subject).to be nil
+              end
+            end
+
+          end
+        end
+      end
+
       it "has quota_definition" do
         quota = build(:quota_definition)
         organization.quota_definition = quota

data/spec/fixtures/fake_cc_user.json

@@ -49,6 +49,7 @@
           },
           "entity": {}
         }],
+        "billing_enabled": true,
         "quota_definition": {
           "metadata": {
             "guid": "quota-definition-id-1",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -413,12 +413,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4193450621271924723
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4193450621271924723
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25