pickup 0.0.1 → 0.0.2

data/README.md

@@ -20,52 +20,52 @@ Or install it yourself as:
 
 For example, we have got a pond with fish.
 
-  ```ruby
-    pond = {
-      "selmon"  => 1,
-      "carp" => 4,
-      "crucian"  => 3,
-      "herring" => 6,
-      "sturgeon" => 8,
-      "gudgeon" => 10,
-      "minnow" => 20
-    }
-  ```
+```ruby
+pond = {
+  "selmon"  => 1,
+  "carp" => 4,
+  "crucian"  => 3,
+  "herring" => 6,
+  "sturgeon" => 8,
+  "gudgeon" => 10,
+  "minnow" => 20
+}
+```
 Values are a chence to get this fish.
 
 So we should create our pickup.
 
-  ```ruby
-    pickup = Pickup.new(pond)
-    pickup.pick(3)
-    #=> [ "gudgeon", "minnow", "minnow" ]
-  ```
-Look, we've just catched few minnows! To get selmon we need some mor tries ;)
+```ruby
+pickup = Pickup.new(pond)
+pickup.pick(3)
+#=> [ "gudgeon", "minnow", "minnow" ]
+```
+Look, we've just catched few minnows! To get selmon we need some more tries ;)
 
 Ok. What if our probability is not a linear function. We can create our pickup with a function:
 
-  ```ruby
-    pickup = Pickup.new(pond){ |v| v**2 }
-    pickup.pick(3)
-    #=> ["carp", "selmon", "crucian"]
-  ```
+```ruby
+pickup = Pickup.new(pond){ |v| v**2 }
+pickup.pick(3)
+#=> ["carp", "selmon", "crucian"]
+```
 Wow, good catch!
 
 Also you can change our `function` on the fly. Let's make square function:
 
-  ```ruby
-    pickup = Pickup.new(pond)
-    pickup.pick_func = Proc.new{ |v| v**2 }
-  ```
+```ruby
+pickup = Pickup.new(pond)
+pickup.pick_func = Proc.new{ |v| v**2 }
+```
 Or you can pass a block as a probability function wich will be applicable only to current operation
 
-  ```ruby
-    pickup = Pickup.new(pond)
-    pickup.pick{ |v| 1/v } # same as pickup.pick(1){ ... }
-    #=> "selmon"
-    pickup.pick
-    #=> "minnow"
-  ```
+```ruby
+pickup = Pickup.new(pond)
+pickup.pick{ |v| Math.sin(v) } # same as pickup.pick(1){ ... }
+#=> "selmon"
+pickup.pick
+#=> "minnow"
+```
 
 
 ## Contributing

data/lib/pickup.rb

@@ -1,17 +1,18 @@
 require "pickup/version"
 
 class Pickup
-  attr_reader :list
+  attr_reader :list, :uniq
   attr_writer :pick_func
 
-  def initialize(list, &block)
+  def initialize(list, uniq=false, &block)
     @list = list
+    @uniq = uniq
     @pick_func = block if block_given?
   end
 
   def pick(count=1, &block)
     func = block || pick_func
-    mlist = MappedList.new(list, func)
+    mlist = MappedList.new(list, func, uniq)
     result = count.times.map do |i|
       mlist.random
     end

data/lib/pickup/version.rb

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

data/spec/pickup/pickup_spec.rb

@@ -16,7 +16,7 @@ describe Pickup do
     @pickup = Pickup.new(@list)
   end
 
-  it "should be equal" do
+  it "should pick correct ammount of items" do
     @pickup.pick(2).size.must_equal 2
   end
 
@@ -26,23 +26,24 @@ describe Pickup do
       @ml = Pickup::MappedList.new(@list, @func, true)
       @ml2 = Pickup::MappedList.new(@list, @func)
     end
-    it "should return mapped list" do
+
+    it "should return right mapped list" do
       @ml.list.must_equal(@mapped_list)
     end
 
-    it "should return selmon and then carp and then crucian" do
+    it "should return selmon and then carp and then crucian for uniq pickup" do
       @ml.get_random_item(1).must_equal "selmon"
       @ml.get_random_item(1).must_equal "carp"
       @ml.get_random_item(1).must_equal "crucian"
     end
 
-    it "should return selmon 3 times" do
+    it "should return selmon 3 times for non-uniq pickup" do
       @ml2.get_random_item(1).must_equal "selmon"
       @ml2.get_random_item(1).must_equal "selmon"
       @ml2.get_random_item(1).must_equal "selmon"
     end
 
-    it "should return first item after last" do
+    it "should return item from the beginning after end of list for uniq pickup" do
       @ml.get_random_item(30).must_equal "gudgeon"
       @ml.get_random_item(30).must_equal "minnow"
       @ml.get_random_item(30).must_equal "selmon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies: []
 description: Pickup helps you to pick item from collection by it's weight/probability
 email: