fog-radosgw 0.0.1 → 0.0.2

data/fog-radosgw.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE.md]
 
   s.add_dependency 'fog-json'
-  s.add_dependency 'fog', '>=1.21.0'
+  s.add_dependency 'fog-xml'
+  s.add_dependency 'fog-core', '>=1.21.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'shindo'

data/lib/fog/radosgw/core.rb

@@ -1,4 +1,4 @@
-require 'fog'
+require 'fog/core'
 
 module Fog
   module Radosgw
@@ -72,7 +72,7 @@ module Fog
 
       def update_radosgw_user(user_id, user)
         path         = "admin/user"
-        user_id      = Fog::AWS.escape(user_id)
+        user_id      = escape(user_id)
         params       = {
           :method => 'POST',
           :path => path,
@@ -125,9 +125,72 @@ module Fog
         "#{@scheme}://#{@host}:#{@port}"
       end
 
+      def escape(string)
+        string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
+          "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+        }
+      end
+
+      def signature(params, expires)
+        headers = params[:headers] || {}
+
+        string_to_sign =
+<<-DATA
+#{params[:method].to_s.upcase}
+#{headers['Content-MD5']}
+#{headers['Content-Type']}
+#{expires}
+DATA
+
+        amz_headers, canonical_amz_headers = {}, ''
+        for key, value in headers
+          if key[0..5] == 'x-amz-'
+            amz_headers[key] = value
+          end
+        end
+        amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
+        for key, value in amz_headers
+          canonical_amz_headers << "#{key}:#{value}\n"
+        end
+        string_to_sign << canonical_amz_headers
+ 
+
+        query_string = ''
+        if params[:query]
+          query_args = []
+          for key in params[:query].keys.sort
+            if VALID_QUERY_KEYS.include?(key)
+              value = params[:query][key]
+              if value
+                query_args << "#{key}=#{value}"
+              else
+                query_args << key
+              end
+            end
+          end
+          if query_args.any?
+            query_string = '?' + query_args.join('&')
+          end
+        end
+
+        canonical_path = (params[:path] || object_to_path(params[:object_name])).to_s
+        canonical_path = '/' + canonical_path if canonical_path[0..0] != '/'
+        if params[:bucket_name]
+          canonical_resource = "/#{params[:bucket_name]}#{canonical_path}"
+        else
+          canonical_resource = canonical_path
+        end
+        canonical_resource << query_string
+        string_to_sign << canonical_resource
+
+        hmac = Fog::HMAC.new('sha1', @radosgw_secret_access_key)
+        signed_string = hmac.sign(string_to_sign)
+        Base64.encode64(signed_string).chomp!
+      end
+
       def signed_headers(params)
         expires = Fog::Time.now.to_date_header
-        auth   =  @s3_connection.signature(params,expires)
+        auth   =  signature(params,expires)
         awskey =  @radosgw_access_key_id
         headers = {
           'Date'          => expires,

data/lib/fog/radosgw/provisioning.rb

@@ -1,4 +1,6 @@
 require 'fog/radosgw/core'
+require 'fog/json'
+require 'fog/xml'
 
 module Fog
   module Radosgw
@@ -55,23 +57,12 @@ module Fog
           @persistent               = options[:persistent]         || false
           @path_style               = options[:path_style]         || false
 
-          @raw_connection = Fog::XML::Connection.new(radosgw_uri, @persistent, @connection_options)
-
-          @s3_connection  = Fog::Storage.new(
-            :provider              => 'AWS',
-            :aws_access_key_id     => @radosgw_access_key_id,
-            :aws_secret_access_key => @radosgw_secret_access_key,
-            :host                  => @host,
-            :port                  => @port,
-            :scheme                => @scheme,
-            :path_style            => @path_style,
-            :connection_options    => @connection_options
-          )
+          @connection = Fog::Xml::Connection.new(radosgw_uri, @persistent, @connection_options)
         end
 
         def request(params, parse_response = true, &block)
           begin
-            response = @raw_connection.request(params.merge({
+            response = @connection.request(params.merge({
               :host     => @host,
               :path     => "#{@path}/#{params[:path]}",
             }), &block)

data/lib/fog/radosgw/requests/provisioning/create_user.rb

@@ -10,9 +10,9 @@ module Fog
           end
 
           path         = "admin/user"
-          user_id      = Fog::AWS.escape(user_id)
-          display_name = Fog::AWS.escape(display_name)
-          email        = Fog::AWS.escape(email)
+          user_id      = escape(user_id)
+          display_name = escape(display_name)
+          email        = escape(email)
           query        = "?uid=#{user_id}&display-name=#{display_name}&email=#{email}&format=json"
           params       = {
             :method => 'PUT',

data/lib/fog/radosgw/requests/provisioning/delete_user.rb

@@ -6,7 +6,7 @@ module Fog
 
         def delete_user(user_id)
           path         = "admin/user"
-          user_id      = Fog::AWS.escape(user_id)
+          user_id      = escape(user_id)
           query        = "?uid=#{user_id}&format=json"
           params       = {
             :method => 'DELETE',

data/lib/fog/radosgw/requests/provisioning/get_user.rb

@@ -7,7 +7,7 @@ module Fog
 
         def get_user(user_id)
           path = "admin/user"
-          user_id = Fog::AWS.escape(user_id)
+          user_id = escape(user_id)
           query = "?uid=#{user_id}&format=json"
           params = { 
             :method => 'GET',

data/lib/fog/radosgw/requests/usage/get_usage.rb

@@ -5,7 +5,7 @@ module Fog
 
         def sanitize_and_convert_time(time)
           fmt = '%Y-%m-%d %H:%M:%S'
-          Fog::AWS.escape(time.strftime(fmt))
+          escape(time.strftime(fmt))
         end
 
       end

data/lib/fog/radosgw/usage.rb

@@ -45,16 +45,6 @@ module Fog
           @radosgw_secret_access_key = options[:radosgw_secret_access_key]
           @connection_options       = options[:connection_options] || {}
           @persistent               = options[:persistent]         || false
-
-          @s3_connection = Fog::Storage.new(
-            :provider              => 'AWS',
-            :aws_access_key_id     => @radosgw_access_key_id,
-            :aws_secret_access_key => @radosgw_secret_access_key,
-            :host                  => @host,
-            :port                  => @port,
-            :scheme                => @scheme,
-            :connection_options    => @connection_options
-          )
         end
       end
     end

data/lib/fog/radosgw/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Radosgw
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/tests/helper.rb

@@ -1,7 +1,7 @@
 ENV['FOG_RC'] = ENV['FOG_RC'] || File.expand_path('../.fog', __FILE__)
 ENV['FOG_CREDENTIAL'] = ENV['FOG_CREDENTIAL'] || 'default'
 
-require 'fog'
+require 'fog/core'
 require 'fog/test_helpers/formats_helper'
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-radosgw
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-json
@@ -28,7 +28,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-xml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: