weighted_random 0.0.4 → 0.1.0

data/lib/weighted_random/version.rb

@@ -1,3 +1,3 @@
 module WeightedRandom
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/weighted_random.rb

@@ -5,6 +5,7 @@ module WeightedRandom
   module Loader
     def weighted_randomizable
       extend WeightedRandom::ClassMethods
+      include WeightedRandom::InstanceMethods
     end
   end
 
@@ -12,21 +13,20 @@ module WeightedRandom
     def weighted_rand
       self.where("cumulative_weight > #{Kernel.rand(self.maximum('cumulative_weight'))}").order('cumulative_weight').limit(1).first
     end
-
-    def create_with_cumulative_weight(collection)
-      self.create WeightedRandom.set_cumulative_weight(collection)
-    end
   end
 
-  class << self
-    def set_cumulative_weight(collection)
-      weight_sum = 0
-      collection.collect do |item|
-        weight_sum += item[:weight]
-        item[:cumulative_weight] = weight_sum
-        item
+  module InstanceMethods
+    def self.included base
+      base.instance_eval do
+        before_create :set_cumulative_weight_of_new_record
       end
     end
+
+    private
+
+      def set_cumulative_weight_of_new_record
+        self.cumulative_weight = self.class.maximum('cumulative_weight').to_i + self.weight
+      end
   end
 
 end

data/spec/auto_management_of_cumulative_weight_spec.rb

@@ -6,25 +6,103 @@ describe WeightedRandom, "auto management of cumulative weight" do
     TestModel.find_by_name(name).cumulative_weight
   end
 
-  describe "#create_with_cumulative_weight sets cumulative_weight to" do
-    before(:all) do
-      TestModel.create_with_cumulative_weight [
-        {:name => 'first-50',  :weight => 50},
-        {:name => 'second-1', :weight => 1},
-        {:name => 'last-10',  :weight => 10}
-      ]
+  before(:each) do
+    TestModel.destroy_all
+  end
+
+  context "when there are no records saved" do
+    describe "on single record create " do
+      before(:each) do
+        TestModel.create :name => 'first-77', :weight => 77
+      end
+
+      it "sets cumulative weight of that record to its weight" do
+        cumulative_weight_of('first-77').should be(77)
+      end
     end
 
-    specify "50 for first record with weight 50" do
-      cumulative_weight_of('first-50').should be(50)
+    describe "on collection of records create " do
+      before(:each) do
+        TestModel.create [
+          {:name => 'first-50', :weight => 50},
+          {:name => 'second-1', :weight => 1},
+          {:name => 'last-10',  :weight => 10}
+        ]
+      end
+
+      context "sets cumulative weight of" do
+        specify "first record to its weight" do
+          cumulative_weight_of('first-50').should be(50)
+        end
+
+        specify "second record to first record weight + its weight" do
+          cumulative_weight_of('second-1').should be(51)
+        end
+
+        specify "third record to first record weight + second record weight + its weight" do
+          cumulative_weight_of('last-10').should be(61)
+        end
+      end
     end
+  end
 
-    specify "51 for second record with weight 1" do
-      cumulative_weight_of('second-1').should be(51)
+  context "when there are some records saved" do
+    before(:each) do
+      TestModel.create [
+        {:name => 'first-50',  :weight => 50, :cumulative_weight => 50},
+        {:name => 'second-10', :weight => 10, :cumulative_weight => 60},
+        {:name => 'last-1',    :weight => 1,  :cumulative_weight => 61}
+      ]
     end
 
-    specify "61 for last record with weight 10" do
-      cumulative_weight_of('last-10').should be(61)
+    describe "on single record create" do
+      before(:each) do
+        TestModel.create :name => 'new-10', :weight => 10
+      end
+
+      it "sets cumulative weight of that record to maximum cumulative weight of existing records + its weight" do
+        cumulative_weight_of('new-10').should be(71)
+      end
+
+      context "does not change cumulative weights of existing records" do
+        specify "first" do
+          cumulative_weight_of('first-50').should be(50)
+        end
+
+        specify "last" do
+          cumulative_weight_of('last-1').should be(61)
+        end
+      end
+    end
+
+    describe "on collection of records create" do
+      before(:each) do
+        TestModel.create [
+          {:name => 'next-10',    :weight => 10},
+          {:name => 'another-20', :weight => 20}
+        ]
+      end
+
+      context "sets cumulative weight of" do
+        specify "first created record to max cumulative weight for existing records + its weight" do
+          cumulative_weight_of('next-10').should be(71)
+        end
+
+        specify "second created record to max cumulative weight for existing records + first record weight + its weight" do
+          cumulative_weight_of('another-20').should be(91)
+        end
+      end
+
+      context "does not change cumulative weights of existing records" do
+        specify "first" do
+          cumulative_weight_of('first-50').should be(50)
+        end
+
+        specify "last" do
+          cumulative_weight_of('last-1').should be(61)
+        end
+      end
     end
   end
+
 end

data/spec/weighted_randomization_spec.rb

@@ -8,22 +8,18 @@ describe WeightedRandom, "weighted randomization" do
     counter
   end
 
-  def reload_with_data(data)
-    TestModel.destroy_all
-    TestModel.create_with_cumulative_weight(data)
-  end
-
   context "in 1000 rands" do
     let(:rand_times) { 1000 }
 
     before(:each) do
+      TestModel.destroy_all
       # Set random number generator seed, so every test will receive the same sequence of numbers
       Kernel.srand(77)
     end
 
     describe "deviation tolerance" do
-      before(:all) do
-        reload_with_data [
+      before(:each) do
+        TestModel.create [
           {:name => 'first-50',  :weight => 50},
           {:name => 'second-25', :weight => 25},
           {:name => 'third-10',  :weight => 10},
@@ -65,8 +61,8 @@ describe WeightedRandom, "weighted randomization" do
     end
 
     describe "boundary records with weight 1 (10% of overall)" do
-      before(:all) do
-        reload_with_data [
+      before(:each) do
+        TestModel.create [
           {:name => 'first-1',  :weight => 1},
           {:name => 'second-8', :weight => 8},
           {:name => 'last-1',   :weight => 1}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weighted_random
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72406200 !ruby/object:Gem::Requirement
+  requirement: &83711230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72406200
+  version_requirements: *83711230
 description: ActiveRecord extension for weighted randomization which supplies loading
   records with weight for randomize into database and weighted randomization of them
 email: