saw 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24e7857a6b04db861aa6a2d7619eb49aa32f650
-  data.tar.gz: f1eb037fbf8a252336b49a19fe6f370f95400893
+  metadata.gz: 10a19585b68bf2d75c22c686e95b183acb11aee0
+  data.tar.gz: 7666fb2b7ace755a9b36f967e2e74c889b7baa1a
 SHA512:
-  metadata.gz: b0f15a0c4da218986cf43bd8c94f61c461ce765d654f43b9f22785d30e16a4774fb9c806481e6a0225a47122a7c2961c38eefa3a29eee861505da7b0f828a492
-  data.tar.gz: 1a219ea218250fdc53349bcbad50ef99c8b88dbe35b5bb29600bd9e8ee035a92e1db86fb3317326ae7381905006c3e50c9d3545d387471f03b5854bc8fae0a33
+  metadata.gz: 5599f1ab6c78d157b133c96ed549db80fd9486714ff05abf868840198480108db0cabfba076650f02f86520d996f3bc342c1c1ffed7ff642bda8eaacc448d395
+  data.tar.gz: 6782a3b90894b9b34b9db20c65d6bd4a46ccc672a8e51236923f482efac44922979514436e91fec48f5f369d4d7011e1b9d8fec47bd991179cafa88f4d9d0203

data/examples/active_admin/saw.rb

@@ -1,7 +1,6 @@
 ActiveAdmin.register Visit do
   menu :parent => "Users"
   belongs_to :user, :optional => true
-
   actions :index, :show, :destroy
 
   index do
@@ -37,20 +36,20 @@ end
 
 ActiveAdmin.register Hit do
   menu false
-  
   belongs_to :visit, :optional => true
-
-  actions :index, :show, :destroy
+  actions :index, :show
 
   index do
     selectable_column
-    column "Time", :sortable => :created_at do |resource|
-      resource.created_at.strftime('%T %Z')
-    end
+    column :after
     column :note do |resource|
       resource.note.html_safe
     end
-    
     default_actions
   end
+
+  filter :note
+  filter :visit, :as => :select, :collection => proc { params[:visit_id] ? Visit.find(params[:visit_id]).user.visits : Visit.scoped }
+  filter :url
+  filter :created_at
 end

data/lib/saw.rb

@@ -1,13 +1,14 @@
 require "saw/version"
+require "saw/util.rb"
 require "saw/visit.rb"
 require "saw/hit.rb"
-require "saw/controller.rb"
 
 module Saw
   class Railtie < ::Rails::Railtie
     config.after_initialize do
-      require "saw/visits_controller"
       require "saw/user_addition"
+      require "saw/controller.rb"
+      require "saw/visits_controller"
     end
   end
 end

data/lib/saw/hit.rb

@@ -3,4 +3,20 @@ class Hit < ActiveRecord::Base
   serialize :json_data, JSON  
   attr_accessible :url, :http_method, :action, :params
   belongs_to :visit
+
+  def last_hit
+    visit.hits.where(' hits.id < ? ', id).last
+  end
+
+  def next_hit
+    visit.hits.where(' hits.id > ? ', id).first
+  end
+
+  def after
+    Saw::Util.time_diff visit.starts_with.created_at, created_at
+  end
+
+  def user_visits
+    visit.user.visits
+  end
 end

data/lib/saw/util.rb

@@ -0,0 +1,40 @@
+module Saw
+  module Util
+    def self.time_diff dt1, dt2
+      diff = nil
+      #diff   = 1 unless dt1 or dt1.kind_of? DateTime
+      #diff ||= 1 unless dt2 or dt2.kind_of? DateTime
+      diff ||= dt2 - dt1
+
+      return '00:00:00' if diff==1
+
+      str = ''
+
+      hours_diff = (diff/1.hour).round
+      if hours_diff > 0
+        str << "#{format('%02d', hours_diff)}"
+        diff = diff - hours_diff.hours
+      else
+        str << "00"
+      end
+
+      minutes_diff = (diff/1.minute).round
+      if minutes_diff > 0
+        str << ":#{format('%02d', minutes_diff)}"
+        diff = diff - minutes_diff.minutes
+      else
+        str << ":00"
+      end
+
+      seconds_diff = (diff/1.second).round
+      if seconds_diff > 0
+        str << ":#{format('%02d', seconds_diff)}"
+        #diff = diff - seconds_diff.seconds
+      else
+        str << ":00"
+      end
+
+      str
+    end
+  end
+end

data/lib/saw/version.rb

