jkrall · brizido · Oct 8, 2012 · Oct 8, 2012 · Oct 8, 2012 · Oct 8, 2012
diff --git a/README.rdoc b/README.rdoc
@@ -27,6 +27,10 @@ Add the following to your controllers:
 
     analytical
 
+Add the middleware configuration in config/application.rb:
+
+  config.middleware.use Analytical::Middleware
+
 Add a configuration file (config/analytical.yml) to declare your API keys, like so:
 
    production:
@@ -53,7 +57,6 @@ Then, in your template files, you'll want to add the analytical helper methods f
         <%= stylesheet_link_tag :all %>
         <%= javascript_include_tag :defaults %>
         <%= csrf_meta_tag %>
-        <% analytical.identify '5', :email=>'[email protected]' %>
         <%= raw analytical.head_append_javascript %>
       </head>
       <body>
@@ -63,9 +66,13 @@ Then, in your template files, you'll want to add the analytical helper methods f
       </body>
     </html>
 
-Note the example above also includes an identify() command that will apply to every page.  More likely, you'll want to make this identify() command conditional so that it only applies when you have a logged-in user:
+You'll want to add the identify() command as a before_filter:
 
-    <% analytical.identify(current_user.id, :email=>current_user.email) if current_user %>
+    before_filter :analytical_identify
+    protected
+    def analytical_identify
+      analytical.identify(current_user.id, :email => current_user.email) if current_user
+    end
 
 You can sprinkle the track() and event() tracking methods throughout your views & controllers as needed.
 
@@ -93,21 +100,6 @@ This can be useful for enabling the console logger optionally in your app, based
 
 New modules should be fairly easy to add.  Follow the structure that I've used in the Clicky, Google, and KISSMetrics modules... and you should be fine.  All modules should include the Analytical::Base::Api module, so that they have some default behavior for methods that they don't support or need.
 
-== Session-based command queues
-
-By default, any Analytical commands that are queued in a controller that subsequently redirects won't be emitted to the client.  This is because the redirect triggers a new request, and everything is cleared out at the beginning of each request.
-
-However, if you would like to be able to queue commands between requests... there's a new option that supports this behavior:
-
-    analytical :modules=>[:console, :google], :use_session_store=>true
-
-This will store the queued commands in the user session, clearing them out when they are emitted to the client, but allowing you to make calls like:
-
-    analytical.track 'something'
-
-... in your controller.  After a redirect, the corresponding track() call will be emitted in the next request made by the client.
-NOTE:  This is new and somewhat experimental, and could cause problems if you store large amounts of data in the session.  (there is a 4k limit to session data)
-
 == Javascript tracking/event commands
 
 Sometimes you want to trigger an analytics track/event via javascript.  Analytical now provides a solution for this by default.  Appended to your <head> is a simple javascript object that will contain "instantaneous" versions of the tracking commands for each of your modules.
@@ -119,10 +111,6 @@ You call these analytical commands like this:
 
 When you call these commands, it will pass the track/event name & data on to each of the modules.  (Take a look at the simple javascript helpers in your <head> for more information.)
 
-To disable this functionality, use
-
-    analytical :javascript_helpers => false
-
 
 == Note on Patches/Pull Requests
 

diff --git a/analytical.gemspec b/analytical.gemspec
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
     "lib/analytical/modules/quantcast.rb",
     "lib/analytical/modules/reinvigorate.rb",
     "lib/analytical/rails/engine.rb",
-    "lib/analytical/session_command_store.rb",
     "rails/init.rb"
   ]
   s.homepage = %q{http://github.com/jkrall/analytical}

diff --git a/app/views/application/_analytical_fire_events.html.erb b/app/views/application/_analytical_fire_events.html.erb
@@ -0,0 +1,20 @@
+<script type="text/javascript">
+var commands;
+
+try {
+  commands = $.parseJSON(decodeURIComponent((Cookies.get('analytical') || '').replace(/\+/g, '%20')) || '[]');
+} catch(e) {
+  commands = [];
+}
+
+Cookies.remove('analytical', { path: '/' });
+
+$.each(commands, function(index, command) {
+  var method = command.shift(),
+      arguments = command;
+
+  if ('function' === typeof Analytical[method]) {
+    Analytical[method].apply(this, arguments);
+  }
+});
+</script>
diff --git a/app/views/application/_analytical_javascript.html.erb b/app/views/application/_analytical_javascript.html.erb
@@ -1,11 +1,22 @@
 <script type="text/javascript">
 var Analytical = {
-  track: function(page) {
-<%= raw analytical.now.track('__PAGE__').gsub(/"__PAGE__"/,'page') %>
+  identify: function(id, options) {
+    <%= raw(analytical.javascript_for.identify.gsub(/^/, " " * 4).strip) %>
   },
-  event: function(name, data) {
-    if (typeof data === 'undefined') { data = {}; }
-<%= raw analytical.now.event('__EVENT__', {}).gsub(/"__EVENT__"/,'name').gsub(/"?\{\}"?/,'data') %>
+  track: function(page, options) {
+    <%= raw(analytical.javascript_for.track.gsub(/^/, " " * 4).strip) %>
+  },
+  event: function(name, options, callback) {
+    <%= raw(analytical.javascript_for.event.gsub(/^/, " " * 4).strip) %>
+  },
+  set: function(properties) {
+    <%= raw(analytical.javascript_for.set.gsub(/^/, " " * 4).strip) %>
+  },
+  reset: function(properties) {
+    <%= raw(analytical.javascript_for.reset.gsub(/^/, " " * 4).strip) %>
+  },
+  alias_identity: function(old_identity, new_identity) {
+    <%= raw(analytical.javascript_for.alias_identity.gsub(/^/, " " * 4).strip) %>
   }
 };
 </script>
diff --git a/example/.gitignore b/example/.gitignore
diff --git a/example/rails2.3/Gemfile b/example/rails2.3/Gemfile
diff --git a/example/rails2.3/Gemfile.lock b/example/rails2.3/Gemfile.lock