jets3t-rb 1.0.1 → 1.0.2

data/examples/s3.rb

@@ -15,15 +15,18 @@ module JetS3t
   test_bucket = s3_service.bucket(BUCKET_NAME)
 
   # # simple string data
-  # data = "Hello World!"
-  # test_bucket.put('test/hello/world/hello_world.txt', data)
+  data = "Hello World!"
+  test_bucket.put('hello_world.txt', data)
   
+  # # file
   FILE_NAME = '/tmp/hello_world.file'
-  PATH = 'one/two/hello_world.txt'
   File.open(FILE_NAME, 'w') {|f| f.write('Hello World!') }
-  file = File.new(FILE_NAME)
-  test_bucket.put(PATH, file)
+  data = File.new(FILE_NAME)
+  test_bucket.put(data)
 
-  object = test_bucket.get(PATH)
+  object = test_bucket.get('hello_world.txt')
+  p object.data
+  
+  object = test_bucket.get('hello_world.file')
   p object.data
 end

data/jets3t-rb.gemspec

@@ -7,10 +7,10 @@ Dir['ext/*.jar'].each { |jar| require jar }
 
 Gem::Specification.new do |s|
   s.name        = 'jets3t-rb'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Daniel Gaiottino']
-  s.email       = ['daniel@burtcorp.com']
+  s.authors     = ['Daniel Gaiottino', 'David Tollmyr']
+  s.email       = ['daniel@burtcorp.com', 'david@burtcorp.com']
   s.homepage    = 'http://github.com/gaiottino/jets3t-rb'
   s.summary     = %q{JRuby wrapper for JetS3t}
   s.description = %q{JRuby wrapper for JetS3t (http://jets3t.s3.amazonaws.com/)}
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'jets3t-rb'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  #s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  #s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 end

data/lib/jets3t/s3_bucket.rb

@@ -15,10 +15,16 @@ module JetS3t
   class S3Bucket
     def initialize(s3_service, name)
       @s3_service = s3_service
+      @bucket_name = name
       @bucket = @s3_service.get_bucket(name)
+      @stored_files = {}
+      list.each do | item |
+        @stored_files[item.get_name] = true
+      end
     end
     
     def put(path, file)
+      clean_path(path)
       java_file = java.io.File.new(file.path)
       input_stream = java.io.FileInputStream.new(java_file)
       
@@ -26,12 +32,50 @@ module JetS3t
       object.set_data_input_stream(input_stream)
       object.set_content_length(java_file.length)
       object.set_content_type('application/octet-stream')
-      
-      @s3_service.put_object(@bucket, object)
+      data = @s3_service.put_object(@bucket, object)
+      @stored_files[path] = true
+    end
+
+    def put_data(path, data)
+      clean_path(path)
+      object = Jar::S3Object.new(path, data)
+      object.set_content_length(data.size)
+      object.set_content_type('application/octet-stream')
+      data = @s3_service.put_object(@bucket, object)
+      @stored_files[path] = true
     end
     
     def get(filename)
-      S3Object.new(@s3_service.get_object(@bucket, filename))
+      clean_path(filename)
+      return nil unless @stored_files.has_key?(filename)
+      begin
+        S3Object.new(@s3_service.get_object(@bucket, filename))
+      rescue Exception => e
+        nil
+      end
     end
+    
+    def delete(filename)
+      clean_path(filename)
+      @s3_service.delete_object(@bucket, filename)
+      true
+    rescue Exception => e
+      false
+    end
+    
+    def list
+      @bucket_list ||= @s3_service.list_objects(@bucket_name)
+    end
+    
+    private
+      def has_object(path)
+        list.each do | item |
+          return item if item.get_name == path
+        end
+      end
+      # Removed leading /
+      def clean_path(path)
+        path.slice!(0) if path[0] == '/'
+      end
   end
 end

metadata

@@ -2,20 +2,22 @@
 name: jets3t-rb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Daniel Gaiottino
+- David Tollmyr
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 Z
+date: 2011-08-04 00:00:00 Z
 dependencies: []
 
 description: JRuby wrapper for JetS3t (http://jets3t.s3.amazonaws.com/)
 email: 
 - daniel@burtcorp.com
+- david@burtcorp.com
 executables: []
 
 extensions: []