deltacloud-core 0.0.7 → 0.0.8

data/Rakefile

@@ -30,19 +30,18 @@ end
 
 desc "Run basic unit tests"
 Rake::TestTask.new("test") { |t|
-  t.test_files = FileList[
-    'tests/api_test.rb',
-    'tests/hardware_profiles_test.rb',
-    'tests/realms_test.rb',
-    'tests/images_test.rb',
-    'tests/instances_test.rb',
-    'tests/instance_states_test.rb',
-    'tests/url_for_test.rb'
-  ]
+  t.test_files = FileList.new('tests/**/*_test.rb')
   t.verbose = true
   t.warning = false
 }
 
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.files   = ['lib/**/*.rb', '*.rb']   # optional
+  end
+rescue LoadError
+end
 
 @specs = ['ruby', 'java'].inject({}) do |hash, spec_platform|
   $platform = spec_platform

data/config.ru

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'sinatra'
 
+$:.unshift File.join(File.dirname(__FILE__), '.')
+
 require 'server.rb'
 run Sinatra::Application

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

@@ -120,7 +120,6 @@ class GogridDriver < Deltacloud::BaseDriver
   end
 
   def instances(credentials, opts=nil)
-    require 'ap'
     instances = []
     if opts and opts[:id]
       begin

data/lib/deltacloud/drivers/mock/data/buckets/blobs/blob1.yml

@@ -0,0 +1,5 @@
+:bucket: bucket1
+:content_length: 12627
+:content_type: text/plain
+:last_modified: 2010-09-23 16:44:54 +0100
+:content: "content of blob 1"

data/lib/deltacloud/drivers/mock/data/buckets/blobs/blob2.yml

@@ -0,0 +1,5 @@
+:bucket: bucket1
+:content_length: 4420
+:content_type: text/html
+:last_modified: 2010-09-23 16:55:05 +0100
+:content: "content of blob 2"

data/lib/deltacloud/drivers/mock/data/buckets/blobs/blob3.yml

@@ -0,0 +1,5 @@
+:bucket: bucket1
+:content_length: 98732
+:content_type: text/plain
+:last_modified: 2010-08-14 02:14:31 +0100
+:content: "content of blob 3"

data/lib/deltacloud/drivers/mock/data/buckets/blobs/blob4.yml

@@ -0,0 +1,5 @@
+:bucket: bucket2
+:content_length: 983232
+:content_type: application/octet-stream
+:last_modified: 2010-09-21 06:17:24 +0100
+:content: "content of blob 4"

data/lib/deltacloud/drivers/mock/data/buckets/blobs/blob5.yml

@@ -0,0 +1,5 @@
+:bucket: bucket2
+:content_length: 651922
+:content_type: application/pdf
+:last_modified: 2009-07-21 11:12:13 +0100
+:content: "content of blob 5"

data/lib/deltacloud/drivers/mock/data/buckets/bucket1.yml

@@ -0,0 +1,2 @@
+:blob_list: [blob1, blob2, blob3]
+:size: 3

data/lib/deltacloud/drivers/mock/data/buckets/bucket2.yml

@@ -0,0 +1,2 @@
+:blob_list: [blob4, blob5]
+:size: 2

data/lib/deltacloud/drivers/mock/mock_driver.rb

@@ -25,6 +25,10 @@ module Deltacloud
     module Mock
 class MockDriver < Deltacloud::BaseDriver
 
