redis_analytics 0.1.0 → 0.6.0

data/lib/redis_analytics/api.rb

@@ -0,0 +1,60 @@
+require 'sinatra/base'
+require 'json'
+
+module Rack
+  module RedisAnalytics
+
+    class Api < Sinatra::Base
+      helpers Rack::RedisAnalytics::Helpers
+
+      get '/data/?' do
+
+        begin
+          to_date_time = Date.parse(params[:to_date_time]).to_time rescue Time.now
+          unit = params[:unit] || 'day'
+          aggregate = (params[:aggregate] == 'yes')
+          units = (params[:unit_count] || 1).to_i
+          p = params[:p].split(',')
+          from_date_time = to_date_time - units.send(unit)
+          results = []
+
+          p.each_with_index do |q, j|
+            result = self.send("#{unit}ly_#{q}", from_date_time, :to_date => to_date_time, :aggregate => aggregate)
+            if result.is_a?(Array) # time range data (non-aggregate)
+              result.each_with_index do |r, i|
+                results[i] ||= {}
+                date_value = r[0][0..2]
+                time_value = r[0][3..-1]
+                date_time_value = []
+                date_time_value << date_value.join('-')
+                date_time_value << time_value.join(':') if time_value
+                # results[i]['raw'] = date_time_value.join(' ').strip
+                results[i]['unix'] = Time.mktime(*r[0].map(&:to_i)).to_i
+                strf = case unit
+                       when 'minute'
+                         '%H%Mhrs'
+                       when 'hour'
+                         '%a %H00hrs'
+                       when 'day'
+                         '%a'
+                       when 'month'
+                         '%b'
+                       when 'year'
+                         '%Y'
+                       end
+                results[i]['raw'] = Time.at(results[i]['unix']).strftime(strf)
+                results[i][q] = r[1]
+              end
+            elsif result.is_a?(Hash) or result.is_a?(Fixnum) # aggregate data
+              results[j] = {q => result}
+            end
+          end
+          content_type :json
+          results.to_json
+        rescue Exception => e
+          halt 500, [500, [e.message, e.backtrace]].to_json
+        end
+      end
+    end
+  end
+end

data/lib/redis_analytics/configuration.rb

@@ -3,23 +3,30 @@ module Rack
     module Configuration
       # Redis connection instance
       attr_accessor :redis_connection
-      
+
       # Redis namespace for keys
       attr_writer :redis_namespace
 
-      # Name of the cookie which tracks returning visitors (known visitors)
-      attr_writer :returning_user_cookie_name
+      # Name of the cookie which tracks first visitors
+      attr_writer :first_visit_cookie_name
 
-      # Name of the cookie which tracks visits
-      attr_writer :visit_cookie_name
+      # Name of the cookie which tracks current visits
+      attr_writer :current_visit_cookie_name
 
       # Minutes the visit should timeout after (if no hit is received)
       attr_writer :visit_timeout
 
       # Endpoint for dashboard
-      attr_accessor :dashboard_endpoint
+      attr_writer :dashboard_endpoint
 
-      # Redis namespace for keys
+      # Endpoint for api
+      attr_writer :api_endpoint
+
+      attr_writer :path_filters
+
+      attr_writer :filters
+
+      # Path to the Geo IP Database file
       attr_writer :geo_ip_data_path
 
       # Redis namespace for keys
@@ -32,16 +39,32 @@ module Rack
         @visit_timeout ||= 1 # minutes
       end
 
-      # Name of the cookie which tracks returning visitors (known visitors)
-      def returning_user_cookie_name
-        @returning_user_cookie_name ||= '_rucn'
+      # Name of the cookie which tracks first visitors (unknown visitors)
+      def first_visit_cookie_name
+        @first_visit_cookie_name ||= '_rucn'
       end
 
       # Name of the cookie which tracks visits
-      def visit_cookie_name
-        @visit_cookie_name ||= '_vcn'
+      def current_visit_cookie_name
+        @current_visit_cookie_name ||= '_vcn'
       end
-      
+
+      def filters
+        @filters ||= []
+      end
+
+      def path_filters
+        @path_filters ||= []
+      end
+
+      def add_filter(&proc)
+        filters << RedisAnalytics::Filter.new(proc)
+      end
+
+      def add_path_filter(path)
+        path_filters << RedisAnalytics::PathFilter.new(path)
+      end
+
       def geo_ip_data_path
         @geo_ip_data_path = ::File.expand_path(::File.join(::File.dirname(__FILE__),'..','..')) + "/bin/GeoIP.dat"
       end
@@ -55,17 +78,25 @@ module Rack
       end
 
       def redis_key_timestamps # [format, expire in seconds or nil]
-        ['%Y', '%Y_%m', '%Y_%m_%d', '%Y_%m_%d_%H', ['%Y_%m_%d_%H_%M', 1.day + 1.minute]]
+        ['%Y', '%Y_%m', '%Y_%m_%d', '%Y_%m_%d_%H', '%Y_%m_%d_%H_%M']
       end
 
       def time_range_formats
         [[:year, :month, "%b"], [:week, :day, "%a"], [:day, :hour, "%l%P"]]
       end
-      
+
       def configure
         yield self
       end
-      
+
+      def api_endpoint
+        @api_endpoint || dashboard_endpoint + '/api'
+      end
+
+      def dashboard_endpoint
+        @dashboard_endpoint || '/redis_analytics'
+      end
+
     end
   end
 end

data/lib/redis_analytics/dashboard.rb

@@ -1,7 +1,5 @@
 require 'sinatra/base'
-require 'json'
-require 'active_support/core_ext'
-require 'redis_analytics'
+require 'sinatra/assetpack'
 
 if defined? Encoding
   Encoding.default_external = Encoding::UTF_8
@@ -9,106 +7,47 @@ end
 
 module Rack
   module RedisAnalytics
-    class Dashboard < Sinatra::Base
-      
-      dir = ::File.expand_path(::File.dirname(__FILE__))
-
-      set :views,  "#{dir}/dashboard/views"
-      
-      if respond_to? :public_folder
-        set :public_folder, "#{dir}/dashboard/public"
-      else
-        set :public, "#{dir}/dashboard/public"
-      end
-      
-      helpers do
-        include Rack::RedisAnalytics::Helpers
 
-        def realistic(n, r = 1000)
-          return n
-          n + r + rand(r)
-        end
-
-        def parse_float(float)
-          float.nan? ? '0.0' : float
-        end
-        
-        def with_benchmarking
-          @t0 = Time.now
-          yield
-          @t1 = Time.now
-          @t = @t1 - @t0
-          puts "Time Taken: #{@t} seconds"
-        end
+    class Dashboard < Sinatra::Base
+      register Sinatra::AssetPack
 
-      end
-      
+      set :root, ::File.expand_path(::File.dirname(__FILE__))
+      set :views,  "#{settings.root}/dashboard/views"
       set :static, true
 
-      def initialize
-        $template_prefix = Rack::RedisAnalytics.dashboard_endpoint
-        super
+      helpers Rack::RedisAnalytics::Helpers
+
+      assets do
+        serve '/css', from: "dashboard/public/css"
+        serve '/javascripts', from: "dashboard/public/javascripts"
+        serve '/img', from: "dashboard/public/img"
+        js :app, [
+          '/javascripts/vendor/*.js',
+          '/javascripts/*.js'
+        ]
+        js :bootstrap, [
+          '/javascripts/vendor/bootstrap/*.js'
+        ]
+        css :application, [
+          '/css/*.css'
+        ]
+        js_compression  :jsmin    # :jsmin | :yui | :closure | :uglify
+        css_compression :simple   # :simple | :sass | :yui | :sqwish
       end
 
       get '/' do
-        status, headers, body = call env.merge("PATH_INFO" => '/visits')
-        [status, headers, body]
+        redirect url('visits')
       end
 
-      get '/activity' do
-        with_benchmarking do 
-          # code
-        end
+      get '/activity/?' do
         erb :activity
       end
 
-      get '/visits' do
-        with_benchmarking do
-          @range = (request.cookies["_rarng"] || RedisAnalytics.default_range).to_sym # should first try to fetch from cookie what the default range is
-          @data = {}
-          
-          RedisAnalytics.time_range_formats.each do |range, unit, time_format|
-            multiple = (1.send(range)/1.send(unit)).round
-            time_range = @t0 - 1.send(range) + 1.send(unit)
-            @data[range] ||= {}
-            @data[range][:visits] = self.send("#{unit}ly_visits".to_sym, time_range)
-            @data[range][:total_visits] = @data[range][:visits].inject(0){|s, x| s += x[1].to_i; s}
-            @data[range][:new_visits] = self.send("#{unit}ly_new_visits", time_range)
-            @data[range][:total_new_visits] = @data[range][:new_visits].inject(0){|s, x| s += x[1].to_i; s}            
-            @data[range][:page_views] = self.send("#{unit}ly_page_views", time_range)
-
-            @data[range][:total_page_views] = @data[range][:page_views].inject(0){|s, x| s += x[1].to_i; s}
-            @data[range][:visit_time] = self.send("#{unit}ly_visit_time", time_range)
-            @data[range][:avg_visit_time] = Hash[@data[range][:visit_time]].values.sum.to_f/@data[range][:visit_time].length.to_f
-
-            @data[range][:visits_new_visits_plot] = @data[range][:new_visits].inject(Hash[@data[range][:visits]]){|a, i| a[i[0]] = [i[1], a[i[0]]];a}.map{|k,v| {'date'=> k.strftime(time_format), 'new_visits' => v[0].to_i, 'returning_visits' => v[1].to_i - v[0].to_i}}
-            @data[range][:visits_new_visits_donut] = [{'label' => 'Returning Visitors', 'value' => @data[range][:total_visits] - @data[range][:total_new_visits]}, {'label' => 'New Visitors', 'value' => @data[range][:total_new_visits]}]
-
-            @data[range][:browsers_donut] = self.send("#{unit}ly_ratio_browsers", time_range, :aggregate => true).map{|x| {'label' => x[0], 'value' => x[1].to_i}}
-            @data[range][:platforms_donut] = self.send("#{unit}ly_ratio_platforms", time_range, :aggregate => true).map{|x| {'label' => x[0], 'value' => x[1].to_i}}
-            @data[range][:devices_donut] = self.send("#{unit}ly_ratio_platforms", time_range, :aggregate => true).map{|x| {'label' => x[0], 'value' => x[1].to_i}}
-            @data[range][:referrers_donut] = self.send("#{unit}ly_ratio_referrers", time_range, :aggregate => true).map{|x| {'label' => x[0], 'value' => x[1].to_i}}
-
-            unique_visits = self.send("#{unit}ly_unique_visits", time_range - 1.send(range)).map{|x,y| [x.strftime(time_format), y]}
-
-            # puts unique_visits[0..(multiple-1)].inject(Hash[unique_visits[multiple..(multiple*2-1)]]){|a, i| a[i[0]] = [i[1], a[i[0]]];a}.inspect
-            @data[range][:unique_visits] = unique_visits[0..(multiple-1)].inject(Hash[unique_visits[multiple..(multiple*2-1)]]){|a, i| a[i[0]] = [i[1], a[i[0]]];a}.map{|k,v| {'unit'=> k, 'unique_visits_last' => v[0].to_i, 'unique_visits_this' => v[1].to_i}}
-            second_page_views = self.send("#{unit}ly_second_page_views", time_range)
-            @data[range][:total_second_page_views] = second_page_views.inject(0){|s, x| s += x[1].to_i; s}
-          
-            visitor_recency = self.send("#{unit}ly_ratio_recency", time_range, :aggregate => true)
-            @data[range][:visitor_recency_slices] = [0, RedisAnalytics.visitor_recency_slices, '*'].flatten.each_cons(2).inject([]) do |h, (x, y)|
-              h << [[x, y], visitor_recency.select{|a, b| a.to_i >= x and (a.to_i < y  or y == '*') }.map{|p, q| q}.sum]
-            end
-            @data[range][:country_map] = Hash[self.send("#{unit}ly_ratio_country", time_range, :aggregate => true)]
-          end
-          @range = @data.keys[0] unless @data[@range]
-        end
-        @data[:all_visits] = daily_visits(Time.now - 1.year).map{|x,y| [x.to_i * 1000, realistic(y)]}
-        @data[:all_unique_visits] = daily_unique_visits(Time.now - 1.year).map{|x,y| [x.to_i * 1000, realistic(y)]}
+      get '/visits/?' do
+        @range = time_range
         erb :visits
       end
-      
+
     end
   end
 end

data/lib/redis_analytics/dashboard/views/activity.erb

@@ -0,0 +1,7 @@
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span12 well">
+      This feature is not implemented yet.
+    </div>
+  </div>
+</div>

data/lib/redis_analytics/dashboard/views/dialogs/unique_visits.erb

@@ -0,0 +1,41 @@
+<!-- Unique Visits Modal -->
+<div id="unique_visits_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel">Daily Unique Visits</h3>
+  </div>
+  <div class="modal-body">
+    <div id="unique_visits_detail" style="width:900px;height:400px;"></div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+    <!-- <button class="btn btn-primary">Save changes</button> -->
+  </div>
+</div>
+
+<script type="text/javascript">
+  $('#unique_visits_modal').on('show', function () {
+    colors = Highcharts.getOptions().colors;
+    // create the chart when all data is loaded
+    $(function(){
+      $('#unique_visits_detail').highcharts('StockChart', {
+        chart: {
+        },
+        // tooltip: {
+        //   pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b> ({point.change}%)<br/>',
+        //   valueDecimals: 2
+        // },
+        yAxis: {
+          allowDecimals: false
+        },
+        xAxis: {
+          allowDecimals: false
+        },
+        series: [{
+          name: 'Unique Visits',
+          data: <%=@data[:all_unique_visits].to_json%>
+        }]
+      });
+    });
+  });
+</script>

data/lib/redis_analytics/dashboard/views/dialogs/visits.erb

@@ -0,0 +1,40 @@
+<!-- Visits Modal -->
+<div id="visits_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel">Daily Visits</h3>
+  </div>
+  <div class="modal-body">
+    <div id="visits_detail" style="width:900px;height:400px;"></div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+    <!-- <button class="btn btn-primary">Save changes</button> -->
+  </div>
+</div>
+
+<script type="text/javascript">
+  $('#visits_modal').on('show', function () {
+    colors = Highcharts.getOptions().colors;
+    // create the chart when all data is loaded
+    $(function(){  
+      $('#visits_detail').highcharts('StockChart', {
+        chart: {},
+        // tooltip: {
+        //   pointFormat: '<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b> ({point.change}%)<br/>',
+        //   valueDecimals: 2
+        // },
+        yAxis: {
+          allowDecimals: false
+        },
+        xAxis: {
+          allowDecimals: false
+        },
+        series: [{
+          name: 'Visits',
+          data: <%=@data[:all_visits].to_json%>
+        }]
+      });
+    });
+  });
+</script>

data/lib/redis_analytics/dashboard/views/footer.erb

@@ -1,5 +1,3 @@
 <!-- start footer -->
-
-
-<script language="javascript" type="text/javascript" src="<%=$template_prefix%>/javascripts/bootstrap.min.js"></script>
+<%= js :bootstrap %>
 <!-- end footer -->

data/lib/redis_analytics/dashboard/views/header.erb

@@ -1,44 +1,19 @@
 <!-- start header -->
-  <div class="navbar">
-    <div class="navbar-inner">
-      <a class="brand" href="http://www.github.com/saturnine/redis_analytics">Redis Analytics</a>
-      <ul class="nav nav-pills pull-right">
-      <!-- <li><a><small><%#@t.round(2)%> sec</small></a></li> -->
-	<li>
-	  <div class="btn-group">
-            <!-- <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Settings</button> -->
-            <ul class="dropdown-menu">
-
-	      <li class="dropdown-submenu">
-		<a tabindex="-1" href="#">Theme</a>
-		<ul class="dropdown-menu">
-		  <li><a href="?template=journal">Journal</a></li>
-		  <li><a href="?template=spacelab">Spacelab</a></li>
-		  <li><a href="?template=united">United</a></li>
-		  <li class="divider"></li>
-		  <li><a href="?">Default</a></li>
-		</ul>
-	      </li>
-              <li><a href="#">Preferences</a></li>
-              <li class="divider"></li>
-              <li><a href="#">About</a></li>
-            </ul>
-          </div>
-
-	  <div class="btn-group" data-toggle="buttons-radio">
-	    <!-- <a href="/visits" class="btn btn-small<%#' active' if request.path == '/visits'%>">Visits</a> -->
-	    <!-- <a href="/activity" class="btn btn-small<%=' active' if request.path == '/activity'%>">Activity</a> -->
-
-	    <!-- <button type="button" class="btn btn-small" onclick='javascript:visits_area.grid=true'>Transactions</button> -->
-	  </div>
-	  <div class="btn-group" data-toggle="buttons-radio">
-	  <% Rack::RedisAnalytics.time_range_formats.map{|x| x[0]}.each do |range| %>
-	    <button type="button" class="btn btn-small <%="active" if @range == range%>" onclick='changeTimeFrame("<%=range.to_s%>")'><%=range.to_s%></button>
-	    <% end %>
-	  </div>
-
-	</li>
-      </ul>
-    </div>
+<div class="navbar">
+  <div class="navbar-inner">
+    <a class="brand" href="http://www.github.com/saturnine/redis_analytics">Redis Analytics</a>
+    <ul class="nav nav-pills pull-right">
+      <li>
+        <div class="btn-group" data-toggle="buttons-radio">
+          <a href="visits" class="btn btn-small <%=' active' if request.path.end_with?('/visits') %>">Visits</a>
+        </div>
+        <div class="btn-group" data-toggle="buttons-radio" id="timeRange">
+        <% Rack::RedisAnalytics.time_range_formats.map{|x| x[0]}.each do |range| %>
+	  <button type="button" class="btn btn-small <%="active" if @range == range%>" onclick='changeTimeFrame("<%=range.to_s%>")'><%=range.to_s%></button>
+        <% end %>
+        </div>
+      </li>
+    </ul>
   </div>
-  <!-- end header -->
+</div>
+<!-- end header -->