trafficlogger 1.1.0 → 2.0.0

data/README.md

@@ -53,10 +53,8 @@ Once integrated with your App you can see the log entries in DB Table and also t
 
 ## Dependencies
 
-  - Ruby 1.9.3+
-  - Rails 3.2.13
-  - will_paginate
-
-### ToDo
-
- Porting this for Rails 2.x is not difficult as only few scope conditions at model level needs to changed ; which are for Rails 3 but does not work for Rails 2, feel free to fork it and contribute for Rails 2.x platforms, also it should work on Ruby 1.8.7+
+  - Ruby 1.9.2+ possibly 1.8.7(you will need to fork it and modiy to test on 1.8.7)
+  - Rails 3.2.x
+  - will_paginate 3.0.x
+  - jquery-ui-rails 4.0.x
+  - jQuery 1.10 is included as part of assets in Trafficlogger, so if your app uses .live function anywhere kindly replace .live function which has been deprecated since jQuery 1.7+

data/app/assets/javascripts/trafficlogger/application.js

@@ -10,5 +10,5 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
 //= require_tree .
+//= require jquery.ui.datepicker

data/app/assets/stylesheets/trafficlogger/application.css

@@ -9,5 +9,141 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+ *= require jquery.ui.datepicker
  *= require_tree .
  */
+
+ /* Pagination Style for will_paginate */
+.r_pagination {
+  background: #fff;
+  text-align: center;
+  padding: 1em;
+  cursor: default; }
+  
+.r_pagination a, .r_pagination span {
+  padding: 0.2em 0.3em; }
+
+.r_pagination .disabled {
+  color: #aaaaaa; }
+
+.r_pagination .current {
+  font-style: normal;
+  font-weight: bold;
+  background-color: #0080C1;
+  color: white;
+  display: inline-block;
+  width: 1.4em;
+  height: 1.4em;
+  line-height: 1.5;
+  -moz-border-radius: 1em;
+  -webkit-border-radius: 1em;
+  border-radius: 1em;
+  text-shadow: rgba(255, 255, 255, 0.1) 1px 1px 1px; }
+.r_pagination a {
+  text-decoration: none;
+  color: black; }
+
+.r_pagination a:hover, .r_pagination a:focus {
+  text-decoration: underline; }
+
+/* Search Form Styles */
+.trafficlogger-form-container {
+   border: 1px solid #CCC;
+   background: #ffffff;
+   background: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ffffff));
+   background: -webkit-linear-gradient(top, #fcfcfc, #ffffff);
+   background: -moz-linear-gradient(top, #fcfcfc, #ffffff);
+   background: -ms-linear-gradient(top, #fcfcfc, #ffffff);
+   background: -o-linear-gradient(top, #fcfcfc, #ffffff);
+   background-image: -ms-linear-gradient(top, #fcfcfc 0%, #ffffff 100%);
+   -webkit-border-radius: 0px;
+   -moz-border-radius: 0px;
+   border-radius: 0px;
+   -webkit-box-shadow: rgba(000,000,000,0.9) 0 0px 2px, inset rgba(255,255,255,0.4) 0 0px 0;
+   -moz-box-shadow: rgba(000,000,000,0.9) 0 0px 2px, inset rgba(255,255,255,0.4) 0 0px 0;
+   box-shadow: rgba(000,000,000,0.9) 0 0px 2px, inset rgba(255,255,255,0.4) 0 0px 0;
+   font-family: 'Helvetica Neue',Helvetica,sans-serif;
+   text-decoration: none;
+   vertical-align: middle;
+   padding:20px;
+   width:auto;
+   }
+.trafficlogger-form-field {
+   border: 0px solid #c2c1c0;
+   background: #f0f0f0;
+   -webkit-border-radius: 15px;
+   -moz-border-radius: 15px;
+   border-radius: 15px;
+   color: #5c5854;
+   -webkit-box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(000,000,000,0.7) 0 0px 0px;
+   -moz-box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(000,000,000,0.7) 0 0px 0px;
+   box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(000,000,000,0.7) 0 0px 0px;
+   padding:8px;
+   margin-bottom:20px;
+   width:280px;
+   }
+.trafficlogger-form-field:focus {
+   background: #fff;
+   color: #474747;
+   }
+.trafficlogger-form-container h2 {
+   text-shadow: #c7c7c9 0 1px 0;
+   font-size:18px;
+   margin: 0 0 10px 0;
+   font-weight:bold;
+    }
+.trafficlogger-form-elements {
+   margin-bottom:2px;
+   color: #8c8c8c;
+   text-shadow: #c7c7c9 0 1px 0;
+   }
+.trafficlogger-submit-container {
+   margin:8px 0;
+   }
+.trafficlogger-submit-button {
+   border: 0px solid #003869;
+   background: #23a1cf;
+   background: -webkit-gradient(linear, left top, left bottom, from(#3289d6), to(#23a1cf));
+   background: -webkit-linear-gradient(top, #3289d6, #23a1cf);
+   background: -moz-linear-gradient(top, #3289d6, #23a1cf);
+   background: -ms-linear-gradient(top, #3289d6, #23a1cf);
+   background: -o-linear-gradient(top, #3289d6, #23a1cf);
+   background-image: -ms-linear-gradient(top, #3289d6 0%, #23a1cf 100%);
+   -webkit-border-radius: 29px;
+   -moz-border-radius: 29px;
+   border-radius: 29px;
+   -webkit-box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(255,255,255,0.4) 0 0px 0;
+   -moz-box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(255,255,255,0.4) 0 0px 0;
+   box-shadow: rgba(255,255,255,0.4) 0 0px 0, inset rgba(255,255,255,0.4) 0 0px 0;
+   text-shadow: #addc7e 0 1px 0;
+   color: #ffffff;
+   font-family: helvetica, serif;
+   padding: 8.5px 18px;
+   font-size: 14px;
+   text-decoration: none;
+   vertical-align: middle;
+   }
+.trafficlogger-submit-button:hover {
+   border: 0px solid #447314;
+   text-shadow: #31540c 0 1px 0;
+   background: #6aa436;
+   background: -webkit-gradient(linear, left top, left bottom, from(#8dc059), to(#6aa436));
+   background: -webkit-linear-gradient(top, #8dc059, #6aa436);
+   background: -moz-linear-gradient(top, #8dc059, #6aa436);
+   background: -ms-linear-gradient(top, #8dc059, #6aa436);
+   background: -o-linear-gradient(top, #8dc059, #6aa436);
+   background-image: -ms-linear-gradient(top, #8dc059 0%, #6aa436 100%);
+   color: #fff;
+   }
+.trafficlogger-submit-button:active {
+   text-shadow: #31540c 0 1px 0;
+   border: 0px solid #447314;
+   background: #8dc059;
+   background: -webkit-gradient(linear, left top, left bottom, from(#6aa436), to(#6aa436));
+   background: -webkit-linear-gradient(top, #6aa436, #8dc059);
+   background: -moz-linear-gradient(top, #6aa436, #8dc059);
+   background: -ms-linear-gradient(top, #6aa436, #8dc059);
+   background: -o-linear-gradient(top, #6aa436, #8dc059);
+   background-image: -ms-linear-gradient(top, #6aa436 0%, #8dc059 100%);
+   color: #fff;
+   }

data/app/controllers/trafficlogger/traffic_analytics_controller.rb

@@ -3,7 +3,7 @@ require_dependency "trafficlogger/application_controller"
 module Trafficlogger
   class TrafficAnalyticsController < ApplicationController
     def index
-    	@records = Analytic.search(params[:searchterm],params[:searchtype]).paginate(:page => params[:page],:per_page => 10)
+    	@records = Analytic.find_listings(params).paginate(:page => params[:page],:per_page => 10)
     end
   end
 end

data/app/models/trafficlogger/analytic.rb

@@ -42,28 +42,77 @@ module Trafficlogger
 				Analytic.create(log_data)
 			end
 
-		  def search(searchterm,searchtype)
-		    if !searchterm.blank? and !searchtype.blank?
-		      case searchtype
-		      when "path_info"
-		        where("path_info = ?",searchterm).order("created_at desc")
-		      when "request_uri"
-		        where("request_uri = ?",searchterm).order("created_at desc")
-		      when "request_method"
-		        where("request_method = ?",searchterm).order("created_at desc")
-		      when "operating_system"
-		        where("operating_system = ?",searchterm).order("created_at desc")
-		      when "device"
-		        where("device = ?",searchterm).order("created_at desc")
-		      when "platform"
-		        where("platform = ?",searchterm).order("created_at desc")
-		      else
-		        order("created_at desc").scoped
-		      end
-		    else
-		      order("created_at desc").scoped
+			attr_accessor :data
+		  def find_listings params
+		    @data = params
+		    Rails.logger.info "Search Parameters passed for Trafficlogger Analytic ----> #{params.inspect}"
+		    @records_listing = find_records
+		    @records_listing
+		  end
+
+		  def find_records
+		    Analytic.where(conditions).order("created_at DESC")
+		  end
+
+		  def path_info_inline_search_clause
+		    unless data['path_info_inline_search'].blank?
+		      ["trafficlogger_analytics.path_info LIKE ?", "%#{data['path_info_inline_search'][0]}%"]
+		    end
+		  end
+
+		  def path_info_clause
+		    ["trafficlogger_analytics.path_info = ?", "#{data['path_info_search']}"] unless data['path_info_search'].blank?
+		  end
+
+		  def request_uri_clause
+		    ["trafficlogger_analytics.request_uri = ?", "#{data['request_uri_search']}"] unless data['request_uri_search'].blank?
+		  end
+
+		  def request_method_clause
+		    ["trafficlogger_analytics.request_method = ?", "#{data['request_method_search']}"] unless data['request_method_search'].blank?
+		  end
+
+		  def operating_system_clause
+		    ["trafficlogger_analytics.operating_system = ?", "#{data['operating_system_search']}"] unless data['operating_system_search'].blank?
+		  end
+
+		  def device_clause
+		    ["trafficlogger_analytics.device = ?", "#{data['device_search']}"] unless data['device_search'].blank?
+		  end
+
+		  def platform_clause
+		    ["trafficlogger_analytics.platform = ?", "#{data['platform_search']}"] unless data['platform_search'].blank?
+		  end
+
+		  def minimum_created_at_clause
+		    unless data['minimum_created_at_search'].blank?
+		      minimum_created_at_search = data['minimum_created_at_search'].to_date.strftime("%Y-%m-%d")
+		      ["DATE(trafficlogger_analytics.created_at) >= DATE(?)", "#{minimum_created_at_search}"]
 		    end
 		  end
+
+		  def maximum_created_at_clause
+		    unless data['maximum_created_at_search'].blank?
+		      maximum_created_at_search = data['maximum_created_at_search'].to_date.strftime("%Y-%m-%d")
+		      ["DATE(trafficlogger_analytics.created_at) <= DATE(?)", "#{maximum_created_at_search}"]
+		    end
+		  end
+
+		  def conditions
+		    [conditions_clauses.join(' AND '), *conditions_options]
+		  end
+
+		  def conditions_clauses
+		    conditions_parts.map { |condition| condition.first }
+		  end
+
+		  def conditions_options
+		    conditions_parts.map { |condition| condition[1..-1] }.flatten
+		  end
+
+		  def conditions_parts
+		    singleton_methods.grep(/_clause$/).map { |m| send(m) }.compact
+		  end
 		end
   end
 end

data/app/views/trafficlogger/traffic_analytics/_listings.html.erb

@@ -12,7 +12,9 @@
 	<thead>
 		<tr>
 			<th>ID</th>
-			<th>Request URI</th>
+			<th>
+				Request URI <%= text_field(:path_info_inline_search,'',:size=>20,:placeholder=>' alteast 5 letters') %>
+			</th>
 			<th>Full URI</th>
 			<th>Server</th>
 			<th>Method</th>
@@ -33,9 +35,9 @@
 				<td><%= rec.server_name %></td>
 				<td><%= rec.request_method %></td>
 				<td><%= rec.http_referer %></td>
+				<td><%= rec.platform %></td>
 				<td><%= rec.operating_system %></td>
 				<td><%= rec.device %></td>
-				<td><%= rec.platform %></td>
 				<td>
 					<button class="r_button complete_record_details" data="<%= rec.id %>">More</button>
 				</td>

data/app/views/trafficlogger/traffic_analytics/index.html.erb

@@ -1,16 +1,23 @@
 <div style="padding: 1em">
 	<div class="search">
-		<%= form_tag traffic_analytics_index_path, :method => 'get', :id => "records_search" do %>
-		  <p>
-		  	<%= submit_tag "Search", :name => nil, :id=>"search_results" %>
-		    <%= text_field_tag :searchterm, params[:searchterm] %>
-		    <%= radio_button_tag 'searchtype', "path_info", true, :class => "searchtype" %> Req URI
-		    <%= radio_button_tag 'searchtype', "request_uri", false, :class => "searchtype" %> Full URI
-		    <%= radio_button_tag 'searchtype', "operating_system", false, :class => "searchtype" %> User OS
-		    <%= radio_button_tag 'searchtype', "device", false, :class => "searchtype" %> User Device
-		    <%= radio_button_tag 'searchtype', "platform", false, :class => "searchtype" %> User Platform
-		    <%= radio_button_tag 'searchtype', "request_method", false, :class => "searchtype" %> Request Type
-		  </p>
+		<%= form_tag traffic_analytics_index_path, :method => 'get', :id => "records_search", :class=>"trafficlogger-form-container" do %>
+		  <div class="trafficlogger-form-elements"><h2>LookUp</h2></div>
+		  <div class="trafficlogger-form-elements">
+		  	Request URI <%= text_field_tag :path_info_search, params[:path_info_search],:placeholder=>"e.g /pages/index_3" ,:class=>"trafficlogger-form-field" %>
+		  	Full URI <%= text_field_tag :request_uri_search, params[:request_uri_search],:placeholder=>"e.g /pages/index_3?q=1" ,:class=>"trafficlogger-form-field" %>
+		  	Method <%= text_field_tag :request_method_search, params[:request_method_search],:placeholder=>"e.g GET,POST.." ,:class=>"trafficlogger-form-field" %>
+		  </div>
+		  <div class="trafficlogger-form-elements">
+		  	User OS <%= text_field_tag :operating_system_search, params[:operating_system_search],:placeholder=>"e.g Linux,Windows.." ,:class=>"trafficlogger-form-field" %>
+		  	User Device <%= text_field_tag :device_search, params[:device_search],:placeholder=>"e.g Samsung,iPhone.." ,:class=>"trafficlogger-form-field" %>
+		  	User Platform <%= text_field_tag :platform_search, params[:platform_search],:placeholder=>"e.g Chrome,IE..." ,:class=>"trafficlogger-form-field" %>
+		  </div>
+		  <div class="trafficlogger-form-elements">
+		  	Date Range <%= text_field_tag :minimum_created_at_search, params[:minimum_created_at_search],:placeholder=>"> Date" ,:class=>"trafficlogger-form-field minimum_created_at_date" %> <%= text_field_tag :maximum_created_at_search, params[:maximum_created_at_search],:placeholder=>"< Date" ,:class=>"trafficlogger-form-field maximum_created_at_date" %>
+		  </div>
+		  <div class="trafficlogger-submit-container">
+		    <%= submit_tag "Search", :name => nil, :class=>"trafficlogger-submit-button" %> - <%= link_to "Reset", traffic_analytics_index_path,:class=>"trafficlogger-submit-button",:style=>"text-decoration:none" %>
+		  </div>
 		<% end %>
 	</div>
 	</br>
@@ -20,9 +27,14 @@
 </div>
 <script>
 $(document).ready(function(){
-	$("#search_results").click(function() {
-		$.get($("#records_search").attr("action"), $("#records_search").serialize(), null, "script");
-	  return false;
-	});
+	$("#path_info_inline_search_").keyup(function() {
+    if ($(this).val().length >=5)
+    {
+      $.get($("#records_search").attr("action"), $(this).serialize(), null, "script");
+    }
+    return false;
+  });
+	$('.minimum_created_at_date').datepicker({ dateFormat: 'dd/mm/yy' });
+	$('.maximum_created_at_date').datepicker({ dateFormat: 'dd/mm/yy' });
 });
 </script>

data/lib/trafficlogger/version.rb

@@ -1,3 +1,3 @@
 module Trafficlogger
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/test/dummy/db/schema.rb

@@ -11,6 +11,44 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(:version => 20140319104457) do
+
+  create_table "trafficlogger_analytics", :force => true do |t|
+    t.string   "server_name"
+    t.string   "server_port"
+    t.text     "server_software"
+    t.string   "gateway_interface"
+    t.string   "path_info"
+    t.string   "original_full_path"
+    t.string   "request_uri"
+    t.string   "query_string"
+    t.string   "remote_host"
+    t.text     "http_accept_encoding"
+    t.string   "server_protocol"
+    t.string   "http_accept_language"
+    t.string   "http_host"
+    t.string   "remote_addr"
+    t.text     "http_referer"
+    t.string   "http_cookie"
+    t.text     "http_accept"
+    t.string   "request_method"
+    t.string   "http_connection"
+    t.string   "http_version"
+    t.text     "http_user_agent"
+    t.string   "platform"
+    t.string   "device"
+    t.string   "operating_system"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
+  end
+
+  add_index "trafficlogger_analytics", ["device"], :name => "index_trafficlogger_analytics_on_device"
+  add_index "trafficlogger_analytics", ["operating_system"], :name => "index_trafficlogger_analytics_on_operating_system"
+  add_index "trafficlogger_analytics", ["original_full_path"], :name => "index_trafficlogger_analytics_on_original_full_path"
+  add_index "trafficlogger_analytics", ["path_info"], :name => "index_trafficlogger_analytics_on_path_info"
+  add_index "trafficlogger_analytics", ["platform"], :name => "index_trafficlogger_analytics_on_platform"
+  add_index "trafficlogger_analytics", ["request_method"], :name => "index_trafficlogger_analytics_on_request_method"
+  add_index "trafficlogger_analytics", ["request_uri"], :name => "index_trafficlogger_analytics_on_request_uri"
+  add_index "trafficlogger_analytics", ["server_name"], :name => "index_trafficlogger_analytics_on_server_name"
 
 end

data/test/dummy/log/development.log

@@ -23,3 +23,32 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (146.0ms)  DROP DATABASE IF EXISTS `dummy_test`
+   (14.0ms)  CREATE DATABASE `dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (179.2ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (254.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.4ms)  SELECT version FROM `schema_migrations`
+   (42.1ms)  INSERT INTO `schema_migrations` (version) VALUES ('0')
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateTrafficloggerAnalytics (20140319104457)
+   (156.7ms)  CREATE TABLE `trafficlogger_analytics` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `server_name` varchar(255), `server_port` varchar(255), `server_software` text, `gateway_interface` varchar(255), `path_info` varchar(255), `original_full_path` varchar(255), `request_uri` varchar(255), `query_string` varchar(255), `remote_host` varchar(255), `http_accept_encoding` text, `server_protocol` varchar(255), `http_accept_language` varchar(255), `http_host` varchar(255), `remote_addr` varchar(255), `http_referer` text, `http_cookie` varchar(255), `http_accept` text, `request_method` varchar(255), `http_connection` varchar(255), `http_version` varchar(255), `http_user_agent` text, `platform` varchar(255), `device` varchar(255), `operating_system` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (198.7ms)  CREATE INDEX `index_trafficlogger_analytics_on_server_name` ON `trafficlogger_analytics` (`server_name`)
+   (188.0ms)  CREATE INDEX `index_trafficlogger_analytics_on_request_method` ON `trafficlogger_analytics` (`request_method`)
+   (177.0ms)  CREATE INDEX `index_trafficlogger_analytics_on_request_uri` ON `trafficlogger_analytics` (`request_uri`)
+   (210.0ms)  CREATE INDEX `index_trafficlogger_analytics_on_path_info` ON `trafficlogger_analytics` (`path_info`)
+   (211.4ms)  CREATE INDEX `index_trafficlogger_analytics_on_original_full_path` ON `trafficlogger_analytics` (`original_full_path`)
+   (210.0ms)  CREATE INDEX `index_trafficlogger_analytics_on_platform` ON `trafficlogger_analytics` (`platform`)
+   (188.0ms)  CREATE INDEX `index_trafficlogger_analytics_on_device` ON `trafficlogger_analytics` (`device`)
+   (165.7ms)  CREATE INDEX `index_trafficlogger_analytics_on_operating_system` ON `trafficlogger_analytics` (`operating_system`)
+   (43.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20140319104457')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Mysql2::Error: Table 'dummy_dev.trafficlogger_analytics' doesn't exist: SHOW FULL FIELDS FROM `trafficlogger_analytics`

metadata

@@ -3,10 +3,10 @@ name: trafficlogger
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Shuddhashil Ray
@@ -59,6 +59,20 @@ dependencies:
         version: "3.0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jquery-ui-rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
+  type: :runtime
+  version_requirements: *id004
 description: Trafficlogger is a Rails Engine with Rack Middleware to track incoming HTTP requests coming to your site and logs them with detailed information about the Request
 email: 
 - rayshuddhashil@gmail.com