uber-s3 0.1.5 → 0.1.6

data/lib/uber-s3/object.rb

@@ -50,7 +50,7 @@ class UberS3
       headers['Cache-Control']        = cache_control
       headers['Expires']              = expires
       headers['Pragma']               = pragma
-            
+
       headers.each {|k,v| headers.delete(k) if v.nil? || v.empty? }
 
       # Content MD5 integrity check

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

@@ -6,7 +6,7 @@ module UberS3::Operation::Object
       base.send :include, InstanceMethods
       
       base.instance_eval do
-        attr_accessor :content_type
+        # attr_accessor :content_type
       end
     end
 
@@ -22,6 +22,9 @@ module UberS3::Operation::Object
         self.content_type ||= 'binary/octet-stream'
       end
       
+      def content_type=(x);     @content_type = x;          end
+      def content_type;         @content_type;              end
+      
     end
     
   end

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

@@ -2,12 +2,14 @@ module UberS3::Operation::Object
   module HttpCache
     
     def self.included(base)
-      base.send :extend,  ClassMethods
-      base.send :include, InstanceMethods
+      # TODO: .. strange behaviour.. can't override these methods in below modules.
+      # requires some metaprogramming debugging
+      # base.instance_eval do
+      #   attr_accessor :cache_control, :expires, :pragma, :ttl
+      # end
       
-      base.instance_eval do
-        attr_accessor :cache_control, :expires, :pragma, :ttl
-      end
+      base.send :extend,  ClassMethods
+      base.send :include, InstanceMethods   
     end
 
     module ClassMethods
@@ -15,11 +17,39 @@ module UberS3::Operation::Object
     
     module InstanceMethods
       
+      # TODO: shouldn't need this junk... see above comment
+      def cache_control=(x);    @cache_control = x;         end
+      def cache_control;        @cache_control;             end
+      
+      def expires=(x);          @expires = x;               end
+      def expires;              @expires;                   end
+      
+      def pragma=(x);           @pragma = x;                end
+      def pragma;               @pragma;                    end
+      
+      def ttl=(x);              @ttl = x;                   end
+      def ttl;                  @ttl;                       end
+      
+      #----
+      
       # Helper method that will set the max-age for cache-control
-      def ttl=(seconds)
-        @ttl = seconds
-        self.cache_control = "public,max-age=#{seconds}"
+      def ttl=(val)
+        (@ttl = val).tap { infer_cache_control! }
+      end
+      
+      # TODO... there are some edge cases here.. ie. someone sets their own self.content_type ...
+      def infer_cache_control!
+        return if ttl.nil? || content_type.nil?
+        
+        if ttl.is_a?(Hash)
+          mime_types = ttl.keys
+          match = mime_types.find {|pattern| !(content_type =~ /#{pattern}/i).nil? }
+          self.cache_control = "public,max-age=#{ttl[match]}" if match
+        else
+          self.cache_control = "public,max-age=#{ttl}"
+        end
       end
+
       
       # Expires can take a time or string
       def expires=(val)

data/lib/uber-s3/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70176041499080 !ruby/object:Gem::Requirement
+  requirement: &70136054186780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.17'
   type: :runtime
   prerelease: false
-  version_requirements: *70176041499080
+  version_requirements: *70136054186780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70176041498320 !ruby/object:Gem::Requirement
+  requirement: &70136054186160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176041498320
+  version_requirements: *70136054186160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70176041496840 !ruby/object:Gem::Requirement
+  requirement: &70136054185000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70176041496840
+  version_requirements: *70136054185000
 description: A simple & very fast S3 client supporting sync / async HTTP adapters
 email:
 - peter@nulayer.com