counter 0.0.5 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.5.1

data/counter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{counter}
-  s.version = "0.0.5"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Koski"]

data/lib/counter/moving_count.rb

@@ -67,17 +67,21 @@ class MovingCount < ActiveRecord::Base
   # Yields a Counter instance, all standard methods apply.
   # Raises an exception if the timestamp would fall too soon under the <tt>sample_interval</tt>.
   def self.record_counts timestamp=Time.now, &block
+   timestamp = Time.at(timestamp) if timestamp.is_a?(Integer)
    c = Counter.new
    yield(c)
    
    self.transaction do
      check_sample_valid(timestamp)
+
+     unless c.counts.empty?
+       q = "INSERT INTO #{self.table_name} (sample_time, category, count) VALUES "
+       c.counts.each { |key, count| q += self.sanitize_sql(['(?, ?, ?),', timestamp, key, count]) }
+       q.chop!
      
-     q = "INSERT INTO #{self.table_name} (sample_time, category, count) VALUES "
-     c.counts.each { |key, count| q += self.sanitize_sql(['(?, ?, ?),', timestamp, key, count]) }
-     q.chop!
-     
-     self.connection.execute(q)
+       self.connection.execute(q)
+     end
+
      self.delete_all(['sample_time < ?', (timestamp - history_to_keep)])
    end
     

data/test/test_moving_count.rb

@@ -20,6 +20,11 @@ class MovingCountTest < Test::Unit::TestCase
       assert_equal 1, PageView.find_by_category('http://www.nytimes.com/article.html').count
     end
     
+    should "not save if no data was recorded" do
+      assert_nothing_raised { PageView.record_counts { |c| } }
+      assert_equal 0, PageView.count
+    end
+    
     context "sample interval" do
       should "raise a RuntimeError to enforce sample interval" do
         setup_existing_counts(59)
@@ -63,6 +68,17 @@ class MovingCountTest < Test::Unit::TestCase
       
         assert_equal 2, PageView.count(:conditions => {:sample_time => Time.now})
       end
+      
+      should "use allow timestamp to be specified as a UNIX stamp" do
+        Timecop.freeze
+      
+        PageView.record_counts(Time.now.to_i) do |c|
+          c.saw('http://www.nytimes.com')
+          c.saw('http://www.nytimes.com/article.html')        
+        end
+      
+        assert_equal 2, PageView.count(:conditions => {:sample_time => Time.now})
+      end
     end
     
     context "purge" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: counter
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.5.1
 platform: ruby
 authors: 
 - Ben Koski