tuersteher 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/lib/tuersteher.rb

@@ -36,6 +36,8 @@ module Tuersteher
     include Singleton
 
     attr_writer :rules_config_file # to set own access_rules-path
+    attr_accessor :check_intervall # check intervall in seconds to check config file
+    attr_accessor :path_prefix # prefix for path-rules
 
     DEFAULT_RULES_CONFIG_FILE = 'access_rules.rb' # in config-dir
 
@@ -43,6 +45,11 @@ module Tuersteher
     def initialize
       @path_rules = []
       @model_rules = []
+      @check_intervall = 300 # set default check interval to 5 minutes
+    end
+
+    def ready?
+      @was_read
     end
 
     # get all path_rules as array of PathAccessRule-Instances
@@ -57,15 +64,17 @@ module Tuersteher
       @model_rules
     end
 
-    
+
     def read_rules_if_needed
       if @was_read
-        # aller 5 Minuten pruefen ob AccessRules-File sich geändert hat
+        # im check_intervall pruefen ob AccessRules-File sich geändert hat
         t = Time.now.to_i
-        if @last_read_check && (@last_read_check - t) > 300
+        @last_read_check ||= t
+        if (t - @last_read_check) > @check_intervall
           @last_read_check = t
           cur_mtime = File.mtime(self.rules_config_file)
-          if @last_mtime.nil? || cur_mtime > @last_mtime
+          @last_mtime ||= cur_mtime
+          if cur_mtime > @last_mtime
             @last_mtime = cur_mtime
             read_rules
           end
@@ -85,9 +94,9 @@ module Tuersteher
       @path_rules = []
       @model_rules = []
       eval rules_definitions, binding, (@rules_config_file||'no file')
-      extend_path_rules_with_prefix @prefix
       @was_read = true
-      Tuersteher::TLogger.logger.info "Tuersteher::AccessRulesStorage: #{@path_rules.size} path-rules and #{@model_rules.size} model-rules"
+      Tuersteher::TLogger.logger.info "Tuersteher::AccessRulesStorage: #{@path_rules.size} path-rules and #{@model_rules.size} model-rules loaded"
+      extend_path_rules_with_prefix
     end
 
     # Load AccesRules from file
@@ -155,25 +164,21 @@ module Tuersteher
     end
 
 
-    def path_prefix_processed?
-      !@path_prefix.nil?
-    end
-
+    private
 
     # Erweitern des Path um einen Prefix
     # Ist notwenig wenn z.B. die Rails-Anwendung nicht als root-Anwendung läuft
     # also root_path != '/' ist.'
-    def extend_path_rules_with_prefix prefix
-      @path_prefix = prefix
-      return if prefix.nil? || prefix.size < 2
-      prefix.chomp!('/') # des abschliessende / entfernen
-      Tuersteher::TLogger.logger.info "extend_path_rules_with_prefix: #{prefix}"
-      path_rules.each do |rule|
+    def extend_path_rules_with_prefix
+      return if @path_prefix.nil? || @path_rules.nil?
+      prefix = @path_prefix.chomp('/') # das abschliessende / entfernen
+      @path_rules.each do |rule|
         path_spec = rule.path_spezification
         if path_spec
           path_spec.path = "#{prefix}#{path_spec.path}"
         end
       end
+      Tuersteher::TLogger.logger.info "extend_path_rules_with_prefix: #{prefix}"
     end
 
 
@@ -270,11 +275,6 @@ module Tuersteher
     # method      http-Methode (:get, :put, :delete, :post), default ist :get
     #
     def path_access?(path, method = :get)
-      ar_storage = AccessRulesStorage.instance
-      unless ar_storage.path_prefix_processed?
-        prefix = respond_to?(:root_path) && root_path
-        ar_storage.extend_path_rules_with_prefix(prefix)
-      end
       AccessRules.path_access? current_user, path, method
     end
 
@@ -310,8 +310,15 @@ module Tuersteher
     # fuer aktullen Request erlaubt ist
     def check_access
 
-      # im dev-mode rules bei jeden request auf Änderungen prüfen
-      AccessRulesStorage.instance.read_rules if Rails.env=='development'
+      ar_storage = AccessRulesStorage.instance
+      unless ar_storage.ready?
+        # bei nicht production-env, dann check-intervall auf 5 sek setzen
+        ar_storage.check_intervall = 5 if Rails.env!='production'
+        # set root-path as prefix for all path rules
+        prefix = respond_to?(:root_path) && root_path
+        ar_storage.path_prefix = prefix if prefix && prefix.size > 1
+        ar_storage.read_rules
+      end
 
       # Rails3 hat andere url-path-methode
       @@url_path_method ||= Rails.version[0..1]=='3.' ? :fullpath : :request_uri

data/tuersteher.gemspec

@@ -1,56 +1,45 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tuersteher}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernd Ledig"]
-  s.date = %q{2011-09-07}
+  s.date = %q{2011-09-08}
   s.description = %q{Security-Layer for Rails-Application acts like a firewall.}
   s.email = %q{bernd@ledig.info}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Manifest",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/tuersteher.rb",
-     "license.txt",
-     "samples/access_rules.rb",
-     "samples/application_controller.rb",
-     "spec/acces_rules_storage_spec.rb",
-     "spec/access_rules_spec.rb",
-     "spec/model_access_rule_spec.rb",
-     "spec/model_extensions_spec.rb",
-     "spec/path_access_rule_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "tuersteher.gemspec"
+    "Manifest",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "init.rb",
+    "lib/tuersteher.rb",
+    "license.txt",
+    "samples/access_rules.rb",
+    "samples/application_controller.rb",
+    "spec/acces_rules_storage_spec.rb",
+    "spec/access_rules_spec.rb",
+    "spec/model_access_rule_spec.rb",
+    "spec/model_extensions_spec.rb",
+    "spec/path_access_rule_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "tuersteher.gemspec"
   ]
   s.homepage = %q{http://github.com/bledig/tuersteher}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Security-Layer for Rails-Application}
-  s.test_files = [
-    "spec/model_extensions_spec.rb",
-     "spec/acces_rules_storage_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/model_access_rule_spec.rb",
-     "spec/access_rules_spec.rb",
-     "spec/path_access_rule_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuersteher
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Bernd Ledig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-07 00:00:00 +02:00
+date: 2011-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - Manifest
 - README.rdoc
 - Rakefile
@@ -51,8 +50,8 @@ homepage: http://github.com/bledig/tuersteher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,14 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Security-Layer for Rails-Application
-test_files: 
-- spec/model_extensions_spec.rb
-- spec/acces_rules_storage_spec.rb
-- spec/spec_helper.rb
-- spec/model_access_rule_spec.rb
-- spec/access_rules_spec.rb
-- spec/path_access_rule_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-pkg
-.idea
-tuersteher*.gem
-nbproject
-.rvmrc