ridley 0.10.2 → 0.11.0.rc1

data/spec/acceptance/client_resource_spec.rb

@@ -4,6 +4,7 @@ describe "Client API operations", type: "acceptance" do
   let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:resource) { double('client-resource') }
 
   let(:connection) do
     Ridley.new(
@@ -21,39 +22,28 @@ describe "Client API operations", type: "acceptance" do
   end
 
   describe "finding a client" do
-    let(:target) do
-      Ridley::ClientResource.new(
-        connection,
-        name: "motherbrain-test",
-        admin: false
-      )
-    end
+    let(:target) { Ridley::ClientObject.new(resource, name: "motherbrain-test", admin: false) }
 
     before(:each) do
       connection.client.create(target)
     end
 
-    it "returns a valid Ridley::ClientResource" do
+    it "returns a valid Ridley::ClientObject" do
       connection.sync do
         obj = client.find(target)
 
-        obj.should be_a(Ridley::ClientResource)
+        obj.should be_a(Ridley::ClientObject)
         obj.should be_valid
       end
     end
   end
 
   describe "creating a client" do
-    let(:target) do
-      Ridley::ClientResource.new(
-        connection,
-        name: "motherbrain_test"
-      )
-    end
+    let(:target) { Ridley::ClientObject.new(resource, name: "motherbrain-test", admin: false) }
 
-    it "returns a Ridley::ClientResource object" do
+    it "returns a Ridley::ClientObject object" do
       connection.sync do
-        client.create(target).should be_a(Ridley::ClientResource)
+        client.create(target).should be_a(Ridley::ClientObject)
       end
     end
 
@@ -65,20 +55,14 @@ describe "Client API operations", type: "acceptance" do
   end
 
   describe "deleting a client" do
-    let(:target) do
-      Ridley::ClientResource.new(
-        connection,
-        name: "motherbrain-test",
-        admin: false
-      )
-    end
+    let(:target) { Ridley::ClientObject.new(resource, name: "motherbrain-test", admin: false) }
 
     before(:each) do
       connection.client.create(target)
     end
 
-    it "returns a Ridley::ClientResource object" do
-      connection.client.delete(target).should be_a(Ridley::ClientResource)
+    it "returns a Ridley::ClientObject object" do
+      connection.client.delete(target).should be_a(Ridley::ClientObject)
     end
   end
 
@@ -91,7 +75,7 @@ describe "Client API operations", type: "acceptance" do
     end
 
     it "returns an array of Ridley::ClientResource objects" do
-      connection.client.delete_all.should each be_a(Ridley::ClientResource)
+      connection.client.delete_all.should each be_a(Ridley::ClientObject)
     end
 
     it "deletes all clients from the remote" do
@@ -104,25 +88,19 @@ describe "Client API operations", type: "acceptance" do
   end
 
   describe "listing all clients" do
-    it "returns an array of Ridley::ClientResource objects" do
-      connection.client.all.should each be_a(Ridley::ClientResource)
+    it "returns an array of Ridley::ClientObject objects" do
+      connection.client.all.should each be_a(Ridley::ClientObject)
     end
   end
 
   describe "regenerating a client's private key" do
-    let(:target) do
-      Ridley::ClientResource.new(
-        connection,
-        name: "motherbrain-test",
-        admin: false
-      )
-    end
+    let(:target) { Ridley::ClientObject.new(resource, name: "motherbrain-test", admin: false) }
 
     before(:each) do
       connection.client.create(target)
     end
 
-    it "returns a Ridley::ClientResource object with a value for 'private_key'" do
+    it "returns a Ridley::ClientObject object with a value for 'private_key'" do
       connection.sync do
         obj = client.regenerate_key(target)
 

data/spec/acceptance/data_bag_item_resource_spec.rb

@@ -5,7 +5,7 @@ describe "DataBag API operations", type: "acceptance" do
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
 
-  let(:connection) do
+  let(:client) do
     Ridley.new(
       server_url: server_url,
       client_name: client_name,
@@ -17,20 +17,14 @@ describe "DataBag API operations", type: "acceptance" do
   after(:all) { WebMock.disable_net_connect! }
 
   before(:all) do
-    connection.data_bag.delete_all
-    @databag = connection.data_bag.create(name: "ridley-test")
+    client.data_bag.delete_all
+    @databag = client.data_bag.create(name: "ridley-test")
   end
 
-  before(:each) do
-    @databag.item.delete_all
-  end
+  before { @databag.item.delete_all }
 
   describe "listing data bag items" do
     context "when the data bag has no items" do
-      before(:each) do
-        @databag.item.delete_all
-      end
-
       it "returns an empty array" do
         @databag.item.all.should have(0).items
       end
@@ -57,9 +51,9 @@ describe "DataBag API operations", type: "acceptance" do
 
     context "when an 'id' field is missing" do
       it "raises an Ridley::Errors::InvalidResource error" do
-        lambda {
+        expect {
           @databag.item.create(name: "jamie")
-        }.should raise_error(Ridley::Errors::InvalidResource)
+        }.to raise_error(Ridley::Errors::InvalidResource)
       end
     end
   end
@@ -96,7 +90,7 @@ describe "DataBag API operations", type: "acceptance" do
     it "returns the deleted data bag item" do
       dbi = @databag.item.delete(attributes["id"])
 
-      dbi.should be_a(Ridley::DataBagItemResource)
+      dbi.should be_a(Ridley::DataBagItemObject)
       dbi.attributes.should eql(attributes)
     end
 
@@ -114,7 +108,7 @@ describe "DataBag API operations", type: "acceptance" do
     end
 
     it "returns the array of deleted data bag items" do
-      @databag.item.delete_all.should each be_a(Ridley::DataBagItemResource)
+      @databag.item.delete_all.should each be_a(Ridley::DataBagItemObject)
     end
 
     it "removes all data bag items from the data bag" do

data/spec/acceptance/data_bag_resource_spec.rb

@@ -34,7 +34,7 @@ describe "DataBag API operations", type: "acceptance" do
       end
 
       it "returns an array of data bags" do
-        connection.data_bag.all.should each be_a(Ridley::DataBagResource)
+        connection.data_bag.all.should each be_a(Ridley::DataBagObject)
       end
 
       it "returns all of the data bags on the server" do

data/spec/acceptance/environment_resource_spec.rb

@@ -4,6 +4,7 @@ describe "Environment API operations", type: "acceptance" do
   let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:resource) { double('environment-resource') }
 
   let(:connection) do
     Ridley.new(
@@ -21,22 +22,17 @@ describe "Environment API operations", type: "acceptance" do
   end
 
   describe "finding an environment" do
-    let(:target) do
-      Ridley::EnvironmentResource.new(
-        connection,
-        name: "ridley-test-env"
-      )
-    end
+    let(:target) { Ridley::EnvironmentObject.new(resource, name: "ridley-test-env") }
 
     before(:each) do
       connection.environment.create(target)
     end
 
-    it "returns a valid Ridley::EnvironmentResource object" do
+    it "returns a valid Ridley::EnvironmentObject object" do
       connection.sync do
         obj = environment.find(target)
 
-        obj.should be_a(Ridley::EnvironmentResource)
+        obj.should be_a(Ridley::EnvironmentObject)
         obj.should be_valid
       end
     end
@@ -44,18 +40,18 @@ describe "Environment API operations", type: "acceptance" do
 
   describe "creating an environment" do
     let(:target) do
-      Ridley::EnvironmentResource.new(
-        connection,
+      Ridley::EnvironmentObject.new(
+        resource,
         name: "ridley-test-env",
         description: "a testing environment for ridley"
       )
     end
 
-    it "returns a valid Ridley::EnvironmentResource object" do
+    it "returns a valid Ridley::EnvironmentObject object" do
       connection.sync do
         obj = environment.create(target)
 
-        obj.should be_a(Ridley::EnvironmentResource)
+        obj.should be_a(Ridley::EnvironmentObject)
         obj.should be_valid
       end
     end
@@ -77,8 +73,8 @@ describe "Environment API operations", type: "acceptance" do
       end
     end
 
-    it "returns an array of Ridley::EnvironmentResource objects" do
-      connection.environment.delete_all.should each be_a(Ridley::EnvironmentResource)
+    it "returns an array of Ridley::EnvironmentObject objects" do
+      connection.environment.delete_all.should each be_a(Ridley::EnvironmentObject)
     end
 
     it "deletes all environments but '_default' from the remote" do
@@ -92,18 +88,13 @@ describe "Environment API operations", type: "acceptance" do
   end
 
   describe "listing all environments" do
-    it "should return an array of Ridley::EnvironmentResource objects" do
-      connection.environment.all.should each be_a(Ridley::EnvironmentResource)
+    it "should return an array of Ridley::EnvironmentObject objects" do
+      connection.environment.all.should each be_a(Ridley::EnvironmentObject)
     end
   end
 
   describe "updating an environment" do
-    let(:target) do
-      Ridley::EnvironmentResource.new(
-        connection,
-        name: "ridley-env-test"
-      )
-    end
+    let(:target) { Ridley::EnvironmentObject.new(resource, name: "ridley-test-env") }
 
     before(:each) do
       connection.environment.create(target)

data/spec/acceptance/node_resource_spec.rb

@@ -4,6 +4,7 @@ describe "Node API operations", type: "acceptance" do
   let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:resource) { double('node-resource') }
 
   let(:connection) do
     Ridley.new(
@@ -21,12 +22,7 @@ describe "Node API operations", type: "acceptance" do
   end
 
   describe "finding a node" do
-    let(:target) do
-      Ridley::NodeResource.new(
-        connection,
-        name: "ridley-one"
-      )
-    end
+    let(:target) { Ridley::NodeObject.new(resource, name: "ridley-one") }
 
     before(:each) do
       connection.node.create(target)
@@ -38,14 +34,9 @@ describe "Node API operations", type: "acceptance" do
   end
 
   describe "creating a node" do
-    let(:target) do
-      Ridley::NodeResource.new(
-        connection,
-        name: "ridley-one"
-      )
-    end
-    
-    it "returns a new Ridley::NodeResource object" do
+    let(:target) { Ridley::NodeObject.new(resource, name: "ridley-one") }
+
+    it "returns a new Ridley::NodeObject object" do
       connection.node.create(target).should eql(target)
     end
 
@@ -59,12 +50,7 @@ describe "Node API operations", type: "acceptance" do
   end
 
   describe "deleting a node" do
-    let(:target) do
-      Ridley::NodeResource.new(
-        connection,
-        name: "ridley-one"
-      )
-    end
+    let(:target) { Ridley::NodeObject.new(resource, name: "ridley-one") }
 
     before(:each) do
       connection.node.create(target)
@@ -101,23 +87,18 @@ describe "Node API operations", type: "acceptance" do
       end
     end
 
-    it "returns an array of Ridley::NodeResource objects" do
+    it "returns an array of Ridley::NodeObject" do
       connection.sync do
         obj = node.all
-        
-        obj.should each be_a(Ridley::NodeResource)
+
+        obj.should each be_a(Ridley::NodeObject)
         obj.should have(2).nodes
       end
     end
   end
 
   describe "updating a node" do
-    let(:target) do
-      Ridley::NodeResource.new(
-        connection,
-        name: "ridley-one"
-      )
-    end
+    let(:target) { Ridley::NodeObject.new(resource, name: "ridley-one") }
 
     before(:each) do
       connection.node.create(target)

data/spec/acceptance/role_resource_spec.rb

@@ -4,6 +4,7 @@ describe "Role API operations", type: "acceptance" do
   let(:server_url) { "https://api.opscode.com/organizations/ridley" }
   let(:client_name) { "reset" }
   let(:client_key) { "/Users/reset/.chef/reset.pem" }
+  let(:resource) { double('role-resource') }
 
   let(:connection) do
     Ridley.new(
@@ -20,8 +21,8 @@ describe "Role API operations", type: "acceptance" do
 
   describe "finding a role" do
     let(:target) do
-      Ridley::RoleResource.new(
-        connection,
+      Ridley::RoleObject.new(
+        resource,
         name: "ridley-test",
         description: "a testing role for ridley" 
       )
@@ -31,21 +32,21 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns the target Ridley::RoleResource from the server" do
+    it "returns the target Ridley::RoleObject from the server" do
       connection.role.find(target.name).should eql(target)
     end
   end
 
   describe "creating a role" do
     let(:target) do
-      Ridley::RoleResource.new(
-        connection,
+      Ridley::RoleObject.new(
+        resource,
         name: "ridley-test",
         description: "a testing role for ridley" 
       )
     end
 
-    it "returns a new Ridley::RoleResource" do
+    it "returns a new Ridley::RoleObject" do
       connection.role.create(target).should eql(target)
     end
 
@@ -60,8 +61,8 @@ describe "Role API operations", type: "acceptance" do
 
   describe "deleting a role" do
     let(:target) do
-      Ridley::RoleResource.new(
-        connection,
+      Ridley::RoleObject.new(
+        resource,
         name: "ridley-role-one"
       )
     end
@@ -70,7 +71,7 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns the deleted Ridley::RoleResource resource" do
+    it "returns the deleted Ridley::RoleObject resource" do
       connection.role.delete(target).should eql(target)
     end
 
@@ -106,15 +107,15 @@ describe "Role API operations", type: "acceptance" do
         obj = role.all
 
         obj.should have(2).roles
-        obj.should each be_a(Ridley::RoleResource)
+        obj.should each be_a(Ridley::RoleObject)
       end
     end
   end
 
   describe "updating a role" do
     let(:target) do
-      Ridley::RoleResource.new(
-        connection,
+      Ridley::RoleObject.new(
+        resource,
         name: "ridley-role-one"
       )
     end
@@ -123,7 +124,7 @@ describe "Role API operations", type: "acceptance" do
       connection.role.create(target)
     end
 
-    it "returns an updated Ridley::RoleResource object" do
+    it "returns an updated Ridley::RoleObject object" do
       connection.role.update(target).should eql(target)
     end
 

data/spec/acceptance/sandbox_resource_spec.rb

@@ -24,8 +24,8 @@ describe "Sandbox API operations", type: "acceptance" do
   end
 
   describe "creating a new sandbox" do
-    it "returns an instance of Ridley::SandboxResource" do
-      connection.sandbox.create(checksums).should be_a(Ridley::SandboxResource)
+    it "returns an instance of Ridley::SandboxObject" do
+      connection.sandbox.create(checksums).should be_a(Ridley::SandboxObject)
     end
 
     it "contains a value for sandbox_id" do