shuck 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -13,10 +13,17 @@ GEM
       mime-types
       xml-simple
     builder (2.1.2)
+    columnize (0.3.2)
+    linecache (0.43)
     mime-types (1.16)
     right_aws (2.0.0)
       right_http_connection (>= 1.2.1)
     right_http_connection (1.2.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     thor (0.14.4)
     xml-simple (1.0.12)
 
@@ -28,5 +35,6 @@ DEPENDENCIES
   builder
   bundler (>= 1.0.0)
   right_aws
+  ruby-debug
   shuck!
   thor

data/lib/shuck/file_store.rb

@@ -36,13 +36,14 @@ module Shuck
       @bucket_hash[bucket] = bucket_obj
     end
 
-    def get_object(bucket,object)
+    def get_object(bucket,object, request)
       begin 
         real_obj = S3Object.new
         obj_root = File.join(@root,bucket,object,SHUCK_METADATA_DIR)
         metadata = YAML.parse(File.open(File.join(obj_root,"metadata"),'rb').read)
         real_obj.name = object
         real_obj.md5 = metadata[:md5].value
+        real_obj.content_type = metadata[:content_type] ? metadata[:content_type].value : "application/octet-stream"
         real_obj.io = File.open(File.join(obj_root,"content"),'rb')
         return real_obj
       rescue
@@ -72,14 +73,17 @@ module Shuck
             md5 << chunk
           end
         end
+
         metadata_struct = {}
         metadata_struct[:md5] = md5.hexdigest
+        metadata_struct[:content_type] = request.header["content-type"].first
 
         File.open(metadata,'w') do |f|
           f << YAML::dump(metadata_struct)
         end
         obj = S3Object.new
         obj.md5 = metadata_struct[:md5]
+        obj.content_type = metadata_struct[:content_type]
         return obj
       rescue
         puts $!

data/lib/shuck/s3_object.rb

@@ -1,5 +1,5 @@
 module Shuck
   class S3Object
-    attr_accessor :name,:size,:creation_date,:md5,:io
+    attr_accessor :name,:size,:creation_date,:md5,:io,:content_type
   end
 end

data/lib/shuck/server.rb

@@ -47,12 +47,37 @@ module Shuck
           end
         else
           object = elems[1,elems.size].join('/')
-          real_obj = @store.get_object(bucket,object)
+          real_obj = @store.get_object(bucket,object, request)
+
           if real_obj
             response.status = 200
-            response['Content-Type'] = "application/octet-stream" 
-            response['Content-Length'] = File.size(real_obj.io)
+            response['Content-Type'] = real_obj.content_type
+            content_length = File::Stat.new(real_obj.io.path).size
             response['Etag'] = real_obj.md5
+            response['Accept-Ranges'] = "bytes"
+
+            # Added Range Query support
+            if range = request.header["range"].first
+              response.status = 206
+              if range =~ /bytes=(\d*)-(\d*)/
+                start = $1.to_i
+                finish = $2.to_i
+                finish_str = ""
+                if finish == 0
+                  finish = content_length - 1
+                  finish_str = "#{finish}"
+                else
+                  finish_str = finish.to_s
+                end
+
+                bytes_to_read = finish - start + 1
+                response['Content-Range'] = "bytes #{start}-#{finish_str}/#{content_length}"
+                real_obj.io.pos = start
+                response.body = real_obj.io.read(bytes_to_read)
+                return
+              end
+            end
+            response['Content-Length'] = File::Stat.new(real_obj.io.path).size
             response.body = real_obj.io
           else
             response.status = 404

data/lib/shuck/version.rb

@@ -1,3 +1,3 @@
 module Shuck
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/shuck.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "aws-s3"
   s.add_development_dependency "right_aws"
+  s.add_development_dependency "ruby-debug"
   s.add_dependency "thor"
   s.add_dependency "builder"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 -08:00
+date: 2011-06-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: ruby-debug
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -69,10 +69,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: thor
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -84,6 +84,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: Use Shuck to test basic S3 functionality without actually connecting to S3
 email: 
 - curtis@sevenforge.com