fog-radosgw 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d448de4d62824a4d80fea3bce8cef6509ab26b70
-  data.tar.gz: d4091f9e68de606571b2b928bec3346044791e1a
+  metadata.gz: b619efd888c9797d8ebc88e36beb34dba79068f8
+  data.tar.gz: 933ef7e27304aaadab19434e2bcbdd9fe8114c4e
 SHA512:
-  metadata.gz: b52887db0c49b317c7559597041f36c5b21cc52a7c720103efa80e7a4e231f2c209b7578d1843a193b2cd5d012d92320e2a46056c6851fe9c22a47cd2955b1f5
-  data.tar.gz: 28ba11afe38ea0fddd3cffec9c1b3d4189a822c849b7e5c1f15264a7c5854c253c85d5e14743b6c5e057b0c4f5e1d022ba02396371808545894b73099dbc9f60
+  metadata.gz: d3b4eee7b957bb3cf84cd2e563ec0eee04c36b120c7e9593195e7b74290d787d9c0cb8b68840aba1f0720ae5319a713c4951ddb6a5d25d715a82c94bd574c21f
+  data.tar.gz: 0cf767e88a221857d18f863a7860dc89de40ee828a13a43c152d3afa798237597904994280773d4b38ea5f3c3ea72e91c0c81d75023553c94e33f39b97a5bb54

data/.travis.yml

@@ -0,0 +1,17 @@
+matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile.1.9.2-
+    - rvm: 1.9.2
+      gemfile: gemfiles/Gemfile.1.9.2-
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.1.9.3+
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.1.9.3+
+    - rvm: 2.1.4
+      gemfile: gemfiles/Gemfile.1.9.3+
+      env: COVERAGE=true
+    - rvm: ree
+      gemfile: gemfiles/Gemfile.1.9.2-
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.1.9.3+