+  def supported_collections
+    DEFAULT_COLLECTIONS + [ :buckets ]
+  end
+
   ( REALMS = [
     Realm.new({
       :id=>'us',
@@ -104,7 +108,6 @@ class MockDriver < Deltacloud::BaseDriver
   #
   # Images
   #
-
   def images(credentials, opts=nil )
     check_credentials( credentials )
     images = []
@@ -251,6 +254,79 @@ class MockDriver < Deltacloud::BaseDriver
     snapshots
   end
 
+#--
+# Buckets
+#--
+  def buckets(credentials, opts=nil)
+    check_credentials(credentials)
+    buckets=[]
+     Dir[ "#{@storage_root}/buckets/*.yml" ].each do |bucket_file|
+      bucket = YAML.load( File.read( bucket_file ) )
+      bucket[:id] = File.basename( bucket_file, ".yml" )
+      bucket[:name] = bucket[:id]
+      buckets << Bucket.new( bucket )
+    end
+    buckets = filter_on( buckets, :id, opts )
+    buckets
+  end
+
+#--
+# Create bucket
+#--
+  def create_bucket(credentials, name, opts=nil)
+    check_credentials(credentials)
+    bucket = {
+      :name=>name,
+      :size=>'0',
+      :blob_list=>[]
+    }
+    File.open( "#{@storage_root}/buckets/#{name}.yml", 'w' ) {|b| YAML.dump( bucket, b )}
+    Bucket.new(bucket)
+  end
+
+#--
+# Delete bucket
+#--
+  def delete_bucket(credentials, name, opts=nil)
+    bucket = bucket(credentials, {:id => name})
+    unless (bucket.size == "0")
+     raise Deltacloud::BackendError.new(403, self.class.to_s, "bucket-not-empty", "delete operation not valid for non-empty bucket")
+    end
+    safely do
+      File.delete("#{@storage_root}/buckets/#{name}.yml")
+    end
+  end
+
+#--
+# Blobs
+#--
+  def blobs(credentials, opts = nil)
+    check_credentials(credentials)
+    blobs=[]
+    Dir[ "#{@storage_root}/buckets/blobs/*.yml" ].each do |blob_file|
+      blob = YAML.load( File.read( blob_file ) )
+      blob[:id] = File.basename( blob_file, ".yml" )
+      blob[:name] = blob[:id]
+      blobs << Blob.new( blob )
+    end
+    blobs = filter_on( blobs, :id, opts )
+    blobs
+  end
+
+#--
+# Blob content
+#--
+  def blob_data(credentials, bucket_id, blob_id, opts = nil)
+    check_credentials(credentials)
+    blob=nil
+    Dir[ "#{@storage_root}/buckets/blobs/*.yml" ].each do |blob_file|
+      if File.basename(blob_file, ".yml") == blob_id
+        blob = YAML.load(File.read(blob_file))
+        blob[:content].each {|part| yield part}
+      end
+    end
+  end
+
   def valid_credentials?(credentials)
     begin
       check_credentials(credentials)

data/lib/deltacloud/helpers/application_helper.rb

@@ -115,8 +115,11 @@ module ApplicationHelper
 
   def cdata(&block)
     text = capture_haml(&block)
-    text.gsub!("\n", "\n ")
-    "<![CDATA[\n #{text}\n]]>"
+    "<![CDATA[#{text.strip}]]>"
+  end
+
+  def render_cdata(text)
+    "<pem><![CDATA[#{text.strip}]]></pem>"
   end
 
 end

data/lib/deltacloud/models/tag.rb

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2009  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.
+
+class Tag < BaseModel
+
+  attr_accessor :resource_id
+  attr_accessor :resource_type
+  attr_accessor :values
+
+  def add_value(name)
+    self.values << Value.new(name, self)
+  end
+
+  class Value
+    attr_accessor :name
+    attr_accessor :tag_id
+
+    def initialize(name, tag_id)
+      self.name, self.tag_id = name, tag_id
+    end
+
+    def to_s
+      self.name
+    end
+
+  end
+
+end

data/server.rb

@@ -14,6 +14,8 @@ require 'lib/deltacloud/helpers/blob_stream'
 configure do
   set :raise_errors => false
   set :show_exceptions, false
+  set :views, File.dirname(__FILE__) + '/views'
+  set :public, File.dirname(__FILE__) + '/public'
 end
 
 configure :development do
@@ -344,7 +346,7 @@ collection :keys do
       @key = driver.create_key(credentials, { :key_name => params[:name] })
       respond_to do |format|
         format.html { haml :"keys/show" }
-        format.xml { haml :"keys/show" }
+        format.xml { haml :"keys/show", :ugly => true }
       end
     end
   end

data/views/images/show.html.haml

@@ -9,7 +9,7 @@
       = @image.name
     %dt Owner
     %dd
-      = link_to @image.owner_id, images_url( :owner_id => @image.owner_id )
+      = link_to @image.owner_id, image_url( :owner_id => @image.owner_id )
     %dt Architecture
     %dd
       = @image.architecture

data/views/keys/show.xml.haml

@@ -8,9 +8,8 @@
     %fingerprint<
       =@key.fingerprint
     - unless @key.pem_rsa_key.nil?
-      %pem<
-        =cdata do
-          =@key.pem_rsa_key
+      %pem
+        ~render_cdata(@key.pem_rsa_key)
   - if @key.is_password?
     %username<
       =cdata do

data/views/tags/index.html.haml

@@ -0,0 +1 @@
+=@tags.inspect

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -253,7 +253,6 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - config.ru
-- test.rb
 - deltacloud.rb
 - server.rb
 - support/fedora/rubygem-deltacloud-core.spec
@@ -263,7 +262,6 @@ files:
 - lib/sinatra/static_assets.rb
 - lib/sinatra/url_for.rb
 - lib/sinatra/rabbit.rb
-- lib/sinatra/respond_to_old.rb
 - lib/sinatra/respond_to.rb
 - lib/deltacloud/models/base_model.rb
 - lib/deltacloud/models/realm.rb
@@ -274,6 +272,7 @@ files:
 - lib/deltacloud/models/storage_snapshot.rb
 - lib/deltacloud/models/image.rb
 - lib/deltacloud/models/blob.rb
+- lib/deltacloud/models/tag.rb
 - lib/deltacloud/models/bucket.rb
 - lib/deltacloud/method_serializer.rb
 - lib/deltacloud/helpers.rb
@@ -317,6 +316,13 @@ files:
 - 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/buckets/blobs/blob1.yml
+- lib/deltacloud/drivers/mock/data/buckets/blobs/blob2.yml
+- lib/deltacloud/drivers/mock/data/buckets/blobs/blob3.yml
+- lib/deltacloud/drivers/mock/data/buckets/blobs/blob4.yml
+- lib/deltacloud/drivers/mock/data/buckets/blobs/blob5.yml
+- lib/deltacloud/drivers/mock/data/buckets/bucket1.yml
+- lib/deltacloud/drivers/mock/data/buckets/bucket2.yml
 - views/instance_states/show.xml.haml
 - views/instance_states/show.html.haml
 - views/root/index.html.haml
@@ -343,13 +349,13 @@ files:
 - views/images/index.xml.haml
 - views/images/index.html.haml
 - views/images/show.html.haml
-- views/api/show.xml.haml
 - views/api/show.html.haml
-- views/keys/show.xml.haml
+- views/api/show.xml.haml
 - views/keys/new.html.haml
 - views/keys/index.xml.haml
 - views/keys/index.html.haml
 - views/keys/show.html.haml
+- views/keys/show.xml.haml
 - views/instances/show.xml.haml
 - views/instances/index.xml.haml
 - views/instances/index.html.haml
@@ -376,6 +382,7 @@ files:
 - views/buckets/new.html.haml
 - views/buckets/show.html.haml
 - views/buckets/show.xml.haml
+- views/tags/index.html.haml
 - views/instance_states/show.png.erb
 - public/favicon.ico
 - public/images/topbar-bg.png
@@ -390,13 +397,6 @@ files:
 - public/stylesheets/compiled/screen.css
 - bin/deltacloudd
 - COPYING
-- tests/api_test.rb
-- tests/hardware_profiles_test.rb
-- tests/realms_test.rb
-- tests/images_test.rb
-- tests/instance_states_test.rb
-- tests/instances_test.rb
-- tests/url_for_test.rb
 has_rdoc: true
 homepage: http://www.deltacloud.org
 licenses: []
@@ -433,11 +433,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST API
-test_files: 
-- tests/api_test.rb
-- tests/hardware_profiles_test.rb
-- tests/realms_test.rb
-- tests/images_test.rb
-- tests/instance_states_test.rb
-- tests/instances_test.rb
-- tests/url_for_test.rb
+test_files: []
+

data/lib/sinatra/respond_to_old.rb

@@ -1,253 +0,0 @@
-require 'sinatra/base'
-require 'sinatra/accept_media_types'
-
-# Accept header parsing was looked at but deemed
-# too much of an irregularity to deal with.  Problems with the header
-# differences from IE, Firefox, Safari, and every other UA causes
-# problems with the expected output.  The general expected behavior
-# would be serve html when no extension provided, but most UAs say
-# they will accept application/xml with out a quality indicator, meaning
-# you'd get the xml block served insead.  Just plain retarded, use the
-# extension and you'll never be suprised.
-
-module Sinatra
-  module RespondTo
-    class UnhandledFormat < Sinatra::NotFound; end
-    class MissingTemplate < Sinatra::NotFound
-      def code; 500 end
-    end
-
-    TEXT_MIME_TYPES = [:txt, :html, :js, :json, :xml, :rss, :atom, :css, :asm, :c, :cc, :conf,
-                       :csv, :cxx, :diff, :dtd, :f, :f77, :f90, :for, :gemspec, :h, :hh, :htm,
-                       :log, :mathml, :mml, :p, :pas, :pl, :pm, :py, :rake, :rb, :rdf, :rtf, :ru,
-                       :s, :sgm, :sgml, :sh, :svg, :svgz, :text, :wsdl, :xhtml, :xsl, :xslt, :yaml,
-                       :yml, :ics, :png]
-
-    def self.registered(app)
-      app.helpers RespondTo::Helpers
-
-      app.set :default_charset, 'utf-8'
-      app.set :default_content, :html
-      app.set :assume_xhr_is_js, true
-
-    #deltacloud: removed the code that tried to 'guess' content based on extension
-    #as this broke blobstore api (stripping blob names). Use ?format if present, otherwise 
-    #use http accept, otherwise set to default
-      app.before do
-        if (params[:format])
-          @mime_types = [Helpers::mime_type(params[:format])]
-          format params[:format]
-        elsif env['HTTP_ACCEPT'].nil? || env['HTTP_ACCEPT'].empty?
-          ext = options.default_content
-        end
-      end
-
-     app.configure :development do |dev|
-        dev.error UnhandledFormat do
-          content_type :html, :charset => 'utf-8'
-
-          (<<-HTML).gsub(/^ {10}/, '')
-          <!DOCTYPE html>
-          <html>
-          <head>
-            <style type="text/css">
-            body { text-align:center;font-family:helvetica,arial;font-size:22px;
-              color:#888;margin:20px}
-            #c {margin:0 auto;width:500px;text-align:left}
-            </style>
-          </head>
-          <body>
-            <h2>Sinatra doesn't know this ditty.</h2>
-            <img src='/__sinatra__/404.png'>
-            <div id="c">
-              Try this:
-              <pre>#{request.request_method.downcase} '#{request.path_info}' do\n  respond_to do |wants|\n    wants.#{format} { "Hello World" }\n  end\nend</pre>
-            </div>
-          </body>
-          </html>
-          HTML
-        end
-
-        dev.error MissingTemplate do
-          content_type :html, :charset => 'utf-8'
-          response.status = request.env['sinatra.error'].code
-
-          engine = request.env['sinatra.error'].message.split('.').last
-          engine = 'haml' unless ['haml', 'builder', 'erb'].include? engine
-
-          path = File.basename(request.path_info)
-          path = "root" if path.nil? || path.empty?
-
-          format = engine == 'builder' ? 'xml' : 'html'
-
-          layout = case engine
-                   when 'haml' then "!!!\n%html\n  %body= yield"
-                   when 'erb' then "<html>\n  <body>\n    <%= yield %>\n  </body>\n</html>"
-                   when 'builder' then ::Sinatra::VERSION =~ /^1.0/ ? "xml << yield" : "builder do |xml|\n  xml << yield\nend"
-                   end
-
-          layout = "<small>app.#{format}.#{engine}</small>\n<pre>#{escape_html(layout)}</pre>"
-
-          (<<-HTML).gsub(/^ {10}/, '')
-          <!DOCTYPE html>
-          <html>
-          <head>
-            <style type="text/css">
-            body { text-align:center;font-family:helvetica,arial;font-size:22px;
-              color:#888;margin:20px}
-            #c {margin:0 auto;width:500px;text-align:left;}
-            small {float:right;clear:both;}
-            pre {clear:both;}
-            </style>
-          </head>
-          <body>
-            <h2>Sinatra can't find #{request.env['sinatra.error'].message}</h2>
-            <img src='/__sinatra__/500.png'>
-            <div id="c">
-              Try this:<br />
-              #{layout}
-              <small>#{path}.#{format}.#{engine}</small>
-              <pre>Hello World!</pre>
-              <small>application.rb</small>
-              <pre>#{request.request_method.downcase} '#{request.path_info}' do\n  respond_to do |wants|\n    wants.#{engine == 'builder' ? 'xml' : 'html'} { #{engine} :#{path}#{",\n#{' '*32}layout => :app" if layout} }\n  end\nend</pre>
-            </div>
-          </body>
-          </html>
-          HTML
-        end
-
-      end
-
-      app.class_eval do
-        private
-          def accept_list
-            @mime_types || Rack::AcceptMediaTypes.new(env['HTTP_ACCEPT'] || '')
-          end
-
-          # Changes in 1.0 Sinatra reuse render for layout so we store
-          # the original value to tell us if this is an automatic attempt
-          # to do a layout call.  If it is, it might fail with Errno::ENOENT
-          # and we want to pass that back to sinatra since it isn't a MissingTemplate
-          # error
-          def render_with_format(*args, &block)
-            assumed_layout = args[1] == :layout
-            args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
-            render_without_format *args, &block
-          rescue Errno::ENOENT => e
-            raise MissingTemplate, "#{args[1]}.#{args[0]}" unless assumed_layout
-            raise e
-          end
-          alias_method :render_without_format, :render
-          alias_method :render, :render_with_format
-
-          if ::Sinatra::VERSION =~ /^0\.9/
-            def lookup_layout_with_format(*args)
-              args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
-              lookup_layout_without_format *args
-            end
-            alias_method :lookup_layout_without_format, :lookup_layout
-            alias_method :lookup_layout, :lookup_layout_with_format
-          end
-      end
-    end
-
-    module Helpers
-      # Patch the content_type function to remember the set type
-      # This helps cut down on time in the format helper so it
-      # doesn't have to do a reverse lookup on the header
-      def self.included(klass)
-        klass.class_eval do
-          def content_type_with_save(*args)
-            content_type_without_save *args
-            @_format = args.first.to_sym
-            response['Content-Type']
-          end
-          alias_method :content_type_without_save, :content_type
-          alias_method :content_type, :content_type_with_save
-        end if ::Sinatra::VERSION =~ /^1.0/
-      end
-
-      def self.mime_type(sym)
-        ::Sinatra::Base.respond_to?(:mime_type) && ::Sinatra::Base.mime_type(sym) || ::Sinatra::Base.media_type(sym)
-      end
-
-      def format(val=nil)
-        unless val.nil?
-          mime_type = ::Sinatra::RespondTo::Helpers.mime_type(val)
-          fail "Unknown media type #{val}\nTry registering the extension with a mime type" if mime_type.nil?
-
-          @_format = val.to_sym
-          response['Content-Type'].sub!(/^[^;]+/, mime_type)
-          charset options.default_charset if Sinatra::RespondTo::TEXT_MIME_TYPES.include?(format) and format!=:png
-        end
-
-        @_format
-      end
-
-      # This is mostly just a helper so request.path_info isn't changed when
-      # serving files from the public directory
-      def static_file?(path)
-        public_dir = File.expand_path(options.public)
-        path = File.expand_path(File.join(public_dir, unescape(path)))
-
-        path[0, public_dir.length] == public_dir && File.file?(path)
-      end
-
-      def charset(val=nil)
-        fail "Content-Type must be set in order to specify a charset" if response['Content-Type'].nil?
-
-        if response['Content-Type'] =~ /charset=[^;]+/
-          response['Content-Type'].sub!(/charset=[^;]+/, (val == '' && '') || "charset=#{val}")
-        else
-          response['Content-Type'] += ";charset=#{val}"
-        end unless val.nil?
-
-        response['Content-Type'][/charset=([^;]+)/, 1]
-      end
-
-      def respond_to(&block)
-        wants = Format.new
-        yield wants
-        fmt, type, handler = match_accept_type(accept_list, wants)
-        raise UnhandledFormat if fmt.nil?
-        format fmt
-        handler.nil? ? nil : handler.call
-      end
-
-      def match_accept_type(mime_types, format)
-        selected = []
-
-        accepted_types = mime_types.map {|type| Regexp.escape(type).gsub(/\\\*/,'.*') }
-        # Fix for Chrome based browsers which returns XML when 'xhtml' is requested.
-        if env['HTTP_USER_AGENT'] =~ /Chrome/ and accepted_types.size>1
-          accepted_types[0], accepted_types[1] = accepted_types[1], accepted_types[0]
-          if accepted_types[0].eql?('application/xhtml\\+xml')
-            accepted_types[0] = 'text/html'
-          end
-        end
-        accepted_types.each do |at|
-          format.each do |fmt, ht, handler|
-            (selected = [fmt, ht, handler]) and break if ht.match(at)
-          end
-          break unless selected.empty?
-        end
-        selected
-      end
-
-      # NOTE Array instead of hash because order matters (wildcard type
-      # matches first handler)
-      class Format < Array #:nodoc:
-        def method_missing(format, *args, &handler)
-          mt = Sinatra::RespondTo::Helpers.mime_type(format)
-          if mt.nil?
-            Sinatra::Base.send(:fail, "Unknown media type for respond_to: #{format}\nTry registering the extension with a mime type")
-          end
-          self << [format.to_s, mt, handler]
-        end
-      end
-    end
-  end
-end
-
-Rack::Mime::MIME_TYPES.merge!({ ".gv" => "text/plain" })
-Sinatra::Application.register Sinatra::RespondTo