jruby-bloomfilter 1.0.5 → 1.0.10

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    jets3t-rb (1.0.1)
+    jets3t-rb (1.0.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/bloomfilter.gemspec

@@ -6,19 +6,19 @@ Dir['ext/*.jar'].each { |jar| require jar }
 
 Gem::Specification.new do |s|
   s.name        = 'jruby-bloomfilter'
-  s.version     = '1.0.5'
+  s.version     = '1.0.10'
   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/bloomfilter'
   s.summary     = %q{JRuby wrapper for java-bloomfilter}
   s.description = %q{JRuby wrapper (+ some extra functionality) to http://code.google.com/p/java-bloomfilter}
 
   s.rubyforge_project = 'jruby-bloomfilter'
-  s.add_dependency 'jets3t-rb'
+  s.add_dependency 'jets3t-rb', '>= 1.0.2'
 
   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/bloomfilter/serialization/file.rb

@@ -1,15 +1,25 @@
+require 'fileutils'
+
 module Bloomfilter
   module Serialization
     class File
       def store(path, filter)
         dir = ::File.dirname(path)
         unless ::File.directory?(dir)
-          %x(mkdir -p #{dir})
+          begin
+            FileUtils.mkdir_p(dir)
+          rescue => e
+            $stderr.puts "Exception raised when trying to create directory: #{path} - #{e.message}"
+          end
         end
 
         unless ::File.directory?(dir)
           $stderr.puts "Unable to create the directory #{dir}. Trying again."
-          %x(mkdir -p #{dir})
+          begin
+            FileUtils.mkdir_p(dir)
+          rescue => e
+            $stderr.puts "Exception raised when trying to create directory: #{path} - #{e.message}"
+          end
         end        
         
         unless ::File.directory?(dir)
@@ -25,8 +35,13 @@ module Bloomfilter
         return nil unless ::File.exist?(path)
         
         ::File.open(path, 'r') do |f|
-          return Marshal.load(f)
+          begin
+            @loaded_file = Marshal.load(f) unless f.size == 0
+          rescue => e
+            @loaded_file = nil
+          end
         end
+        @loaded_file
       end
       
     private

data/lib/bloomfilter/serialization/s3.rb

@@ -12,19 +12,32 @@ module Bloomfilter
         @bucket = s3_service.bucket(bucket_name)
       end
     
+      def store_file(path, file_path)
+        begin
+          file = ::File.new(file_path)
+          path.slice!(0) if path[0] == '/'
+          @bucket.put(path, file)
+        rescue Exception => e
+          $stderr.puts "Exception when storing to S3 #{e.message}"
+          $stderr.puts e.backtrace
+        end
+      end
+      
       def store(path, filter)
-        tmp = Tempfile.new(TEMP_FILE_PREFIX)
-        @file_serializer.store(tmp.path, filter)
-        @bucket.put(path, tmp)
+        begin
+          data = Marshal.dump(filter).to_java_bytes
+          @bucket.put_data(path, data)
+        end
       end
 
       def load(path)
         s3_object = @bucket.get(path)
-        tmp = Tempfile.new(TEMP_FILE_PREFIX)
-        ::File.open(tmp.path, 'w') do |f|
-          f << s3_object.data
+        return nil if s3_object.nil?
+        begin
+          @loaded_file = Marshal.load(s3_object.data)
+        rescue Exception => e
+          nil
         end
-        @file_serializer.load(tmp.path)
       end
     end
   end

data/lib/bloomfilter/serializer.rb

@@ -5,7 +5,7 @@ module Bloomfilter
   class Serializer
 
     def self.s3(access_key, secret_key, bucket_name)
-      credentials = JetS3t::AWSCredentials.new(access_key_id, secret_access_key)
+      credentials = JetS3t::AWSCredentials.new(access_key, secret_key)
       s3_service = JetS3t::RestS3Service.new(credentials)
       return Serialization::S3.new(s3_service, bucket_name)
     end

data/spec/serialization_spec.rb

@@ -11,12 +11,14 @@ module Bloomfilter
       @filter << 'hello'
       @filter << 'world'
       @path = Tempfile.new('bloomfilter').path
+      %x(rm -rf /tmp/bloomfilter_spec)
+      @path2 = "/tmp/bloomfilter_spec/test1/test2/test3"
     end
   
     context 'File' do
       it 'should be possible to store a filter to a file' do
         Serializer.file.store(@path, @filter)
-        File.new(@path).size.should == 1612
+        File.new(@path).size.should > 0
       end
 
       it 'should be possible to load a filter from a file' do
@@ -26,9 +28,19 @@ module Bloomfilter
         filter.include?('world').should be_true
         filter.include?('bloomfilter').should be_false
       end
+
+      it 'should create a recursive directory for storing stuff' do
+        1000.times do | i |
+          filename = @path2 + "/test#{i}/staticdir/filter"
+          Serializer.file.store(filename, @filter)
+          f = File.new(filename)
+          f.size.should > 0
+        end
+      end
+
     end
   
-    context 'S3' do
+    context 'S3 stubbed' do
       before do
         bucket_name = 'test-bucket'
         s3_service = stub('s3_service')
@@ -38,17 +50,40 @@ module Bloomfilter
         @s3 = Serialization::S3.new(s3_service, bucket_name)
       end
     
-      it 'should be possible to store a filter to S3' do
-        @bucket.should_receive(:put).with('/some/path', anything)
+      it 'should send serialized file to S3 and strip leading /' do
+        @bucket.should_receive(:put).with('some/path', anything)
         @s3.store('/some/path', @filter)
       end
     
-      it 'should be possible to load a filter from S3' do
+      it 'should try and get serialized file from S3' do
         s3_object = stub('s3_object')
         @bucket.should_receive(:get).with('/some/path').and_return(s3_object)
         s3_object.should_receive(:data).and_return(Marshal.dump(@filter))
         @s3.load('/some/path')
       end
     end
+    
+    context 'S3' do
+      before do
+        aws_secret_path = '~/.awssecret'.freeze
+        raise "#{aws_secret_path} not found" unless File.exist?(File.expand_path(aws_secret_path))
+        access_key_id, secret_access_key = File.readlines(File.expand_path(aws_secret_path)).map(&:chomp)
+        @bucket_name = 'test-bucket-12345'
+        credentials = JetS3t::AWSCredentials.new(access_key_id, secret_access_key)
+        s3_service = JetS3t::RestS3Service.new(credentials)
+        @s3 = Serialization::S3.new(s3_service, @bucket_name)
+        @store_path = "/path/rspec_store_test.bin"
+        bucket = s3_service.bucket(@bucket_name)
+        bucket.delete(@store_path)
+      end
+    
+      it 'should be possible to store and load a filter from S3' do
+        @s3.store(@store_path, @filter)
+        filter = @s3.load(@store_path)
+        filter.include?('hello').should be_true
+        filter.include?('world').should be_true
+        filter.include?('bloomfilter').should be_false
+      end
+    end    
   end
 end

metadata

@@ -2,15 +2,16 @@
 name: jruby-bloomfilter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors: 
 - Daniel Gaiottino
+- David Tollmyr
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 Z
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jets3t-rb
@@ -20,12 +21,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.2
   type: :runtime
   version_requirements: *id001
 description: JRuby wrapper (+ some extra functionality) to http://code.google.com/p/java-bloomfilter
 email: 
 - daniel@burtcorp.com
+- david@burtcorp.com
 executables: []
 
 extensions: []
@@ -75,7 +77,5 @@ rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: JRuby wrapper for java-bloomfilter
-test_files: 
-- spec/bloomfilter_spec.rb
-- spec/serialization_spec.rb
-- spec/spec_helper.rb
+test_files: []
+