bbrowning-deltacloud-core 0.0.1.1 → 0.0.3.1

data/views/storage_volumes/index.xml.haml

@@ -1,13 +1,13 @@
 !!!XML
-%storage-volumes
+%storage_volumes
   - @elements.each do |volume|
-    %storage-volume{ :href => storage_volume_url(volume.id)}
-      %id<
-        =volume.id
+    %storage_volume{ :href => storage_volume_url(volume.id), :id => volume.id }
       %created<
         =volume.created
       %capacity<
         =volume.capacity
-      %device<
-        =volume.device
-      %instance{:href => volume.instance_id}
+      - unless volume.device.nil?
+        %device<
+          =volume.device
+      - unless volume.instance_id.nil?
+        %instance{:href => instance_url(volume.instance_id), :id => volume.instance_id}

data/views/storage_volumes/show.xml.haml

@@ -1,7 +1,5 @@
 !!!XML
-%storage-volume{ :href => storage_volume_url(@storage_volume.id)}
-  %id<
-    =@storage_volume.id
+%storage_volume{ :href => storage_volume_url(@storage_volume.id), :id => @storage_volume.id}
   %created<
     =@storage_volume.created
   %capacity<
@@ -10,4 +8,4 @@
     =@storage_volume.device
   %state<
     =@storage_volume.state
-  %instance{:href => @storage_volume.instance_id}
+  %instance{:href => @storage_volume.instance_id, :id => @storage_volume.instance_id}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bbrowning-deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 0
+  - 3
   - 1
-  - 1
-  version: 0.0.1.1
+  version: 0.0.3.1
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -04:00
+date: 2010-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,26 +83,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,11 +98,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,11 +114,11 @@ dependencies:
         - 17
         version: 0.8.17
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -146,11 +130,11 @@ dependencies:
         - 1
         version: 1.4.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,11 +146,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,11 +162,11 @@ dependencies:
         - 3
         version: 0.6.3
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -194,7 +178,7 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: "    The Deltacloud API is built as a service-based REST API.\n    You do not directly link a Deltacloud library into your program to use it.\n    Instead, a client speaks the Deltacloud API over HTTP to a server\n    which implements the REST interface.\n"
 email: deltacloud-users@lists.fedorahosted.org
 executables: 
@@ -206,11 +190,11 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - config.ru
-- torquebox-ec2-config.ru
 - server.rb
 - deltacloud.rb
 - support/fedora/rubygem-deltacloud-core.spec
 - support/fedora/deltacloudd
+- support/torquebox/torquebox-ec2-config.ru
 - lib/sinatra/rabbit.rb
 - lib/sinatra/respond_to.rb
 - lib/sinatra/lazy_auth.rb
@@ -251,6 +235,18 @@ files:
 - lib/deltacloud/models/instance_profile.rb
 - lib/deltacloud/models/instance.rb
 - lib/drivers.rb
+- lib/deltacloud/drivers/mock/data/instances/inst1.yml
+- lib/deltacloud/drivers/mock/data/instances/inst2.yml
+- lib/deltacloud/drivers/mock/data/instances/inst0.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
+- lib/deltacloud/drivers/mock/data/images/img2.yml
+- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/drivers/mock/data/images/img3.yml
 - views/instances/new.html.haml
 - views/instances/show.html.haml
 - views/instances/index.html.haml
@@ -265,6 +261,8 @@ files:
 - views/api/show.xml.haml
 - views/errors/auth_exception.html.haml
 - views/errors/auth_exception.xml.haml
+- views/errors/not_found.xml.haml
+- views/errors/not_found.html.haml
 - views/errors/backend_error.xml.haml
 - views/errors/validation_failure.xml.haml
 - views/errors/validation_failure.html.haml
@@ -310,12 +308,12 @@ files:
 - public/stylesheets/compiled/application.css
 - bin/deltacloudd
 - COPYING
-- tests/storage_volumes_test.rb
-- tests/storage_snapshots_test.rb
 - tests/realms_test.rb
+- tests/hardware_profiles_test.rb
 - tests/instances_test.rb
-- tests/deltacloud_test.rb
+- tests/instance_states_test.rb
 - tests/images_test.rb
+- tests/api_test.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -353,9 +351,9 @@ signing_key:
 specification_version: 3
 summary: Deltacloud REST API
 test_files: 
-- tests/storage_volumes_test.rb
-- tests/storage_snapshots_test.rb
 - tests/realms_test.rb
+- tests/hardware_profiles_test.rb
 - tests/instances_test.rb
-- tests/deltacloud_test.rb
+- tests/instance_states_test.rb
 - tests/images_test.rb
+- tests/api_test.rb

data/tests/deltacloud_test.rb

@@ -1,60 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'rack/test'
-require 'base64'
-require 'nokogiri'
-require 'pp'
-require 'sinatra'
-
-ENV['API_DRIVER']='mock'
-ENV['API_HOST']='localhost'
-
-require 'server'
-
-set :environment => :test
-
-module DeltacloudTest
-    include Rack::Test::Methods
-
-    def app
-      Sinatra::Application
-    end
-
-    def test_if_response_is_valid
-      get '/api/'+@collection+'.xml', @params, rack_headers
-      assert last_response.ok?
-    end
-
-    def test_if_http_status_is_correct_with_wrong_credentials
-      return if ['realms'].include?(@collection)
-      wrong_header = rack_headers
-      wrong_header['HTTP_AUTHORIZATION'] = authorization('wronguser', 'wrongpassword')
-      get '/api/'+@collection+'.xml', @params, wrong_header
-      assert_equal 403, last_response.status
-    end
-
-    def test_if_index_operation_proper_root_element
-      get '/api/'+@collection+'.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      assert_equal @collection.gsub('_', '-'), doc.root.name
-    end
-
-    def test_html_response
-      get '/api/'+@collection+'.html', @params, rack_headers
-      doc = Nokogiri::HTML.parse(last_response.body)
-      assert_equal 'html', doc.root.name
-    end
-
-    def authorization(username, password)
-      "Basic " + Base64.encode64("#{username}:#{password}")
-    end
-
-    def rack_headers
-      return {
-        'HTTP_AUTHORIZATION' => authorization('mockuser', 'mockpassword'),
-        'SERVER_PORT' => '4040',
-        'Accept' => 'application/xml;q=1'
-      }
-    end
-
-end

data/tests/storage_snapshots_test.rb

@@ -1,48 +0,0 @@
-require 'tests/deltacloud_test'
-
-class StorageSnapshotsTest < Test::Unit::TestCase
-
-  def initialize(*args)
-    @collection = 'storage_snapshots'
-    @operations = [:index, :show]
-    @options = [:id, :architecture, :memory, :storage]
-    @params = {}
-    super(*args)
-  end
-
-  def test_if_storage_snapshots_are_not_empty
-    get '/api/storage_snapshots.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_not_equal 0, doc.xpath('/storage-snapshots/storage-snapshot').size
-  end
-
-  [:id, :created, :state, :'storage-volume'].each do |option|
-    method_name = :"test_if_storage_snapshots_index_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/storage_snapshots.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      storage_volume = doc.xpath('/storage-snapshots/storage-snapshot[1]').first
-      assert_not_nil storage_volume.xpath(option.to_s).first
-    end
-  end
-
-  [:id, :created, :state, :'storage-volume'].each do |option|
-    method_name = :"test_if_storage_volume_show_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/storage_snapshots/snap3.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      storage_volume = doc.xpath('/storage-snapshot').first
-      assert_not_nil storage_volume.xpath(option.to_s).first
-    end
-  end
-
-  def test_storage_snapshots_filtering_by_id
-    get '/api/storage_snapshots.xml', { :id => 'snap3'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 1, doc.xpath('/storage-snapshots/storage-snapshot').size
-    assert_equal 'snap3', doc.xpath('/storage-snapshots/storage-snapshot/id').first.text
-  end
-
-  include DeltacloudTest
-
-end

data/tests/storage_volumes_test.rb

@@ -1,48 +0,0 @@
-require 'tests/deltacloud_test'
-
-class StorageVolumesTest < Test::Unit::TestCase
-
-  def initialize(*args)
-    @collection = 'storage_volumes'
-    @operations = [:index, :show]
-    @options = [:id, :architecture, :memory, :storage]
-    @params = {}
-    super(*args)
-  end
-
-  def test_if_storage_volumes_are_not_empty
-    get '/api/storage_volumes.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_not_equal 0, doc.xpath('/storage-volumes/storage-volume').size
-  end
-
-  [:id, :created, :capacity, :device, :state].each do |option|
-    method_name = :"test_if_storage_volumes_index_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/storage_volumes.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      storage_volume = doc.xpath('/storage-volumes/storage-volume[1]').first
-      assert_not_nil storage_volume.xpath(option.to_s).first
-    end
-  end
-
-  [:id, :created, :capacity, :device, :state].each do |option|
-    method_name = :"test_if_storage_volume_show_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/storage_volumes/vol2.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      storage_volume = doc.xpath('/storage-volume').first
-      assert_not_nil storage_volume.xpath(option.to_s).first
-    end
-  end
-
-  def test_storage_volumes_filtering_by_id
-    get '/api/storage_volumes.xml', { :id => 'vol2'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 1, doc.xpath('/storage-volumes/storage-volume').size
-    assert_equal 'vol2', doc.xpath('/storage-volumes/storage-volume/id').first.text
-  end
-
-  include DeltacloudTest
-
-end