ixtlan 0.4.0.pre3 → 0.4.0.pre4

data/lib/ixtlan/audit_rack.rb

@@ -0,0 +1,20 @@
+module Ixtlan
+  class AuditRack
+    AUDIT = Ixtlan::Models::AUDIT.nil? ? nil : Object.full_const_get(Ixtlan::Models::AUDIT)
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      result = @app.call(env)
+      if AUDIT
+        AUDIT.pop_all.each do |audit|
+          audit.save
+        end
+      end
+      result
+    end
+
+  end
+end

data/lib/ixtlan/controllers/audits_controller.rb

@@ -0,0 +1,23 @@
+module Ixtlan
+  module Controllers
+    module AuditsController
+      
+      def self.included(base)
+        base.send(:include, Ixtlan::Controllers::SearchQuery)
+      end
+
+      public
+
+      # GET /audits
+      # GET /audits.xml
+      def index
+        @audits = Audit.all(query(:login, params[:query])) + Audit.all(query(:message, params[:query]))
+
+        respond_to do |format|
+          format.html
+          format.xml  { render :xml => @audits }
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/controllers/search_query.rb

@@ -5,20 +5,23 @@ module Ixtlan
       private 
 
       def simple_query(search_parameter)
+        query(search_parameter, params[search_parameter])
+      end
+
+      def query(parameter, value)
         args = {}
         args[:limit] = params[:limit].to_i + 1 if params[:limit]
         args[:offset] = params[:offset].to_i if params[:offset]
 
-        if login = params[search_parameter]
+        if value
           if "false" == params[:fuzzy]
-            args[search_parameter] = login
+            args[parameter] = value
           else
-            args[search_parameter.like] = "%" + login.to_s + "%"
+            args[parameter.like] = "%" + value.to_s + "%"
           end
         end
         args
       end
-
     end
   end
 end

data/lib/ixtlan/controllers/users_controller.rb

@@ -72,7 +72,8 @@ module Ixtlan
             format.html { redirect_to(user_url(@user.id)) }
             format.xml  { render :xml => @user, :status => :created, :location => user_url(@user.id) + ".xml" }
 
-            Mailer.deliver_password(@user.email, "Configuration.instance.password_sender_email", @user.password)
+            ::Ixtlan::Mailer.deliver_new_user(@user.email, Configuration.instance.password_sender_email, @user.login, Configuration.instance.login_url)
+            ::Ixtlan::Mailer.deliver_password(@user.email, Configuration.instance.password_sender_email, @user.password)
           else
             format.html { render :action => "new" }
             format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }

data/lib/ixtlan/logger_config.rb

@@ -46,12 +46,19 @@ module Ixtlan
     DataMapper.logger = logger([appender,rails_appender], DataMapper)
 
     #TODO better find out which database !!!
