pickup 0.0.4 → 0.0.5

data/README.md

@@ -67,6 +67,21 @@ pickup.pick
 #=> "minnow"
 ```
 
+### Random uniq pick
+
+Also we can pick random uniq items from the list
+
+```ruby
+pickup = Pickup.new(pond, uniq: true)
+pickup.pick(3)
+#=> [ "gudgeon", "herring", "minnow" ]
+pickup.pick
+#=> "herring"
+pickup.pick
+#=> "gudgeon"
+pickup.pick
+#=> "sturgeon"
+```
 
 ## Contributing
 

data/lib/pickup.rb

@@ -4,18 +4,16 @@ class Pickup
   attr_reader :list, :uniq
   attr_writer :pick_func
 
-  def initialize(list, uniq=false, &block)
+  def initialize(list, opts={}, &block)
     @list = list
-    @uniq = uniq
+    @uniq = opts[:uniq] || false
     @pick_func = block if block_given?
   end
 
   def pick(count=1, &block)
     func = block || pick_func
     mlist = MappedList.new(list, func, uniq)
-    result = count.times.map do |i|
-      mlist.random
-    end
+    result = mlist.random(count)
     count == 1 ? result.first : result
   end
 
@@ -28,44 +26,71 @@ class Pickup
   end
 
   class MappedList
+    include Enumerable
     attr_reader :list, :func, :uniq, :max
 
     def initialize(list, func, uniq=false)
       @func = func
       @uniq = uniq
-      @list = map_list(list)
+      @list = list
+      @current_state = 0
     end
 
-    def random
-      num = rand(max)
-      get_random_item(num)
+    def each(&blk)
+      item_iterator = next_item
+      item = nil
+      drop = false
+      while true do
+        item ||= item_iterator.call(drop)
+        drop = false
+        if uniq
+          drop = true if yield item
+          item = nil 
+        else
+          item = nil unless yield item
+        end
+      end
     end
 
-    def get_random_item(n)
-      item = list.detect do |k,v|
-        val = func.call v[:value]
-        num = func.call n
-        (val >= num) && !(uniq && v[:picked])
+    def next_item
+      dup   = list.dup
+      start = 0
+      enum  = dup.to_enum
+      item  = nil
+      Proc.new do |drop|
+        dup.delete item if drop
+        item = begin
+          enum.next
+        rescue StopIteration => e
+          enum = dup.to_enum
+          enum.next
+        end
+        start += item[1]
+        item[1] = start
+        item
       end
-      item ||= list.detect{ |k,v| !v[:picked] }
-      raise "No items left" unless item
-      key = item[0]
-      list[key][:picked] = true if uniq
-      key
     end
-    
-  private
 
-    def map_list(list)
-      @max = 0
-      mapped_list = {}
-      list.each do |k, v|
-        mapped_list[k] = {}
-        mapped_list[k][:value] = @max
-        @max += v
-        mapped_list[k][:picked] = false if uniq
+    def random(count)
+      raise "List is shorter then count of items you want to get" if uniq && list.size < count
+      nums = count.times.map{ func.call(rand(max)) }.sort
+      get_random_items(nums)
+    end
+
+    def get_random_items(nums)
+      next_num = Proc.new{ nums.shift }
+      current_num = next_num.call
+      items = []
+      each do |item, counter|
+        break unless current_num
+        val = func.call(counter)
+        if val > current_num
+          items << item
+          current_num = next_num.call
+          true
+        end
       end
-      mapped_list
+      items
     end
   end
 end

data/lib/pickup/version.rb

@@ -1,3 +1,3 @@
 class Pickup
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/pickup/pickup_spec.rb

@@ -14,40 +14,32 @@ describe Pickup do
     }
     @func = Proc.new{ |a| a }
     @pickup = Pickup.new(@list)
-    @pickup2 = Pickup.new(@list, true)
+    @pickup2 = Pickup.new(@list, uniq: true)
   end
 
   it "should pick correct ammount of items" do
     @pickup.pick(2).size.must_equal 2
+    @pickup.pick(10).size.must_equal 10
   end
 
   describe Pickup::MappedList do
     before do
-      @mapped_list = {"selmon"=>{:value=>0, :picked=>false}, "carp"=>{:value=>1, :picked=>false}, "crucian"=>{:value=>5, :picked=>false}, "herring"=>{:value=>8, :picked=>false}, "sturgeon"=>{:value=>14, :picked=>false}, "gudgeon"=>{:value=>22, :picked=>false}, "minnow"=>{:value=>32, :picked=>false}}
       @ml = Pickup::MappedList.new(@list, @func, true)
       @ml2 = Pickup::MappedList.new(@list, @func)
     end
 
-    it "should return right mapped list" do
-      @ml.list.must_equal(@mapped_list)
-    end
-
     it "should return selmon and then carp and then crucian for uniq pickup" do
-      @ml.get_random_item(0).must_equal "selmon"
-      @ml.get_random_item(0).must_equal "carp"
-      @ml.get_random_item(0).must_equal "crucian"
+      @ml.get_random_items([0, 0, 0]).must_equal ["selmon", "carp", "crucian"]
     end
 
     it "should return selmon 3 times for non-uniq pickup" do
-      @ml2.get_random_item(0).must_equal "selmon"
-      @ml2.get_random_item(0).must_equal "selmon"
-      @ml2.get_random_item(0).must_equal "selmon"
+      @ml2.get_random_items([0]).first.must_equal "selmon"
+      @ml2.get_random_items([0]).first.must_equal "selmon"
+      @ml2.get_random_items([0]).first.must_equal "selmon"
     end
 
     it "should return item from the beginning after end of list for uniq pickup" do
-      @ml.get_random_item(20).must_equal "gudgeon"
-      @ml.get_random_item(20).must_equal "minnow"
-      @ml.get_random_item(20).must_equal "selmon"
+      @ml.get_random_items([20, 20, 20, 20]).must_equal ["sturgeon", "gudgeon", "minnow", "selmon"]
     end
   end
 
@@ -55,4 +47,8 @@ describe Pickup do
     items = @pickup2.pick(7)
     items.uniq.size.must_equal 7
   end
+
+  it "should raise an exception" do
+    proc{ items = @pickup2.pick(8) }.must_raise RuntimeError
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies: []
 description: Pickup helps you to pick item from collection by it's weight/probability
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Pickup helps you to pick item from collection by it's weight/probability