ridley 0.2.1 → 0.2.2

data/lib/ridley/connection.rb

@@ -92,6 +92,10 @@ module Ridley
         uri_hash[:port] = (uri_hash[:scheme] == "https" ? 443 : 80)
       end
 
+      if org_match = options[:server_url].match(/.*\/organizations\/(.*)/)
+        @organization ||= org_match[1]
+      end
+
       unless organization.nil?
         uri_hash[:path] = "/organizations/#{organization}"
       end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/unit/ridley/connection_spec.rb

@@ -62,6 +62,29 @@ describe Ridley::Connection do
         end
       end
 
+      describe "with a server_url containing an organization" do
+        before(:each) do
+          @conn = subject.new(
+            server_url: "#{server_url}/organizations/#{organization}",
+            client_name: client_name,
+            client_key: client_key
+          )
+        end
+
+        it "gets the host data from the server_url" do
+          @conn.host.should eql("api.opscode.com")
+          @conn.scheme.should eql("https")
+        end
+
+        it "assigns the value of the 'organization' option to an 'organization' attribute" do
+          @conn.organization.should eql(organization)
+        end
+
+        it "sets the 'path_prefix' of the connection the organization sub URI" do
+          @conn.path_prefix.should eql("/organizations/#{organization}")
+        end
+      end
+
       it "raises 'ArgumentError' if a value for server_url is not given" do
         lambda {
           subject.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chozo
@@ -434,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1603548164029238966
+      hash: -754146470047240925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23