periodic_counter 0.1.1 → 0.1.2

data/lib/periodic_counter.rb

@@ -48,12 +48,20 @@ class PeriodicCounter
                 computed_at = data["#{col}_at"] || Time.now.utc
                 duration = column_to_period_integer(col)
                 time_since_compute = Time.now.utc - computed_at
+                last_day =
+                  if col.include?('day')
+                    self.class.today
+                  elsif col.include?('week')
+                    self.class.last_monday
+                  elsif col.include?('month')
+                    self.class.first_of_the_month
+                  end
                 if (time_since_compute - duration) >= 0
                   data[col] = count
-                  data["#{col}_at"] = Time.now.utc
+                  data["#{col}_at"] = last_day
                 else
                   data[col] ||= count
-                  data["#{col}_at"] ||= Time.now.utc
+                  data["#{col}_at"] ||= last_day
                 end
                 record[col] = count - data[col].to_i
               end
@@ -80,4 +88,25 @@ class PeriodicCounter
     end
     eval(column.join('.'))
   end
+  
+  class <<self
+  
+    def first_of_the_month(now=Time.now.utc.to_date)
+      Date.new(now.year, now.month, 1).to_time(:utc)
+    end
+  
+    def last_monday(now=Time.now.utc.to_date)
+      wday = now.wday
+      if wday == 0
+        -6
+      else
+        diff = 1 - wday
+      end
+      Date.new(now.year, now.month, now.day + diff).to_time(:utc)
+    end
+  
+    def today(now=Time.now.utc.to_date)
+      Date.new(now.year, now.month, now.day).to_time(:utc)
+    end
+  end
 end

data/require.rb

@@ -18,7 +18,7 @@ Require do
     name 'periodic_counter'
     homepage "http://github.com/winton/#{name}"
     summary "Maintains period fields on any counter column in your database"
-    version '0.1.1'
+    version '0.1.2'
   end
   
   bin { require 'lib/periodic_counter' }

data/spec/log/test.log

@@ -9957,6 +9957,606 @@ counter_last_day: 4
 counter_last_day_at: &id001 2010-06-12 22:18:56.313985 Z
 counter_last_2_days_at: *id001
 counter_last_2_days: 4
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.2ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (14.5ms)   SHOW TABLES
+  SQL (13.1ms)   SELECT version FROM schema_migrations
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (100.5ms)   DROP TABLE `counters`
+  SQL (0.9ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.4ms)   SHOW TABLES
+  SQL (0.3ms)   SELECT version FROM schema_migrations
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (2.3ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (18.1ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (187.3ms)   SHOW FIELDS FROM `counters`
+  SQL (0.1ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.5ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.3ms)   SHOW FIELDS FROM `counters`
+  SQL (1.6ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.2ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.9ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-14 00:00:00 Z
+counter_last_2_days_at: 2010-06-14 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-14 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-14 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (2.9ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.8ms)   SHOW FIELDS FROM `counters`
+  SQL (1.5ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (3.1ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.7ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-14 00:00:00 Z
+counter_last_2_days_at: 2010-06-14 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 1, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (6.1ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-14 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-14 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (0.5ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-15 23:46:45.964893 Z
+counter_last_2_days_at: 2010-06-14 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 2
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-15 23:46:45.964893 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-14 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (21.0ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: &id001 2010-06-16 23:46:46.005453 Z
+counter_last_2_days_at: *id001
+counter_last_2_days: 4
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.2ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (0.7ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.8ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (21.3ms)   DROP TABLE `counters`
+  SQL (0.8ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (22.0ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (0.7ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (1.7ms)   SHOW FIELDS FROM `counters`
+  SQL (75.0ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.6ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.4ms)   SHOW FIELDS FROM `counters`
+  SQL (1.4ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.4ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.7ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-14 00:00:00 Z
+counter_last_2_days_at: 2010-06-14 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-14 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-14 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (0.6ms)   COMMIT
+  SQL (0.9ms)   SHOW TABLES
+  SQL (3.2ms)   SHOW FIELDS FROM `counters`
+  SQL (1.7ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.4ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.7ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 2
+counter_last_day_at: 2010-06-14 00:00:00 Z
+counter_last_2_days_at: 2010-06-14 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (1.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.4ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 2\ncounter_last_day_at: 2010-06-14 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-14 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (0.6ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-16 00:00:00 Z
+counter_last_2_days_at: 2010-06-16 00:00:00 Z
+counter_last_2_days: 3
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (1.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-16 00:00:00 Z\ncounter_last_2_days: 3\ncounter_last_2_days_at: 2010-06-16 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (0.6ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: 2010-06-17 00:00:00 Z
+counter_last_2_days_at: 2010-06-16 00:00:00 Z
+counter_last_2_days: 3
+', counter_last_day = 0, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (10.6ms)   DROP TABLE `counters`
+  SQL (0.7ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (1.8ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (0.5ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (1.4ms)   SHOW FIELDS FROM `counters`
+  SQL (0.1ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.5ms)   COMMIT
+  SQL (0.6ms)   SHOW TABLES
+  SQL (1.0ms)   SHOW FIELDS FROM `counters`
+  SQL (1.7ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.4ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (31.1ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (3.7ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (0.4ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.0ms)   SHOW FIELDS FROM `counters`
+  SQL (3.5ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.7ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (1.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 1, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.7ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (0.9ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-16 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 2
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.7ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.8ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-16 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (0.4ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: 2010-06-17 00:00:00 Z
+counter_last_2_days_at: 2010-06-17 00:00:00 Z
+counter_last_2_days: 4
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.2ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (10.4ms)   DROP TABLE `counters`
+  SQL (0.8ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (1.9ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (53.9ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (1.3ms)   SHOW FIELDS FROM `counters`
+  SQL (0.8ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.7ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (10.9ms)   SHOW FIELDS FROM `counters`
+  SQL (1.5ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.7ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.6ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (1.7ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (1.4ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.9ms)   SHOW FIELDS FROM `counters`
+  SQL (1.5ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.7ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.6ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 1, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.6ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (3.0ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-16 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 2
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-16 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (0.9ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: 2010-06-17 00:00:00 Z
+counter_last_2_days_at: 2010-06-17 00:00:00 Z
+counter_last_2_days: 4
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (45.9ms)   DROP TABLE `counters`
+  SQL (0.7ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (2.0ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (0.6ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (1.6ms)   SHOW FIELDS FROM `counters`
+  SQL (0.1ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.5ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.3ms)   SHOW FIELDS FROM `counters`
+  SQL (1.7ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.2ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.7ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.4ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (0.8ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.3ms)   SHOW FIELDS FROM `counters`
+  SQL (13.1ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.3ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.8ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 1, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.3ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.8ms)   BEGIN
+  Counter Update (0.3ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (0.6ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-16 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 2
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-16 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (1.0ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: 2010-06-17 00:00:00 Z
+counter_last_2_days_at: 2010-06-17 00:00:00 Z
+counter_last_2_days: 4
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.2ms)   SET SQL_AUTO_IS_NULL=0
+  SQL (0.3ms)   SHOW TABLES
+  SQL (0.3ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (36.2ms)   DROP TABLE `counters`
+  SQL (0.7ms)   DELETE FROM schema_migrations WHERE version = '1'
+  SQL (0.4ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)   SHOW TABLES
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to Counters (1)
+  SQL (2.0ms)   CREATE TABLE `counters` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `counter` int(11), `counter_last_day` int(11), `counter_last_2_days` int(11), `counter_data` varchar(2048)) ENGINE=InnoDB
+  SQL (0.9ms)   INSERT INTO schema_migrations (version) VALUES ('1')
+  Counter Columns (74.3ms)   SHOW FIELDS FROM `counters`
+  SQL (0.4ms)   BEGIN
+  Counter Create (0.3ms)   INSERT INTO `counters` (`counter_data`, `counter_last_day`, `counter`, `counter_last_2_days`) VALUES(NULL, NULL, 1, NULL)
+  SQL (0.4ms)   COMMIT
+  SQL (0.3ms)   SHOW TABLES
+  SQL (1.1ms)   SHOW FIELDS FROM `counters`
+  SQL (1.5ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.7ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.6ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 0
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.4ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 2 WHERE `id` = 1
+  SQL (0.7ms)   COMMIT
+  SQL (0.2ms)   SHOW TABLES
+  SQL (1.4ms)   SHOW FIELDS FROM `counters`
+  SQL (1.3ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.7ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.8ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 1
+counter_last_day_at: 2010-06-15 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 1, counter_last_2_days = 1
+ WHERE id = 1
+
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 1\ncounter_last_day_at: 2010-06-15 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 3 WHERE `id` = 1
+  SQL (0.4ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 3
+counter_last_day_at: 2010-06-16 00:00:00 Z
+counter_last_2_days_at: 2010-06-15 00:00:00 Z
+counter_last_2_days: 1
+', counter_last_day = 0, counter_last_2_days = 2
+ WHERE id = 1
+
+  Counter Load (0.0ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  Counter Load (0.2ms)   SELECT * FROM `counters` ORDER BY counters.id DESC LIMIT 1
+  SQL (0.1ms)   BEGIN
+  Counter Update (0.2ms)   UPDATE `counters` SET `counter_data` = '--- \ncounter_last_day: 3\ncounter_last_day_at: 2010-06-16 00:00:00 Z\ncounter_last_2_days: 1\ncounter_last_2_days_at: 2010-06-15 00:00:00 Z\n', `counter` = 4 WHERE `id` = 1
+  SQL (0.4ms)   COMMIT
+  SQL (0.0ms)   SHOW TABLES
+  SQL (0.0ms)   SHOW FIELDS FROM `counters`
+  SQL (0.0ms)   SHOW FIELDS FROM `schema_migrations`
+  SQL (0.0ms)    SELECT id, counter, counter_data, counter_last_day, counter_last_2_days
+ FROM counters
+
+  SQL (0.0ms)    UPDATE counters
+ SET counter_data = '--- 
+counter_last_day: 4
+counter_last_day_at: 2010-06-17 00:00:00 Z
+counter_last_2_days_at: 2010-06-17 00:00:00 Z
+counter_last_2_days: 4
 ', counter_last_day = 0, counter_last_2_days = 0
  WHERE id = 1
 

data/spec/periodic_counter_spec.rb

@@ -13,8 +13,8 @@ describe PeriodicCounter do
     start
     attributes = Counter.last.attributes
     data = attributes.delete('counter_data')
-    data.delete('counter_last_day_at').to_s.should == Time.now.utc.to_s
-    data.delete('counter_last_2_days_at').to_s.should == Time.now.utc.to_s
+    data.delete('counter_last_day_at').to_s.should == PeriodicCounter.today.to_s
+    data.delete('counter_last_2_days_at').to_s.should == PeriodicCounter.today.to_s
     data.should == {
       "counter_last_day"=>1,
       "counter_last_2_days"=>1
@@ -32,8 +32,8 @@ describe PeriodicCounter do
     start
     attributes = Counter.last.attributes
     data = attributes.delete('counter_data')
-    data.delete('counter_last_day_at').to_s.should == Time.now.utc.to_s
-    data.delete('counter_last_2_days_at').to_s.should == Time.now.utc.to_s
+    data.delete('counter_last_day_at').to_s.should == PeriodicCounter.today.to_s
+    data.delete('counter_last_2_days_at').to_s.should == PeriodicCounter.today.to_s
     data.should == {
       "counter_last_day"=>1,
       "counter_last_2_days"=>1
@@ -52,8 +52,8 @@ describe PeriodicCounter do
     start
     attributes = Counter.last.attributes
     data = attributes.delete('counter_data')
-    data.delete('counter_last_day_at').to_s.should == Time.now.utc.to_s
-    data.delete('counter_last_2_days_at').to_s.should == (Time.now - 1.day).utc.to_s
+    data.delete('counter_last_day_at').to_s.should == PeriodicCounter.today.to_s
+    data.delete('counter_last_2_days_at').to_s.should == (PeriodicCounter.today - 1.day).to_s
     data.should == {
       "counter_last_day"=>3,
       "counter_last_2_days"=>1
@@ -72,8 +72,8 @@ describe PeriodicCounter do
     start
     attributes = Counter.last.attributes
     data = attributes.delete('counter_data')
-    data.delete('counter_last_day_at').to_s.should == Time.now.utc.to_s
-    data.delete('counter_last_2_days_at').to_s.should == Time.now.utc.to_s
+    data.delete('counter_last_day_at').to_s.should == PeriodicCounter.today.to_s
+    data.delete('counter_last_2_days_at').to_s.should == PeriodicCounter.today.to_s
     data.should == {
       "counter_last_day"=>4,
       "counter_last_2_days"=>4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: periodic_counter
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Winton Welsh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -07:00
+date: 2010-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency