deltacloud-core 1.0.1 → 1.0.2

data/tests/ec2/server_test.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative './common.rb'
+
+describe Deltacloud::EC2::API do
+
+  before do
+    def app; Deltacloud::EC2::API; end
+  end
+
+  it 'has the config set property' do
+    Deltacloud::config[:ec2].must_be_kind_of Deltacloud::Server
+    root_url.must_equal Deltacloud[:ec2].root_url
+  end
+
+  it 'must do a redirection when no Action parameter' do
+    get root_url
+    status.must_equal 301
+    headers['Location'].must_equal 'http://example.org/'
+  end
+
+  it 'must set the Connection header to close' do
+    get root_url
+    headers['Connection'].must_equal 'close'
+  end
+
+  it 'must advertise current API version in response headers' do
+    get root_url
+    headers['Server'].must_equal 'Apache-Deltacloud-EC2/2012-04-01'
+  end
+
+  it 'must return EC2 exception when unknown action' do
+    get root_url + '?Action=UnknownActionTest'
+    xml.root.name.must_equal 'Response'
+    (xml/'Response/Errors/Code').first.text.strip.must_equal 'InvalidAction'
+  end
+
+  it 'must return EC2 exception when authentication failed' do
+    authorize 'unknownuser', 'password'
+    get root_url + '?Action=DescribeAvailabilityZones'
+    status.must_equal 401
+  end
+
+end

data/tests/helpers/core_ext/array_test.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative '../../test_helper.rb'
+
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'core_ext.rb')
+
+class TestArray < MiniTest::Unit::TestCase
+
+
+  def test_expand_opts!
+    assert_equal true, [].respond_to?(:"expand_opts!")
+    a = [1,2,3]
+    a.expand_opts!(:test => 1)
+    assert_equal Hash, a.last.class
+  end
+
+  def test_extract_opts!
+    assert_equal true, [].respond_to?(:"extract_opts!")
+    a = [1,2,3, { :test => 1}]
+    a.extract_opts!
+    assert_equal [1,2,3], a
+  end
+
+end

data/tests/helpers/core_ext/hash_test.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative '../../test_helper.rb'
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'core_ext.rb')
+
+class TestHash < MiniTest::Unit::TestCase
+
+
+  def test_gsub_keys
+    assert_equal true, {}.respond_to?(:"gsub_keys")
+    h = {
+      :'test-key-1' => '1',
+      :'test-key-2' => '2',
+      'test-key-3' => '3',
+      :random => '10'
+    }
+
+    h.gsub_keys(/test/, 'new')
+
+    assert_equal '1', h['new-key-1']
+    assert_equal '2', h['new-key-2']
+    assert_equal '3', h['new-key-3']
+    assert_equal '10', h[:random]
+  end
+
+  def test_symbolize_keys
+    assert_equal true, {}.respond_to?(:"symbolize_keys")
+    h = {
+      'test1' => 1,
+      :test3 => 3
+    }
+
+    h.symbolize_keys
+
+    assert_equal 1, h[:test1]
+    assert_equal nil, h['test1']
+    assert_equal 3, h[:test3]
+
+  end
+
+end

data/tests/helpers/core_ext/integer_test.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative '../../test_helper.rb'
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'core_ext.rb')
+
+class TestInteger < MiniTest::Unit::TestCase
+
+
+  def test_ordinalize
+    assert_equal true, 1.respond_to?(:"ordinalize")
+    assert_equal '1st', 1.ordinalize
+    assert_equal '2nd', 2.ordinalize
+    assert_equal '3rd', 3.ordinalize
+    assert_equal '6th', 6.ordinalize
+    assert_equal '1211th', 1211.ordinalize
+  end
+
+end

data/tests/helpers/core_ext/string_test.rb

@@ -0,0 +1,74 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative '../../test_helper.rb'
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud', 'core_ext.rb')
+
+class TestString < MiniTest::Unit::TestCase
+
+
+  def test_blank?
+    assert_equal true, ''.respond_to?(:"blank?")
+    assert_equal true, ''.blank?
+    assert_equal true, ' '.blank?
+    assert_equal false, 'test'.blank?
+  end
+
+  def test_titlecase
+    assert_equal true, ''.respond_to?(:"titlecase")
+    assert_equal "This Is A String", 'this is a string'.titlecase
+    assert_equal 'This', 'this'.titlecase
+  end
+
+  def test_pluralize
+    assert_equal true, ''.respond_to?(:"pluralize")
+    assert_equal 'instances', 'instance'.pluralize
+    assert_equal 'properties', 'property'.pluralize
+    assert_equal 'addresses', 'address'.pluralize
+  end
+
+  def test_singularize
+    assert_equal true, ''.respond_to?(:"singularize")
+    assert_equal 'instance', 'instances'.singularize
+    assert_equal 'property', 'properties'.singularize
+    assert_equal 'address', 'addresses'.singularize
+  end
+
+  def test_underscore
+    assert_equal true, ''.respond_to?(:"underscore")
+    assert_equal 'test_model', 'TestModel'.underscore
+    assert_equal 'test/model', 'Test::Model'.underscore
+  end
+
+  def test_camelize
+    assert_equal true, ''.respond_to?(:"camelize")
+    assert_equal 'TestModel', 'test_model'.camelize
+    assert_equal 'testModel', 'test_model'.camelize(:lowercase_first_letter)
+  end
+
+  def test_uncapitalize
+    assert_equal true, ''.respond_to?(:"uncapitalize")
+    assert_equal 'testModel', 'TestModel'.uncapitalize
+    assert_equal 'test', 'Test'.uncapitalize
+  end
+
+  def test_upcase_first
+    assert_equal true, ''.respond_to?(:"upcase_first")
+    assert_equal 'Test', 'test'.upcase_first
+    assert_equal 'Test', 'Test'.upcase_first
+    assert_equal 'TestModel', 'testModel'.upcase_first
+  end
+
+  def test_truncate
+    assert_equal true, ''.respond_to?(:"truncate")
+    assert_equal 'ThisIs...cated', 'ThisIsALogStringThatNeedsToBeTruncated'.truncate
+    assert_equal 'Thi...ed', 'ThisIsALogStringThatNeedsToBeTruncated'.truncate(5)
+    assert_equal 'T...', 'ThisIsALogStringThatNeedsToBeTruncated'.truncate(1)
+    assert_equal 'This', 'This'.truncate(10)
+  end
+
+  def test_it_has_each
+    assert_equal true, ''.respond_to?(:each)
+  end
+
+end

data/tests/test_helper.rb

@@ -0,0 +1,66 @@
+require 'rubygems'
+require 'logger'
+require 'minitest/autorun'
+require 'rack/test'
+require 'nokogiri'
+require 'pp'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+ENV['RACK_ENV'] = 'test'
+
+if ENV['COVERAGE']
+  begin
+    require 'simplecov'
+  rescue LoadError
+    warn "To generate code coverage you need to install 'simplecov' (gem install simplecov OR bundle)"
+  end
+end
+
+require 'time'
+
+# This code was originally copied from:
+# https://github.com/jtrupiano/timecop/issues/8#issuecomment-1396047
+#
+# Since 'timecop' gem has broken 'timezone' support, this small monkey-patching
+# on Time object seems to fix this issue.
+
+class Time
+  module TimeMock
+    attr_accessor :mock_time
+
+    def mock_now
+      @mock_time || Time.original_now
+    end
+
+    def be(a_time)
+      @mock_time = Time.parse(a_time)
+    end
+
+  end
+
+  class << self
+    include TimeMock
+    alias_method :original_now, :now
+    alias_method :now, :mock_now
+  end
+end
+
+# Test helpers
+
+def record_retries(name='')
+  {
+    :before => Proc.new { |r, &block|
+      VCR.use_cassette("#{__name__}-#{name.empty? ? '' : "#{name}-"}#{r}", &block)
+    }
+  }
+end
+
+include Rack::Test::Methods
+
+def status; last_response.status; end
+def headers; last_response.headers; end
+def response_body; last_response.body; end
+def xml; Nokogiri::XML(response_body); end
+def json; JSON::parse(response_body); end
+def formats; [ 'application/xml', 'application/json', 'text/html' ]; end
+def root_url(url=''); Deltacloud.default_frontend.root_url + url; end

data/views/api/show.html.haml

@@ -3,8 +3,7 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
-    - Deltacloud.collections.each do |c|
-      - next unless c.operation(:index).has_capability?
+    - supported_collections do |c|
       %li
         %a{ :href => api_url_for(c.collection_name),  :'data-icon' => "arrow-r"}=c.collection_name.to_s.gsub('_', ' ').titlecase
 

data/views/api/show.xml.haml

@@ -1,6 +1,5 @@
 %api{ :version => settings.version, :driver => driver_symbol, :provider => Thread.current[:provider] || ENV['API_PROVIDER'] }
-  - Deltacloud.collections.each do |c|
-    - next unless c.operation(:index).has_capability?
+  - supported_collections do |c|
     %link{ :rel => c.collection_name, :href => self.send(:"#{c.collection_name}_url")}
       - c.features.select { |f| driver.class.has_feature?(c.collection_name, f.name) }.each do |f|
         %feature{ :name => f.name }

data/views/blobs/show.xml.haml

@@ -9,6 +9,5 @@
   %user_metadata
     - if @blob.user_metadata.respond_to? :each
       - @blob.user_metadata.each do |k, v|
-        %entry{:key => k}
-          #{cdata v}
+        %entry{:key => k}=render_cdata(v)
   %content{:href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content', :rel => 'blob_content'}

data/views/keys/new.html.haml

@@ -3,6 +3,13 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
   %form{ :action => keys_url, :method => :post}
     %div{ 'data-role' => :fieldcontain }
-      %label{ :for => :name} Key name:
-      %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+      %p
+        %label{ :for => :name} Key name:
+      %p
+        %input{ :type => :text, :id => :name, :name => :name, :value => '' }
+      %p
+        %label{ :for => :public_key} Public Key (Optional - import):
+        %small Enter your public key here to import it rather than creating a new one (not supported by all providers)
+      %p
+        %textarea{ :name => :public_key, :cols=>65, :rows=>5 }
     %button{ :type => :submit} Create key

data/views/load_balancers/new.html.haml

@@ -1,38 +1,39 @@
-%h1 New Load Balancer
+=header "Create new load balancer"
 
-%form{ :action => load_balancers_url, :method => :post }
-  %p
-    %label
-      Name:
-    %input{ :name => 'name', :size => 30 }/
-  -if @instances
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => load_balancers_url, :method => :post }
     %p
       %label
-        Running instance:
-      %select{ :name => 'instance_id'}
-        - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
-          %option{ :value => instance.id } #{instance.id}
-  %p
-    %label
-      Realm:
-    %select{ :name => 'realm_id'}
-      - @realms.each do |realm|
-        %option{ :value => realm.id } #{realm.id} - #{realm.name}
-  %hr
-  %p
-    %label
-      Protocol:
-    %select{ :name => 'listener_protocol'}
-      %option{ :value => 'HTTP'}  HTTP
-      %option{ :value => 'TCP'} TCP
-  %p
-    %label
-      Load balancer port:
-    %input{ :name => "listener_balancer_port", :size => 30}
-  %p
-    %label
-      Instances port:
-    %input{ :name => "listener_instance_port", :size => 30}
-  %p
-    %input{ :type => :submit, :name => "commit", :value => "create" }/
+        Name:
+      %input{ :name => 'name', :size => 30 }/
+    -if @instances
+      %p
+        %label
+          Running instance:
+        %select{ :name => 'instance_id'}
+          - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
+            %option{ :value => instance.id } #{instance.id}
+    %p
+      %label
+        Realm:
+      %select{ :name => 'realm_id'}
+        - @realms.each do |realm|
+          %option{ :value => realm.id } #{realm.id} - #{realm.name}
+    %hr
+    %p
+      %label
+        Protocol:
+      %select{ :name => 'listener_protocol'}
+        %option{ :value => 'HTTP'}  HTTP
+        %option{ :value => 'TCP'} TCP
+    %p
+      %label
+        Load balancer port:
+      %input{ :name => "listener_balancer_port", :size => 30}
+    %p
+      %label
+        Instances port:
+      %input{ :name => "listener_instance_port", :size => 30}
+    %p
+      %input{ :type => :submit, :name => "commit", :value => "create" }/
 

data/views/metrics/index.html.haml

@@ -8,6 +8,6 @@
       %li
         %a{ :href => metric_url(metric.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/metric.png'}
-          %h3= metric.id
+          %h3= metric.entity || metric.id
           %p
             = metric.properties.map { |p| p.name }.join(', ')

data/views/metrics/show.html.haml

@@ -10,10 +10,10 @@
           %caption Statistics for last 60 minutes
           %tr
             %th Time
-            %th Minumum
+            %th Minimum
             %th Maximum
             %th Average
-            %th Units
+            %th Unit
           - p.values.each do |v|
             %tr
               %td=v[:timestamp]

data/views/metrics/show.xml.haml

@@ -2,8 +2,12 @@
   !!! XML
 %metric{:href => metric_url(@metric.id), :id => @metric.id}
   -haml_tag(:entity, :<) do
-    -haml_concat @metric.send(:id)
+    -haml_concat @metric.send(:entity) || @metric.send(:id)
   %properties
     -@metric.properties.each do |prop|
       -haml_tag(prop.name, :<) do
-        - haml_concat prop.values
+        - if prop.values
+          - prop.values.each do |p|
+            %sample
+              - p.each do |k, v|
+                %property{ :name => k, :value => v }

data/views/storage_volumes/attach.html.haml

@@ -1,6 +1,6 @@
 %h1 Attach storage volume
 
-%form{ :action => attach_storage_volume_url(params[:id]), :method => :post }
+%form{ :action => api_url_for("storage_volumes/#{params[:id]}/attach"), :method => :post }
   %p
     %label
       Instance ID: