express_analytics 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d543b4d000f2d078e1de04c7037a363002055b
-  data.tar.gz: a72da1ba9efaae938db14708005edef4309309fb
+  metadata.gz: f7abe0673ba3998d5fd74e802648f889fa8c1902
+  data.tar.gz: 4be92f4156160e140a2102b1eca58e1e3409ceb8
 SHA512:
-  metadata.gz: 05d9b3d4d4fb6c90df2413c6936e16ec4990279468ebf6435d234e1ca307d575e81a404a7a2836b4766565965bec85f16f5fd61ae470fc5e6e9c0b0a684268fc
-  data.tar.gz: 25cec6f1cc4dab45c1734bf2cd85cdb94d524b9e80b2205e133f722204d593ae1819cd5c52dfc1aad1bdeb35002618a76b1061ae1e97c78213a79b598c9a304c
+  metadata.gz: 2c257ab462f9083eb471e2f8684f8e30377ea9afea07306fb394aaf4e64f191609e639619a5dedb7f4dd74e5adc0c0ac2e88c0ec787212c79cf08a0ef502fdcf
+  data.tar.gz: 51245652186485fef2e37ba4b5f89cd99b4319b22d56ea12be25ac38b6c8b01109288041e837405378ee1b5c02370f8ead0f9f49215890a577b7455c419a5724

data/app/views/express_analytics/daily_statistics/index.html.et

@@ -1,8 +1,24 @@
-main_region {
-  smart_table(:daily_statistics)
-}
-sidebar_region {
-  widget_box(:daily_statistic) {
-    smart_form(:daily_statistic)
+v_box {
+  div {
+    collection_filter :log_entries
+
+    h2(class: 'content-title') {"Daily Statistics"}
+  }
+
+  div {
+    # table(class: table_classes) {
+    #   thead {
+    #     tr {
+    #       ExpressAnalytics::Daily.each do |column|
+    #         th(class: column.name) {
+    #           config[:sortable].present? ? sortable(column) : column.title
+    #         }
+    #       end
+    #       actions_header if should_show_actions?
+    #       hidden_columns_header_indicator if columns_hidden?
+    #     }
+    #   }
+    #   tbody {
+
   }
 }

data/config/initializers/initialize_logger.rb

@@ -0,0 +1 @@
+ExpressAnalytics.initialize!

data/lib/express_analytics/default_logger.rb

@@ -0,0 +1,89 @@
+# meant to extend ApplicationController or ActionController::Base
+# to override anything just override the appropriate method here.
+module ExpressAnalytics
+  module DefaultLogger
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+        extend ClassMethods
+
+        before_action do
+          create_log_entry!
+        end
+      end
+    end
+
+    module ClassMethods
+      def skip_logging!
+        define_method(:create_log_entry!) do
+          #nothing
+        end
+      end
+    end
+
+    module InstanceMethods
+      def create_log_entry!
+        geo_data = begin
+           ExpressGeoip.lookup(request.remote_ip)
+         rescue => e
+           {}
+         end
+
+        entity = entity_for_log
+
+        entry_data = {
+          action:      action_for_log,
+          username:    current_user.try(:email),
+          ip_address:  request.ip,
+          user_agent:  request.user_agent,
+          entity_type: entity.try(:class).try(:to_s),
+          entity_id:   entity.try(:id),
+          notes:       notes_for_log
+        }
+
+        ExpressAnalytics::LogEntry.create(entry_data.merge(geo_data))
+
+      end
+
+      def action_for_log
+        # ExpressAnalytics::LogEntriesController#show becomes
+        # express_analytics/log_entries_controller#show
+        # show log entry
+        is_plural = %w(list index).include?(request.params[:action])
+        object_name = self.class.to_s.demodulize.underscore.titleize
+        object_name.gsub!(/ Controller/, '')
+        object_name = is_plural ? object_name : object_name.singularize
+
+        verb = is_plural ? 'view' : request.params[:action]
+        "#{verb} #{object_name}"
+      end
+
+      def entity_for_log
+        self.respond_to?(:resource) ? resource : nil
+      end
+
+      def notes_for_log
+        request.path # override to add notes
+      end
+    end
+
+  end
+end
+
+
+# TODO: Move this to ExpressGeoip
+module ExpressGeoip
+  def lookup(remote_ip)
+    geo_data = {}
+    if result = ExpressGeoip::GeoipLookup.lookup(request.remote_ip)
+      if result.present?
+        geo_data.merge!(geo_country_code: result.country.name,
+                        geo_administrative_area: nil,
+                        geo_locality: result.city.name,
+                        geo_latitude: (result.location.present? ? result.location.latitude : nil),
+                        geo_longitude: (result.location.present? ? result.location.latitude : nil) )
+      end
+    end
+    geo_data
+  end
+end

data/lib/express_analytics/version.rb

@@ -1,3 +1,3 @@
 module ExpressAnalytics
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/express_analytics.rb

@@ -1,4 +1,21 @@
 require "express_analytics/engine"
+require "express_analytics/default_logger"
 
 module ExpressAnalytics
+
+  def self.initialize!
+    initialize_filter!
+
+
+    ActionDispatch::Reloader.to_prepare do
+      ExpressAccess.initialize_filter!
+    end
+  end
+
+  def self.initialize_filter!
+    ActionController::Base.send(:include, ExpressAnalytics::DefaultLogger)
+    puts "Added ExpressAnalytics::DefaultLogger to ActionController::Base" unless Rails.env.test?
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_analytics
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -76,13 +76,14 @@ files:
 - app/views/express_analytics/log_entries/index.html.et
 - app/views/layouts/express_analytics/admin.html.et
 - app/views/layouts/express_analytics/application.html.erb
-- config/initializers/default_logger.rb
+- config/initializers/initialize_logger.rb
 - config/initializers/mount_engine.rb
 - config/menu.yml
 - config/routes.rb
 - db/migrate/20160215051456_create_express_analytics_daily_statistics.rb
 - db/migrate/20160215053321_create_express_analytics_log_entries.rb
 - lib/express_analytics.rb
+- lib/express_analytics/default_logger.rb
 - lib/express_analytics/engine.rb
 - lib/express_analytics/version.rb
 - lib/generators/express_analytics/install/USAGE

data/config/initializers/default_logger.rb

@@ -1,78 +0,0 @@
-# opening ApplicationController here to add default functionality
-# to override anything just override the appropriate method here.
-class ApplicationController < ActionController::Base
-  before_action do
-    create_log_entry!
-  end
-
-  def self.skip_logging!
-    define_method(:create_log_entry!) do
-      #nothing
-    end
-  end
-
-  def create_log_entry!
-
-    geo_data = begin
-       ExpressGeoip.lookup(request.remote_ip)
-     rescue => e
-       {}
-     end
-
-    entity = entity_for_log
-
-    entry_data = {
-      action:      action_for_log,
-      username:    current_user.try(:email),
-      ip_address:  request.ip,
-      user_agent:  request.user_agent,
-      entity_type: entity.try(:class).try(:to_s),
-      entity_id:   entity.try(:id),
-      notes:       notes_for_log
-    }
-
-    ExpressAnalytics::LogEntry.create(entry_data.merge(geo_data))
-
-  end
-
-  def action_for_log
-    # ExpressAnalytics::LogEntriesController#show becomes
-    # express_analytics/log_entries_controller#show
-    # show log entry
-    is_plural = %w(list index).include?(request.params[:action])
-    object_name = self.class.to_s.demodulize.underscore.titleize
-    object_name.gsub!(/ Controller/, '')
-    object_name = is_plural ? object_name : object_name.singularize
-
-    verb = is_plural ? 'view' : request.params[:action]
-    "#{verb} #{object_name}"
-  end
-
-  def entity_for_log
-    self.respond_to?(:resource) ? resource : nil
-  end
-
-  def notes_for_log
-    request.path # override to add notes
-  end
-
-
-end
-
-
-# TODO: Move this to ExpressGeoip
-module ExpressGeoip
-  def lookup(remote_ip)
-    geo_data = {}
-    if result = ExpressGeoip::GeoipLookup.lookup(request.remote_ip)
-      if result.present?
-        geo_data.merge!(geo_country_code: result.country.name,
-                        geo_administrative_area: nil,
-                        geo_locality: result.city.name,
-                        geo_latitude: (result.location.present? ? result.location.latitude : nil),
-                        geo_longitude: (result.location.present? ? result.location.latitude : nil) )
-      end
-    end
-    geo_data
-  end
-end