fog-google 0.1.3 → 0.2.0

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Real
         # Get an expiring object url from Google Storage
         #

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/get_service.rb

@@ -1,9 +1,7 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Real
-        require 'fog/google/parsers/storage/get_service'
-
         # List information about Google Storage buckets for authorized user
         #
         # ==== Returns
@@ -16,29 +14,27 @@ module Fog
         #       * 'DisplayName'<~String> - Display name of bucket owner
         #       * 'ID'<~String> - Id of bucket owner
         def get_service
-          request({
-            :expects  => 200,
-            :headers  => {},
-            :host     => @host,
-            :idempotent => true,
-            :method   => 'GET',
-            :parser   => Fog::Parsers::Storage::Google::GetService.new
-          })
+          request(:expects  => 200,
+                  :headers  => {},
+                  :host     => @host,
+                  :idempotent => true,
+                  :method   => "GET",
+                  :parser   => Fog::Parsers::Storage::Google::GetService.new)
         end
       end
 
       class Mock
         def get_service
           response = Excon::Response.new
-          response.headers['Status'] = 200
-          buckets = self.data[:buckets].values.map do |bucket|
-            bucket.reject do |key, value|
-              !['CreationDate', 'Name'].include?(key)
+          response.headers["Status"] = 200
+          buckets = data[:buckets].values.map do |bucket|
+            bucket.reject do |key, _value|
+              !%w(CreationDate Name).include?(key)
             end
           end
           response.body = {
-            'Buckets' => buckets,
-            'Owner'   => { 'ID' => 'some_id'}
+            "Buckets" => buckets,
+            "Owner"   => { "ID" => "some_id" }
           }
           response
         end

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/head_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Real
         # Get headers for an object from Google Storage
         #
@@ -23,28 +23,22 @@ module Fog
         #     * 'Content-Type'<~String> - MIME type of object
         #     * 'ETag'<~String> - Etag of object
         #     * 'Last-Modified'<~String> - Last modified timestamp for object
-        def head_object(bucket_name, object_name, options={})
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          if version_id = options.delete('versionId')
-            query = {'versionId' => version_id}
+        def head_object(bucket_name, object_name, options = {})
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          if version_id = options.delete("versionId")
+            query = { "versionId" => version_id }
           end
           headers = {}
-          headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since']
-          headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since']
+          headers["If-Modified-Since"] = Fog::Time.at(options["If-Modified-Since"].to_i).to_date_header if options["If-Modified-Since"]
+          headers["If-Unmodified-Since"] = Fog::Time.at(options["If-Unmodified-Since"].to_i).to_date_header if options["If-Modified-Since"]
           headers.merge!(options)
-          request({
-            :expects  => 200,
-            :headers  => headers,
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'HEAD',
-            :path     => CGI.escape(object_name),
-            :query    => query
-          })
+          request(:expects  => [200, 206],
+                  :headers  => headers,
+                  :host     => "#{bucket_name}.#{@host}",
+                  :method   => "HEAD",
+                  :path     => CGI.escape(object_name),
+                  :query    => query)
         end
       end
 

data/lib/fog/storage/google_xml/requests/put_bucket.rb

@@ -0,0 +1,71 @@
+module Fog
+  module Storage
+    class GoogleXML
+      class Real
+        # Create an Google Storage bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to create
+        # * options<~Hash> - config arguments for bucket.  Defaults to {}.
+        #   * 'LocationConstraint'<~Symbol> - sets the location for the bucket
+        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * status<~Integer> - 200
+        def put_bucket(bucket_name, options = {})
+          location_constraint = options.delete("LocationConstraint")
+          storage_class = options.delete("StorageClass")
+          if location_constraint || storage_class
+            data = "<CreateBucketConfiguration>"
+
+            data += "<LocationConstraint>#{location_constraint}</LocationConstraint>" if location_constraint
+            data += "<StorageClass>#{storage_class}</StorageClass>" if storage_class
+            data += "</CreateBucketConfiguration>"
+
+          else
+            data = nil
+          end
+          request(:expects    => 200,
+                  :body       => data,
+                  :headers    => options,
+                  :idempotent => true,
+                  :host       => "#{bucket_name}.#{@host}",
+                  :method     => "PUT")
+        end
+      end
+
+      class Mock
+        def put_bucket(bucket_name, options = {})
+          acl = options["x-goog-acl"] || "private"
+          if !["private", "public-read", "public-read-write", "authenticated-read"].include?(acl)
+            raise Excon::Errors::BadRequest.new("invalid x-goog-acl")
+          else
+            data[:acls][:bucket][bucket_name] = self.class.acls(options[acl])
+          end
+          response = Excon::Response.new
+          response.status = 200
+          bucket = {
+            :objects        => {},
+            "Name"          => bucket_name,
+            "CreationDate"  => Time.now,
+            "Owner"         => { "DisplayName" => "owner", "ID" => "some_id" },
+            "Payer"         => "BucketOwner"
+          }
+          if options["LocationConstraint"]
+            bucket["LocationConstraint"] = options["LocationConstraint"]
+          else
+            bucket["LocationConstraint"] = ""
+          end
+          if data[:buckets][bucket_name].nil?
+            data[:buckets][bucket_name] = bucket
+          else
+            response.status = 409
+            raise(Excon::Errors.status_error({ :expects => 200 }, response))
+          end
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_bucket_acl.rb

@@ -1,8 +1,8 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Mock
-        def put_bucket_acl(bucket_name, acl)
+        def put_bucket_acl(_bucket_name, _acl)
           Fog::Mock.not_implemented
         end
       end
@@ -21,14 +21,12 @@ module Fog
 </AccessControlList>
 DATA
 
-          request({
-            :body     => data,
-            :expects  => 200,
-            :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'PUT',
-            :query    => {'acl' => nil}
-          })
+          request(:body     => data,
+                  :expects  => 200,
+                  :headers  => {},
+                  :host     => "#{bucket_name}.#{@host}",
+                  :method   => "PUT",
+                  :query    => { "acl" => nil })
         end
 
         private
@@ -38,18 +36,18 @@ DATA
         end
 
         def scope_tag(scope)
-          if %w(AllUsers AllAuthenticatedUsers).include?(scope['type'])
+          if %w(AllUsers AllAuthenticatedUsers).include?(scope["type"])
             "<Scope type='#{scope['type']}'/>"
           else
             "<Scope type='#{scope['type']}'>" +
-              scope.to_a.select { |pair| pair[0] != 'type' }.map { |pair| tag(pair[0], pair[1]) }.join("\n") +
-            "</Scope>"
+              scope.to_a.select { |pair| pair[0] != "type" }.map { |pair| tag(pair[0], pair[1]) }.join("\n") +
+              "</Scope>"
           end
         end
 
         def entries_list(access_control_list)
           access_control_list.map do |entry|
-            tag('Entry', scope_tag(entry['Scope']) + tag('Permission', entry['Permission']))
+            tag("Entry", scope_tag(entry["Scope"]) + tag("Permission", entry["Permission"]))
           end.join("\n")
         end
       end

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Real
         # Create an object in an Google Storage bucket
         #
@@ -25,61 +25,57 @@ module Fog
         def put_object(bucket_name, object_name, data, options = {})
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)
-          request({
-            :body       => data[:body],
-            :expects    => 200,
-            :headers    => headers,
-            :host       => "#{bucket_name}.#{@host}",
-            :idempotent => true,
-            :method     => 'PUT',
-            :path       => Fog::Google.escape(object_name)
-          })
+          request(:body       => data[:body],
+                  :expects    => 200,
+                  :headers    => headers,
+                  :host       => "#{bucket_name}.#{@host}",
+                  :idempotent => true,
+                  :method     => "PUT",
+                  :path       => Fog::Google.escape(object_name))
         end
       end
 
       class Mock
         def put_object(bucket_name, object_name, data, options = {})
-          acl = options['x-goog-acl'] || 'private'
-          if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl)
-            raise Excon::Errors::BadRequest.new('invalid x-goog-acl')
+          acl = options["x-goog-acl"] || "private"
+          if !["private", "public-read", "public-read-write", "authenticated-read"].include?(acl)
+            raise Excon::Errors::BadRequest.new("invalid x-goog-acl")
           else
             self.data[:acls][:object][bucket_name] ||= {}
             self.data[:acls][:object][bucket_name][object_name] = self.class.acls(acl)
           end
 
           data = Fog::Storage.parse_data(data)
-          unless data[:body].is_a?(String)
-            data[:body] = data[:body].read
-          end
+          data[:body] = data[:body].read unless data[:body].is_a?(String)
           response = Excon::Response.new
           if (bucket = self.data[:buckets][bucket_name])
             response.status = 200
             object = {
               :body             => data[:body],
-              'Content-Type'    => options['Content-Type'] || data[:headers]['Content-Type'],
-              'ETag'            => Fog::Google::Mock.etag,
-              'Key'             => object_name,
-              'Last-Modified'   => Fog::Time.now.to_date_header,
-              'Content-Length'  => options['Content-Length'] || data[:headers]['Content-Length']
+              "Content-Type"    => options["Content-Type"] || data[:headers]["Content-Type"],
+              "ETag"            => Fog::Google::Mock.etag,
+              "Key"             => object_name,
+              "Last-Modified"   => Fog::Time.now.to_date_header,
+              "Content-Length"  => options["Content-Length"] || data[:headers]["Content-Length"]
             }
 
             for key, value in options
               case key
-              when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-MD5', 'Expires', /^x-goog-meta-/
+              when "Cache-Control", "Content-Disposition", "Content-Encoding", "Content-MD5", "Expires", /^x-goog-meta-/
                 object[key] = value
               end
             end
 
             bucket[:objects][object_name] = object
             response.headers = {
-              'Content-Length'  => object['Content-Length'],
-              'Content-Type'    => object['Content-Type'],
-              'ETag'            => object['ETag'],
-              'Last-Modified'   => object['Last-Modified']
+              "Content-Length"  => object["Content-Length"],
+              "Content-Type"    => object["Content-Type"],
+              "ETag"            => object["ETag"],
+              "Last-Modified"   => object["Last-Modified"]
             }
           else
             response.status = 404
-            raise(Excon::Errors.status_error({:expects => 200}, response))
+            raise(Excon::Errors.status_error({ :expects => 200 }, response))
           end
           response
         end

data/lib/fog/{google/requests/storage → storage/google_xml/requests}/put_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
   module Storage
-    class Google
+    class GoogleXML
       class Real
         # TODO: move this methods to helper to use them with put_bucket_acl request
         def tag(name, value)
@@ -8,18 +8,18 @@ module Fog
         end
 
         def scope_tag(scope)
-          if %w(AllUsers AllAuthenticatedUsers).include?(scope['type'])
+          if %w(AllUsers AllAuthenticatedUsers).include?(scope["type"])
             "<Scope type='#{scope['type']}'/>"
           else
             "<Scope type='#{scope['type']}'>" +
-              scope.to_a.select {|pair| pair[0] != 'type'}.map { |pair| tag(pair[0], pair[1]) }.join("\n") +
-            "</Scope>"
+              scope.to_a.select { |pair| pair[0] != "type" }.map { |pair| tag(pair[0], pair[1]) }.join("\n") +
+              "</Scope>"
           end
         end
 
         def entries_list(access_control_list)
           access_control_list.map do |entry|
-            tag('Entry', scope_tag(entry['Scope']) + tag('Permission', entry['Permission']))
+            tag("Entry", scope_tag(entry["Scope"]) + tag("Permission", entry["Permission"]))
           end.join("\n")
         end
 
@@ -35,15 +35,13 @@ module Fog
 </AccessControlList>
 DATA
 
-          request({
-            :body     => data,
-            :expects  => 200,
-            :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
-            :method   => 'PUT',
-            :query    => {'acl' => nil},
-            :path     => CGI.escape(object_name)
-          })
+          request(:body     => data,
+                  :expects  => 200,
+                  :headers  => {},
+                  :host     => "#{bucket_name}.#{@host}",
+                  :method   => "PUT",
+                  :query    => { "acl" => nil },
+                  :path     => CGI.escape(object_name))
         end
       end
     end

data/lib/fog/storage/google_xml/requests/put_object_url.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Storage
+    class GoogleXML
+      class Real
+        # Get an expiring object url from Google Storage for putting an object
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        def put_object_url(bucket_name, object_name, expires, headers = {})
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => headers,
+                      :host     => @host,
+                      :method   => "PUT",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+
+      class Mock
+        def put_object_url(bucket_name, object_name, expires, headers = {})
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => headers,
+                      :host     => @host,
+                      :method   => "PUT",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+    end
+  end
+end

data/tasks/bundler.rake

@@ -0,0 +1,3 @@
+# This installs the tasks that help with gem creation and
+# publishing.
+Bundler::GemHelper.install_tasks

data/tasks/console.rake

@@ -0,0 +1,12 @@
+# From http://erniemiller.org/2014/02/05/7-lines-every-gems-rakefile-should-have/
+# with some modification.
+
+desc "Project IRB console"
+task :console do
+  require "irb"
+  require "irb/completion"
+  require "fog/google"
+  Fog.credential = :test
+  ARGV.clear
+  IRB.start
+end