steamcannon-deltacloud-core 0.1.1.3 → 0.1.2.1

data/lib/sinatra/lazy_auth.rb

@@ -40,7 +40,7 @@ module Sinatra
     end
 
     def authorize!
-      r = "#{DRIVER}-deltacloud@#{HOSTNAME}"
+      r = "#{driver_symbol}-deltacloud@#{HOSTNAME}"
       response['WWW-Authenticate'] = %(Basic realm="#{r}")
       throw(:halt, [401, "Not authorized\n"])
     end

data/lib/sinatra/rabbit.rb

@@ -60,7 +60,7 @@ module Sinatra
       def control(&block)
         op = self
         @control = Proc.new do
-          op.check_capability(driver)
+          op.check_capability(Deltacloud::driver)
           op.validate(params)
           instance_eval(&block)
         end
@@ -72,7 +72,7 @@ module Sinatra
       end
 
       def path(args = {})
-        l_prefix = args[:prefix] ? args[:prefix] : prefix
+        l_prefix = args[:prefix] || prefix
         if @member
           if standard?
             "#{l_prefix}/#{@collection.name}/:id"
@@ -133,7 +133,7 @@ module Sinatra
       end
 
       def generate_documentation
-        coll, oper, features = self, @operations, driver.features(name)
+        coll, oper, features = self, @operations, Deltacloud::driver.features(name)
         ::Sinatra::Application.get("/api/docs/#{@name}") do
           @collection, @operations, @features = coll, oper, features
           respond_to do |format|
@@ -206,9 +206,9 @@ module Sinatra
     # operation on this collection.
     def collection(name, &block)
       raise DuplicateCollectionException if collections[name]
-      return unless driver.has_collection?(name.to_sym)
+      return unless Deltacloud::driver.has_collection?(name.to_sym)
       collections[name] = Collection.new(name, &block)
-      collections[name].add_feature_params(driver.features(name))
+      collections[name].add_feature_params(Deltacloud::driver.features(name))
       collections[name].generate
     end
 

data/lib/sinatra/rack_driver_select.rb

@@ -0,0 +1,29 @@
+class RackDriverSelect
+
+  def initialize(app, opts={})
+    @app = app
+    @opts = opts
+  end
+
+  HEADER_TO_ENV_MAP = {
+    'HTTP_X_DELTACLOUD_DRIVER' => :driver,
+    'HTTP_X_DELTACLOUD_PROVIDER' => :provider
+  }
+  
+  def call(env)
+    original_settings = { }
+    HEADER_TO_ENV_MAP.each do |header, name|
+      original_settings[name] = Thread.current[name]
+      new_setting = extract_header(env, header)
+      Thread.current[name] = new_setting if new_setting
+    end
+    @app.call(env)
+  ensure
+    original_settings.each { |name, value| Thread.current[name] = value }
+  end
+
+  def extract_header(env, header)
+    env[header].downcase if env[header]
+  end
+
+end

data/server.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2009, 2010  Red Hat, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
 require 'sinatra'
 require 'deltacloud'
 require 'drivers'
@@ -10,6 +27,12 @@ require 'erb'
 require 'haml'
 require 'open3'
 require 'lib/deltacloud/helpers/blob_stream'
+require 'sinatra/rack_driver_select'
+
+set :version, '0.1.0'
+
+
+use RackDriverSelect
 
 configure do
   set :raise_errors => false
@@ -46,25 +69,30 @@ end
 Sinatra::Application.register Sinatra::RespondTo
 
 # Redirect to /api
-get '/' do redirect url_for('/api'); end
+get '/' do redirect url_for('/api'), 301; end
+
+get '/api/drivers\/?' do
+  respond_to do |format|
+    format.xml { haml :"api/drivers" }
+  end
+end
 
 get '/api\/?' do
-    @version = 0.1
-    if params[:force_auth]
-      return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials)
-    end
-    respond_to do |format|
-        format.xml { haml :"api/show" }
-        format.json do
-          { :api => {
-            :version => @version,
-            :driver => DRIVER,
-            :links => entry_points.collect { |l| { :rel => l[0], :href => l[1]} }
-            }
-          }.to_json
-        end
-        format.html { haml :"api/show" }
+  if params[:force_auth]
+    return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials)
+  end
+  respond_to do |format|
+    format.xml { haml :"api/show" }
+    format.json do
+      { :api => {
+          :version => settings.version,
+          :driver => driver_symbol,
+          :links => entry_points.collect { |l| { :rel => l[0], :href => l[1]} }
+        }
+      }.to_json
     end
+    format.html { haml :"api/show" }
+  end
 end
 
 # Rabbit DSL
@@ -595,6 +623,7 @@ get '/api/buckets/:bucket/:blob/content' do
   @blob = driver.blob(credentials, { :id => params[:blob], 'bucket' => params[:bucket]})
   params['content_length'] = @blob.content_length
   params['content_type'] = @blob.content_type
+  params['content_disposition'] = "attachment; filename=#{@blob.id}"
   BlobStream.call(env, credentials, params)
 end
 

data/views/api/drivers.xml.haml

@@ -0,0 +1,6 @@
+%api{ :version => settings.version }
+  %drivers
+    - DRIVERS.each do |id, details|
+      %driver{ :id => id }
+        %name<
+          =details[:name]

data/views/api/show.html.haml

@@ -1,5 +1,5 @@
 %h1
-  API v#{@version}
+  API v#{settings.version}
 
 %ul
   - collections.keys.sort_by { |k| k.to_s }.each do |key|
@@ -12,4 +12,4 @@
             = op
   %li
     %strong
-      %a{:href => url_for("/api/docs")} Documentation (v#{@version})
+      %a{:href => url_for("/api/docs")} Documentation (#{settings.version})

data/views/api/show.xml.haml

@@ -1,4 +1,4 @@
-%api{ :version=>@version, :driver=>DRIVER }
+%api{ :version => settings.version, :driver => driver_symbol }
   - for entry_point in entry_points
     %link{ :rel=>entry_point[0], :href=>entry_point[1] }
       - for feature in driver.features(entry_point[0])

data/views/buckets/index.html.haml

@@ -30,4 +30,5 @@
           -bucket.blob_list.each do |blob|
             = blob
         %td
-          =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete
+          -if bucket.size == 0
+            =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete

data/views/buckets/show.html.haml

@@ -14,9 +14,10 @@
     %dd
       -@bucket.blob_list.each do |blob|
         = link_to blob, bucket_url(@bucket.name) + '/' + blob
-    %dt Delete bucket (must be empty)
-    %dd
     %dt Create a new blob
     %dd
       =link_to 'Create Blob', bucket_url(@bucket.name) + '/new_blob'
-      =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete
+    %dt Delete bucket (must be empty)
+    %dd
+      -if @bucket.size == 0
+        =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete

data/views/errors/backend_error.xml.haml

@@ -1,6 +1,6 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %kind backend_error
-  %backend{ :driver => DRIVER }
+  %backend{ :driver => driver_symbol }
     %code= @error.code
     %cause= @error.cause
     - if @error.details

data/views/images/index.xml.haml

@@ -4,5 +4,9 @@
     %image{:href => image_url(image.id), :id => image.id}
       - image.attributes.select{ |attr| attr!=:id }.each do |attribute|
         - haml_tag("#{attribute}".tr('-', '_'), :<) do
-          - haml_concat image.send(attribute)
+          - if [:name, :description].include?(attribute)
+            =cdata do
+              - haml_concat image.send(attribute)
+          - else
+            - haml_concat image.send(attribute)
 

data/views/layout.html.haml

@@ -19,7 +19,7 @@
         = yield
       #footer
         #driver_info
-          Driver: #{DRIVER}
+          Driver: #{driver_symbol} | API version: #{settings.version}
         #copyright
           Copyright 2009, 2010
           %a{:href => 'http://redhat.com'} Red Hat

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: steamcannon-deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 77
   prerelease: false
   segments: 
   - 0
   - 1
+  - 2
   - 1
-  - 3
-  version: 0.1.1.3
+  version: 0.1.2.1
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,7 +230,6 @@ files:
 - lib/deltacloud/backend_capability.rb
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
-- lib/deltacloud/drivers/gogrid/test.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
 - lib/deltacloud/drivers/gogrid/gogrid_driver.rb
 - lib/deltacloud/drivers/opennebula/occi_client.rb
@@ -273,6 +272,7 @@ files:
 - lib/sinatra/url_for.rb
 - lib/sinatra/static_assets.rb
 - lib/sinatra/accept_media_types.rb
+- lib/sinatra/rack_driver_select.rb
 - lib/sinatra/rabbit.rb
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
@@ -338,6 +338,7 @@ files:
 - views/images/show.html.haml
 - views/accounts/index.html.haml
 - views/accounts/show.html.haml
+- views/api/drivers.xml.haml
 - views/api/show.xml.haml
 - views/api/show.html.haml
 - views/docs/collection.xml.haml

data/lib/deltacloud/drivers/gogrid/test.rb

@@ -1,13 +0,0 @@
-require 'gogrid_client'
-require 'ap'
-
-user='fbb1de3897597ccf'
-password='ngieth10'
-
-client=GoGridClient.new('https://api.gogrid.com/api', user, password)
-
-ap client.request('grid/ip/list', {
-  'ip.type' => '1',
-  'ip.state' => '1',
-  'datacenter' => '1'
-})