snapstats 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ca87d7c50d7d0d47d8d2aa212bc8a3e7b72037
-  data.tar.gz: fae35dab5d5a2e7dc6f1b6c6775a139532fb12d0
+  metadata.gz: eece7c49770b47faa4ddbbcfceac38deac8b3609
+  data.tar.gz: 472bdc6c237d80e9013309acbaf0ec4b8ea48f23
 SHA512:
-  metadata.gz: f977f60aa20bbcb1879e843e5eaca246f0b154e2d83eecfa962a9672331d6bfbf0164c09bfb0686c5e747fed37d01653b343886f7196cd1843b38ae941069901
-  data.tar.gz: 1382fa641600ae869c49b4a0fe9855e1a915c290dd8ce3637e58e0cc739c8875661b25835f2cc1ff285c1df0a8396354e95c5c92afd3848647a32cb657678e65
+  metadata.gz: bceab64fbc63c1e0ae7c677b6d949605b8b3940a6dd9fbecd55f1ca7025ebe61a636aed6267345e9b02e76c7b04338232ee297ed868879d9e7f6b9b6f4689bec
+  data.tar.gz: 780d1c312e68e970ce374165c8456b82cb7528ba85e40b6ad7696b77a4b325d544a1401682ecc5f4b2fac5340fb5453e889af19a9d8d92f9e6d63e21844f45e6

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

@@ -40,10 +40,10 @@
 					<td><%= @clicks[:cpm] %></td>
 				</tr>
 
-				<tr>
+				<!-- <tr>
 					<td>Clicks per hour</td>
 					<td><%= @clicks[:cph] %></td>
-				</tr>
+				</tr> -->
 
 				<tr>
 					<td>Clicks per day</td>

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

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

data/lib/event_logger/event_logger_static.rb

@@ -4,11 +4,15 @@ module Snapstats
 
   	@@is_started = false
 
-    def self.start
+    def self.start opt={}
     	unless @@is_started
-	    	
-	    	init_events
-	    	subscribe 
+
+				Snapstats.set_redis opt[:redis]
+
+				unless opt[:disable_logging] == true
+		    	init_events opt
+		    	subscribe 
+		    end
 
 	    	@@is_started = true
 	    end
@@ -18,10 +22,25 @@ module Snapstats
     	ActiveSupport::Notifications.subscribe('process_action.action_controller', self.new)
     end
 
-    def self.init_events
+    def self.init_events opt={}
     	
 			ActionController::Instrumentation.send(:define_method, "process_action") do |arg|
 
+				fetch_user_id = -> params { 
+					model = params.try(:[], :devise_model).try(:[], :model) || :user
+					request.env['warden'].try(model.to_sym).try(:id)
+				}
+
+				fetch_user_email = -> params {
+					model = params.try(:[], :devise_model).try(:[], :model) || :user
+
+					if params[:devise_model].present? && params[:devise_model].try(:[], :login_fields).present?
+						return params[:devise_model][:login_fields].map{ |field| request.env['warden'].try(model.to_sym).try(field.to_sym) }.compact.first
+					else
+						return request.env['warden'].try(model.to_sym).try(:email)
+					end
+				}
+
 			  raw_payload = {
 			    :controller => self.class.name,
 			    :action     => self.action_name,
@@ -33,8 +52,8 @@ module Snapstats
 			    :ip         => request.remote_ip,
 			    :stash      => request.session['flash'] && request.session['flash'][:log],
 			    
-			    :user_id  	=> request.env['warden'].try(:user).try(:id),
-			    :user_email => request.env['warden'].try(:user).try(:email),
+			    :user_id  	=> fetch_user_id.call(opt),
+			    :user_email => fetch_user_email.call(opt),
 			    :user_agent => request.user_agent
 			  }
 			 

data/lib/event_logger/event_logger_store.rb

@@ -69,7 +69,7 @@ module Snapstats
         email:  @payload[:user_email]
   		}.to_json
 
-  		@redis.hset mkey("activity:users"), @payload[:user_id], value 
+  		@redis.hset mday("activity:users"), @payload[:user_id], value 
   	end
 
   	# Performance

data/lib/event_reader/event_reader.rb

@@ -109,10 +109,10 @@ module Snapstats
 				cpm = data[Time.now.beginning_of_minute.to_i.to_s] || 0
 				cpd = data.values.reduce(0){ |sum, i| sum + i.to_i }
 
-				cph = data.group_by{ |k, v| Time.at(k.to_i).beginning_of_hour }.reduce({}){|sum, (k, v)| sum[k] = v.map{|i| i.last.to_i}.reduce(:+); sum }
-				cph = cph.values.reduce(:+) / cph.keys.count
+				# cph = data.group_by{ |k, v| Time.at(k.to_i).beginning_of_hour }.reduce({}){|sum, (k, v)| sum[k] = v.map{|i| i.last.to_i}.reduce(:+); sum }
+				# cph = cph.values.reduce(:+) / cph.keys.count
 
-				{ cpm: cpm, cph: cph, cpd: cpd }
+				{ cpm: cpm, cph: 0, cpd: cpd }
 			end
 
 			def self.fetch_all_chart
@@ -134,7 +134,7 @@ module Snapstats
 			attribute :version, String
 
 			def self.fetch_all
-				Snapstats.redis.hgetall(Snapstats.mkey("activity:users")).map do |uid, values|
+				Snapstats.redis.hgetall(Snapstats.mday("activity:users")).map do |uid, values|
 					values = JSON.parse(values, :symbolize_names => true)
 					self.new(email: values[:email], date: Time.at(values[:ts].to_i), path: values[:path], user_id: uid)
 				end
@@ -154,7 +154,7 @@ module Snapstats
       end
 
       def self.fetch_email_by_uid user_id
-      	data = Snapstats.redis.hgetall(Snapstats.mkey("activity:users"))[user_id]
+      	data = Snapstats.redis.hgetall(Snapstats.mday("activity:users"))[user_id]
       	JSON.parse(data, :symbolize_names => true)[:email] if data
       end
 

data/lib/ext/redis.rb

@@ -1,7 +1,11 @@
 module Snapstats
 	
 	def self.redis
-		@@redis ||= Redis.new(:host => 'localhost', :port => 6379)
+		@@redis # ||= Redis.new(:host => 'localhost', :port => 6379)
+	end
+
+	def self.set_redis opt={}
+		@@redis = Redis.new( opt.present? ? opt : { :host => 'localhost', :port => 6379 } )
 	end
 
 	def self.mkey name

data/lib/snapstats/version.rb

@@ -1,3 +1,3 @@
 module Snapstats
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/snapstats.rb

@@ -4,5 +4,5 @@ require "event_logger/event_logger"
 require "event_reader/event_reader"
 
 module Snapstats
-	EventLogger.start
+	
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapstats
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - s3k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails