effective_logging 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c56031f528265bd29b5ad3e5a6777f87c15275a1
-  data.tar.gz: 9dd9730ea1237141d1ef8772928c65317fdf21ea
+  metadata.gz: df044f4842187ae687d8fce22ece707399782c32
+  data.tar.gz: d08801613da6ca975bd5fc0fb90834059b221bf6
 SHA512:
-  metadata.gz: 0ec3e3de1a369e7d40d5974b605032bd495ccc465519adfed4b6ff22d8a4350b12f4844ab5af6d2c86aa8ed9703fe2aa8f69ce289ef21d6860e761650e47b650
-  data.tar.gz: e1416af20d48313956c5e1adb4db2be10105f76af08149458cfa57b77216d7dadede1776225f99e75f4817d93ad99e827fbeefedc0fee9ca9990000ba0368b97
+  metadata.gz: 61c6a3249e84bb44fcd75af0fcd5d884f23482d6c9b63355f500aa5269ffd3343ce50e774878f4c16a5aa44a862e6eabe89759a4531b0dc47a3b041e4ada3a29
+  data.tar.gz: 33b56849e5103f98ca13091eae5fe92c944a20c23c0a3136f188d22b570addc2e68a5cf13c01ccd41158f69e62a5193cbfd6522cf59954589d1eed676a4eb569

data/README.md

@@ -301,6 +301,14 @@ Then you should be able to visit:
 link_to 'Logs', effective_logging.admin_logs_path   # /admin/logs
 ```
 
+But you may need to add the permission (using CanCan):
+
+```ruby
+can :manage, Effective::Log
+can :admin, :effective_logging
+```
+
+
 ### Build an All Logs Screen
 
 If you don't want to use the builtin Admin screen, and would rather render the effective_datatable of logs elsewhere
@@ -335,9 +343,6 @@ In your controller:
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
-
-
 ## Testing
 
 The test suite for this gem is unfortunately not yet complete.

data/app/controllers/admin/logs_controller.rb

@@ -8,10 +8,11 @@ module Admin
     helper EffectiveLoggingHelper
 
     def index
-      @datatable = Effective::Datatables::Logs.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::Logs.new()
       @page_title = 'Logs'
 
       EffectiveLogging.authorized?(self, :index, Effective::Log)
+      EffectiveLogging.authorized?(self, :admin, :effective_logging)
     end
 
     def show
@@ -26,6 +27,7 @@ module Admin
       end
 
       EffectiveLogging.authorized?(self, :show, @log)
+      EffectiveLogging.authorized?(self, :admin, :effective_logging)
     end
   end
 end

data/app/controllers/effective/logs_controller.rb

@@ -40,7 +40,7 @@ module Effective
 
     # This is the User index event
     def index
-      @datatable = Effective::Datatables::Logs.new(:user_id => current_user.id) if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::Logs.new(:user_id => current_user.id)
       @page_title = 'My Activity'
 
       EffectiveLogging.authorized?(self, :index, Effective::Log.new(:user_id => current_user.id))

data/app/views/active_admin/effective_logging/logs/index.html.haml

@@ -1,5 +1,7 @@
 .fluid-container
   .row
     .col-sm-12
-      = render_datatable @datatable do
+      - if @datatable.present?
+        = render_datatable(@datatable)
+      - else
         %p There are no logs

data/app/views/admin/logs/index.html.haml

@@ -1,4 +1,3 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
 
-= render_datatable @datatable do
-  %p There are no logs
+= render_datatable(@datatable)

data/app/views/admin/logs/show.html.haml

@@ -1,3 +1,4 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
+
 = render_log(@log)
 

data/app/views/effective/logs/index.html.haml

@@ -1,4 +1,6 @@
-%h2= @page_title
+%h1.effective-heading= @page_title
 
-= render_datatable @datatable do
+- if @datatable.present?
+  = render_datatable(@datatable)
+- else
   %p You have no previous recorded activity

data/app/views/effective/logs/show.html.haml

@@ -1,2 +1,3 @@
-%h2= @page_title
+%h1.effective-heading= @page_title
+
 = render_log(@log)

data/{lib/generators/templates → config}/effective_logging.rb

@@ -21,7 +21,7 @@ EffectiveLogging.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| true }  # All users can see every screen
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
   # Register Effective::Logs with ActiveAdmin if ActiveAdmin is present
   config.use_active_admin = true
@@ -43,5 +43,4 @@ EffectiveLogging.setup do |config|
   # Log all successful user login attempts
   config.user_logins_enabled = true
   config.user_logouts_enabled = false
-
 end

data/lib/effective_logging/engine.rb

@@ -6,7 +6,7 @@ module EffectiveLogging
 
     # Set up our default configuration options.
     initializer "effective_logging.defaults", :before => :load_config_initializers do |app|
-      eval File.read("#{config.root}/lib/generators/templates/effective_logging.rb")
+      eval File.read("#{config.root}/config/effective_logging.rb")
     end
 
     # ActiveAdmin (optional)

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.5.9'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/generators/effective_logging/install_generator.rb

@@ -3,9 +3,9 @@ module EffectiveLogging
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectiveLogging initializer in your application."
+      desc 'Creates an EffectiveLogging initializer in your application.'
 
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         if not ActiveRecord::Base.timestamped_migrations
@@ -16,17 +16,13 @@ module EffectiveLogging
       end
 
       def copy_initializer
-        template "effective_logging.rb", "config/initializers/effective_logging.rb"
+        template ('../' * 3) + 'config/effective_logging.rb', 'config/initializers/effective_logging.rb'
       end
 
       def create_migration_file
         @logs_table_name = ':' + EffectiveLogging.logs_table_name.to_s
 
-        migration_template '../../../db/migrate/01_create_effective_logging.rb.erb', 'db/migrate/create_effective_logging.rb'
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_logging.rb.erb', 'db/migrate/create_effective_logging.rb'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/views/effective/logs/_log.html.haml
 - app/views/effective/logs/index.html.haml
 - app/views/effective/logs/show.html.haml
+- config/effective_logging.rb
 - config/routes.rb
 - db/migrate/01_create_effective_logging.rb.erb
 - lib/effective_logging.rb
@@ -120,10 +121,6 @@ files:
 - lib/effective_logging/user_logger.rb
 - lib/effective_logging/version.rb
 - lib/generators/effective_logging/install_generator.rb
-- lib/generators/templates/README
-- lib/generators/templates/effective_logging.rb
-- spec/effective_logging_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/code-and-effect/effective_logging
 licenses:
 - MIT
@@ -149,6 +146,4 @@ signing_key:
 specification_version: 4
 summary: Automatically log all sent emails, user logins, and page views. This also
   will log custom events from Ruby and JavaScript.
-test_files:
-- spec/effective_logging_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/lib/generators/templates/README

@@ -1 +0,0 @@
-Thanks for using EffectiveLogging

data/spec/effective_logging_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe EffectiveLogging do
-  it 'should be a module' do
-    assert_kind_of Module, EffectiveLogging
-  end
-end

data/spec/spec_helper.rb

@@ -1,33 +0,0 @@
-ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../dummy/config/environment", __FILE__)
-
-require 'rspec/rails'
-require 'rspec/autorun'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f }
-
-RSpec.configure do |config|
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  Rails.logger.level = 4    # Output only minimal stuff to test.log
-
-  config.use_transactional_fixtures = true   # Make this false to once again use DatabaseCleaner
-  config.infer_base_class_for_anonymous_controllers = false
-  config.order = 'random'
-end
-
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
-
-# Forces all threads to share the same connection. This works on
-# Capybara because it starts the web server in a thread.
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection