pickup 0.0.5 → 0.0.6

data/lib/pickup.rb

@@ -25,9 +25,26 @@ class Pickup
     end
   end
 
+  class CircleIterator
+      def initialize(obj)
+        @obj = obj.dup
+      end
+
+      def each
+        start = 0
+        until @obj.empty?
+          @obj.each do |item, weight|
+            start += weight
+            if yield([item, start])
+              @obj.delete item
+            end
+          end
+        end
+      end
+    end
+
   class MappedList
-    include Enumerable
-    attr_reader :list, :func, :uniq, :max
+    attr_reader :list, :func, :uniq
 
     def initialize(list, func, uniq=false)
       @func = func
@@ -37,43 +54,18 @@ class Pickup
     end
 
     def each(&blk)
-      item_iterator = next_item
-      item = nil
-      drop = false
-      while true do
-        item ||= item_iterator.call(drop)
-        drop = false
+      CircleIterator.new(@list).each do |item|
         if uniq
-          drop = true if yield item
-          item = nil 
+          true if yield item
         else
-          item = nil unless yield item
+          nil while yield(item)
         end
       end
     end
 
-    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
-    end
-
     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
+      nums = count.times.map{ rand(func.call(max)) }.sort
       get_random_items(nums)
     end
 
@@ -92,5 +84,11 @@ class Pickup
       end
       items
     end
+
+    def max
+      @max ||= begin
+        list.inject(0){ |mx, item| mx += item[1]}
+      end
+    end
   end
 end

data/lib/pickup/version.rb

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

data/spec/pickup/pickup_spec.rb

@@ -38,9 +38,17 @@ describe Pickup do
       @ml2.get_random_items([0]).first.must_equal "selmon"
     end
 
+    it "should return crucian 3 times for uniq pickup" do
+      @ml2.get_random_items([7, 7, 7]).must_equal ["crucian", "crucian", "crucian"]
+    end
+
     it "should return item from the beginning after end of list for uniq pickup" do
       @ml.get_random_items([20, 20, 20, 20]).must_equal ["sturgeon", "gudgeon", "minnow", "selmon"]
     end
+
+    it "should return right max" do
+      @ml.max.must_equal 52
+    end
   end
 
   it "should take 7 different fish" do
@@ -51,4 +59,9 @@ describe Pickup do
   it "should raise an exception" do
     proc{ items = @pickup2.pick(8) }.must_raise RuntimeError
   end
+
+  it "should return include most wegtful item (but not always - sometimes it will fail)" do
+    items = @pickup2.pick(2){ |v| v**20 }
+    (items.include? "minnow").must_equal true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickup
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-04 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.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pickup helps you to pick item from collection by it's weight/probability