ridley 0.7.0.beta → 0.7.0.rc1

data/spec/acceptance/role_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Role API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -22,7 +20,7 @@ describe "Role API operations", type: "acceptance" do
 
   describe "finding a role" do
     let(:target) do
-      Ridley::Role.new(
+      Ridley::RoleResource.new(
         connection,
         name: "ridley-test",
         description: "a testing role for ridley" 
@@ -33,21 +31,21 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns the target Ridley::Role from the server" do
+    it "returns the target Ridley::RoleResource from the server" do
       connection.role.find(target.name).should eql(target)
     end
   end
 
   describe "creating a role" do
     let(:target) do
-      Ridley::Role.new(
+      Ridley::RoleResource.new(
         connection,
         name: "ridley-test",
         description: "a testing role for ridley" 
       )
     end
 
-    it "returns a new Ridley::Role" do
+    it "returns a new Ridley::RoleResource" do
       connection.role.create(target).should eql(target)
     end
 
@@ -62,7 +60,7 @@ describe "Role API operations", type: "acceptance" do
 
   describe "deleting a role" do
     let(:target) do
-      Ridley::Role.new(
+      Ridley::RoleResource.new(
         connection,
         name: "ridley-role-one"
       )
@@ -72,7 +70,7 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns the deleted Ridley::Role resource" do
+    it "returns the deleted Ridley::RoleResource resource" do
       connection.role.delete(target).should eql(target)
     end
 
@@ -103,19 +101,19 @@ describe "Role API operations", type: "acceptance" do
       end
     end
 
-    it "should return an array of Ridley::Role objects" do
+    it "should return an array of Ridley::RoleResource objects" do
       connection.sync do
         obj = role.all
 
         obj.should have(2).roles
-        obj.should each be_a(Ridley::Role)
+        obj.should each be_a(Ridley::RoleResource)
       end
     end
   end
 
   describe "updating a role" do
     let(:target) do
-      Ridley::Role.new(
+      Ridley::RoleResource.new(
         connection,
         name: "ridley-role-one"
       )
@@ -125,7 +123,7 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns an updated Ridley::Role object" do
+    it "returns an updated Ridley::RoleResource object" do
       connection.role.update(target).should eql(target)
     end
 

data/spec/acceptance/sandbox_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Sandbox API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
   let(:connection) do
-    Ridley.connection(
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -20,14 +18,14 @@ describe "Sandbox API operations", type: "acceptance" do
 
   let(:checksums) do
     [
-      Ridley::Sandbox.checksum(fixtures_path.join("recipe_one.rb")),
-      Ridley::Sandbox.checksum(fixtures_path.join("recipe_two.rb"))
+      Ridley::SandboxUploader.checksum(fixtures_path.join("recipe_one.rb")),
+      Ridley::SandboxUploader.checksum(fixtures_path.join("recipe_two.rb"))
     ]
   end
 
   describe "creating a new sandbox" do
-    it "returns an instance of Ridley::Sandbox" do
-      connection.sandbox.create(checksums).should be_a(Ridley::Sandbox)
+    it "returns an instance of Ridley::SandboxResource" do
+      connection.sandbox.create(checksums).should be_a(Ridley::SandboxResource)
     end
 
     it "contains a value for sandbox_id" do

data/spec/acceptance/search_resource_spec.rb

@@ -1,17 +1,15 @@
 require 'spec_helper'
 
 describe "Search API operations", type: "acceptance" do
-  let(:server_url) { "https://api.opscode.com" }
+  let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
-  let(:organization) { "ridley" }
 
-  let(:connection) do
-    Ridley.connection(
+  let(:client) do
+    Ridley.new(
       server_url: server_url,
       client_name: client_name,
-      client_key: client_key,
-      organization: organization
+      client_key: client_key
     )
   end
 
@@ -20,7 +18,7 @@ describe "Search API operations", type: "acceptance" do
 
   describe "listing indexes" do
     it "returns an array of indexes" do
-      indexes = connection.search_indexes
+      indexes = client.search_indexes
 
       indexes.should include("role")
       indexes.should include("node")
@@ -32,7 +30,7 @@ describe "Search API operations", type: "acceptance" do
   describe "searching an index that doesn't exist" do
     it "it raises a Ridley::Errors::HTTPNotFound error" do
       lambda {
-        connection.search(:notthere)
+        client.search(:notthere)
       }.should raise_error(Ridley::Errors::HTTPNotFound)
     end
   end

data/spec/support/shared_examples/ridley_resource.rb

@@ -1,5 +1,6 @@
 shared_examples_for "a Ridley Resource" do |resource_klass|
   let(:connection) { double('connection', hosted?: true) }
+  let(:client) { double('client', connection: connection) }
   let(:active_connection) { double('active-connection') }
   let(:response) { double('response') }
 
@@ -7,20 +8,20 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     subject { resource_klass }
 
     describe "::all" do
-      it "sends a get request for the class' resource_path using the given connection" do
+      it "sends a get request for the class' resource_path using the given client" do
         response.stub(:body) { Hash.new }
-        connection.should_receive(:get).with(subject.resource_path).and_return(response)
+        client.connection.should_receive(:get).with(subject.resource_path).and_return(response)
         
-        subject.all(connection)
+        subject.all(client)
       end
     end
 
     describe "::find" do
       it "delegates to find!" do
         id = double('id')
-        subject.should_receive(:find!).with(connection, id)
+        subject.should_receive(:find!).with(client, id)
 
-        subject.find(connection, id)
+        subject.find(client, id)
       end
 
       context "when the resource is not found" do
@@ -31,12 +32,12 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     end
 
     describe "::find!" do
-      it "sends a get request to the given connection to the resource_path of the class for the given chef_id" do
+      it "sends a get request to the given client to the resource_path of the class for the given chef_id" do
         chef_id = "ridley_test"
         response.stub(:body) { Hash.new }
-        connection.should_receive(:get).with("#{subject.resource_path}/#{chef_id}").and_return(response)
+        client.connection.should_receive(:get).with("#{subject.resource_path}/#{chef_id}").and_return(response)
 
-        subject.find(connection, chef_id)
+        subject.find(client, chef_id)
       end
 
       context "when the resource is not found" do
@@ -47,34 +48,34 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     end
 
     describe "::create" do
-      it "sends a post request to the given connection using the includer's resource_path" do
+      it "sends a post request to the given client using the includer's resource_path" do
         attrs = {
           first_name: "jamie",
           last_name: "winsor"
         }
 
         response.stub(:body) { attrs }
-        connection.should_receive(:post).with(subject.resource_path, duck_type(:to_json)).and_return(response)
+        client.connection.should_receive(:post).with(subject.resource_path, duck_type(:to_json)).and_return(response)
 
-        subject.create(connection, attrs)
+        subject.create(client, attrs)
       end
     end
 
     describe "::delete" do
-      it "sends a delete request to the given connection using the includer's resource_path for the given string" do
+      it "sends a delete request to the given client using the includer's resource_path for the given string" do
         response.stub(:body) { Hash.new }
-        connection.should_receive(:delete).with("#{subject.resource_path}/ridley-test").and_return(response)
+        client.connection.should_receive(:delete).with("#{subject.resource_path}/ridley-test").and_return(response)
 
-        subject.delete(connection, "ridley-test")
+        subject.delete(client, "ridley-test")
       end
 
       it "accepts an object that responds to 'chef_id'" do
         object = double("obj")
         object.stub(:chef_id) { "hello" }
         response.stub(:body) { Hash.new }
-        connection.should_receive(:delete).with("#{subject.resource_path}/#{object.chef_id}").and_return(response)
+        client.connection.should_receive(:delete).with("#{subject.resource_path}/#{object.chef_id}").and_return(response)
 
-        subject.delete(connection, object)
+        subject.delete(client, object)
       end
     end
 
@@ -85,19 +86,19 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
     end
 
     describe "::update" do
-      it "sends a put request to the given connection using the includer's resource_path with the given object" do
+      it "sends a put request to the given client using the includer's resource_path with the given object" do
         subject.stub(:chef_id) { :name }
         subject.attribute(:name)
         object = subject.new(name: "hello")
         response.stub(:body) { Hash.new }
-        connection.should_receive(:put).with("#{subject.resource_path}/#{object.chef_id}", duck_type(:to_json)).and_return(response)
+        client.connection.should_receive(:put).with("#{subject.resource_path}/#{object.chef_id}", duck_type(:to_json)).and_return(response)
 
-        subject.update(connection, object)
+        subject.update(client, object)
       end
     end
   end
 
-  subject { resource_klass.new(connection) }
+  subject { resource_klass.new(client) }
 
   describe "#save" do
     context "when the object is valid" do
@@ -106,7 +107,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
       it "sends a create message to the implementing class" do
         updated = double('updated')
         updated.stub(:attributes).and_return(Hash.new)
-        subject.class.should_receive(:create).with(connection, subject).and_return(updated)
+        subject.class.should_receive(:create).with(client, subject).and_return(updated)
 
         subject.save
       end
@@ -183,7 +184,7 @@ shared_examples_for "a Ridley Resource" do |resource_klass|
 
     before(:each) do
       subject.class.attribute(:fake_attribute)
-      subject.class.stub(:find).with(connection, subject).and_return(updated_subject)
+      subject.class.stub(:find).with(client, subject).and_return(updated_subject)
     end
 
     it "returns itself" do

data/spec/unit/ridley/client_spec.rb

@@ -0,0 +1,153 @@
+require 'spec_helper'
+
+describe Ridley::Client do
+  let(:server_url) { "https://api.opscode.com" }
+  let(:client_name) { "reset" }
+  let(:client_key) { fixtures_path.join("reset.pem").to_s }
+  let(:organization) { "vialstudios" }
+  let(:encrypted_data_bag_secret_path) { fixtures_path.join("reset.pem").to_s }
+
+  let(:config) do
+    {
+      server_url: server_url,
+      client_name: client_name,
+      client_key: client_key,
+      organization: organization,
+      encrypted_data_bag_secret_path: encrypted_data_bag_secret_path
+    }
+  end
+
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::initialize" do
+      let(:server_url) { "https://api.opscode.com/some_path" }
+
+      describe "parsing the 'server_url' option" do
+        before(:each) do
+          @conn = subject.new(
+            server_url: server_url,
+            client_name: client_name,
+            client_key: client_key
+          )
+        end
+
+        it "assigns a 'host' attribute from the given 'server_url' option" do
+          @conn.host.should eql("api.opscode.com")
+        end
+
+        it "assigns a 'scheme' attribute from the given 'server_url' option" do
+          @conn.scheme.should eql("https")
+        end
+
+        it "sets a 'path_prefix' to the root of the given 'server_url' option" do
+          @conn.path_prefix.should eql("/")
+        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.connection.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(
+            client_name: client_name,
+            client_key: client_key
+          )
+        }.should raise_error(ArgumentError, "Missing required option(s): 'server_url'")
+      end
+
+      it "raises if a value for client_name is not given" do
+        lambda {
+          subject.new(
+            server_url: server_url,
+            client_key: client_key
+          )
+        }.should raise_error(ArgumentError, "Missing required option(s): 'client_name'")
+      end
+
+      it "raises if a value for client_key is not given" do
+        lambda {
+          subject.new(
+            server_url: server_url,
+            client_name: client_name
+          )
+        }.should raise_error(ArgumentError, "Missing required option(s): 'client_key'")
+      end
+
+      it "raises a ClientKeyFileNotFound if the filepath for client_key is not found" do
+        config[:client_key] = "/tmp/nofile.xxsa"
+
+        lambda {
+          subject.new(config)
+        }.should raise_error(Ridley::Errors::ClientKeyFileNotFound)
+      end
+
+      it "expands the path of the client_key" do
+        config[:client_key] = "~/"
+
+        subject.new(config).client_key.should_not == "~/"
+      end
+    end
+
+    describe "::open" do
+      it "raises a LocalJumpError if no block is given" do
+        lambda {
+          subject.open(config)
+        }.should raise_error(LocalJumpError)
+      end
+    end
+  end
+
+  subject do
+    described_class.new(config)
+  end
+
+  describe "#encrypted_data_bag_secret" do
+    it "returns a string" do
+      subject.encrypted_data_bag_secret.should be_a(String)
+    end
+
+    context "when a encrypted_data_bag_secret_path is not provided" do
+      before(:each) do
+        subject.stub(:encrypted_data_bag_secret_path) { nil }
+      end
+
+      it "returns nil" do
+        subject.encrypted_data_bag_secret.should be_nil
+      end
+    end
+
+    context "when the file is not found at the given encrypted_data_bag_secret_path" do
+      before(:each) do
+        subject.stub(:encrypted_data_bag_secret_path) { fixtures_path.join("not.txt").to_s }
+      end
+
+      it "raises an EncryptedDataBagSecretNotFound erorr" do
+        lambda {
+          subject.encrypted_data_bag_secret
+        }.should raise_error(Ridley::Errors::EncryptedDataBagSecretNotFound)
+      end
+    end
+  end
+end