@@ -1,3 +1,3 @@
 module Saw
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/saw/visit.rb

@@ -1,45 +1,33 @@
 class Visit < ActiveRecord::Base
   default_scope order('id')
 
-  attr_accessible :user_id, :session_id, :remote_host
+  attr_accessible :user_id, :session_id, :remote_host, :user_agent
 
   has_many :hits, :dependent => :destroy
   belongs_to :user
 
   def title
-    "#{lasts} on #{created_at.strftime('%b %-d %Y, %l %P')}"
-  end
-
-  def lasts
-    str = ''
+    user_name = ''
 
-    last_hit = hits.last
-    diff = last_hit ? last_hit.created_at - created_at : 1
-
-    hours_diff = (diff/1.hour).round
-    if hours_diff > 0
-      str << "#{format('%02d', hours_diff)}"
-      diff = diff - hours_diff.hours
-    else
-      str << "00"
+    %w(name first_name username email).each do |attr|
+      if user.respond_to? attr
+        user_name = user.send attr
+        break
+      end
     end
 
-    minutes_diff = (diff/1.minute).round
-    if minutes_diff > 0
-      str << ":#{format('%02d', minutes_diff)}"
-      diff = diff - minutes_diff.minutes
-    else
-      str << ":00"
-    end
+    "#{user_name}(#{lasts}) on #{created_at.strftime('%b %-d %Y, %l %P')}"
+  end
 
-    seconds_diff = (diff/1.second).round
-    if seconds_diff > 0
-      str << ":#{format('%02d', seconds_diff)}"
-      #diff = diff - seconds_diff.seconds
-    else
-      str << ":00"
-    end
+  def starts_with
+    hits.first
+  end
 
-    str
+  def ends_with
+    hits.last
+  end
+
+  def lasts
+    Saw::Util.time_diff created_at, ends_with.created_at if ends_with
   end
 end

data/test/models/hit.rb

@@ -3,4 +3,20 @@ class Hit < ActiveRecord::Base
   serialize :json_data, JSON  
   attr_accessible :url, :http_method, :action, :params
   belongs_to :visit
+
+  def last_hit
+    visit.hits.where(' hits.id < ? ', id).last
+  end
+
+  def next_hit
+    visit.hits.where(' hits.id > ? ', id).first
+  end
+
+  def after
+    Saw::Util.time_diff visit.starts_with.created_at, created_at
+  end
+
+  def user_visits
+    visit.user.visits
+  end
 end

data/test/models/visit.rb

@@ -1,45 +1,33 @@
 class Visit < ActiveRecord::Base
   default_scope order('id')
 
-  attr_accessible :user_id, :session_id, :remote_host
+  attr_accessible :user_id, :session_id, :remote_host, :user_agent
 
   has_many :hits, :dependent => :destroy
   belongs_to :user
 
   def title
-    "#{lasts} on #{created_at.strftime('%b %-d %Y, %l %P')}"
-  end
-
-  def lasts
-    str = ''
+    user_name = ''
 
-    last_hit = hits.last
-    diff = last_hit ? last_hit.created_at - created_at : 1
-
-    hours_diff = (diff/1.hour).round
-    if hours_diff > 0
-      str << "#{format('%02d', hours_diff)}"
-      diff = diff - hours_diff.hours
-    else
-      str << "00"
+    %w(name first_name username email).each do |attr|
+      if user.respond_to? attr
+        user_name = user.send attr
+        break
+      end
     end
 
-    minutes_diff = (diff/1.minute).round
-    if minutes_diff > 0
-      str << ":#{format('%02d', minutes_diff)}"
-      diff = diff - minutes_diff.minutes
-    else
-      str << ":00"
-    end
+    "#{user_name}(#{lasts}) on #{created_at.strftime('%b %-d %Y, %l %P')}"
+  end
 
-    seconds_diff = (diff/1.second).round
-    if seconds_diff > 0
-      str << ":#{format('%02d', seconds_diff)}"
-      #diff = diff - seconds_diff.seconds
-    else
-      str << ":00"
-    end
+  def starts_with
+    hits.first
+  end
 
-    str
+  def ends_with
+    hits.last
+  end
+
+  def lasts
+    Saw::Util.time_diff created_at, ends_with.created_at if ends_with
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saw
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Amol Pujari
@@ -44,6 +44,7 @@ files:
 - lib/saw/controller.rb
 - lib/saw/hit.rb
 - lib/saw/user_addition.rb
+- lib/saw/util.rb
 - lib/saw/version.rb
 - lib/saw/visit.rb
 - lib/saw/visits_controller.rb