data/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+## Getting Involved
+
+New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+
+### Coding
+
+* Pick a task:
+  * Offer feedback on open [pull requests](https://github.com/fog/fog-radosgw/pulls).
+  * Review open [issues](https://github.com/fog/fog-radosgw/issues) for things to help on.
+  * [Create an issue](https://github.com/fog/fog-radosgw/issues/new) to start a discussion on additions or features.
+* Fork the project, add your changes and tests to cover them in a topic branch.
+* Commit your changes and rebase against `fog/fog-radosgw` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/fog/fog-radosgw/compare/)
+
+### Non-Coding
+
+* Offer feedback on open [issues](https://github.com/fog/fog-radosgw/issues).
+* Organize or volunteer at events.

data/Rakefile

@@ -49,7 +49,7 @@ end
 #############################################################################
 
 GEM_NAME = "#{name}"
-task :default => :test
+task :default => :travis
 task :travis  => ['test', 'test:travis']
 
 Rake::TestTask.new do |t|

data/gemfiles/Gemfile.1.9.2-

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'mime-types', '< 2.0'
+gem 'nokogiri', '< 1.6'
+gem 'rest-client', '~> 1.6.8'
+gem 'fog-core'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.1.9.3+

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'activesupport', '>= 3.0', '< 4'
+gem 'mime-types', '< 2.0'
+gem 'fog-core'
+
+gemspec :path => '../'

data/lib/fog/radosgw.rb

@@ -1,2 +1,18 @@
-require 'fog/radosgw/provisioning'
-require 'fog/radosgw/usage'
+require 'fog/core'
+require 'fog/json'
+require 'fog/xml'
+
+module Fog
+  module Radosgw
+    autoload :Provisioning, File.expand_path('../radosgw/provisioning', __FILE__)
+    autoload :Usage, File.expand_path('../radosgw/usage', __FILE__)
+    autoload :MultipartUtils, File.expand_path('../radosgw/multipart_utils', __FILE__)
+    autoload :UserUtils, File.expand_path('../radosgw/user_utils', __FILE__)
+    autoload :Utils, File.expand_path('../radosgw/utils', __FILE__)
+
+    extend Fog::Provider
+
+    service(:provisioning, 'Provisioning')
+    service(:usage,        'Usage')
+  end
+end

data/lib/fog/radosgw/multipart_utils.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Radosgw
+    module MultipartUtils
+      autoload :Headers, File.expand_path('../multipart_utils/headers', __FILE__)
+
+      def parse(data, boundary)
+        contents = data.match(end_boundary_regex(boundary)).pre_match rescue ""
+        contents.split(inner_boundary_regex(boundary)).reject(&:empty?).map do |part|
+          parse_multipart_section(part)
+        end.compact
+      end
+
+      def extract_boundary(header_string)
+        $1 if header_string =~ /boundary=([A-Za-z0-9\'()+_,-.\/:=?]+)/
+      end
+
+      private
+      def end_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}--\r?\n?/
+      end
+
+      def inner_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}\r?\n/
+      end
+
+      def parse_multipart_section(part)
+        headers = Headers.new
+        if md = part.match(/\r?\n\r?\n/)
+          body = md.post_match
+          md.pre_match.split(/\r?\n/).each do |line|
+            headers.parse(line)
+          end
+
+          if headers["content-type"] =~ /multipart\/mixed/
+            boundary = extract_boundary(headers.to_hash["content-type"].first)
+            parse(body, boundary)
+          else
+            {:headers => headers.to_hash, :body => body}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/radosgw/multipart_utils/headers.rb

@@ -0,0 +1,32 @@
+require 'net/http'
+
+module Fog
+  module Radosgw
+    module MultipartUtils
+      class Headers
+        include Net::HTTPHeader
+
+        def initialize
+          initialize_http_header({})
+        end
+
+        # Parse a single header line into its key and value
+        # @param [String] chunk a single header line
+        def self.parse(chunk)
+          line = chunk.strip
+          # thanks Net::HTTPResponse
+          return [nil,nil] if chunk =~ /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in
+          m = /\A([^:]+):\s*/.match(line)
+          [m[1], m.post_match] rescue [nil, nil]
+        end
+
+        # Parses a header line and adds it to the header collection
+        # @param [String] chunk a single header line
+        def parse(chunk)
+          key, value = self.class.parse(chunk)
+          add_field(key, value) if key && value
+        end
+      end
+    end
+  end
+end

data/lib/fog/radosgw/provisioning.rb

@@ -1,7 +1,3 @@
-require 'fog/radosgw/core'
-require 'fog/json'
-require 'fog/xml'
-
 module Fog
   module Radosgw
     class Provisioning < Fog::Service

data/lib/fog/radosgw/usage.rb

@@ -1,4 +1,3 @@
-require 'fog/radosgw/core'
 require 'time'
 
 module Fog

data/lib/fog/radosgw/user_utils.rb

@@ -0,0 +1,47 @@
+module Fog
+  module Radosgw
+    module UserUtils
+      def update_radosgw_user(user_id, user)
+        path         = "admin/user"
+        user_id      = escape(user_id)
+        params       = {
+            :method => 'POST',
+            :path => path,
+        }
+        query        = "?uid=#{user_id}&format=json&suspended=#{user[:suspended]}"
+        begin
+          response = Excon.post("#{@scheme}://#{@host}/#{path}#{query}",
+                                :headers => signed_headers(params))
+          if !response.body.empty?
+            case response.headers['Content-Type']
+              when 'application/json'
+                response.body = Fog::JSON.decode(response.body)
+            end
+          end
+          response
+        rescue Excon::Errors::NotFound => e
+          raise Fog::Radosgw::Provisioning::NoSuchUser.new
+        rescue Excon::Errors::BadRequest => e
+          raise Fog::Radosgw::Provisioning::ServiceUnavailable.new
+        end
+      end
+
+      def update_mock_user(user_id, user)
+        if data[user_id]
+          if suspended = user[:suspended]
+            data[user_id][:suspended] = suspended
+          end
+
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body   = data[user_id]
+          end
+        else
+          Excon::Response.new.tap do |response|
+            response.status = 403
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/radosgw/utils.rb

@@ -0,0 +1,89 @@
+module Fog
+  module Radosgw
+    module Utils
+      def configure_uri_options(options = {})
+        @host       = options[:host]       || 'localhost'
+        @persistent = options[:persistent] || true
+        @port       = options[:port]       || 8080
+        @scheme     = options[:scheme]     || 'http'
+      end
+
+      def radosgw_uri
+        "#{@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   =  signature(params,expires)
+        awskey =  @radosgw_access_key_id
+        headers = {
+            'Date'          => expires,
+            'Authorization' => "AWS #{awskey}:#{auth}"
+        }
+      end
+    end
+  end
+end

data/lib/fog/radosgw/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Radosgw
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: fog-radosgw
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jon Kåre Hellan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Fog backend for provisioning users on Ceph Radosgw - the Swift and S3
@@ -103,15 +103,20 @@ extra_rdoc_files:
 - README.md
 - LICENSE.md
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - fog-radosgw.gemspec
+- gemfiles/Gemfile.1.9.2-
+- gemfiles/Gemfile.1.9.3+
 - lib/fog/radosgw.rb
-- lib/fog/radosgw/core.rb
+- lib/fog/radosgw/multipart_utils.rb
+- lib/fog/radosgw/multipart_utils/headers.rb
 - lib/fog/radosgw/provisioning.rb
 - lib/fog/radosgw/requests/provisioning/create_user.rb
 - lib/fog/radosgw/requests/provisioning/delete_user.rb
@@ -123,6 +128,8 @@ files:
 - lib/fog/radosgw/requests/provisioning/user.json
 - lib/fog/radosgw/requests/usage/get_usage.rb
 - lib/fog/radosgw/usage.rb
+- lib/fog/radosgw/user_utils.rb
+- lib/fog/radosgw/utils.rb
 - lib/fog/radosgw/version.rb
 - tests/helper.rb
 - tests/helpers/mock_helper.rb
@@ -135,22 +142,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Fog backend for provisioning Ceph Radosgw.

data/lib/fog/radosgw/core.rb

@@ -1,207 +0,0 @@
-require 'fog/core'
-
-module Fog
-  module Radosgw
-    module MultipartUtils
-      require 'net/http'
-
-      class Headers
-        include Net::HTTPHeader
-
-        def initialize
-          initialize_http_header({})
-        end
-
-        # Parse a single header line into its key and value
-        # @param [String] chunk a single header line
-        def self.parse(chunk)
-          line = chunk.strip
-          # thanks Net::HTTPResponse
-          return [nil,nil] if chunk =~ /\AHTTP(?:\/(\d+\.\d+))?\s+(\d\d\d)\s*(.*)\z/in
-          m = /\A([^:]+):\s*/.match(line)
-          [m[1], m.post_match] rescue [nil, nil]
-        end
-
-        # Parses a header line and adds it to the header collection
-        # @param [String] chunk a single header line
-        def parse(chunk)
-          key, value = self.class.parse(chunk)
-          add_field(key, value) if key && value
-        end
-      end
-
-      def parse(data, boundary)
-        contents = data.match(end_boundary_regex(boundary)).pre_match rescue ""
-        contents.split(inner_boundary_regex(boundary)).reject(&:empty?).map do |part|
-          parse_multipart_section(part)
-        end.compact
-      end
-
-      def extract_boundary(header_string)
-        $1 if header_string =~ /boundary=([A-Za-z0-9\'()+_,-.\/:=?]+)/
-      end
-
-      private
-      def end_boundary_regex(boundary)
-        /\r?\n--#{Regexp.escape(boundary)}--\r?\n?/
-      end
-
-      def inner_boundary_regex(boundary)
-        /\r?\n--#{Regexp.escape(boundary)}\r?\n/
-      end
-
-      def parse_multipart_section(part)
-        headers = Headers.new
-        if md = part.match(/\r?\n\r?\n/)
-          body = md.post_match
-          md.pre_match.split(/\r?\n/).each do |line|
-            headers.parse(line)
-          end
-
-          if headers["content-type"] =~ /multipart\/mixed/
-            boundary = extract_boundary(headers.to_hash["content-type"].first)
-            parse(body, boundary)
-          else
-            {:headers => headers.to_hash, :body => body}
-          end
-        end
-      end
-    end
-
-    module UserUtils
-
-      def update_radosgw_user(user_id, user)
-        path         = "admin/user"
-        user_id      = escape(user_id)
-        params       = {
-          :method => 'POST',
-          :path => path,
-        }
-        query        = "?uid=#{user_id}&format=json&suspended=#{user[:suspended]}"
-        begin
-          response = Excon.post("#{@scheme}://#{@host}/#{path}#{query}",
-                                :headers => signed_headers(params))
-          if !response.body.empty?
-            case response.headers['Content-Type']
-            when 'application/json'
-              response.body = Fog::JSON.decode(response.body)
-            end
-          end
-          response
-        rescue Excon::Errors::NotFound => e
-          raise Fog::Radosgw::Provisioning::NoSuchUser.new
-        rescue Excon::Errors::BadRequest => e
-          raise Fog::Radosgw::Provisioning::ServiceUnavailable.new
-        end
-      end
-
-      def update_mock_user(user_id, user)
-        if data[user_id]
-          if suspended = user[:suspended]
-            data[user_id][:suspended] = suspended
-          end
-
-          Excon::Response.new.tap do |response|
-            response.status = 200
-            response.body   = data[user_id]
-          end
-        else
-          Excon::Response.new.tap do |response|
-            response.status = 403
-          end
-        end
-      end
-    end
-
-    module Utils
-      def configure_uri_options(options = {})
-        @host       = options[:host]       || 'localhost'
-        @persistent = options[:persistent] || true
-        @port       = options[:port]       || 8080
-        @scheme     = options[:scheme]     || 'http'
-      end
-
-      def radosgw_uri
-        "#{@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   =  signature(params,expires)
-        awskey =  @radosgw_access_key_id
-        headers = {
-          'Date'          => expires,
-          'Authorization' => "AWS #{awskey}:#{auth}"
-        }
-      end
-    end
-
-    extend Fog::Provider
-
-    service(:provisioning, 'Provisioning')
-    service(:usage,        'Usage')
-  end
-end