pickup 0.0.2 → 0.0.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/pickup.rb +2 -2
- data/lib/pickup/version.rb +1 -1
- data/spec/pickup/pickup_spec.rb +6 -0
- metadata +1 -1
data/lib/pickup.rb
CHANGED
@@ -63,9 +63,9 @@ class Pickup
|
|
63
63
|
item = list.detect do |k,v|
|
64
64
|
val = func.call v[:value]
|
65
65
|
num = func.call n
|
66
|
-
val >= num && !(uniq && v[:picked])
|
66
|
+
(val >= num) && !(uniq && v[:picked])
|
67
67
|
end
|
68
|
-
item ||= list.
|
68
|
+
item ||= list.detect{ |k,v| !v[:picked] }
|
69
69
|
raise "No items left" unless item
|
70
70
|
key = item[0]
|
71
71
|
list[key][:picked] = true if uniq
|
data/lib/pickup/version.rb
CHANGED
data/spec/pickup/pickup_spec.rb
CHANGED
@@ -14,6 +14,7 @@ describe Pickup do
|
|
14
14
|
}
|
15
15
|
@func = Proc.new{ |a| a }
|
16
16
|
@pickup = Pickup.new(@list)
|
17
|
+
@pickup2 = Pickup.new(@list, true)
|
17
18
|
end
|
18
19
|
|
19
20
|
it "should pick correct ammount of items" do
|
@@ -49,4 +50,9 @@ describe Pickup do
|
|
49
50
|
@ml.get_random_item(30).must_equal "selmon"
|
50
51
|
end
|
51
52
|
end
|
53
|
+
|
54
|
+
it "should take 7 different fish" do
|
55
|
+
items = @pickup2.pick(7)
|
56
|
+
items.uniq.size.must_equal 7
|
57
|
+
end
|
52
58
|
end
|