top_n 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5fc5435e211281c5d59fa26d155260a0359a216
-  data.tar.gz: f3cd1bf16b9c9c11ad87793a7c0741e1fe7f314a
+  metadata.gz: cda9c5805aaeda70a3ea35e8a01314a96e071cd5
+  data.tar.gz: f581488f6929408afe40e98567b076fc1d09f42f
 SHA512:
-  metadata.gz: 471670b61a3b91ff867fab94bcd414a9f766fb7367579122ea57d5f4d58e7b964e4551d77bb4ce35a4b2523df7282dce8a845791c0c8c7677ff4ec46c82b4071
-  data.tar.gz: 24330b140e01c80493d4434720672bef428825bbb8a6133ab234443c77bf498583f4c91360e2a33524da9d4e02a20814ec450a33ed14498a3dbe1c6b435eb08b
+  metadata.gz: f55b87b0711b17b8fee03294baffa347c1df8fb92f010198418870ed5a337a2559358e76cd4a92ded26c424da9e9a9abfea7ef9bea9c744723a3cd3a62b8d2b4
+  data.tar.gz: dab46fa2befd85a4edc51c5c7bef1f4f41b43e1e57ee2aaae0ff5031cf1a0e6fb458f58261e6ca7b20dd5de288edd6bf625d57acc5f0bc942d5a06249f6e19e3

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/top_n.rb

@@ -66,6 +66,12 @@ class TopN
       direction: :top,
     }.merge(options)
 
+    options.keys.each do |opt|
+      unless [:maxsize, :direction].include?opt
+        raise ArgumentError.new("invalid option #{opt}")
+      end
+    end
+
     @maxsize = options[:maxsize]
     @direction = options[:direction]
     @data = {}
@@ -137,20 +143,20 @@ class TopN
   def add_top(key, value)
     @threshold_key ||= key
 
-    if @size >= @maxsize
-      return nil if key < @threshold_key
-      @data.delete(@threshold_key)
-    end
-
-    unless @data.has_key?key
-      @data[key] = []
-      @size += 1 if @size < @maxsize
+    if @data.has_key?key
+      @data[key] << value
+    else
+      if @size >= @maxsize
+        return nil if key < @threshold_key
+        @data.delete(@threshold_key)
+        @size -= 1
+        @threshold_key = @data.keys.min
+      end
+      @data[key] = [ value ]
+      @size += 1
+      @threshold_key = key if key < @threshold_key
     end
 
-    @data[key] << value
-
-    @threshold_key = key if key < @threshold_key
-
     @data[key]
   end
 
@@ -159,20 +165,20 @@ class TopN
   def add_bottom(key, value)
     @threshold_key ||= key
 
-    if @size >= @maxsize
-      return nil if key > @threshold_key
-      @data.delete(@threshold_key)
-    end
-
-    unless @data.has_key?key
-      @data[key] = []
-      @size += 1 if @size < @maxsize
+    if @data.has_key?key
+      @data[key] << value
+    else
+      if @size >= @maxsize
+        return nil if key > @threshold_key
+        @data.delete(@threshold_key)
+        @size -= 1
+        @threshold_key = @data.keys.max
+      end
+      @data[key] = [ value ]
+      @size += 1
+      @threshold_key = key if key > @threshold_key
     end
 
-    @data[key] << value
-
-    @threshold_key = key if key > @threshold_key
-
     @data[key]
   end
 end

data/test/test_adding_bottom.rb

@@ -85,4 +85,19 @@ class TestAddingBottom < Minitest::Test
     assert_equal [2], topn.find(2)
     assert_nil topn.find(3)
   end
+
+  def test_torture
+    topn = TopN.new(direction: :bottom, maxsize: 10)
+
+    records = []
+    300_000.times do
+      record = rand(4000)
+      records << record
+      topn.add(record, rand(100_000_000))
+    end
+
+    top_records = records.uniq.sort[0..9]
+    keys = topn.keys.sort
+    assert_equal top_records, keys
+  end
 end

data/test/test_adding_top.rb

@@ -85,4 +85,19 @@ class TestAddingTop < Minitest::Test
     assert_equal [2], topn.find(2)
     assert_equal [3], topn.find(3)
   end
+
+  def test_torture
+    topn = TopN.new(maxsize: 1000)
+
+    records = []
+    300_000.times do
+      record = rand(4000)
+      records << record
+      topn.add(record, rand(100_000_000))
+    end
+
+    top_records = records.uniq.sort { |a, b| b <=> a }[0..999]
+    keys = topn.keys.sort { |a, b| b <=> a }
+    assert_equal top_records, keys
+  end
 end

data/test/test_creation.rb

@@ -44,4 +44,10 @@ class TestTopN < Minitest::Test
       TopN.new(maxsize: 'foo')
     }
   end
+
+  def test_creation_raises_assertion_for_invalid_argument_names
+    assert_raises(ArgumentError) {
+      TopN.new(flarg: 1)
+    }
+  end
 end

data/top_n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "top_n"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Graff"]
-  s.date = "2013-12-15"
+  s.date = "2013-12-16"
   s.description = "Track the top (or bottom) N keys added to a list, and discard the remainder."
   s.email = "explorer@flame.org"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top_n
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Graff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest