audited_logfile 0.0.10 → 0.0.12

data/lib/audited_logfile.rb

@@ -53,11 +53,11 @@ module Audited
           user_info = user ? "#{user_type}(#{user_id}): #{user.try(:email)}" : 'Unknown'
           common_log = "#{Time.now.iso8601(1)}, #{action.upcase}, #{user_info}"
 
-          case action
-          when 'report'
-            AuditedLogfile.logger.info "#{common_log}, #{audited_changes.inspect}"
-          else
+          case action.to_s
+          when 'create', 'update', 'destroy'
             AuditedLogfile.logger.info "#{common_log}, #{auditable_type}, #{auditable_id}, (#{changes})"
+          else
+            AuditedLogfile.logger.info "#{common_log}, #{audited_changes.inspect}"
           end
         end
       end
@@ -88,7 +88,19 @@ module Audited
   end
 
   def self.report(options)
-    Adapters::ActiveRecord::Audit.create!(action: 'report', audited_changes: options)
+    action = options[:action] || 'report'
+    Adapters::ActiveRecord::Audit.create!(action: action, audited_changes: options)
+  end
+
+  def self.week_activity_chart_data(actions, since, till)
+    records = Adapters::ActiveRecord::Audit
+      .select("TO_CHAR(created_at, 'DD') DAY, TO_CHAR(created_at, 'MM') MONTH, TO_CHAR(created_at, 'YYYY') YEAR")
+      .where(action: actions)
+      .where('created_at >= ? AND created_at < ?', since, till + 1)
+    data = Hash[Adapters::ActiveRecord::Audit
+      .find_by_sql("SELECT DAY, MONTH, YEAR, COUNT(*) COUNT FROM (#{records.to_sql}) GROUP BY YEAR, MONTH, DAY ORDER BY YEAR, MONTH, DAY")
+      .map { |x| [Date.new(x.year.to_i, x.month.to_i, x.day.to_i), x.count.to_i] }]
+    (since .. till).map { |day| [day, (data[day] || 0)] }
   end
 end
 

metadata

@@ -2,31 +2,31 @@
 name: audited_logfile
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Alexander Kiseliov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
+  name: audited-activerecord
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-  name: audited-activerecord
-  type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
 description: Audited extention to log audit
 email: aakiselev@at-consulting.ru
 executables: []
@@ -41,20 +41,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: audited_logfile