uber-s3 0.1.4 → 0.1.5

data/lib/uber-s3/object.rb

@@ -1,12 +1,11 @@
 class UberS3
   class Object
     include Operation::Object::AccessPolicy
-    include Operation::Object::CacheControl
     include Operation::Object::ContentDisposition
     include Operation::Object::ContentEncoding
     include Operation::Object::ContentMd5
     include Operation::Object::ContentType
-    include Operation::Object::Expires
+    include Operation::Object::HttpCache
     include Operation::Object::Meta
     include Operation::Object::StorageClass
 
@@ -44,12 +43,13 @@ class UberS3
       gzip_content!
       
       # Standard pass through values
-      headers['Cache-Control']        = cache_control
       headers['Content-Disposition']  = content_disposition
       headers['Content-Encoding']     = content_encoding
       headers['Content-Length']       = size.to_s
       headers['Content-Type']         = content_type
+      headers['Cache-Control']        = cache_control
       headers['Expires']              = expires
+      headers['Pragma']               = pragma
             
       headers.each {|k,v| headers.delete(k) if v.nil? || v.empty? }
 

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

@@ -0,0 +1,37 @@
+module UberS3::Operation::Object
+  module HttpCache
+    
+    def self.included(base)
+      base.send :extend,  ClassMethods
+      base.send :include, InstanceMethods
+      
+      base.instance_eval do
+        attr_accessor :cache_control, :expires, :pragma, :ttl
+      end
+    end
+
+    module ClassMethods
+    end
+    
+    module InstanceMethods
+      
+      # Helper method that will set the max-age for cache-control
+      def ttl=(seconds)
+        @ttl = seconds
+        self.cache_control = "public,max-age=#{seconds}"
+      end
+      
+      # Expires can take a time or string
+      def expires=(val)
+        if val.is_a?(String)
+          self.expires = val
+        elsif val.is_a?(Time)
+          # RFC 1123 format 
+          self.expires = val.strftime("%a, %d %b %Y %H:%I:%S %Z")
+        end
+      end
+      
+    end
+        
+  end
+end

data/lib/uber-s3/response.rb

@@ -13,14 +13,14 @@ class UberS3
       self.body   = options[:body]
       self.raw    = options[:raw]
       
-      check_for_errors!
+      success?
     end
     
     # TODO: can/should we normalize the keys..? downcase.. etc.?
     # def header=(header)
     # end
     
-    def check_for_errors!
+    def success?
       return if status < 400 || body.to_s.empty?
       
       # Errors are XML

data/lib/uber-s3/version.rb

@@ -1,3 +1,3 @@
 class UberS3
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70197560327260 !ruby/object:Gem::Requirement
+  requirement: &70176041499080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *70197560327260
+  version_requirements: *70176041499080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197560326480 !ruby/object:Gem::Requirement
+  requirement: &70176041498320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70197560326480
+  version_requirements: *70176041498320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70197560325160 !ruby/object:Gem::Requirement
+  requirement: &70176041496840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70197560325160
+  version_requirements: *70176041496840
 description: A simple & very fast S3 client supporting sync / async HTTP adapters
 email:
 - peter@nulayer.com
@@ -61,12 +61,11 @@ files:
 - lib/uber-s3/error.rb
 - lib/uber-s3/object.rb
 - lib/uber-s3/operation/object/access_policy.rb
-- lib/uber-s3/operation/object/cache_control.rb
 - lib/uber-s3/operation/object/content_disposition.rb
 - lib/uber-s3/operation/object/content_encoding.rb
 - lib/uber-s3/operation/object/content_md5.rb
 - lib/uber-s3/operation/object/content_type.rb
-- lib/uber-s3/operation/object/expires.rb
+- lib/uber-s3/operation/object/http_cache.rb
 - lib/uber-s3/operation/object/meta.rb
 - lib/uber-s3/operation/object/storage_class.rb
 - lib/uber-s3/operation.rb

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

@@ -1,20 +0,0 @@
-module UberS3::Operation::Object
-  module CacheControl
-    
-    def self.included(base)
-      base.send :extend,  ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.instance_eval do
-        attr_accessor :cache_control
-      end
-    end
-
-    module ClassMethods
-    end
-    
-    module InstanceMethods
-    end
-    
-  end
-end

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

@@ -1,20 +0,0 @@
-module UberS3::Operation::Object
-  module Expires
-    
-    def self.included(base)
-      base.send :extend,  ClassMethods
-      base.send :include, InstanceMethods
-      
-      base.instance_eval do
-        attr_accessor :expires
-      end
-    end
-
-    module ClassMethods
-    end
-    
-    module InstanceMethods
-    end
-    
-  end
-end