aggtive_record 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmZlNDM4YTRiZTMwOGVlZjYwOWIwOWE2NmExNTAzODEzNTA0ZmI1OQ==
+    NGVmOTFmZTQ3MGExYjRlM2M5ZWViMDM0NzQ5ZjRiNTM0NGU4YzE1Yg==
   data.tar.gz: !binary |-
-    MDQwZjE3ZWQ0ZTZhNDgwY2RhNzMwOTI5YzM1NDU0NjcwNDRhN2FlMQ==
+    MGNlMThmOTU1NmYxYjNjMGJmM2QwZjU0YzczOWU3YzJhNjY3MjQzZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzA2YjM5ZjVkMTlmMjViMTBmOTQwNjBjODUzMTJiZDRiNmM5ODBmMTYxNzc0
-    NTllNDc4ZGJkZmQ0ZTRiOGJkMTdjZTIwOWMyYWZhMDA4MDA0ZGY5ZDM0Y2Rk
-    MTNiNGI0ZDk2OGUxYjFjNDkyMWU3MDBiY2Y3MzEyNTkxNWFmY2E=
+    YjUxNmM0NDg4ZmI1NzE1ZjEyZjdiY2IzOWFmMjZhZWI3ZTk4NDhkYmY4ZGU0
+    NTUyNjVhOGMzZjk4YjUwNmU3NDMxN2NlYTc2Nzk0M2JlMTIzNGQ2ODRkYzUx
+    NjM5NmU3N2M5NmY0ZDUwYTA4YzFlMjkxY2JiNGJhZjc2MTZhMDM=
   data.tar.gz: !binary |-
-    ODBiNTU3ZTBmN2E2YzJkNGMyMjAwODY4MjY3NzU1OGYzM2ViYzFhMzI3Y2Qw
-    YjA5NmZlMDkzMzcxZGE5NzI2ZTRkMzc3MDI3YmY3OWQ3YWE0NTU4ODAxOTIx
-    Mzk2ZjQwMWJmOGM2ZGU5ZmUyOGJlODJiYTljMWY1YWQzOTNkZWE=
+    YjU5NGQ2YmRiZTkwZWQwMGVmOTdmOGFmMWU5NmQ2OTEyOGRmYTU1NzExY2Vi
+    YzY2YjFjYzcxODdiYWFiMGE2YTc5NzMyMDBmOWZkNzk0MWQ1YTY4ZTE5ZDlk
+    MGNmYWM0NzJmNjNkMjU3Y2ExNzdiODdjYWIwOWMyNTY2MjU2NTE=

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/aggtive_record.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "aggtive_record"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Nguyen"]

data/lib/aggtive_record/egg_scopes/collation/rate_per.rb

@@ -22,12 +22,17 @@ module AggtiveRecord
             timespan_in_seconds ||= self.timespan_to_now(records)
 
             # return 0 if no timespan_in_seconds
-            return 0 if timespan_in_seconds.to_i ==0
+            return 0 if timespan_in_seconds.to_i == 0
 
             # eg. :hour is 3600 seconds
             time_period_in_secs = AggtiveRecord::Time.to_seconds(time_period)
+
+            # if the rate query is #per_year, and the only record was created 1 day ago
+            #   then the rate should be _no greater_ than 1 per year (as opposed to 365 per year)
+            time_denominator = [time_period_in_secs, timespan_in_seconds].max
+
                     
-            return records.size.to_f * time_period_in_secs / timespan_in_seconds
+            return records.size.to_f * time_period_in_secs / time_denominator
           end
 
           # defines rate_per_year, rate_per_hour

data/spec/functional/collation_spec.rb

@@ -52,9 +52,17 @@ describe AggtiveRecord do
       old_time = MusicRecord.order('published_at').pluck(:published_at).first
       new_time = Time.now
 
-      expect(MusicRecord.rate_per_week(:overall)).to eq   4.0 * AggtiveRecord::Time.to_seconds(:week) /  (new_time - old_time)
+      expect(MusicRecord.rate_per_week(:overall)).to eq  MusicRecord.count.to_f * AggtiveRecord::Time.to_seconds(:week) /  (new_time - old_time)
     end
 
+    it '#rate_per_month(:overall)'  do
+      old_time = MusicRecord.order('published_at').pluck(:published_at).first
+      new_time = Time.now
+      
+      expect(MusicRecord.rate_per_month(:overall)).to eq  MusicRecord.count.to_f * AggtiveRecord::Time.to_seconds(:month) /  (new_time - old_time)
+    end
+
+
 
     it '#rate_per_week(:past_14_days)' do 
       expect(MusicRecord.rate_per_week(:past_14_days)).to eq 0.5

data/spec/lib/rate_spec.rb

@@ -23,10 +23,20 @@ describe "AggtiveRecord::EggScopes -- .rate" do
             MusicRecord.create published_at: 59.minutes.ago
             expect(MusicRecord.rate_per_hour ).to be_within(0.1).of 2
           end
-
         end
 
 
+        context 'when time span of all records is less than the time period' do 
+          context 'it should have a minimum rate of per that time_period' do 
+            it 'should have rate no less than 1 per month' do 
+              Timecop.freeze
+              MusicRecord.create published_at: 1.day.ago 
+
+              expect(MusicRecord.rate_per_month).to eq 1
+            end
+          end
+        end
+
         it 'should raise an error when a non-time period is passed in'
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggtive_record
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dan Nguyen