ixtlan-audit 0.3.3 → 0.4.0

data/lib/ixtlan/audit/cuba.rb

@@ -25,14 +25,17 @@ module Ixtlan
   module Audit
     class Cuba < ::CubaAPI
       define do
-        on get, 'last' do |number|
-          write Ixtlan::Audit::Audit.all.last
+        on get, 'last' do
+          write Ixtlan::Audit::Audit.last
         end
-        on get, :numder do |number|
+        on get, :number do |number|
           write Ixtlan::Audit::Audit.get!( number.to_i )
         end
         on get do
-          write Ixtlan::Audit::Audit.all.reverse
+          query = {}
+          query[ :login ] = req[ :login ] if req[ :login ]
+          query[ :path.like ] = '%' + req[ :path ] + '%' if req[ :path ]
+          write Ixtlan::Audit::Audit.all( query ).reverse
         end
       end
     end

data/lib/ixtlan/audit/cuba_plugin.rb

@@ -27,7 +27,8 @@ module Ixtlan
         if options[ :audit ] != false
           username = options[ :username ]
           username ||= current_user_name if respond_to?( :current_user_name )
-          audit_manager.push( username, env['SCRIPT_NAME'], obj )
+          user = respond_to?( :current_user ) ? current_user : nil
+          audit_manager.push( username, req.request_method, env['SCRIPT_NAME'], obj, user )
         end
         obj
       end

data/lib/ixtlan/audit/manager.rb

@@ -65,7 +65,7 @@ module Ixtlan
         @keep_logs
       end
       
-      def push( username, path, obj )
+      def push( username, http_method, path, obj, user = nil )
         if model
           message = 
             if !obj.is_a?( String ) && obj.respond_to?( :collect )
@@ -77,9 +77,12 @@ module Ixtlan
             else
               obj.to_s
             end
-          list << model.new( :path => path, 
-                             :message => message, 
-                             :login => username || '???' )
+          m =  model.new( :http_method => http_method,
+                          :path => path, 
+                          :message => message, 
+                          :login => username || '???' )
+          m.created_by = user if user && m.respond_to?( :created_by ) && user.respond_to?( :new? ) && !user.new?
+          list << m
         end
         list.last
       end
@@ -89,7 +92,9 @@ module Ixtlan
         list.each do |audit|
           begin
             audit.save
-            warn audit.errors.inspect unless audit.valid?
+            if ( audit.respond_to?( :errors ) && audit.errors.size > 0 )
+              warn audit.errors.inspect
+            end
           rescue => e
             warn "unexpected error - skip entry"
             warn e.message

data/lib/ixtlan/audit/resource.rb

@@ -24,14 +24,24 @@ module Ixtlan
     class Audit
       include DataMapper::Resource
 
+      def self.storage_name(arg)
+        'ixtlan_audits'
+      end
+
       property :id, Serial
       
-      property :login, String
-      property :path, String
-      property :message, String
-      
+      property :login, String, :length => 32
+      property :http_method, String, :length => 8, :field => 'method'
+      property :path, String, :length => 64
+      property :message, String, :length => 192      
       property :created_at, DateTime
       
+      if defined?( ::User ) && ::User.respond_to?( :properties ) # DataMapper
+        belongs_to :created_by, ::User, :required => false
+      elsif defined?( Ixtlan::UserManagement::User ) && Ixtlan::UserManagement::User.respond_to?( :properties ) # DataMapper
+        belongs_to :created_by, Ixtlan::UserManagement::User, :required => false
+      end
+
       before :save do
         self.created_at = DateTime.now
       end

data/lib/ixtlan/audit/serializer.rb

@@ -25,9 +25,15 @@ module Ixtlan
 
       root 'audit'
       
-      add_context( :single )
+      add_context( :single,
+                   :except => [:created_by_id],
+                   :include => {
+                     :created_by => {
+                       :only => [:id, :login, :name]
+                     }
+                   } )
       
-      add_context( :collection, :except => [:created_at] )
+      add_context( :collection, :except => [:created_at, :created_by_id] )
     end
   end
-end
+end

data/lib/ixtlan/audit/user_logger.rb

@@ -85,7 +85,7 @@ module Ixtlan
       def log_user(user, message = nil, &block)
         user ||= "???"
         msg = "#{message}#{block.call if block}"
-        @manager.push( user, msg.sub(/\ .*$/, ''), msg.sub(/^[^\ ]*\ /, '') )
+        @manager.push( user, '', msg.sub(/\ .*$/, ''), msg.sub(/^[^\ ]*\ /, '') )
         logger.debug {"[#{user}] #{msg}" }
       end
     end

data/spec/audit_manager_spec.rb

@@ -2,22 +2,9 @@ require 'dm-core'
 require 'dm-migrations'
 require 'slf4r/ruby_logger'
 require 'ixtlan/audit/manager'
+require 'ixtlan/audit/resource'
 
-class Audit
-  include DataMapper::Resource
-
-  property :id, Serial
-
-  property :login, String
-  property :path, String
-  property :message, String
-
-  property :created_at, DateTime
-
-  before :save do
-    self.created_at = DateTime.now
-  end
-end
+Audit = Ixtlan::Audit::Audit
 
 DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.finalize
@@ -29,9 +16,9 @@ describe Ixtlan::Audit::Manager do
 
   it 'should collect log events and the save them all in one go' do
     size = Audit.all.size
-    subject.push( "login1", "path1", "msg1" )
-    subject.push( "login2", "path2", "msg2" )
-    subject.push( "login3", "path3", "msg3" )
+    subject.push( "login1", "POST", "path1", "msg1" )
+    subject.push( "login2", "DELETE", "path2", "msg2" )
+    subject.push( "login3", "GET", "path3", "msg3" )
     subject.save_all
 
     Audit.all.size.should == size + 3
@@ -42,8 +29,8 @@ describe Ixtlan::Audit::Manager do
     Audit.all.size.should > 0
     subject.keep_logs = 0
     Audit.all.size.should == 0
-    subject.push( "login1", "path1", "msg1" )
-    subject.push( "login2", "path2", "msg2" )
+    subject.push( "login1", "PUT", "path1", "msg1" )
+    subject.push( "login2", "OPTION", "path2", "msg2" )
     subject.save_all
     Audit.all.size.should == 2
   end

metadata

@@ -1,127 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ixtlan-audit
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Christian Meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-01-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: slf4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 4
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.4.2
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+  prerelease: false
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 73
-        segments: 
-        - 10
-        - 0
-        - 3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 10.0.3
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-migrations
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.0
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id006
 description: audit the controller actions for the current user. log that data into the database and allow to expire this log files (privacy protection) and be able to browse it from the UI
-email: 
+email:
 - m.kristian@web.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - MIT-LICENSE
 - lib/ixtlan-audit.rb~
 - lib/ixtlan-audit.rb
@@ -145,38 +137,33 @@ files:
 - spec/audit_manager_spec.rb
 - spec/audit_manager_spec.rb~
 homepage: http://github.com/mkristian/ixtlan-audit
-licenses: 
+licenses:
 - MIT
-post_install_message: 
-rdoc_options: 
-- --main
+post_install_message:
+rdoc_options:
+- "--main"
 - README.textile
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: audit the controller actions for the current user
-test_files: 
+test_files:
 - spec/audit_manager_spec.rb