-    DataObjects::Sqlite3.logger = logger([appender,rails_appender], DataObjects)
+    if DataObjects.const_defined?("Sqlite3")
+      DataObjects::Sqlite3.logger = logger([appender,rails_appender], DataObjects)
+    elsif DataObjects.const_defined?("Mysql")
+      DataObjects::Mysql.logger = logger([appender,rails_appender], DataObjects)
+    elsif DataObjects.const_defined?("Postgres")
+      DataObjects::Postgres.logger = logger([appender,rails_appender], DataObjects)
+    end
 
     # configure audit logger
     Ixtlan::AuditConfig.configure(Object.full_const_get(Ixtlan::Models::CONFIGURATION).instance.keep_audit_logs,
                                   log_filebase('audit'),
                                   [
+                                   Ixtlan::AuditConfig,
                                    Ixtlan::Models::User,
                                    Ixtlan::Rails::Audit,
                                    Ixtlan::Rails::SessionTimeout,

data/lib/ixtlan/mailer/new_user.erb

@@ -0,0 +1,5 @@
+a new user has been added.
+
+URL     : <%= @url %>
+username: <%= @username %>
+password: will be sent in a separate email

data/lib/ixtlan/mailer.rb

@@ -3,7 +3,6 @@ module Ixtlan
 
     require 'pathname'
     path = Pathname(__FILE__).parent.dirname.to_s
-    p path
     view_paths << path unless view_paths.member? path
 
     def password(email_to, email_from, password)
@@ -15,8 +14,17 @@ module Ixtlan
       @headers    = {}
     end
 
+    def new_user(email_to, email_from, login, url)
+      @subject    = "details for #{url}"
+      @body       = {:username => login, :url => url}
+      @recipients = email_to
+      @from       = email_from
+      @sent_on    = Time.now
+      @headers    = {}
+    end
+
     def error_notification(email_from, email_to, exception, error_file)
-        @subject    = exception.to_s
+        @subject    = exception.message
         @body       = {:text => "#{error_file}"}
         @recipients = email_to
         @from       = email_from

data/lib/ixtlan/models/audit.rb

@@ -0,0 +1,43 @@
+require 'dm-serializer'
+module Ixtlan
+  module Models
+    module Audit
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+
+        model.property :id, ::DataMapper::Types::Serial
+
+        model.property :date, DateTime, :required => true
+
+        model.property :login, String, :required => true, :format => /^[a-zA-Z0-9]+$/, :length => 32, :auto_validation => false #required => true does not allow empty string :-( so skip validation
+
+        model.property :message, String, :required => true, :length => 255
+
+        model.class_eval <<-EOS, __FILE__, __LINE__
+      unless const_defined? "CONFIGURATION"
+        CONFIGURATION = Object.full_const_get(Models::CONFIGURATION)
+      end
+      def self.pop_all
+        result = Thread.current[:audit] || []
+        Thread.current[:audit] = nil
+        if(!@last_cleanup.nil? && @last_cleanup < 1.days.ago)
+          @last_cleanup = Date.today
+          begin
+            self.class.all(:date.lt => CONFIGURATION.keep_audit_log.days.ago).destroy!
+          rescue Error
+            # TODO log this !!
+          end
+        end
+        result
+      end
+EOS
+      end
+
+      def push
+        list = (Thread.current[:audit] ||= [])
+        list << self
+      end
+    end
+  end
+end
+  

data/lib/ixtlan/models/configuration.rb

@@ -22,6 +22,8 @@ module Ixtlan
 
         model.property :password_sender_email, String, :format => :email_address, :required => false, :length => 64
 
+        model.property :login_url, String, :required => false, :length => 128
+
         model.property :notification_sender_email, String, :format => :email_address, :required => false, :length => 64
 
         model.property :notification_recipient_emails, String, :format => Proc.new { |email| emails = email.split(','); emails.find_all { |e| e =~ DataMapper::Validate::Format::Email::EmailAddress }.size == emails.size}, :required => false, :length => 254 #honour mysql max varchar length

data/lib/ixtlan/models.rb

@@ -1,14 +1,15 @@
 module Ixtlan
   module Models
-    AUTHENTICATION = "::Ixtlan::Models::Authentication" unless const_defined? "AUTHENTICATION"
-    USER = "::Ixtlan::Models::User" unless const_defined? "USER"
-    GROUP = "::Ixtlan::Models::Group" unless const_defined? "GROUP"
-    ROLE = "::Ixtlan::Models::Role" unless const_defined? "ROLE"
-    PERMISSION = "::Ixtlan::Models::Permission" unless const_defined? "PERMISSION"
-    LOCALE = "::Ixtlan::Models::Locale" unless const_defined? "LOCALE"
-    DOMAIN = "::Ixtlan::Models::Domain" unless const_defined? "DOMAIN"
-    CONFIGURATION = "::Ixtlan::Models::Configuration" unless const_defined? "CONFIGURATION"
-    TRANSLATION = "::Ixtlan::Models::Translation" unless const_defined? "TRANSLATION"
-    TEXT = "::Ixtlan::Models::I18nText" unless const_defined? "TEXT"
+    AUTHENTICATION = "::Authentication" unless const_defined? "AUTHENTICATION"
+    AUDIT = "::Audit" unless const_defined? "AUDIT"
+    USER = "::User" unless const_defined? "USER"
+    GROUP = "::Group" unless const_defined? "GROUP"
+    ROLE = "::Role" unless const_defined? "ROLE"
+    PERMISSION = "::Permission" unless const_defined? "PERMISSION"
+    LOCALE = "::Locale" unless const_defined? "LOCALE"
+    DOMAIN = "::Domain" unless const_defined? "DOMAIN"
+    CONFIGURATION = "::Configuration" unless const_defined? "CONFIGURATION"
+    TRANSLATION = "::Translation" unless const_defined? "TRANSLATION"
+    TEXT = "::I18nText" unless const_defined? "TEXT"
   end
 end

data/lib/ixtlan/rails/error_handling.rb

@@ -90,7 +90,7 @@ module Ixtlan
         logger = Logger.new(log_file)
 
         dump_environment(logger, exception, controller)
-        Ixtlan::Mailer.deliver_error_notification(@email_from, @email_to, exception, log_file) unless (@email_to.blank? || @email_from.blank?)
+        ::Ixtlan::Mailer.deliver_error_notification(@email_from, @email_to, exception, log_file) unless (@email_to.blank? || @email_from.blank?)
         log_file
       end
 

data/lib/ixtlan/rails/migrations.rb

@@ -75,6 +75,10 @@ module Ixtlan
       def self.create_text
         TEXT.auto_migrate!
       end
+
+      def self.create_audit
+        Object.const_get(Ixtlan::Models::AUDIT.sub(/^::/, '')).auto_migrate! if Ixtlan::Models::AUDIT
+      end
     end
   end
 end

data/lib/ixtlan/rails/rescue_module.rb

@@ -0,0 +1,28 @@
+module Ixtlan
+  module Rails
+    module RescueModule
+      def self.included(controller)
+        # needs 'optimistic_persistence'
+        controller.rescue_from ::Ixtlan::StaleResourceError, :with => :stale_resource
+
+        # needs 'guard'
+        controller.rescue_from ::Ixtlan::GuardException, :with => :page_not_found
+        controller.rescue_from ::Ixtlan::PermissionDenied, :with => :page_not_found
+        
+        # rest is standard rails or datamapper
+        controller.rescue_from ::DataMapper::ObjectNotFoundError, :with => :page_not_found
+        controller.rescue_from ::ActionController::RoutingError, :with => :page_not_found
+        controller.rescue_from ::ActionController::UnknownAction, :with => :page_not_found
+        controller.rescue_from ::ActionController::MethodNotAllowed, :with => :page_not_found
+        controller.rescue_from ::ActionController::NotImplemented, :with => :page_not_found
+        controller.rescue_from ::ActionController::InvalidAuthenticityToken, :with => :stale_resource
+        
+        # have nice stacktraces in development mode
+        unless controller.consider_all_requests_local
+          controller.rescue_from ::ActionView::MissingTemplate, :with => :internal_server_error
+          controller.rescue_from ::ActionView::TemplateError, :with => :internal_server_error
+        end
+      end
+    end
+  end
+end

data/lib/ixtlan/user_logger.rb

@@ -2,6 +2,8 @@ module Ixtlan
 
   class UserLogger
 
+    AUDIT = Ixtlan::Models::AUDIT.nil? ? nil : Object.full_const_get(Ixtlan::Models::AUDIT)
+
     def initialize(arg)
       @logger = Slf4r::LoggerFacade.new(arg)
     end
@@ -46,7 +48,11 @@ module Ixtlan
 
     def log_user(user, message = nil, &block)
       user ||= "???"
-      @logger.info {"[#{user}] #{message}#{block.call if block}" }
+      msg = "#{message}#{block.call if block}"
+      if AUDIT
+        AUDIT.new(:date => DateTime.now, :message => msg, :login => user).push
+      end
+      @logger.info {"[#{user}] #{msg}" }
     end
   end
 end

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 class Ixtlan
-  VERSION = '0.4.0.pre3'.freeze
+  VERSION = '0.4.0.pre4'.freeze
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 4
     - 0
-    - pre3
-  version: 0.4.0.pre3
+    - pre4
+  version: 0.4.0.pre4
 platform: ruby
 authors: 
   - mkristian
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +05:30
+date: 2010-07-05 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
   - lib/ixtlan/logger_config.rb
   - lib/ixtlan/models.rb
   - lib/ixtlan/audit_config.rb
+  - lib/ixtlan/audit_rack.rb
   - lib/ixtlan/session.rb
   - lib/ixtlan/optimistic_persistence.rb
   - lib/ixtlan/mailer.rb
@@ -188,6 +189,7 @@ files:
   - lib/ixtlan/models/phrase.rb
   - lib/ixtlan/models/update_children.rb
   - lib/ixtlan/models/translation.rb
+  - lib/ixtlan/models/audit.rb
   - lib/ixtlan/models/user.rb
   - lib/ixtlan/models/permission.rb
   - lib/ixtlan/models/locale.rb
@@ -206,13 +208,16 @@ files:
   - lib/ixtlan/controllers/texts_controller.rb
   - lib/ixtlan/controllers/locales_controller.rb
   - lib/ixtlan/controllers/word_bundles_controller.rb
+  - lib/ixtlan/controllers/audits_controller.rb
   - lib/ixtlan/controllers/search_query.rb
   - lib/ixtlan/controllers/authentications_controller.rb
   - lib/ixtlan/controllers/domains_controller.rb
   - lib/ixtlan/controllers/users_controller.rb
+  - lib/ixtlan/mailer/new_user.erb
   - lib/ixtlan/mailer/error_notification.erb
   - lib/ixtlan/mailer/password.erb
   - lib/ixtlan/rails/timestamps_modified_by_filter.rb
+  - lib/ixtlan/rails/rescue_module.rb
   - lib/ixtlan/rails/audit.rb
   - lib/ixtlan/rails/error_handling.rb
   - lib/ixtlan/rails/migrations.rb
@@ -283,7 +288,7 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: this is set of rails and datamapper plugins for setting up a little more advanced rails application then the default rails generator does
+summary: ixtlan plugins for rails and datamapper
 test_files: 
   - spec/text_collection_spec.rb
   - spec/optimistic_persistence_spec.rb