obuf 1.0.1 → 1.0.2

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.2 / 2011-08-02
+
+* Fix the bug that caused marshaling errors when an index was requested with Obuf#[] that was out of bounds
+
+
 === 1.0.1 / 2011-08-02
 
 * Fix the bug that was failing Obuf in Ruby 1.8.7 since Mutex is not loaded by default

data/Rakefile

@@ -1,15 +1,31 @@
 # -*- ruby -*-
-
 require 'rubygems'
-require 'hoe'
+require 'jeweler'
+require './lib/obuf'
+
+Jeweler::Tasks.new do |gem|
+  gem.version = Obuf::VERSION
+  gem.name = "obuf"
+  gem.summary = "Ruby disk-backed object buffer"
+  gem.description = "Stores marshaled temporary objects on-disk in a simple Enumerable"
+  gem.email = "me@julik.nl"
+  gem.homepage = "http://github.com/julik/obuf"
+  gem.authors = ["Julik Tarkhanov"]
+  gem.license = 'MIT'
+  
+  gem.add_development_dependency "jeweler"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "flexmock", "~>0.8"
+end
 
-Hoe.spec 'obuf' do | p |
-  p.developer('Julik Tarkhanov', 'me@julik.nl')
+Jeweler::RubygemsDotOrgTasks.new
 
-  p.readme_file   = 'README.rdoc'
-  p.extra_rdoc_files  = FileList['*.rdoc'] + FileList['*.txt']
-  p.extra_dev_deps = {"flexmock" => "~> 0.8"}
-  p.clean_globs = File.read(File.dirname(__FILE__) + "/.gitignore").split(/\s/).to_a
+require 'rake/testtask'
+desc "Run all tests"
+Rake::TestTask.new("test") do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = true
 end
 
-# vim: syntax=ruby
+task :default => [ :test ]

data/lib/obuf.rb

@@ -19,7 +19,7 @@ require "thread" # required for ruby 18
 #
 # Both reading and writing aim to be threadsafe
 class Obuf
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
   
   include Enumerable
   
@@ -113,6 +113,10 @@ class Obuf
   def recover_object_from(io)
     # Up to the tab is the amount of bytes to read
     demarshal_bytes = io.gets("\t").to_i
+    
+    # When at end of IO return nil
+    return nil if demarshal_bytes == 0
+    
     blob = io.read(demarshal_bytes)
     demarshal_object(blob)
   end

data/obuf.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "obuf"
+  s.version = "1.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Julik Tarkhanov"]
+  s.date = "2012-01-10"
+  s.description = "Stores marshaled temporary objects on-disk in a simple Enumerable"
+  s.email = "me@julik.nl"
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".autotest",
+    ".travis.yml",
+    "Gemfile",
+    "History.txt",
+    "README.rdoc",
+    "Rakefile",
+    "lib/obuf.rb",
+    "obuf.gemspec",
+    "test/test_obuf.rb"
+  ]
+  s.homepage = "http://github.com/julik/obuf"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Ruby disk-backed object buffer"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<obuf>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.8"])
+    else
+      s.add_dependency(%q<obuf>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<flexmock>, ["~> 0.8"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<flexmock>, ["~> 0.8"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<flexmock>, ["~> 0.8"])
+    end
+  else
+    s.add_dependency(%q<obuf>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<flexmock>, ["~> 0.8"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<flexmock>, ["~> 0.8"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<flexmock>, ["~> 0.8"])
+  end
+end
+

data/test/test_obuf.rb

@@ -73,6 +73,26 @@ class TestObuf < Test::Unit::TestCase
     assert_equal "E\r\nWow!", a[4]
   end
   
+  def test_random_access
+    a = Obuf.new
+    letters = ("A".."Z").map{|e| "#{e}\r\nWow!"}.to_a
+    letters.map(&a.method(:push))
+    
+    assert_equal "B\r\nWow!", a[1]
+    assert_equal "E\r\nWow!", a[4]
+  end
+
+  def test_random_access_out_of_bounds
+    a = Obuf.new
+    letters = ("A".."Z").map{|e| "#{e}\r\nWow!"}.to_a
+    letters.map(&a.method(:push))
+    assert_equal nil, a[27]
+    
+    b = Obuf.new
+    assert_nil b[0]
+    assert_nil b[-1]
+  end
+  
   def test_clear_calls_close_on_buffer
     io = Tempfile.new("testing")
     flexmock(io).should_receive(:close!).once

metadata

@@ -1,108 +1,165 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: obuf
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-20 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: obuf
+  requirement: &10090570 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *10090570
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &10089860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10089860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &10089550 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10089550
+- !ruby/object:Gem::Dependency
   name: flexmock
+  requirement: &10089250 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: *10089250
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &10088960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10088960
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &10088620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *10088620
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &10088250 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: *10088250
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &10087870 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10087870
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &10087280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 9
-        - 4
-        version: 2.9.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: A simple Ruby object buffer. Use this if you need to temporarily store alot of serializable Ruby objects.
-email: 
-- me@julik.nl
+  prerelease: false
+  version_requirements: *10087280
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &10086930 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: *10086930
+description: Stores marshaled temporary objects on-disk in a simple Enumerable
+email: me@julik.nl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .autotest
+- .travis.yml
+- Gemfile
 - History.txt
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - lib/obuf.rb
+- obuf.gemspec
 - test/test_obuf.rb
-- .gemtest
-has_rdoc: true
 homepage: http://github.com/julik/obuf
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: obuf
-rubygems_version: 1.6.2
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: A simple Ruby object buffer
-test_files: 
-- test/test_obuf.rb
+summary: Ruby disk-backed object buffer
+test_files: []

data/Manifest.txt

@@ -1,7 +0,0 @@
-.autotest
-History.txt
-Manifest.txt
-README.rdoc
-Rakefile
-lib/obuf.rb
-test/test_obuf.rb