uber-s3 0.1.2 → 0.1.3

data/lib/uber-s3/connection/net_http.rb

@@ -4,18 +4,31 @@ module UberS3::Connection
   class NetHttp < Adapter
     
     def request(verb, url, headers={}, body=nil)
+      if verb == :get
+        # Support fetching compressed data
+        headers['Accept-Encoding'] = 'gzip, deflate'
+      end
+      
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
       
       req_klass = instance_eval("Net::HTTP::"+verb.to_s.capitalize)
       req = req_klass.new(uri.to_s, headers)
-            
+      
       r = http.request(req, body)
       
+      # Auto-decode any gzipped objects
+      if verb == :get && r.header['content-encoding'] == 'gzip'
+        gz = Zlib::GzipReader.new(StringIO.new(r.body))
+        response_body = gz.read
+      else
+        response_body = r.body
+      end
+      
       {
         :status => r.code.to_i,
         :header => r.header.to_hash,
-        :body   => r.body,
+        :body   => response_body,
         :raw    => r
       }
     end

data/lib/uber-s3/connection.rb

@@ -39,10 +39,6 @@ class UberS3
           # headers['Connection'] = (persistent ? 'keep-alive' : 'close')
           
           if body
-            mime_type = MIME::Types.type_for(path).first
-            
-            headers['Content-Type']   ||= mime_type.content_type if mime_type
-            headers['Content-Type']   ||= 'binary/octet-stream'
             headers['Content-Length'] ||= body.bytesize.to_s
           end
           

data/lib/uber-s3/object.rb

@@ -1,24 +1,28 @@
 class UberS3
   class Object
+    include Operation::Object::All
 
-    attr_accessor :bucket, :key, :value, :errors
-    # attr_accessor :etag, :last_modified
-    
-    attr_accessor :access,
-                  :cache_control,
-                  :content_disposition,
-                  :content_encoding,
-                  :size,
-                  :content_md5,
-                  :content_type,
-                  :expires,
-                  :storage_class
+    attr_accessor :bucket, :key, :value, :size, :errors
+    
+    # attr_accessor :access,
+    #               :cache_control,
+    #               :content_disposition,
+    #               :content_encoding,
+    #               :size,
+    #               :content_md5,
+    #               :content_type,
+    #               :expires,
+    #               :storage_class
     
     def initialize(bucket, key, value=nil, options={})
-      self.bucket = bucket
-      self.key    = key
-      self.value  = value
+      self.bucket        = bucket
+      self.key           = key
+      self.value         = value
+      
+      # Init state of object
+      infer_content_type!
       
+      # Call operation methods based on options passed
       bucket.connection.defaults.merge(options).each {|k,v| self.send((k.to_s+'=').to_sym, v) }
     end
     
@@ -38,6 +42,9 @@ class UberS3
     def save
       headers = {}
       
+      # Encode data if necessary
+      gzip_content!
+      
       # Standard pass through values
       headers['Cache-Control']        = cache_control
       headers['Content-Disposition']  = content_disposition
@@ -69,6 +76,7 @@ class UberS3
       response = bucket.connection.put(key, headers, value)
       
       if response[:status] != 200
+        # TODO: .. we should raise stuff here!!!!!!!! exception handling....................
         self.errors = response[:body]    
       else
         self.errors = nil
@@ -98,32 +106,13 @@ class UberS3
       @key = key.gsub(/^\//,'')
     end
     
-    ##########################
-    
     def value=(value)
       self.size = value.to_s.bytesize
       @value = value
     end
     
-    def access=(access)
-      valid_values = [:private, :public_read, :public_read_write, :authenticated_read]
-      
-      if valid_values.include?(access)
-        @access = access
-      else
-        raise "Invalid access value"
-      end
-    end
-    
-    def storage_class=(storage_class)
-      valid_values = [:standard, :reduced_redundancy]
-      
-      if valid_values.include?(storage_class)
-        @storage_class = storage_class
-      else
-        raise "Invalid storage_class value"
-      end
-    end
+    # TODO..
+    # Add callback support so Operations can hook into that ... cleaner. ie. on_save { ... }
     
   end
 end

data/lib/uber-s3/operation/object/access_policy.rb

@@ -14,6 +14,15 @@ module UberS3::Operation::Object
     end
     
     module InstanceMethods
+      def access=(access)
+        valid_values = [:private, :public_read, :public_read_write, :authenticated_read]
+
+        if valid_values.include?(access)
+          @access = access
+        else
+          raise "Invalid access value"
+        end
+      end
     end
     
   end

data/lib/uber-s3/operation/object/cache_control.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :cache_control
       end
     end
 

data/lib/uber-s3/operation/object/content_disposition.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :content_disposition
       end
     end
 

data/lib/uber-s3/operation/object/content_encoding.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :gzip, :content_encoding
       end
     end
 
@@ -13,6 +14,50 @@ module UberS3::Operation::Object
     end
     
     module InstanceMethods
+      
+      # Default mime-types to be auto-gzipped if gzip == :web
+      WEB_GZIP_TYPES = ['text/html', 'text/plain', 'text/css',
+                        'application/javascript', 'application/x-javascript',
+                        'text/xml', 'application/xml', 'application/xml+rss']
+      
+      private
+      
+        def gzip_content!
+          return if gzip.nil?
+          
+          if gzip == true
+            encode = true
+          elsif gzip == :web && WEB_GZIP_TYPES.include?(content_type)
+            encode = true
+          elsif gzip.is_a?(String) && gzip == content_type
+            encode = true
+          elsif gzip.is_a?(Array) && gzip.include?(content_type)
+            encode = true
+          else
+            encode = false
+          end
+          
+          if encode
+            self.value = gzip_encoder(value)
+            self.content_encoding = 'gzip'
+          end
+        end
+      
+        def gzip_encoder(data)
+          begin
+            gz_stream = StringIO.new
+            gz = Zlib::GzipWriter.new(gz_stream)
+            gz.write(value)
+            gz.close
+
+            gz_stream.string
+          rescue => ex
+            # TODO ...
+            $stderr.puts "Gzip failed: #{ex.message}"
+            raise ex
+          end
+        end
+      
     end
     
   end

data/lib/uber-s3/operation/object/content_md5.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :content_md5
       end
     end
 

data/lib/uber-s3/operation/object/content_type.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :content_type
       end
     end
 
@@ -13,6 +14,14 @@ module UberS3::Operation::Object
     end
     
     module InstanceMethods
+      
+      def infer_content_type!
+        mime_type = MIME::Types.type_for(key).first
+
+        self.content_type ||= mime_type.content_type if mime_type
+        self.content_type ||= 'binary/octet-stream'
+      end
+      
     end
     
   end

data/lib/uber-s3/operation/object/expires.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :expires
       end
     end
 

data/lib/uber-s3/operation/object/storage_class.rb

@@ -6,6 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
+        attr_accessor :storage_class
       end
     end
 
@@ -13,6 +14,15 @@ module UberS3::Operation::Object
     end
     
     module InstanceMethods
+      def storage_class=(storage_class)
+        valid_values = [:standard, :reduced_redundancy]
+
+        if valid_values.include?(storage_class)
+          @storage_class = storage_class
+        else
+          raise "Invalid storage_class value"
+        end
+      end
     end
     
   end

data/lib/uber-s3/operation.rb

@@ -1,22 +1,35 @@
 class UberS3
   module Operation
     
-    # Load and include all operations
-    Dir[File.dirname(__FILE__)+'/operation/*'].each do |group|
-      Dir[group+'/*.rb'].each do |op|
-      
-        group_klass_name = File.basename(group).split('_').map {|x| x.capitalize}.join("")
-        op_klass_name    = File.basename(op).gsub(/.rb$/i, '').split('_').map {|x| x.capitalize}.join("")
-        
+    module Bucket
+      module All
+        def self.included(base)
+          Operation.include_modules(base, 'bucket')
+        end
+      end
+    end
+    
+    module Object
+      module All
+        def self.included(base)
+          Operation.include_modules(base, 'object')
+        end
+      end
+    end
+    
+    def include_modules(base, path)
+      # Auto include modules of a particular path
+      Dir[File.dirname(__FILE__)+"/operation/#{path}/*.rb"].each do |op|
+        group_module_name = self.to_s + '::' + path.split('_').map {|x| x.capitalize}.join("")
+        op_klass_name = File.basename(op).gsub(/.rb$/i, '').split('_').map {|x| x.capitalize}.join("")
+          
         require op
-        op_klass = instance_eval(group_klass_name+'::'+op_klass_name)
-        group_klass = instance_eval(group_klass_name)
-      
-        group_klass.send :include, op_klass
+        op_klass = instance_eval(group_module_name+'::'+op_klass_name)
+        
+        base.send :include, op_klass
       end
     end
+    module_function :include_modules
         
   end
 end
-
-

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/uber-s3.rb

@@ -4,6 +4,8 @@ require 'openssl'
 require 'forwardable'
 require 'base64'
 require 'digest/md5'
+require 'zlib'
+require 'stringio'
 require 'mime/types'
 
 class UberS3
@@ -30,6 +32,7 @@ require 'uber-s3/version'
 require 'uber-s3/exceptions'
 require 'uber-s3/connection'
 require 'uber-s3/authorization'
+require 'uber-s3/operation'
 require 'uber-s3/bucket'
 require 'uber-s3/object'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70154944646920 !ruby/object:Gem::Requirement
+  requirement: &70300780746280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70154944646920
+  version_requirements: *70300780746280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70154944646480 !ruby/object:Gem::Requirement
+  requirement: &70300780745880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70154944646480
+  version_requirements: *70300780745880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70154944645900 !ruby/object:Gem::Requirement
+  requirement: &70300780745320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70154944645900
+  version_requirements: *70300780745320
 description: A simple & very fast S3 client supporting sync and async communication
 email:
 - peter@nulayer.com