occi 1.2.0 → 1.2.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "hugs", "~> 2.2.0"
+gem "hugs", "~> 2.3.0"
 #gem "hugs", :path => "~/git/hugs"
 gem "multipart-post", "~> 1.0.1"
 gem "nokogiri", "~> 1.4.4"
@@ -8,7 +8,7 @@ gem "nokogiri", "~> 1.4.4"
 group :development, :test do
   gem "rake"
   gem "jeweler", "~> 1.5.1"
-  gem "webmock", "~> 1.6.1"
+  gem "webmock", "~> 1.6.2"
   gem "vcr", "~> 1.4.0"
   gem "minitest", "~> 2.0.0"
   gem "ZenTest", "~> 4.4.2"

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     addressable (2.2.2)
     crack (0.1.8)
     git (1.2.5)
-    hugs (2.2.0)
+    hugs (2.3.0)
       multipart-post (~> 1.0.1)
       net-http-persistent (~> 1.4.1)
       nokogiri (~> 1.4.4)
@@ -20,17 +20,17 @@ GEM
     nokogiri (1.4.4)
     rake (0.8.7)
     vcr (1.4.0)
-    webmock (1.6.1)
+    webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    yajl-ruby (0.7.8)
+    yajl-ruby (0.7.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ZenTest (~> 4.4.2)
-  hugs (~> 2.2.0)
+  hugs (~> 2.3.0)
   jeweler (~> 1.5.1)
   minitest (~> 2.0.0)
   multipart-post (~> 1.0.1)

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/occi/resource.rb

@@ -52,7 +52,7 @@ module Occi
     # Deletes the Compute resource identified by +compute_id+.
     # 204 No Content : The Compute has been successfully deleted.
 
-    def delete id
+    def destroy id
       @connection.delete entity(id)
     end
   end

data/occi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{occi}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["retr0h"]
-  s.date = %q{2011-01-06}
+  s.date = %q{2011-01-13}
   s.email = %q{john@dewey.ws}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,17 +31,18 @@ Gem::Specification.new do |s|
     "lib/occi/resource.rb",
     "lib/occi/storage.rb",
     "occi.gemspec",
+    "test/fixtures/cassettes/compute_all.yml",
     "test/fixtures/cassettes/compute_create.yml",
-    "test/fixtures/cassettes/compute_delete.yml",
+    "test/fixtures/cassettes/compute_destroy.yml",
     "test/fixtures/cassettes/compute_find.yml",
     "test/fixtures/cassettes/compute_update.yml",
     "test/fixtures/cassettes/network_all.yml",
     "test/fixtures/cassettes/network_create.yml",
-    "test/fixtures/cassettes/network_delete.yml",
+    "test/fixtures/cassettes/network_destroy.yml",
     "test/fixtures/cassettes/network_find.yml",
     "test/fixtures/cassettes/storage_all.yml",
     "test/fixtures/cassettes/storage_create.yml",
-    "test/fixtures/cassettes/storage_delete.yml",
+    "test/fixtures/cassettes/storage_destroy.yml",
     "test/fixtures/cassettes/storage_find.yml",
     "test/lib/occi/compute_test.rb",
     "test/lib/occi/network_test.rb",
@@ -64,33 +65,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hugs>, ["~> 2.2.0"])
+      s.add_runtime_dependency(%q<hugs>, ["~> 2.3.0"])
       s.add_runtime_dependency(%q<multipart-post>, ["~> 1.0.1"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.4"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<webmock>, ["~> 1.6.1"])
+      s.add_development_dependency(%q<webmock>, ["~> 1.6.2"])
       s.add_development_dependency(%q<vcr>, ["~> 1.4.0"])
       s.add_development_dependency(%q<minitest>, ["~> 2.0.0"])
       s.add_development_dependency(%q<ZenTest>, ["~> 4.4.2"])
     else
-      s.add_dependency(%q<hugs>, ["~> 2.2.0"])
+      s.add_dependency(%q<hugs>, ["~> 2.3.0"])
       s.add_dependency(%q<multipart-post>, ["~> 1.0.1"])
       s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<webmock>, ["~> 1.6.1"])
+      s.add_dependency(%q<webmock>, ["~> 1.6.2"])
       s.add_dependency(%q<vcr>, ["~> 1.4.0"])
       s.add_dependency(%q<minitest>, ["~> 2.0.0"])
       s.add_dependency(%q<ZenTest>, ["~> 4.4.2"])
     end
   else
-    s.add_dependency(%q<hugs>, ["~> 2.2.0"])
+    s.add_dependency(%q<hugs>, ["~> 2.3.0"])
     s.add_dependency(%q<multipart-post>, ["~> 1.0.1"])
     s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<webmock>, ["~> 1.6.1"])
+    s.add_dependency(%q<webmock>, ["~> 1.6.2"])
     s.add_dependency(%q<vcr>, ["~> 1.4.0"])
     s.add_dependency(%q<minitest>, ["~> 2.0.0"])
     s.add_dependency(%q<ZenTest>, ["~> 4.4.2"])

data/test/fixtures/cassettes/compute_all.yml

@@ -0,0 +1,28 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://oneadmin:a9464e3228ae563be6207bbf50437a219550f48b@one.example.com:4567/compute
+    body: 
+    headers: 
+      accept: 
+      - application/xml
+      connection: 
+      - keep-alive
+      keep-alive: 
+      - 30
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      content-type: 
+      - text/html;charset=utf-8
+      content-length: 
+      - "799"
+      connection: 
+      - keep-alive
+      server: 
+      - thin 1.2.7 codename No Hup
+    body: "<COMPUTE_COLLECTION><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/150\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/164\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/170\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/171\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/172\" name=\"Centos-5-4_x86_64\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/174\" name=\"Test Framework\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/175\" name=\"Test Framework\"/><COMPUTE href=\"http://cm-01.cloud.int.ev1.atti.com:4567/compute/176\" name=\"Test Framework\"/></COMPUTE_COLLECTION>       "
+    http_version: "1.1"

data/test/lib/occi/compute_test.rb

@@ -2,13 +2,13 @@ require "test_helper"
 
 describe Occi::Compute do
   describe "#all" do
-    #it "returns a parsed XML document" do
-    #  VCR.use_cassette "compute_all" do
-    #    response = Connection.compute.all
+    it "returns a parsed XML document" do
+      VCR.use_cassette "compute_all" do
+        response = CONNECTION.compute.all
 
-    #    is_okay response
-    #  end
-    #end
+        is_okay response
+      end
+    end
   end
 
   describe "#create" do
@@ -19,7 +19,7 @@ describe Occi::Compute do
       # boot.  Then we no longer need the coupling in the XML.
       # CLOUD-35 open to address this.
 
-      @builder = Nokogiri::XML::Builder.new do
+      @xml = Nokogiri::XML::Builder.new do
         COMPUTE {
           NAME "Test Framework"
           INSTANCE_TYPE "small"
@@ -38,7 +38,7 @@ describe Occi::Compute do
 
     it "returns a parsed XML document" do
       VCR.use_cassette "compute_create" do
-        response = Connection.compute.create @builder
+        response = CONNECTION.compute.create @xml
 
         is_created response
       end
@@ -50,19 +50,19 @@ describe Occi::Compute do
       id = cassette_for("compute_create").xpath('//ID').text
 
       VCR.use_cassette "compute_find" do
-        response = Connection.compute.find id
+        response = CONNECTION.compute.find id
 
         is_okay response
       end
     end
   end
 
-  describe "#delete" do
+  describe "#destroy" do
     it "returns a parsed XML document" do
       id = cassette_for("compute_create").xpath('//ID').text
 
-      VCR.use_cassette "compute_delete" do
-        response = Connection.compute.delete id
+      VCR.use_cassette "compute_destroy" do
+        response = CONNECTION.compute.destroy id
 
         is_no_content response
       end
@@ -71,7 +71,7 @@ describe Occi::Compute do
 
   describe "#update" do
     before do
-      @builder = Nokogiri::XML::Builder.new do
+      @xml = Nokogiri::XML::Builder.new do
         COMPUTE {
           STATE "shutdown"
         }
@@ -82,7 +82,7 @@ describe Occi::Compute do
       id = cassette_for("compute_create").xpath('//ID').text
 
       VCR.use_cassette "compute_update" do
-        response = Connection.compute.update id, @builder
+        response = CONNECTION.compute.update id, @xml
 
         is_accepted response
       end

data/test/lib/occi/network_test.rb

@@ -4,7 +4,7 @@ describe Occi::Network do
   describe "#all" do
     it "returns a parsed XML document" do
       VCR.use_cassette "network_all" do
-        response = Connection.network.all
+        response = CONNECTION.network.all
 
         is_okay response
       end
@@ -13,7 +13,7 @@ describe Occi::Network do
 
   describe "#create" do
     before do
-      @builder = Nokogiri::XML::Builder.new do
+      @xml = Nokogiri::XML::Builder.new do
         NETWORK {
           NAME "Test Framework"
           ADDRESS "192.168.1.1"
@@ -24,7 +24,7 @@ describe Occi::Network do
 
     it "returns a parsed XML document" do
       VCR.use_cassette "network_create" do
-        response = Connection.network.create @builder
+        response = CONNECTION.network.create @xml
 
         is_created response
       end
@@ -36,19 +36,19 @@ describe Occi::Network do
       id = cassette_for("network_create").xpath('//ID').text
 
       VCR.use_cassette "network_find" do
-        response = Connection.network.find id
+        response = CONNECTION.network.find id
 
         is_okay response
       end
     end
   end
 
-  describe "#delete" do
+  describe "#destroy" do
     it "returns a parsed XML document" do
       id = cassette_for("network_create").xpath('//ID').text
 
-      VCR.use_cassette "network_delete" do
-        response = Connection.network.delete id
+      VCR.use_cassette "network_destroy" do
+        response = CONNECTION.network.destroy id
 
         is_no_content response
       end

data/test/lib/occi/storage_test.rb

@@ -4,7 +4,7 @@ describe Occi::Storage do
   describe "#all" do
     it "returns a parsed XML document" do
       VCR.use_cassette "storage_all" do
-        response = Connection.network.all
+        response = CONNECTION.network.all
 
         is_okay response
       end
@@ -13,7 +13,7 @@ describe Occi::Storage do
 
   describe "#create" do
     before do
-      @builder = Nokogiri::XML::Builder.new do
+      @xml = Nokogiri::XML::Builder.new do
         STORAGE {
           NAME "Test Framework"
           DESCRIPTION "Test Framework Image."
@@ -26,7 +26,7 @@ describe Occi::Storage do
       @upload = {
         :parts => {
           :file    => "/dev/null",
-          :occixml => @builder,
+          :occixml => @xml,
         },
         :content_type => "application/octet-stream"
       }
@@ -34,7 +34,7 @@ describe Occi::Storage do
 
     it "returns a parsed XML document" do
       VCR.use_cassette "storage_create" do
-        response = Connection.storage.create @upload
+        response = CONNECTION.storage.create @upload
 
         is_created response
       end
@@ -46,19 +46,19 @@ describe Occi::Storage do
       id = cassette_for("storage_create").xpath('//ID').text
 
       VCR.use_cassette "storage_find" do
-        response = Connection.storage.find id
+        response = CONNECTION.storage.find id
 
         is_okay response
       end
     end
   end
 
-  describe "#delete" do
+  describe "#destroy" do
     it "returns a parsed XML document" do
       id = cassette_for("storage_create").xpath('//ID').text
 
-      VCR.use_cassette "storage_delete" do
-        response = Connection.storage.delete id
+      VCR.use_cassette "storage_destroy" do
+        response = CONNECTION.storage.destroy id
 
         is_no_content response
       end

data/test/test_helper.rb

@@ -4,15 +4,15 @@ Bundler.setup :default, :test
 %w(minitest/autorun minitest/spec nokogiri vcr webmock occi).each { |r| require r }
 
 class MiniTest::Unit::TestCase
-  Connection = Occi::Client.new(
+  CONNECTION = Occi::Client.new(
     :host     => "one.example.com",
     :user     => ENV['ONE_USER'],
     :password => ENV['ONE_PASSWORD'],
   )
 
   def okay response, code
-    response.body.must_be_kind_of Nokogiri::XML::Document
     response.code.must_equal code
+    response.body.errors.must_be_empty
   end
 
   def is_okay response

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - retr0h
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -08:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 2
+        - 3
         - 0
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -100,8 +100,8 @@ dependencies:
         segments: 
         - 1
         - 6
-        - 1
-        version: 1.6.1
+        - 2
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -175,17 +175,18 @@ files:
 - lib/occi/resource.rb
 - lib/occi/storage.rb
 - occi.gemspec
+- test/fixtures/cassettes/compute_all.yml
 - test/fixtures/cassettes/compute_create.yml
-- test/fixtures/cassettes/compute_delete.yml
+- test/fixtures/cassettes/compute_destroy.yml
 - test/fixtures/cassettes/compute_find.yml
 - test/fixtures/cassettes/compute_update.yml
 - test/fixtures/cassettes/network_all.yml
 - test/fixtures/cassettes/network_create.yml
-- test/fixtures/cassettes/network_delete.yml
+- test/fixtures/cassettes/network_destroy.yml
 - test/fixtures/cassettes/network_find.yml
 - test/fixtures/cassettes/storage_all.yml
 - test/fixtures/cassettes/storage_create.yml
-- test/fixtures/cassettes/storage_delete.yml
+- test/fixtures/cassettes/storage_destroy.yml
 - test/fixtures/cassettes/storage_find.yml
 - test/lib/occi/compute_test.rb
 - test/lib/occi/network_test.rb