merge with timestamp changes

Author: Patrick Crosby

Rakefile

@@ -1,61 +1,13 @@
 require 'rubygems'
-#require 'bundler'
-#begin
-#  Bundler.setup(:default, :development)
-#rescue Bundler::BundlerError => e
-#  $stderr.puts e.message
-#  $stderr.puts "Run `bundle install` to install missing gems"
-#  exit e.status_code
-#end
 require 'rake'
 
-#require 'jeweler'
-#Jeweler::Tasks.new do |gem|
-#  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-#  gem.name = "stathat"
-#  gem.homepage = "http://github.com/patrickxb/stathat"
-#  gem.license = "MIT"
-#  gem.summary = %Q{gem to access StatHat api}
-#  gem.description = %Q{Easily post stats to your StatHat account using this gem.  Encapsulates full API.}
-#  gem.email = "[email protected]"
-#  gem.authors = ["Patrick Crosby"]
-#  # Include your dependencies below. Runtime dependencies are required when using your gem,
-#  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-#  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-#  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-#end
-#Jeweler::RubygemsDotOrgTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-#require 'rcov/rcovtask'
-#Rcov::RcovTask.new do |test|
-#  test.libs << 'test'
-#  test.pattern = 'test/**/test_*.rb'
-#  test.verbose = true
-#end
-
 task :default => :test
 
 require 'rdoc/task'
-#require 'rake/rdoctask'
-#Rake::RDocTask.new do |rdoc|
-#  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-#
-#  rdoc.rdoc_dir = 'rdoc'
-#  rdoc.title = "stathat #{version}"
-#  rdoc.rdoc_files.include('README*')
-#  rdoc.rdoc_files.include('lib/**/*.rb')
-#end
-
-#namespace :doc do
-#        desc "build literate documentation"
-#        task :build do
-#                sh "rocco -o doc lib/*.rb"
-#        end
-#end

VERSION

@@ -1 +1 @@
-0.0.4
+0.1.3

lib/stathat.rb

@@ -7,20 +7,20 @@
 module StatHat
         class API
                 class << self
-                        def ez_post_value(stat_name, ezkey, value, &block)
-                                Reporter.instance.ez_post_value(stat_name, ezkey, value, block)
+                        def ez_post_value(stat_name, ezkey, value, timestamp=nil, &block)
+                                Reporter.instance.ez_post_value(stat_name, ezkey, value, timestamp, block)
                         end
 
-                        def ez_post_count(stat_name, ezkey, count, &block)
-                                Reporter.instance.ez_post_count(stat_name, ezkey, count, block)
+                        def ez_post_count(stat_name, ezkey, count, timestamp=nil, &block)
+                                Reporter.instance.ez_post_count(stat_name, ezkey, count, timestamp, block)
                         end
 
-                        def post_count(stat_key, user_key, count, &block)
-                                Reporter.instance.post_count(stat_key, user_key, count, block)
+                        def post_count(stat_key, user_key, count, timestamp=nil, &block)
+                                Reporter.instance.post_count(stat_key, user_key, count, timestamp, block)
                         end
 
-                        def post_value(stat_key, user_key, value, &block)
-                                Reporter.instance.post_value(stat_key, user_key, value, block)
+                        def post_value(stat_key, user_key, value, timestamp=nil, &block)
+                                Reporter.instance.post_value(stat_key, user_key, value, timestamp, block)
                         end
                 end
         end
@@ -32,7 +32,6 @@ class Reporter
                 CLASSIC_COUNT_URL = "http://api.stathat.com/c"
                 EZ_URL = "http://api.stathat.com/ez"
 
-
                 def initialize
                         @que = Queue.new
                         @runlock = Mutex.new
@@ -44,32 +43,36 @@ def finish()
                         # XXX serialize queue?
                 end
 
-                def post_value(stat_key, user_key, value, cb)
+                def post_value(stat_key, user_key, value, timestamp, cb)
                         args = { :key => stat_key,
                                 :ukey => user_key,
                                 :value => value }
+                        args[:t] = timestamp unless timestamp.nil?
                         enqueue(CLASSIC_VALUE_URL, args, cb)
                 end
 
-                def post_count(stat_key, user_key, count, cb)
+                def post_count(stat_key, user_key, count, timestamp, cb)
                         args = { :key => stat_key,
                                 :ukey => user_key,
                                 :count => count }
+                        args[:t] = timestamp unless timestamp.nil?
                         enqueue(CLASSIC_COUNT_URL, args, cb)
                 end
 
-                def ez_post_value(stat_name, ezkey, value, cb)
+                def ez_post_value(stat_name, ezkey, value, timestamp, cb)
                         puts "ezval cb: #{cb}"
                         args = { :stat => stat_name,
                                 :ezkey => ezkey,
                                 :value => value }
+                        args[:t] = timestamp unless timestamp.nil?
                         enqueue(EZ_URL, args, cb)
                 end
 
-                def ez_post_count(stat_name, ezkey, count, cb)
+                def ez_post_count(stat_name, ezkey, count, timestamp, cb)
                         args = { :stat => stat_name,
                                 :ezkey => ezkey,
                                 :count => count }
+                        args[:t] = timestamp unless timestamp.nil?
                         enqueue(EZ_URL, args, cb)
                 end