tuersteher 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/tuersteher.rb

@@ -170,10 +170,8 @@ module Tuersteher
         if Tuersteher::TLogger.logger.debug?
           if rule.nil?
             s = 'denied'
-          elsif rule.deny?
-            s = "denied with #{rule}"
           else
-            s = "granted with #{rule}"
+            s = "fired with #{rule}"
           end
           usr_id = user && user.respond_to?(:id) ? user.id : user.object_id
           Tuersteher::TLogger.logger.debug("Tuersteher: path_access?(user.id=#{usr_id}, path=#{path}, method=#{method})  =>  #{s}")
@@ -391,7 +389,7 @@ module Tuersteher
     end
 
     def to_s
-      "Path[#{@negation&&'! '}#{@path}]"
+      "#{@negation && 'not.'}path('#{@path}')"
     end
   end
 
@@ -408,7 +406,7 @@ module Tuersteher
     end
 
     def to_s
-      "Model[#{@negation&&'! '}#{@clazz}]"
+      "#{@negation && 'not.'}model(#{@clazz})"
     end
   end
 
@@ -429,7 +427,8 @@ module Tuersteher
     end
 
     def to_s
-      "Role[#{@negation&&'! '}#{@roles.join(',')}]"
+      role_s = @roles.size == 1 ? "role(:#{@roles.first})" : "roles(#{@roles.map{|r| ":#{r}"}.join(',')})"
+      "#{@negation && 'not.'}#{role_s}"
     end
   end
 
@@ -445,7 +444,7 @@ module Tuersteher
     end
 
     def to_s
-      "Method[#{@negation&&'! '}#{@method}]"
+      "#{@negation && 'not.'}method(:#{@method})"
     end
   end
 
@@ -486,8 +485,8 @@ module Tuersteher
     end
 
     def to_s
-      val_s = @expected_value.nil? ? nil :  "=#{@expected_value}"
-      "Extension[#{@negation&&'! '}#{@method}#{val_s}]"
+      val_s = @expected_value.nil? ? nil :  ", #{@expected_value}"
+      "#{@negation && 'not.'}extension(:#{@method}#{val_s})"
     end
   end
 
@@ -581,11 +580,7 @@ module Tuersteher
 
 
     def to_s
-      s = "#{self.class}["
-      s << 'DENY ' if @deny
-      s << @rule_spezifications.map(&:to_s).join(', ')
-      s << ']'
-      s
+      "Rule[#{@deny ? 'deny' : 'grant'}.#{@rule_spezifications.map(&:to_s).join('.')}]"
     end
   end # of BaseAccessRule
 
@@ -594,6 +589,7 @@ module Tuersteher
 
     METHOD_NAMES = [:get, :edit, :put, :delete, :post, :all].freeze
     attr_reader :path_spezification
+    @@_to_s = nil
 
     # Zugriffsregel
     #
@@ -617,11 +613,15 @@ module Tuersteher
       self
     end
 
+    def to_s
+      @@_to_s ||= super
+    end
   end
 
 
 
   class ModelAccessRule < BaseAccessRule
+    @@_to_s = nil
 
     # erzeugt neue Object-Zugriffsregel
     #
@@ -635,6 +635,10 @@ module Tuersteher
       end
     end
 
+
+    def to_s
+      @@_to_s ||= super
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -4,4 +4,4 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/tuersteher")
 
 # Logger auf stdout stellen
 Tuersteher::TLogger.logger = Logger.new(STDOUT)
-Tuersteher::TLogger.logger.level = Logger::ERROR
+#Tuersteher::TLogger.logger.level = Logger::ERROR

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuersteher
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Bernd Ledig
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 +02:00
+date: 2011-07-15 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