snapstats 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417ac8a47a89389f3cf4ab6802afc5b77bd14d3e
-  data.tar.gz: ab877ec2ffe285e2aa47a57eb9a88120669853da
+  metadata.gz: 3b4173e26fe094b94b9915c2a66d8f25d2ac3cf2
+  data.tar.gz: f1781889c78345501c71d04262defa290a10c071
 SHA512:
-  metadata.gz: 927e5b9f3052d5ac603aafe0b39e09d8b40faf64929877fccb9670ca0b016db6d1a39a59bf45446836f1e64b8ed4a30e45808f8ff35cb84557b5b6293c9f0f66
-  data.tar.gz: 0794eb15edb0627e949c0d82d40bb08a05b129661f573804a33206764469afc4226b6c940ee98179a3934bfa3d9b5c873f61a612d5369d3918a017256edfd773
+  metadata.gz: 7fb4f552e6162053d20cb684502ac0ea029165b74ac81e6abd459d8de0fc2482d95e507cd18c65ac8b94d98426e14eac093f446fc07741ad464e4406e24a519a
+  data.tar.gz: e4dc7bf545a41829226db38f0a2b7dad3c28e636fa664eb0f1cadff292c471a6ba36cd3290a763e9725ab117fe7592d5eb1805697e2fa5304748b08d1b01fcb1

data/app/assets/javascripts/snapstats/main/main_controller.js

@@ -12,13 +12,18 @@ $(document).ready(function () {
         return false;
       }
 
+      self.run_autoupdate();
+    },
+
+    run_autoupdate : function () {
+      var self = this;
       self.draw_chart();
+      setInterval(function () { self.draw_chart() }, 5000);
     },
 
     draw_chart : function () {
       var self = this;
 
-
       $.getJSON(self.data_path, function (data) {
 
         for (var i = 0; i < data.length; i++) {
@@ -26,9 +31,10 @@ $(document).ready(function () {
         }
 
         MG.data_graphic({
-          data: data,          
           
+          data: data,          
           full_width: true,
+
           height: self.torso.height * 3 / 2,
           right: self.torso.right,
 
@@ -37,9 +43,12 @@ $(document).ready(function () {
           x_accessor: "date",
           y_accessor: "value",
           interpolate: "linear",
-          y_scale_type:'log',
+          // y_scale_type:'log'
         });
 
+        $('.loader').hide();
+        $('.chart').addClass('animated fadeIn');
+
       });
 
     }

data/app/assets/javascripts/snapstats/performances/performances_controller.js

@@ -1,8 +1,9 @@
 $(document).ready(function () {
   ({
 
-    when_cat : "li.section-performance",
-    data_path : ($(location).attr('pathname') + '/chart').replace('//', '/'),
+    when_cat        : "li.section-performance",
+    data_path       : ($(location).attr('pathname') + '/chart').replace('//', '/'),
+    flat_data_path  : ($(location).attr('pathname') + '/flat_chart').replace('//', '/'),
 
     torso : { width : 375, height : 200, right : 20 },
 
@@ -13,7 +14,58 @@ $(document).ready(function () {
         return false;
       }
 
-      self.draw_chart();
+      self.init_buttons();
+
+      // self.draw_chart();
+      self.draw_flat_chart();
+    },
+
+    init_buttons : function () {
+      var self = this;
+
+      $('.detail-chart').click(function () {
+        self.draw_chart();
+        
+        $('.legend').show();
+        $(this).siblings().removeClass('active');
+        $(this).addClass('active');
+      });
+
+      $('.total-chart').click(function () {
+        self.draw_flat_chart();
+        
+        $('.legend').hide();
+        $(this).siblings().removeClass('active');
+        $(this).addClass('active');
+      });
+    },
+
+    draw_flat_chart : function () {
+      var self = this;
+
+      $.getJSON(self.flat_data_path, function (data) {
+
+        for (var i = 0; i < data.length; i++) {
+          data[i].date = new Date(data[i].date*1000)
+        }
+
+        MG.data_graphic({
+          
+          data: data,
+          full_width: true,
+          
+          height: self.torso.height * 3 / 2,
+          right: self.torso.right,
+
+          target: ".chart-performance",
+          x_extended_ticks: true,
+          x_accessor: "date",
+          y_accessor: "value",
+          // y_scale_type:'log',
+          interpolate: "linear"
+        });
+      });
+
     },
 
     draw_chart : function () {
@@ -36,11 +88,16 @@ $(document).ready(function () {
             target: '.chart-performance',
             x_accessor: 'date',
             y_accessor: 'value',
-            interpolate: "linear",
-            y_scale_type:'log',
-            // y_label: "milliseconds",
+            interpolate: "basic",
+            y_scale_type:'linear',
             legend: data.legend,
-            legend_target: '.legend'
+            legend_target: '.legend',
+            
+            // y_label: "milliseconds",
+            // y_extended_ticks: true,
+            // yax_format: d3.time.format('%B'),
+            
+            // yax_units: 'ms '
           });
 
         });

data/app/assets/javascripts/snapstats/users/users_controller.js

@@ -12,10 +12,16 @@ $(document).ready(function () {
         return false;
       }
 
-      self.user_chart();
+      self.run_autoupdate();
     },
 
-    user_chart : function () {
+    run_autoupdate : function () {
+      var self = this;
+      self.draw_chart();
+      setInterval(function () { self.draw_chart() }, 5000);
+    },
+
+    draw_chart : function () {
       var self = this;
 
       if ( $('div.user-activity-chart').length <= 0 ){
@@ -43,6 +49,8 @@ $(document).ready(function () {
           interpolate: "linear"
         });
 
+        $('.loader').hide();
+
       });
       
     }

data/app/assets/stylesheets/snapstats/app.css

@@ -43,10 +43,6 @@ ul.menu li { display: inline; margin-right: 15px;}
 ul.menu li a { text-decoration: none; color: #767F73; }
 ul.menu li.active a, ul.menu li a:hover { color: white; }
 
-.chart{
-	margin-top: 70px;
-}
-
 .panel-wgt {
 	background: none;
 	border: 1px solid #3A344A;
@@ -63,4 +59,48 @@ ul.menu li.active a, ul.menu li a:hover { color: white; }
 	overflow: hidden; 
 	text-overflow: ellipsis; 
 	white-space: nowrap;
+}
+
+.btn-trigger {
+	font-size: 10px;
+
+	background: none;
+	border:0px solid #3A344A;
+	
+	padding: 1px;
+	margin: 0px 3px;
+	
+	color: #767F73;
+}
+
+.btn-trigger:hover {
+	border: 0px solid #4A445A;
+	color: #ccc;
+}
+
+.btn-trigger.active {
+	border-bottom: 1px dashed #ccc;
+	border-radius: 0;
+	color: #ccc;
+}
+
+.chart-corner-btns {
+	margin-top: -20px;
+}
+
+.loader
+{
+	width:200px;
+	height:200px;
+	border-radius:100px;
+	font-size:14px;
+
+	color:#4A445A;
+
+	margin: 50px auto;
+
+	line-height:200px;
+	text-align:center;
+	/*background:#000;*/
+	border: 1px dashed #4A445A;
 }

data/app/controllers/snapstats/performances_controller.rb

@@ -14,5 +14,9 @@ module Snapstats
 			render json: {data: data.values, legend: data.keys}
 		end
 
+		def flat_chart
+			render json: Snapstats::EventReader::Activity.fetch_flat_chart
+		end
+
 	end
 end

data/app/controllers/snapstats/users_controller.rb

@@ -15,7 +15,7 @@ module Snapstats
 		end
 
 		def chart
-			render json: EventReader::UserActivity.fetch_chart_for_user(params[:id])
+			render json: EventReader::UserActivity.fetch_chart_for_user(params[:id], 5)
 		end
 
 	end

data/app/views/snapstats/mains/show.html.erb

@@ -5,9 +5,17 @@
 	<div class="panel panel-wgt">
 		<div class="panel-heading">
 			<h3 class="panel-title">Activity</h3>
+
+			<!-- <div class="pull-right chart-corner-btns"> 
+				<a class="btn btn-trigger active total-chart">5 min</a> 
+				<a class="btn btn-trigger total-chart">10 min</a> 
+				<a class="btn btn-trigger total-chart">30 min</a> 
+			</div> -->
+
 		</div>
 		<div class="panel-body">
-			<div class="chart"></div>					
+			<div class="loader center-block animated rotateIn">loading</div>
+			<div class="chart"></div>	
 		</div>
 	</div>
 

data/app/views/snapstats/performances/show.html.erb

@@ -3,17 +3,23 @@
 	<div class="panel panel-wgt">
 		<div class="panel-heading">
 			<h3 class="panel-title">Load Average</h3>
+			
+			<div class="pull-right chart-corner-btns"> 
+				<a class="btn btn-trigger active total-chart">Total</a> 
+				<a class="btn btn-trigger detail-chart">Detail</a>
+			</div>
+			
 		</div>
 		<div class="panel-body">
 			<div class="chart-performance"></div>
-			<div class="legend pull-right"></div>
+			<div class="legend pull-right">&nbsp;</div>
 		</div>
+
 	</div>
 
 </div>
 
 
-
 <div class="container animated fadeIn">
 
 	<div class="page-header">

data/app/views/snapstats/users/activity.html.erb

@@ -30,7 +30,7 @@
 					<th>Browser</th>
 				</tr>
 				
-				<% @activity.sort_by{ |i| i.date.to_i }.each do |i| %>
+				<% @activity.sort_by{ |i| -i.date.to_i }.each do |i| %>
 				
 					<tr>
 						<td> 

data/app/views/snapstats/users/show.html.erb

@@ -15,7 +15,7 @@
 					<th>Path</th>
 				</tr>
 				
-				<% @users.sort_by{ |i| i.date }.each do |i| %>
+				<% @users.sort_by{ |i| -i.date.to_i }.each do |i| %>
 				
 					<tr>
 						<td> <%= link_to i.email, activity_user_path(i.user_id) %> </td>

data/config/routes.rb

@@ -12,6 +12,7 @@ Snapstats::Engine.routes.draw do
 	resource :performance do
 		collection do
 			get :chart
+			get :flat_chart
 		end
 	end
 	

data/lib/event_reader/event_reader.rb

@@ -1,6 +1,7 @@
 module Snapstats
 	module EventReader
-		
+		require "event_reader/event_reader_helpers"
+
 		class Activity
 			include Virtus.model
 
@@ -50,6 +51,10 @@ module Snapstats
 
       end
 
+      def self.fetch_flat_chart
+				fetch(Time.now.beginning_of_day).map{ |i| { date: i.date.to_i, value: i.render_time } }
+			end
+
 		end
 
 		class Performance
@@ -97,7 +102,7 @@ module Snapstats
 
 		class Cpm
 			include Virtus.model
-
+			extend EventReaderHelpers
 
 			def self.fetch_all
 				Snapstats.redis.hgetall(Snapstats.mday("cpm"))
@@ -115,14 +120,15 @@ module Snapstats
 				{ cpm: cpm, cph: 0, cpd: cpd }
 			end
 
-			def self.fetch_all_chart
-				fetch_all.map{ |k, v| { date: k, value: v } }
+			def self.fetch_all_chart aprx=10
+				fetch_all.group_by{|k, v| floor_time(k.to_i, aprx.minutes) }.reduce({}){ |sum, (k,v)| sum[k] = v.reduce(0){|s, i| s += i.last.to_i }; sum }.map{ |k, v| { date: k, value: v } }
 			end
       
 		end
 
 		class UserActivity
 			include Virtus.model
+			extend EventReaderHelpers
 
 			attribute :email, String
 			attribute :date, Time
@@ -158,8 +164,8 @@ module Snapstats
       	JSON.parse(data, :symbolize_names => true)[:email] if data
       end
 
-      def self.fetch_chart_for_user user_id
-      	fetch_for_user(user_id).group_by{ |i| i.date.beginning_of_minute }.map{ |k, v| { date: k.to_i, value: v.count } }
+      def self.fetch_chart_for_user user_id, aprx=10
+      	fetch_for_user(user_id).group_by{ |i| floor_time(i.date.to_i, aprx.minutes) }.map{ |k, v| { date: k.to_i, value: v.count } }
       end
 
 		end

data/lib/event_reader/event_reader_helpers.rb

@@ -0,0 +1,7 @@
+module EventReaderHelpers
+
+	def floor_time sec, fsec
+		(Time.at(sec).to_f/fsec).floor*fsec
+	end
+	
+end

data/lib/snapstats/version.rb

@@ -1,3 +1,3 @@
 module Snapstats
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapstats
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - s3k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - lib/event_logger/event_logger_static.rb
 - lib/event_logger/event_logger_store.rb
 - lib/event_reader/event_reader.rb
+- lib/event_reader/event_reader_helpers.rb
 - lib/ext/redis.rb
 - lib/snapstats.rb
 - lib/snapstats/engine.rb