pickup 0.0.2 → 0.0.3

data/lib/pickup.rb

@@ -63,9 +63,9 @@ class Pickup
       item = list.detect do |k,v|
         val = func.call v[:value]
         num = func.call n
-        val >= num && !(uniq && v[:picked])
+        (val >= num) && !(uniq && v[:picked])
       end
-      item ||= list.first{ |k,v| !v[:picked] }
+      item ||= list.detect{ |k,v| !v[:picked] }
       raise "No items left" unless item
       key = item[0]
       list[key][:picked] = true if uniq

data/lib/pickup/version.rb

@@ -1,3 +1,3 @@
 class Pickup
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/pickup/pickup_spec.rb

@@ -14,6 +14,7 @@ describe Pickup do
     }
     @func = Proc.new{ |a| a }
     @pickup = Pickup.new(@list)
+    @pickup2 = Pickup.new(@list, true)
   end
 
   it "should pick correct ammount of items" do
@@ -49,4 +50,9 @@ describe Pickup do
       @ml.get_random_item(30).must_equal "selmon"
     end
   end
+
+  it "should take 7 different fish" do
+    items = @pickup2.pick(7)
+    items.uniq.size.must_equal 7
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: