shuck 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shuck (0.0.3)
+    shuck (0.0.4)
       builder
       thor
 

data/lib/shuck/file_store.rb

@@ -1,9 +1,14 @@
 require 'fileutils'
 require 'time'
+require 'shuck/s3_object'
 require 'shuck/bucket'
+require 'digest/md5'
+require 'yaml'
 
 module Shuck
   class FileStore
+    SHUCK_METADATA_DIR = ".shuck_metadataFFF"
+
     def initialize(root)
       @root = root
       @buckets = []
@@ -33,26 +38,53 @@ module Shuck
 
     def get_object(bucket,object)
       begin 
-        io = File.open(File.join(@root,bucket,object),'rb')
-        return io
+        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.io = File.open(File.join(obj_root,"content"),'rb')
+        return real_obj
       rescue
         puts $!
         return nil
       end
     end
 
+    def object_metadata(bucket,object)
+    end
+
     def store_object(bucket,object,request)
       begin
         filename = File.join(@root,bucket,object)
-        parent_dir = File.dirname(filename)
-        FileUtils.mkdir_p(parent_dir)
-        File.open(filename,'w') do |f|
+        FileUtils.mkdir_p(filename)
+
+        metadata_dir = File.join(filename,SHUCK_METADATA_DIR)
+        FileUtils.mkdir_p(metadata_dir)
+
+        content = File.join(filename,SHUCK_METADATA_DIR,"content")
+        metadata = File.join(filename,SHUCK_METADATA_DIR,"metadata")
+
+        md5 = Digest::MD5.new
+        File.open(content,'w') do |f|
           request.body do |chunk|
             f << chunk
+            md5 << chunk
           end
         end
+        metadata_struct = {}
+        metadata_struct[:md5] = md5.hexdigest
+
+        File.open(metadata,'w') do |f|
+          f << YAML::dump(metadata_struct)
+        end
+        obj = S3Object.new
+        obj.md5 = metadata_struct[:md5]
+        return obj
       rescue
         puts $!
+        $!.backtrace.each { |line| puts line }
+        return nil
       end
     end
   end

data/lib/shuck/s3_object.rb

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

data/lib/shuck/server.rb

@@ -47,12 +47,14 @@ module Shuck
           end
         else
           object = elems[1,elems.size].join('/')
-          io = @store.get_object(bucket,object)
-          if io
+          real_obj = @store.get_object(bucket,object)
+          if real_obj
             response.status = 200
             response['Content-Type'] = "application/octet-stream" 
-            response.body = io
-            response.chunked = true
+            response['Content-Length'] = real_obj.io.size
+            response['Etag'] = real_obj.md5
+            response.body = real_obj.io
+            puts real_obj.io.size
           else
             response.status = 404
             response.body = ""
@@ -66,6 +68,7 @@ module Shuck
       path_len = path.size
       path_style_request = true
       host = request["Host"]
+      puts host
       bucket = nil
       path_style_request = true
       if host != @hostname
@@ -92,10 +95,12 @@ module Shuck
             @store.create_bucket(bucket)
           else 
             object = elems[1,elems.size].join('/')
-            @store.store_object(bucket,object,request)
+            real_obj = @store.store_object(bucket,object,request)
+            response['Etag'] = real_obj.md5
           end
         else
-          @store.store_object(bucket,path,request)
+          real_obj = @store.store_object(bucket,path,request)
+          response['Etag'] = real_obj.md5
         end
       end
       response.status = 200

data/lib/shuck/version.rb

@@ -1,3 +1,3 @@
 module Shuck
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/right_aws_commands_test.rb

@@ -6,7 +6,7 @@ require 'right_aws'
 class RightAWSCommandsTest < Test::Unit::TestCase
 
   def setup
-    @s3 = RightAws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => false, :logger => Logger.new('/tmp/x.log'), :server => 'localhost', :port => 10453, :protocol => 'http' })
+    @s3 = RightAws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => false, :server => 'localhost', :port => 10453, :protocol => 'http' })
   end
 
   def teardown
@@ -31,7 +31,7 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     500000.times do
       buffer << "#{(rand * 100).to_i}"
     end
-#
+
     buf_len = buffer.length
     @s3.put("s3media","big",buffer)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 -08:00
+date: 2010-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency