chrno_audit 0.2.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0062dcbf09cede00ed1653833974379aec8b57d
-  data.tar.gz: 04895bc6278aec3259ed18d9612ddcb53a9d9e06
+  metadata.gz: fe0a4ec8f0e6ed3025f0d2189528eee044cfcebc
+  data.tar.gz: 9e1764234ae1cc8300df44d6e5915b7cecab433a
 SHA512:
-  metadata.gz: e54826cdb9a5a549873c544f9325cbdb751ae9cfc8bd5b1ffb7cc9215ab6c0c6eab03fae334b5162981706b67067a0b42400ac8058fb8c7a7e8491761d0ba40f
-  data.tar.gz: 4a1c88092ac240d6052b201ef3ed7d0c3bfefdf63b08dde907f16e67210627f200e30ee09a5bc8ed0ec664037d2b5ed1a2f29ee0a8b77a6f0df0e190d3c8f764
+  metadata.gz: ea081b2310d6e4afcbc3fb8dcc3f62009e3421edb12409a5d8763352a7d4ed89673b68690bde597f2fa69c07b95f4f66341e06222cb609f77afee23e9ae54807
+  data.tar.gz: 0d0d1c1086ed645fcde3f0370ba1bbf92ae55fc8b29c9ce9f927e96dbf0df76e96027c17bff137be2ecdcccf33d4f8eef9021dbafd9b209eadf8b68e2ea8be94

data/Gemfile.lock

@@ -1,88 +1,27 @@
 PATH
   remote: .
   specs:
-    chrno_audit (0.2.4)
+    chrno_audit (0.4.0)
       activerecord (>= 3.1)
-      rails (>= 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.19)
+      activesupport (= 3.2.19)
       builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.19)
+      activemodel (= 3.2.19)
+      activesupport (= 3.2.19)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
     builder (3.0.4)
-    erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
+    i18n (0.7.0)
     multi_json (1.10.1)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (0.3.42)
 
 PLATFORMS

data/app/models/chrno_audit/audit_record.rb

@@ -5,7 +5,7 @@
 #
 class ChrnoAudit::AuditRecord < ActiveRecord::Base
   # Имя таблицы с логами
-  self.table_name = ChrnoAudit.config.table_name || "audit_log"
+  self.table_name = "audit_log"
 
   # Кто изменил?
   belongs_to :initiator, :polymorphic => true
@@ -14,10 +14,10 @@ class ChrnoAudit::AuditRecord < ActiveRecord::Base
   belongs_to :auditable, :polymorphic => true
 
   # Изменения
-  serialize :diff, ChrnoAudit.config.serializer || Object
+  serialize :diff
 
   # Контекст
-  serialize :context, ChrnoAudit.config.serializer || Object
+  serialize :context
 
   # Возвращает записи для заданного типа сущности.
   scope :for_type, -> *types { where( auditable_type: types.map { |t| t.class.model_name })}

data/chrno_audit.gemspec

@@ -15,6 +15,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_runtime_dependency "rails", ">= 3.1"
   s.add_runtime_dependency "activerecord", ">= 3.1"
 end

data/lib/chrno_audit.rb

@@ -1,33 +1,38 @@
 # encoding: utf-8
-if Rails.version.to_i >= 4
+if !defined?( Rails ) || Rails.version.to_i >= 4
   # В четвёртых рельсах обзерверы вынесены в джем
   gem "rails-observers", "~> 0.1.1"
   require "rails-observers"
 
   # Хак для eager load: по умолчанию класс ActiveRecord::Observer грузится ПОСЛЕ
   # того грузятся модели из app/models при eager_load = true, что приводит к ошибке
-  # если рядом с моделями лежат обзервере. Поэтому грузим определение класса сразу.
+  # если рядом с моделями лежат обзерверы. Поэтому грузим определение класса сразу.
   require "rails/observers/activerecord/active_record"
 end
 
-require "active_support/configurable"
-require "chrno_audit/version"
-
 module ChrnoAudit
-  include ActiveSupport::Configurable
+  require "chrno_audit/version"
+end
 
-  class Engine < Rails::Engine
-    initializer "chrno_audit.initialize", :before => :load_active_support do
-      require "chrno_audit/action_controller_concern"
-      require "chrno_audit/active_record_concern"
+ActiveSupport.on_load( :action_controller ) do
+  require "chrno_audit/action_controller_concern"
+  include ChrnoAudit::ActionControllerConcern
+end
+
+ActiveSupport.on_load( :active_record ) do
+  require "chrno_audit/active_record_concern"
+  include ChrnoAudit::ActiveRecordConcern
+end
 
-      ActiveSupport.on_load( :action_controller ) do
-        include ChrnoAudit::ActionControllerConcern
-      end
+# Если мы запускаемся в контексте рельс, то грузим Engine
+if defined?( Rails ) && defined?( Rails::Engine )
+  require "chrno_audit/engine"
 
-      ActiveSupport.on_load( :active_record ) do
-        include ChrnoAudit::ActiveRecordConcern
-      end
+# Иначе подключаем модели руками
+else
+  ActiveSupport.on_load( :active_record ) do
+    Dir.glob( File.join( File.expand_path( "../../app/models", __FILE__ ), "**", "*.rb" )).each do |file|
+      require file
     end
   end
 end

data/lib/chrno_audit/active_record_concern.rb

@@ -32,7 +32,7 @@ module ChrnoAudit
       def audit( *fields )
         # Если таблицы ещё нет, ничего не делаем (полезно для миграций)
         unless table_exists?
-          Rails.logger.warn "Audit: try to audit model [#{name}] with non-existent table"
+          self.logger.warn "Audit: try to audit model [#{name}] with non-existent table" if self.logger
           return
         end
 
@@ -71,8 +71,10 @@ module ChrnoAudit
         self.auditable_options = options
 
         # Проверки
-        Rails.logger.warn "Audit: no fields to audit" if self.auditable_fields.empty?
-        Rails.logger.warn "Audit: no actions to audit" if self.auditable_actions.empty?
+        if self.logger
+          self.logger.warn "Audit: no fields to audit" if self.auditable_fields.empty?
+          self.logger.warn "Audit: no actions to audit" if self.auditable_actions.empty?
+        end
       end
     end
   end

data/lib/chrno_audit/engine.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+module ChrnoAudit
+  class Engine < Rails::Engine
+  end
+end

data/lib/chrno_audit/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module ChrnoAudit
   # Версия гема
-  VERSION = "0.2.4"
+  VERSION = "0.4.0"
 end

data/lib/generators/chrno_audit/templates/README

@@ -5,7 +5,7 @@
 
 Вот пример кода, который может использоваться в контроллере:
 
-  def history$
+  def history
     @page = Page.find params[:id]
     @history = ChrnoAudit::AuditRecord.for_object( @page ).order( "created_at DESC" )
   end

data/lib/generators/chrno_audit/templates/initializer.rb

@@ -1,8 +1,7 @@
 # encoding: utf-8
-ChrnoAudit.configure do |config|
-  # Имя таблицы с событиями
-  # config.table_name = "audit_log"
 
-  # Кодер для сериализации diff'а
-  # config.serializer = ActiveRecord::Coders::YAMLColumn
-end
+# Имя таблицы с событиями
+# ChrnoAudit::AuditRecord.table_name = "audit_log"
+
+# Кодер для сериализации diff'а
+# ChrnoAudit::AuditRecord.serialize :diff, ActiveRecord::Coders::YAMLColumn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrno_audit
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Denis Diachkov
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -53,11 +39,11 @@ files:
 - TODO
 - app/models/chrno_audit/audit_observer.rb
 - app/models/chrno_audit/audit_record.rb
-- chrno_audit-0.4.0.gem
 - chrno_audit.gemspec
 - lib/chrno_audit.rb
 - lib/chrno_audit/action_controller_concern.rb
 - lib/chrno_audit/active_record_concern.rb
+- lib/chrno_audit/engine.rb
 - lib/chrno_audit/version.rb
 - lib/generators/chrno_audit/install_generator.rb
 - lib/generators/chrno_audit/templates/README