dimsum 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbenv-version

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in dimsum.gemspec
 gemspec
+
+group :test do
+  gem 'ruby-debug19'
+  gem 'rake'
+end

data/Rakefile

@@ -1,2 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.ruby_opts = ['-I.:lib:test']
+  t.libs << 'test'
+  t.test_files = ['./test/*_test.rb']
+  t.verbose = true
+end
+
+task :default => :test

data/bin/dimsum

@@ -1,6 +1,7 @@
-#!/usr/bin/env ruby
-
 require 'optparse'
+require 'dimsum'
+
+include Dimsum
 
 options = {}
 
@@ -11,29 +12,15 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-filename = ARGV[0]
-lines = options[:lines].to_i
-raise ArgumentError, "The filename is required" unless filename
-
-file_size = `wc -l #{filename}`.strip.to_i
+options[:lines] ||= "5"
 
-last_2 = `tail -c2 #{filename}`
-if last_2 == "\n\n"
-  file_size -= 1
-end
-
-random = Random.new
+lines = options[:lines].to_i
 
-File.open(filename, "r").lines do |line|
-  if file_size == 0
-    next
-  end
-  r = random.rand(0 .. file_size - 1)
-  if r < lines
-    STDOUT.print line
-    STDOUT.flush
-    lines -= 1
-  end
-  file_size -= 1
-end
+reservoir_sample = if ARGV.length > 0
+                     filename = ARGV[0]
+                     reservoir_file(filename, lines)
+                   else
+                     reservoir_stdin(lines)
+                   end
 
+reservoir_sample.each{ |l| STDOUT.print l }

data/dimsum.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.test_files    = gem.files.grep(%r{^(test)/})
   gem.name          = "dimsum"
   gem.require_paths = ["lib"]
   gem.bindir        = 'bin'

data/lib/dimsum.rb

@@ -1,5 +1,38 @@
 require "dimsum/version"
 
 module Dimsum
-  # Your code goes here...
+  def reservoir_file(filename, sample_size)
+    random = Random.new
+    out = []
+
+    File.open(filename, "r").each_line.each_with_index do |line, line_number|
+      keep, index = keep_line_in_index(line_number, sample_size, random)
+      out[index] = line if keep
+    end
+    out
+  end
+
+  def reservoir_stdin(sample_size)
+    random = Random.new
+    input_line_number = 0
+    out = []
+
+    STDIN.readlines.each do |line|
+      keep, index = keep_line_in_index(input_line_number, sample_size,  random)
+      out[index] = line if keep
+      input_line_number += 1
+    end
+
+    out
+  end
+
+  def keep_line_in_index(input_line_number, sample_size, random_number_generator)
+    if input_line_number <= sample_size
+      [true, input_line_number]
+    else
+      r = random_number_generator.rand(0 .. input_line_number)
+      keep = r < sample_size 
+      [keep, r]
+    end
+  end
 end

data/lib/dimsum/version.rb

@@ -1,3 +1,3 @@
 module Dimsum
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/dimsum_test.rb

@@ -0,0 +1,41 @@
+require 'lib/dimsum'
+require 'minitest/autorun'
+
+class TestDimsum < MiniTest::Unit::TestCase 
+  include Dimsum
+
+  def test_keep_line_in_index__should_keep_any_line_number_less_than_sample_size
+    random = MiniTest::Mock.new
+    sample_size = 5
+
+    (0..4).each do |k|
+      keep, _ = keep_line_in_index(k, sample_size, random)
+      assert keep
+    end
+  end
+
+  def test_keep_line_inde_index__should__keep_line_when_index_is_less_than_random
+    expected_index = 2
+    random = MiniTest::Mock.new
+    current_line = 10
+    random.expect(:rand, expected_index, [(0 .. current_line)])
+    sample_size = 5
+
+    keep, actual_index = keep_line_in_index(10, sample_size, random)
+
+    assert keep
+    assert_equal expected_index, actual_index
+  end
+
+  def test_keep_line_inde_index__should_not_keep_line_when_index_is_more_or_equal_than_random
+    random_value = 8
+    random = MiniTest::Mock.new
+    current_line = 10
+    random.expect(:rand, random_value, [(0 .. current_line)])
+    sample_size = 5
+    keep, _ = keep_line_in_index(10, sample_size, random)
+
+    refute keep
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimsum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies: []
 description: dimsum is a very simple ruby script that performs reservoir sampling
   on the input file.
@@ -33,6 +33,7 @@ files:
 - dimsum.gemspec
 - lib/dimsum.rb
 - lib/dimsum/version.rb
+- test/dimsum_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -47,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1291815841305852171
+      hash: 1690918052010414443
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -56,11 +57,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1291815841305852171
+      hash: 1690918052010414443
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: reservoir sampling
-test_files: []
+test_files:
+- test/dimsum_test.rb