ixtlan-audit 0.2.1 → 0.3.0

data/lib/ixtlan-audit.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 if defined?(Rails)
   require 'ixtlan/audit/railtie'
 end

data/lib/ixtlan/audit/audit_resource.rb~

@@ -0,0 +1,55 @@
+require 'dm-core'
+require 'dm-migrations'
+require 'slf4r/ruby_logger'
+require 'ixtlan/audit/manager'
+
+class Audit
+  include DataMapper::Resource
+
+  property :id, Serial
+
+  property :login, String
+  property :message, String
+
+  property :created_at, DateTime
+
+  before :save do
+    self.created_at = DateTime.now
+  end
+end
+
+class Fixnum
+  def days
+    self
+  end
+  def ago
+    DateTime.now - 86000 * self
+  end
+end
+DataMapper.setup(:default, "sqlite3::memory:")
+DataMapper.finalize
+DataMapper.repository.auto_migrate!
+
+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("msg1", "login1")
+    subject.push("msg2", "login2")
+    subject.push("msg3", "login3")
+    subject.save_all
+
+    Audit.all.size.should == size + 3
+  end
+
+  it "should clean up audit logs" do
+    Audit.create(:message => "msg", :login => "login")
+    Audit.all.size.should > 0
+    subject.keep_logs = 0
+    Audit.all.size.should == 0
+    subject.push("msg", "login")
+    subject.push("msg", "login")
+    subject.save_all
+    Audit.all.size.should == 2
+  end
+end

data/lib/ixtlan/audit/audit_serializer.rb~

@@ -0,0 +1,14 @@
+require 'ixtlan/babel/serializer'
+
+class AuditSerializer < Ixtlan::Babel::Serializer
+
+  model Audit
+
+  root 'audit'
+
+  add_context(:single)
+
+  add_context(:collection,
+              :except => [:created_at]
+             )
+end

data/lib/ixtlan/audit/cuba.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'cuba_api'
+require 'ixtlan/audit/resource'
+require 'ixtlan/audit/serializer'
+module Ixtlan
+  module Audit
+    class Cuba < ::CubaAPI
+      define do
+        on get, :numder do |number|
+          write Ixtlan::Audit::Audit.get!( number.to_i )
+        end
+        on get do
+          write Ixtlan::Audit::Audit.all.reverse
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/audit/cuba.rb~

@@ -0,0 +1,14 @@
+require 'cuba_api'
+require 'ixtlan/audit/resource'
+require 'ixtlan/audit/serializer'
+module Ixtlan
+  module Audit
+    class Cuba < ::CubaAPI
+      define do
+        on get do
+          write Ixtlan::Audit::Audit.all.reverse
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/audit/cuba_plugin.rb

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'ixtlan/audit/manager'
+require 'ixtlan/audit/rack'
+module Ixtlan
+  module Audit
+    module CubaPlugin
+      def audit( obj, args )
+        if args[ :audit ] != false
+          username = current_user_name if respond_to?( :current_user_name )
+          audit_manager.push( username, env['SCRIPT_NAME'], obj )
+        end
+        obj
+      end
+      
+      def audit_manager
+        @audit_manager ||= self.class[ :audit_manager ] || Manager.new
+      end
+      
+      def self.included( base )
+        base.prepend_aspect :audit
+        manager = Manager.new
+        base[ :audit_manager ] = manager
+        base.use( Rack, manager)
+      end
+    end
+  end
+end

data/lib/ixtlan/audit/cuba_plugin.rb~

@@ -0,0 +1,34 @@
+require 'ixtlan/audit/manager'
+require 'ixtlan/audit/rack'
+module Ixtlan
+  module Audit
+    module CubaSetup
+
+      module Audit
+        def audit( obj, args )
+          if args[ :audit ] != false
+            username = current_user_name if respond_to?( :current_user_name )
+            audit_manager.push( username, env['SCRIPT_NAME'], obj )
+          end
+          obj
+        end
+        
+        def audit_manager
+          @audit_manager ||= self.class.settings[ :audit_manager ] || Manager.new
+        end
+        
+        def self.included( base )
+          base.add_aspect :audit
+        end
+      end
+
+      def self.setup( cuba, model = nil )
+        #cuba.plugin Audit
+        manager = Manager.new( model )
+        cuba.settings[ :audit_manager ] = manager
+        cuba.use( Rack, manager)
+        manager
+      end
+    end
+  end
+end

data/lib/ixtlan/audit/cuba_setup.rb~

@@ -0,0 +1,34 @@
+require 'ixtlan/audit/manager'
+require 'ixtlan/audit/rack'
+module Ixtlan
+  module Audit
+    module CubaSetup
+
+      module Audit
+        def audit( obj, args )
+          if args[ :audit ] != false
+            username = current_user_name if respond_to?( :current_user_name )
+            audit_manager.push( username, env['SCRIPT_NAME'], obj )
+          end
+          obj
+        end
+        
+        def audit_manager
+          @audit_manager ||= self.class.settings[ :audit_manager ] || Manager.new
+        end
+        
+        def self.included( base )
+          base.add_aspect :audit
+        end
+      end
+
+      def self.setup( cuba, model = nil )
+        #cuba.plugin Audit
+        manager = Manager.new( model )
+        cuba.settings[ :audit_manager ] = manager
+        cuba.use( Rack, manager)
+        manager
+      end
+    end
+  end
+end

data/lib/ixtlan/audit/manager.rb

@@ -1,44 +1,86 @@
-require 'slf4r/logger'
-
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 module Ixtlan
   module Audit
     class Manager
 
       private
 
-      include ::Slf4r::Logger
+      if defined? ::Slf4r
+        include ::Slf4r::Logger
+      else
+        require 'logger'
+        def logger
+          @logger ||= Logger.new( STDOUT )
+        end
+      end
 
       def list
         Thread.current[:audit] ||= []
       end
 
-      def model
-        @model ||= (::Audit rescue nil)
-      end
-
       public
 
-      def initialize
-        @username_method = :login
+      attr_accessor :model, :block, :keep_logs
+
+      def initialize( model = nil, &block )
+        @model = model
         @keep_logs = 90
+        block.call( self ) if block
+        @block = block
       end
-      
-      def username_method=(method)
-        @username_method = method.to_sym if method
-      end
-      
-      def model=(m)
-        @model = m if m
+
+      def model
+        @model ||= (Ixtlan::Audit::Audit rescue nil)
       end
 
-      def keep_logs=(days)
+      def keep_logs=( keep )
         old = @keep_logs
-        @keep_logs = days.to_i
+        @keep_logs = keep
         daily_cleanup if old != @keep_logs
       end
+
+      def keep_logs
+        if block
+          keep_logs = block.call
+        end
+        @keep_logs
+      end
       
-      def push(message, username)
-        list << model.new(:message => message, :login => username) if model
+      def push( username, path, obj )
+        if model
+          message = 
+            if !obj.is_a?( String ) && obj.respond_to?( :collect )
+              if o = obj.first
+                "#{o.class}[ #{obj.size} ]"
+              else
+                "[ 0 ] - <EMPTY ARRAY>"
+              end
+            else
+              obj.to_s
+            end
+          list << model.new( :path => path, 
+                             :message => message, 
+                             :login => username || '???' )
+        end
         list.last
       end
 
@@ -56,35 +98,31 @@ module Ixtlan
         list.clear
       end
 
-      def username_method
-        @username_method
-      end
-
       def daily_cleanup
-        if model
-          if(@last_cleanup.nil? || @last_cleanup < 1.days.ago)
-            @last_cleanup = 0.days.ago # to have the right type
-            begin
-              delete_all
-              logger.info("cleaned audit logs")
-            rescue Exception => e
-              logger.error("cleanup audit logs", e)
-            end
+        return unless model
+        now = DateTime.now
+        if(@last_cleanup.nil? || @last_cleanup < (now - 1))
+          @last_cleanup = now
+          begin
+            delete_all( now - keep_logs )
+            logger.info "cleaned audit logs"
+          rescue Exception => e
+            logger.warn "error cleaning up audit logs: #{e.message}" 
           end
         end
       end
-
+  
       private
 
       if defined? ::DataMapper
-        def delete_all
-          model.all(:created_at.lte => @keep_logs.days.ago).destroy!
+        def delete_all( expired )
+          model.all( :created_at.lte => expired ).destroy!
         end
       else # ActiveRecord
-        def delete_all
-          model.all(:conditions => ["created_at <= ?", @keep_logs.days.ago]).each(&:delete)
+        def delete_all( expired )
+          model.all( :conditions => ["created_at <= ?", expired] ).each(&:delete)
         end
       end
     end
   end
-end
+end

data/lib/ixtlan/audit/rack.rb

@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Ixtlan
+  module Audit
+    class Rack
+
+      def initialize(app, audit_manager)
+        @app = app
+        @audit_manager = audit_manager
+      end
+      
+      def call(env)
+        result = @app.call(env)
+        @audit_manager.save_all
+        result
+      end
+      
+    end
+  end
+end

data/lib/ixtlan/audit/railtie.rb

@@ -1,5 +1,25 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'ixtlan/audit/manager'
-require 'ixtlan/audit/audit_rack'
+require 'ixtlan/audit/rack'
 require 'ixtlan/audit/user_logger'
 
 
@@ -11,7 +31,7 @@ module Ixtlan
         app.config.audit_manager = Manager.new
         ::ActionController::Base.send(:include, Module)
         ::ActionController::Base.send(:after_filter, :audit)
-        app.config.middleware.use(AuditRack, app.config.audit_manager)
+        app.config.middleware.use(Rack, app.config.audit_manager)
       end
     end
     
@@ -23,4 +43,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/audit/resource.rb

@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'dm-core'
+module Ixtlan
+  module Audit
+    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
+  end
+end

data/lib/ixtlan/audit/serializer.rb

@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'ixtlan/babel/serializer'
+module Ixtlan
+  module Audit
+    class AuditSerializer < Ixtlan::Babel::Serializer
+
+      root 'audit'
+      
+      add_context( :single )
+      
+      add_context( :collection, :except => [:created_at] )
+    end
+  end
+end

data/lib/ixtlan/audit/user_logger.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'slf4r/logger'
 
 module Ixtlan
@@ -14,7 +34,7 @@ module Ixtlan
       
       def login_from(controller)
         user = controller.respond_to?(:current_user) ? controller.send(:current_user) : nil
-        user.nil? ? nil: user.send(@manager.username_method)
+        user.nil? ? nil: (user.respond_to?(:login) ? user.login : user.username)
       end
       
       public
@@ -25,15 +45,14 @@ module Ixtlan
       
       def log_action(controller, message = nil)
         log_user(login_from(controller)) do
-          as_xml = controller.response.content_type == 'application/xml' ? " - xml" : ""
           if controller.params[:controller]
             clname = controller.params[:controller]
             cname = clname.sub(/^.*\//, '')
             audits = controller.instance_variable_get("@#{cname}")
-            if(audits)
-              "#{clname}##{controller.params[:action]} #{cname.classify}[#{audits.size}]#{as_xml}#{message}"
+            if(audits && audits.respond_to?(:collect))
+              "#{clname}##{controller.params[:action]} #{cname.classify}[#{audits.size}]#{message}"
             else
-              audit = controller.instance_variable_get("@#{cname.singularize}")
+              audit = audits || controller.instance_variable_get("@#{cname.singularize}")
               if(audit)
                 errors = if(audit.respond_to?(:errors) && !audit.errors.empty?)
                            " - errors: " + audit.errors.full_messages.join(", ")
@@ -42,12 +61,14 @@ module Ixtlan
                               audit.to_log
                             elsif audit.is_a? String
                               audit
+                            elsif audit.respond_to?(:model)
+                              "#{audit.model}(#{audit.id})"
                             else
                               "#{audit.class.name}(#{audit.id})"
                             end
-                "#{clname}##{controller.params[:action]} #{audit_log}#{as_xml}#{message}#{errors}"
+                "#{clname}##{controller.params[:action]} #{audit_log}#{message}#{errors}"
               else
-                "#{clname}##{controller.params[:action]}#{as_xml}#{message}"
+                "#{clname}##{controller.params[:action]}#{message}"
               end
             end
           else
@@ -59,9 +80,9 @@ module Ixtlan
       def log_user(user, message = nil, &block)
         user ||= "???"
         msg = "#{message}#{block.call if block}"
-        @manager.push( msg, user)
+        @manager.push( user, msg.sub(/\ .*$/, ''), msg )
         logger.debug {"[#{user}] #{msg}" }
       end
     end
   end
-end
+end

data/spec/audit_manager_spec.rb

@@ -9,6 +9,7 @@ class Audit
   property :id, Serial
 
   property :login, String
+  property :path, String
   property :message, String
 
   property :created_at, DateTime
@@ -18,25 +19,19 @@ class Audit
   end
 end
 
-class Fixnum
-  def days
-    self
-  end
-  def ago
-    DateTime.now - 86000 * self
-  end
-end
 DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.finalize
 DataMapper.repository.auto_migrate!
 
 describe Ixtlan::Audit::Manager do
 
+  before { subject.model = Audit }
+
   it 'should collect log events and the save them all in one go' do
     size = Audit.all.size
-    subject.push("msg1", "login1")
-    subject.push("msg2", "login2")
-    subject.push("msg3", "login3")
+    subject.push( "login1", "path1", "msg1" )
+    subject.push( "login2", "path2", "msg2" )
+    subject.push( "login3", "path3", "msg3" )
     subject.save_all
 
     Audit.all.size.should == size + 3
@@ -47,8 +42,8 @@ describe Ixtlan::Audit::Manager do
     Audit.all.size.should > 0
     subject.keep_logs = 0
     Audit.all.size.should == 0
-    subject.push("msg", "login")
-    subject.push("msg", "login")
+    subject.push( "login1", "path1", "msg1" )
+    subject.push( "login2", "path2", "msg2" )
     subject.save_all
     Audit.all.size.should == 2
   end

metadata

@@ -1,133 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ixtlan-audit
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
-  - mkristian
+authors:
+- Christian Meier
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-04 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: slf4r
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.4.2
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.6.0
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.8.7
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: dm-core
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :development
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: dm-migrations
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: dm-sqlite-adapter
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.2.0
-    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: 
-  - m.kristian@web.de
+date: 2012-12-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: slf4r
+  requirement: &16127020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *16127020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &16126340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *16126340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &16125600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *16125600
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: &16124940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *16124940
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: &16124460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *16124460
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: &16123860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: *16123860
+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:
+- m.kristian@web.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - MIT-LICENSE
-  - README.textile
-  - lib/ixtlan-audit.rb~
-  - lib/ixtlan-audit.rb
-  - lib/ixtlan/audit/logging_configurator.rb~
-  - lib/ixtlan/audit/user_logger.rb
-  - lib/ixtlan/audit/manager.rb
-  - lib/ixtlan/audit/audit_rack.rb
-  - lib/ixtlan/audit/manager.rb~
-  - lib/ixtlan/audit/railtie.rb
-  - lib/ixtlan/audit/user_logger.rb~
-  - spec/audit_manager_spec.rb
-  - spec/audit_manager_spec.rb~
+files:
+- MIT-LICENSE
+- lib/ixtlan-audit.rb~
+- lib/ixtlan-audit.rb
+- lib/ixtlan/audit/cuba.rb~
+- lib/ixtlan/audit/cuba_plugin.rb
+- lib/ixtlan/audit/cuba.rb
+- lib/ixtlan/audit/resource.rb
+- lib/ixtlan/audit/cuba_setup.rb~
+- lib/ixtlan/audit/logging_configurator.rb~
+- lib/ixtlan/audit/user_logger.rb
+- lib/ixtlan/audit/audit_resource.rb~
+- lib/ixtlan/audit/manager.rb
+- lib/ixtlan/audit/audit_serializer.rb~
+- lib/ixtlan/audit/manager.rb~
+- lib/ixtlan/audit/railtie.rb
+- lib/ixtlan/audit/user_logger.rb~
+- lib/ixtlan/audit/rack.rb~
+- lib/ixtlan/audit/rack.rb
+- lib/ixtlan/audit/cuba_plugin.rb~
+- lib/ixtlan/audit/serializer.rb
+- spec/audit_manager_spec.rb
+- spec/audit_manager_spec.rb~
 homepage: http://github.com/mkristian/ixtlan-audit
-licenses: 
-  - MIT-LICENSE
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-  - --main
-  - README.textile
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+rdoc_options:
+- --main
+- README.textile
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: audit the controller actions for the current user
-test_files: 
-  - spec/audit_manager_spec.rb
+test_files:
+- spec/audit_manager_spec.rb
+has_rdoc: 

data/README.textile

@@ -1,4 +0,0 @@
-h1. Rails Audit Log
-
-p. once you have a logged in user in your system, the usual request log can be improved by added the login name of the user to log output. but since you associate data with a "real" person privacy comes into play. the best privacy protection is not to store data, but in our case the compromise is to just define how long the data shall be stored (define an expiration date for the data).
-