km_resque 1.0.0 → 1.0.1

data/README.md

@@ -44,7 +44,7 @@ Configure your API key:
 
 ## Credits
 
-Written by Luke Melia. Thanks to Yapp for open sourcing KMResque. Inspiration from delayed_kiss and km-delay.
+Written by Luke Melia. Thanks to Yapp for open sourcing KmResque. Inspiration from delayed_kiss and km-delay.
 
 ## License
 

data/lib/km_resque/api_client.rb

@@ -46,8 +46,14 @@ class KmResque
         raise Error.new("Can't hit the API without an API Key")
       end
 
-      data['_d'] = 1 if data['_t']
-      data['_t'] ||= Time.now.to_i
+      if data['_t']
+        data['_d'] = 1
+        unless validate_timestamp(data['_t'])
+          raise Error.new("Timestamp #{data['_t']} is invalid")
+        end
+      else
+        data['_t'] = Time.now.to_i
+      end
 
       unsafe = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}]", false, 'N')
 
@@ -62,5 +68,12 @@ class KmResque
         http.get(query)
       end
     end
+
+    SECONDS_IN_ONE_HUNDRED_YEARS = 60 * 60 * 24 * 365 * 100
+
+    def validate_timestamp(timestamp)
+      timestamp = timestamp.to_i
+      (timestamp > 0) && (timestamp < (Time.now.to_i + SECONDS_IN_ONE_HUNDRED_YEARS))
+    end
   end
 end

data/lib/km_resque/version.rb

@@ -1,3 +1,3 @@
 class KmResque
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/lib/km_resque/record_job_spec.rb

@@ -28,5 +28,11 @@ describe "KmResque::RecordJob" do
         KmResque::RecordJob.perform(nil, "eventName", { :foo => 'bar', :baz => 'bay'}, timestamp)
         }.should raise_error(KmResque::Error)
     end
+    it "should raise an error when an invalid timestamp is provided" do
+      timestamp = Time.now.to_i * 1000 # common mistake is providing milliseconds instead of seconds
+      lambda {
+        KmResque::RecordJob.perform("identifier", "eventName", { :foo => 'bar', :baz => 'bay'}, timestamp)
+        }.should raise_error(KmResque::Error)
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: km_resque
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Luke Melia
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-20 00:00:00 Z
+date: 2012-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: resque