deltacloud-core 0.3.0 → 0.4.0

data/views/buckets/show.html.haml

@@ -1,23 +1,23 @@
-%h1 Bucket
-%h2
-  = @bucket.id
+=header "Bucket"
+=subheader @bucket.id
 
-%dl
-  %di
-    %dt Name
-    %dd
-      = @bucket.name
-    %dt Size
-    %dd
-      = @bucket.size
-    %dt Blobs
-    %dd
-      -@bucket.blob_list.each do |blob|
-        = link_to blob, bucket_url(@bucket.name) + '/' + blob
-    %dt Create a new blob
-    %dd
-      =link_to 'Create Blob', bucket_url(@bucket.name) + '/new_blob'
-    %dt Delete bucket (must be empty)
-    %dd
-      -if @bucket.size == 0
-        =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Name
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@bucket.name
+    %li{ :'data-role' => 'list-divider'} Size
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@bucket.size
+    %li{ :'data-role' => 'list-divider'}
+      Blobs
+    - @bucket.blob_list.each do |blob|
+      %li
+        %a{ :href => bucket_url(@bucket.name) + "/" + blob, :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/blob.png'}
+          %h3=blob
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        %a{ :href => new_blob_form_url(@bucket), :'data-role' => "button", :'data-ajax' => 'false'} Create a new blob
+        =link_to_action 'Delete bucket', destroy_bucket_url(@bucket.name), :delete

data/views/buckets/show.xml.haml

@@ -1,8 +1,10 @@
-!!! XML
+- unless defined?(partial)
+  !!! XML
 %bucket{:href => bucket_url(@bucket.id), :id => @bucket.id}
   - @bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - unless attribute == :blob_list
       -haml_tag(attribute, :<) do
         - haml_concat @bucket.send(attribute)
-  - @bucket.blob_list.each do |blb|
-    %blob{:id => blb, :href => bucket_url(@bucket.id) +"/#{blb}"}
+  - if @bucket.blob_list
+    - @bucket.blob_list.each do |blb|
+      %blob{:id => blb, :href => bucket_url(@bucket.id) +"/#{blb}"}

data/views/docs/collection.html.haml

@@ -1,37 +1,26 @@
-%h2
-  = @collection.name.to_s.titlecase
+=header "Deltacloud API #{settings.version} documentation", :back => 'false'
+=subheader @collection.name.to_s.titlecase
 
-%p #{@collection.description}
-
-%br
-
-%h3 Operations:
-
-%table
-  %thead
-    %tr
-      %th Name
-      %th Description
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'}
+      %h3
+        Collection description:
+    %li
+      %br
+      %p{ :'data-role' => 'fieldcontain'}=@collection.description
+    %li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
+      %h3 Operations:
     - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
-      %tr
-        %td{:style => "width:15em"}
-          %a{:href => url_for("/api/docs/#{@collection.name.to_s}/#{operation}")} #{operation}
-        %td{:style => "width:10em"} #{@operations[operation].description}
-
-%h3 Features:
-
-%table
-  %thead
-    %tr
-      %th Name
-      %th Description
-      %th Modified Operations
-  %tbody
+      %li{ :'data-role' => 'list-divider'}
+        %a{:href => api_url_for("docs/#{@collection.name.to_s}/#{operation}"), :'data-ajax' => 'false'} #{operation}
+      %li
+        %br
+        %p=@operations[operation].description
+    %li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
+      %h3 Defined features:
     - @features.sort_by { |f| f.name.to_s }.each do |feature|
-      %tr
-        %td= feature.name
-        %td= feature.description
-        %td
-          - feature.operations.each do |op|
-            %a{:href => url_for("/api/docs/#{@collection.name.to_s}/#{op.name}")} #{op.name}
+      %li{ :'data-role' => 'list-divider'}=feature.name
+      %li
+        %br
+        %p=feature.description

data/views/docs/collection.xml.haml

@@ -1,9 +1,9 @@
 %docs{:status => "unsupported"}
-  %collection{:url => url_for("/api/docs/#{@collection.name}"), :name => "#{@collection.name}"}
+  %collection{:url => api_url_for("docs/#{@collection.name}"), :name => "#{@collection.name}"}
     %description #{@collection.description}
     %operations
       - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
-        %operation{:url => url_for("/api/#{@collection.name.to_s}"), :name => "#{operation}", :href => url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
+        %operation{:url => api_url_for("#{@collection.name.to_s}"), :name => "#{operation}", :href => api_url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
           %description #{@operations[operation].description}
           - @operations[operation].each_param do |param|
             %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/docs/index.html.haml

@@ -1,15 +1,11 @@
-%h2 API Documentation
+=header "Deltacloud API #{settings.version} documentation", :back => 'false'
+=subheader "Note: This documentation is autogenerated and thus not supported"
 
-%h3 Collections:
-
-%table
-  %thead
-    %tr
-      %th Name
-      %th Description
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
     - collections.keys.sort_by { |k| k.to_s }.each do |collection|
-      %tr
-        %td{:style => "width:15em"}
-          %a{:href => url_for("/api/docs/#{collection}")} #{collection}
-        %td{:style => "width:10em"} #{collections[collection].description}
+      %li
+        %a{:href => api_url_for("docs/#{collection}"), :'data-ajax' => 'false'}
+          %h3=collection.to_s.capitalize.tr('_', ' ')
+          %p=collections[collection].description
+

data/views/docs/index.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
   - collections.keys.sort_by { |k| k.to_s }.each do |collection|
-    %collection{:url => url_for("/api/docs/#{collection}")}
+    %collection{:url => api_url_for("docs/#{collection}")}
       %name #{collection}
       %description  #{collections[collection].description}

data/views/docs/operation.html.haml

@@ -1,43 +1,33 @@
-%h2
-  = action_method(@operation.name, @collection.name).to_s.upcase
-  = action_url
+=header "Deltacloud API #{settings.version} documentation", :back => 'false'
+=subheader "#{action_method(@operation.name, @collection.name).to_s.upcase} /api/#{@collection.name}/#{@operation.name}"
 
-%p
-  #{@operation.description}
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'}
+      %h3
+        Description:
+    %li
+      %br
+      %p=@operation.description
 
-%br
-
-%h2 Parameters:
-
-
-%table
-  %thead
-    %tr
-      %th Name
-      %th Type
-      %th Class
-      %th Valid values
-      %th Description
-  %tbody
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider', :'data-divider-theme' => 'a'}
+      %h3 Parameters:
     - @operation.each_param do |p|
-      %tr
-        %td{:style => "width:15em"}
-          %em #{p.name}
-        %td{:style => "width:10em"} #{p.type}
-        %td #{p.klass}
-        %td{:style => "width:10em"} #{p.options.join(', ')}
-        %td #{p.description}
+      %li{ :'data-role' => 'list-divider'}
+        =p.name
+        %span{ :class => 'ui-li-count'}
+          =[p.type,p.klass].join(',')
+      %li
+        %br
+        %p=p.description.empty? ? '<strong>FIXME:</strong> No description for this parameter' : p.description
     - @features.sort { |a,b| a.name.to_s <=> b.name.to_s }.each do |f|
-      %tr
-        %th{:colspan => 4}
-          Feature #{f.name}
-        %th{:colspan => 1}
-          %em= f.description
       - f.decl.operation(@operation.name).each_param do |p|
-        %tr
-          %td{:style => "width:15em"}
-            %em #{p.name}
-          %td{:style => "width:10em"} #{p.type}
-          %td #{p.klass}
-          %td{:style => "width:10em"} #{p.options.join(', ')}
-          %td #{p.description}
+        %li{ :'data-role' => 'list-divider'}
+          =p.name
+          %span{ :class => 'ui-li-count'}
+            =[p.type,p.klass].join(',')
+        %li
+          %br
+          %p=p.description.empty? ? '<strong>FIXME:</strong> No description for this parameter' : p.description
+

data/views/docs/operation.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
-  %operation{:url => url_for("/api/docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
+  %operation{:url => api_url_for("docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
     %description #{@operation.description}
     - @operation.each_param do |param|
       %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/drivers/index.html.haml

@@ -1,15 +1,10 @@
-%h1
-  Available Drivers
+=header "Supported drivers"
+=subheader "Deltacloud API #{settings.version}"
 
-%table.display
-  %thead
-    %tr
-      %th ID
-      %th Name
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     - @drivers.each do |id, details|
-      %tr
-        %td{ :width => '20%' }
-          %tt
-            %a{ :href => driver_url(id) }= id
-        %td= details[:name]
+      %li
+        %a{ :href => driver_url(id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/cloud.png'}
+          %h3=details[:name]

data/views/drivers/show.html.haml

@@ -1,20 +1,20 @@
-%h1
-  Details for driver #{@name}
+=header @name
+=subheader "Deltacloud API #{settings.version}"
 
-%dl
-  %di
-    %dt ID
-    %dd= @name
-  %di
-    %dt Name
-    %dd= @driver[:name]
-  %di
-    %dt Provider
-    %dd
-      - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
-      - if providers.empty?
-        None
-      - else
-        %ol
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Identifier
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@name
+    %li{ :'data-role' => 'list-divider'} Name
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@driver[:name]
+    %li{ :'data-role' => 'list-divider'} Provider
+    %li
+      %p{ :'data-role' => 'fieldcontain'}
+        - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
+        - if providers.empty?
+          None
+        - else
           - providers.each do |k|
-            %li= k
+            %p= k

data/views/error.html.haml

@@ -1,31 +1,36 @@
-!!!
-!!! XML
-
+!!!5
 %html
   %head
-    = stylesheet_link_tag '/stylesheets/compiled/screen.css', :media => 'screen, projection'
-    = stylesheet_link_tag '/stylesheets/compiled/print.css', :media => 'print'
-    /[if lt IE 8]
-      = stylesheet_link_tag '/stylesheets/compiled/ie.css', :media => 'screen, projection'
-    = stylesheet_link_tag '/stylesheets/compiled/application.css', :media => 'screen, projection'
-    %script{:type => "text/javascript", :src => "/javascripts/jquery-1.4.2.min.js" }
+    %title Deltacloud API #{settings.version}
+    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0b1.min.css'
+    = stylesheet_link_tag '/stylesheets/new.css'
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.min.js" }
     %script{:type => "text/javascript", :src => "/javascripts/application.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0b1.min.js" }
+    :javascript
+      $(document).ready(function() {
+        $(document).bind("mobileinit", function(){
+          $.mobile.ajaxEnabled = false;
+          $.mobile.hashListeningEnabled = false;
+        });
+      })
   %body
-    #wrapper
-      #header
-        = link_to image_tag( "/images/logo-wide.png" ), root_url
-      = bread_crumb
-      #content{:class => :error}
-        = yield
-      #footer
-        #formats
-          Format:
-          =link_to_format(:xml)
-          |
-          =link_to_format(:json)
-        #driver_info
-          Driver: #{driver_symbol} | API version: #{settings.version}
-        #copyright
-          Copyright 2009-2011
-          %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
-          and individual contributors.
+    %div{ 'data-role' => :page, :'data-theme' => 'e', :class => :error }
+      =header "#{response.status} - #{translate_error_code(response.status)[:message]}"
+      - if @error
+        =subheader @error.message
+      - elsif response.status.to_s =~ /4(\d{2})/
+        =subheader request.env['REQUEST_URI']
+      = yield
+      %div{ 'data-role' => :footer, :'data-theme' => 'a'}
+        %div{ 'data-role' => :navbar}
+          %ul
+            %li
+              %a{ :'data-icon' => 'home', :href => api_url_for(''), :'data-ajax' => 'false'} Home
+            %li=link_to_format(:xml)
+            %li=link_to_format(:json)
+        %div{ 'data-role' => :header, 'data-theme' => 'a' }
+          #copyright
+            Copyright 2009-2011
+            %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
+            and individual contributors.

data/views/errors/400.html.haml

@@ -0,0 +1,41 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3=[@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= @error.details
+      - else
+        %em No details
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Backtrace
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      %li
+        %pre=@error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect

data/views/errors/{validation_failure.xml.haml → 400.xml.haml}

@@ -1,8 +1,4 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %parameter #{@error.name}
   %message< #{cdata @error.message}
-  - unless @error.param.options.empty?
-    %valid_options
-      - @error.param.options.each do |v|
-        %value< #{cdata v}
 

data/views/errors/401.html.haml

@@ -0,0 +1,41 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3=[@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= @error.details
+      - else
+        %em No details
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Backtrace
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      %li
+        %pre=@error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect