i_wonder 0.0.5 → 0.0.6

data/lib/i_wonder/configuration.rb

@@ -10,7 +10,7 @@ module IWonder
    end
   
   class Configuration
-    attr_accessor :keep_hits_for, :only_log_hits_on_200, :back_to_app_link, :app_name
+    attr_accessor :keep_hits_for, :only_log_hits_on_200, :back_to_app_link, :app_name, :return_visit_interval
     attr_reader :controllers_to_ignore
     
     def initialize
@@ -19,6 +19,7 @@ module IWonder
       @only_log_hits_on_200 = true
       @back_to_app_link = "/"
       @app_name = "My App"
+      @return_visit_interval = 1.hour
     end
     
     def controllers_to_ignore=(new_controllers)

data/lib/i_wonder/logging/action_controller_mixins.rb

@@ -2,7 +2,7 @@ module IWonder
   module Logging
     module ActionControllerMixins
 
-      def report!(event_sym, options = {})        
+      def report!(event_sym, options = {})
         options ||= {}
         options[:event_type] = event_sym.to_s # it will get converted when stored anyways.
         

data/lib/i_wonder/logging/middleware.rb

@@ -2,6 +2,7 @@ module IWonder
   module Logging
     class Middleware
       NO_USER_KEY = "_no_user"
+      LAST_HIT_TIME = "_last_hit"
       BOT_REGEX = /msnbot|yahoo|slurp|googlebot/
       
       def initialize(app)
@@ -27,6 +28,7 @@ module IWonder
       
       def process_env(env)
         check_for_new_visitor(env) # this will set the i_wonder_session_id if blank. This session is needed later
+        check_for_return_visit(env)
         log_hit(env)
         merge_session_to_user(env)
         generate_any_reported_events(env)
@@ -40,6 +42,20 @@ module IWonder
         end
       end
       
+      def check_for_return_visit(env)
+        env[ENV_KEY]["new_events"] ||= []
+        
+        #is there a last_hit key
+        if cookies(env)[COOKIE_KEY+LAST_HIT_TIME]
+          previous_hit = Time.zone.parse(cookies(env)[COOKIE_KEY+LAST_HIT_TIME])
+          if previous_hit + IWonder.configuration.return_visit_interval < Time.zone.now
+            env[ENV_KEY]["new_events"] << {:event_type => "return_visit"}
+          end
+        end
+        
+        cookies(env).permanent[COOKIE_KEY+LAST_HIT_TIME] = Time.zone.now.to_s
+      end
+      
       def check_for_new_visitor(env)
         if cookies(env)[COOKIE_KEY+SESSION_KEY_NAME].blank?
           cookies(env).permanent[COOKIE_KEY+SESSION_KEY_NAME] = SecureRandom.hex(10) # this should swithc to something actually unique

data/lib/i_wonder/version.rb

@@ -1,3 +1,3 @@
 module IWonder
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end