pickup 0.0.3 → 0.0.4

data/lib/pickup.rb

@@ -28,7 +28,7 @@ class Pickup
   end
 
   class MappedList
-    attr_reader :list, :func, :uniq
+    attr_reader :list, :func, :uniq, :max
 
     def initialize(list, func, uniq=false)
       @func = func
@@ -36,24 +36,6 @@ class Pickup
       @list = map_list(list)
     end
 
-    def map_list(list)
-      n = 0
-      mapped_list = {}
-      list.each do |k, v|
-        n += v
-        mapped_list[k] = {}
-        mapped_list[k][:value] = n
-        mapped_list[k][:picked] = false if uniq
-      end
-      mapped_list
-    end
-
-    def max
-      @max ||= begin
-        list.inject(0){|sum, (k,v)| sum+list[k][:value] }
-      end
-    end
-
     def random
       num = rand(max)
       get_random_item(num)
@@ -71,5 +53,19 @@ class Pickup
       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
+      end
+      mapped_list
+    end
   end
 end

data/lib/pickup/version.rb

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

data/spec/pickup/pickup_spec.rb

@@ -23,7 +23,7 @@ describe Pickup do
 
   describe Pickup::MappedList do
     before do
-      @mapped_list = {"selmon"=>{:value=>1, :picked=>false}, "carp"=>{:value=>5, :picked=>false}, "crucian"=>{:value=>8, :picked=>false}, "herring"=>{:value=>14, :picked=>false}, "sturgeon"=>{:value=>22, :picked=>false}, "gudgeon"=>{:value=>32, :picked=>false}, "minnow"=>{:value=>52, :picked=>false}}
+      @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
@@ -33,21 +33,21 @@ describe Pickup do
     end
 
     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"
+      @ml.get_random_item(0).must_equal "selmon"
+      @ml.get_random_item(0).must_equal "carp"
+      @ml.get_random_item(0).must_equal "crucian"
     end
 
     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"
+      @ml2.get_random_item(0).must_equal "selmon"
+      @ml2.get_random_item(0).must_equal "selmon"
+      @ml2.get_random_item(0).must_equal "selmon"
     end
 
     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"
+      @ml.get_random_item(20).must_equal "gudgeon"
+      @ml.get_random_item(20).must_equal "minnow"
+      @ml.get_random_item(20).must_equal "selmon"
     end
   end
 

metadata

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