kerryb-amazon-ec2 0.3.6 → 0.3.7

data/lib/EC2.rb

@@ -57,7 +57,6 @@ module EC2
       host + "\n" +
       base + "\n" +
       sigquery
-
   end
 
   # Encodes the given string with the secret_access_key, by taking the
@@ -98,7 +97,7 @@ module EC2
   #
   class Base
 
-    attr_reader :use_ssl, :server, :proxy_server, :port
+    attr_reader :use_ssl, :server, :proxy_server, :port, :base_path
 
     def initialize( options = {} )
 
@@ -106,12 +105,14 @@ module EC2
                   :secret_access_key => "",
                   :use_ssl => true,
                   :server => DEFAULT_HOST,
-                  :proxy_server => nil
+                  :proxy_server => nil,
+                  :base_path => '/'
                   }.merge(options)
 
       @server = options[:server]
       @proxy_server = options[:proxy_server]
       @use_ssl = options[:use_ssl]
+      @base_path = options[:base_path]
 
       raise ArgumentError, "No :access_key_id provided" if options[:access_key_id].nil? || options[:access_key_id].empty?
       raise ArgumentError, "No :secret_access_key provided" if options[:secret_access_key].nil? || options[:secret_access_key].empty?
@@ -206,7 +207,7 @@ module EC2
 
       # Set the Authorization header using AWS signed header authentication
       def get_aws_auth_param(params, secret_access_key)
-        canonical_string =  EC2.canonical_string(params)
+        canonical_string =  EC2.canonical_string(params, @server, 'GET', @base_path)
         encoded_canonical = EC2.encode(secret_access_key, canonical_string)
       end
 

data/test/test_EC2.rb

@@ -44,9 +44,26 @@ context "The EC2 method " do
                           :server => "foo.example.com",
                           :port => 8443 )
 
-    @ec2.use_ssl.should.equal true
     @ec2.port.should.equal 8443
-    @ec2.server.should.equal "foo.example.com"
+  end
+
+  specify "EC2::Base should allow specification of base path" do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key",
+                          :secret_access_key => "not a secret",
+                          :use_ssl => false,
+                          :server => "foo.example.com",
+                          :base_path => '/services/Eucalyptus' )
+
+    @ec2.base_path.should.equal '/services/Eucalyptus'
+  end
+
+  specify "EC2::Base should default base path to /" do
+    @ec2 = EC2::Base.new( :access_key_id => "not a key",
+                          :secret_access_key => "not a secret",
+                          :use_ssl => false,
+                          :server => "foo.example.com" )
+
+    @ec2.base_path.should.equal '/'
   end
 
   specify "EC2.canonical_string(path) should conform to Amazon's requirements " do
@@ -59,6 +76,12 @@ context "The EC2 method " do
       EC2.canonical_string(path).should.equal "POST\neu-west-1.ec2.amazonaws.com\n/\nname1=value1&name2=value2&name3=value3"
     end
   end
+  
+  specify 'EC2.canonical_string(path) should allow specification of host, base path and method' do
+    path = {"name1" => "value1", "name2" => "value2", "name3" => "value3"}
+    EC2.canonical_string(path, 'foo.example.com', 'GET', '/services/Eucalyptus').should.
+        equal "GET\nfoo.example.com\n/services/Eucalyptus\nname1=value1&name2=value2&name3=value3"
+  end
 
   specify "EC2.encode should return the expected string" do
     EC2.encode("secretaccesskey", "foobar123", urlencode=true).should.equal "e3jeuDc3DIX2mW8cVqWiByj4j5g%3D"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kerryb-amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Glenn Rempe