cfoundry 2.3.3 → 2.3.4

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

@@ -64,22 +64,9 @@ module CFoundry
               elsif klass.scoped_organization && current_organization
                 current_organization.send(plural, *args)
               else
-                prefiltered = @base.send(plural, *args).collect do |json|
+                @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
 
@@ -134,4 +121,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.3".freeze
+  VERSION = "2.3.4".freeze
 end

data/spec/cfoundry/v2/organization_spec.rb

@@ -11,126 +11,6 @@ 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

metadata

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