aegis 2.5.1 → 2.5.2

data/.gitignore

@@ -2,3 +2,5 @@ doc
 pkg
 *.gem
 .idea
+Gemfile.lock
+

data/VERSION

@@ -1 +1 @@
-2.5.1
+2.5.2

data/aegis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.5.1"
+  s.version = "2.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch", "Tobias Kraze"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-06}
   s.description = %q{Aegis is an authorization solution for Ruby on Rails that supports roles and a RESTish, resource-style declaration of permission rules.}
   s.email = %q{henning.koch@makandra.de}
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Gemfile",
-     "Gemfile.lock",
      "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -39,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/aegis/sieve.rb",
      "lib/aegis/spec.rb",
      "lib/aegis/spec/matchers.rb",
+     "lib/aegis/util.rb",
      "spec/aegis/controller_spec.rb",
      "spec/aegis/has_role_spec.rb",
      "spec/aegis/loader_spec.rb",
@@ -69,7 +69,8 @@ Gem::Specification.new do |s|
      "spec/controllers/reviews_controller_spec.rb",
      "spec/rcov.opts",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/spec_candy.rb"
   ]
   s.homepage = %q{http://github.com/makandra/aegis}
   s.post_install_message = %q{Upgrade notice:
@@ -106,7 +107,8 @@ Also see http://wiki.github.com/makandra/aegis/controller-integration
      "spec/aegis/permissions_spec.rb",
      "spec/aegis/sieve_spec.rb",
      "spec/aegis/spec/matchers_spec.rb",
-     "spec/aegis/controller_spec.rb"
+     "spec/aegis/controller_spec.rb",
+     "spec/support/spec_candy.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/aegis/has_role.rb

@@ -29,8 +29,7 @@ module Aegis
         role_names.include?(role_name.to_s)
       end
       
-      prototype = respond_to?(:singleton_class) ? singleton_class : metaclass
-      prototype.send :define_method, :validates_role do |*validate_options|
+      Aegis::Util.define_class_method(self, :validates_role) do |*validate_options|
         validate_options = validate_options[0] || {}
 
         send :define_method, :validate_role do
@@ -66,9 +65,11 @@ module Aegis
         send :define_method, :method_missing_with_aegis_permissions do |symb, *args|
           method_name = symb.to_s
           if method_name =~ may_pattern
-            action_path = $1
-            severity = $2
-            permissions.call.send("may#{severity}", self, action_path, *args)
+            action_path, severity = $1, $2
+            Aegis::Util.define_class_method(self, method_name) do |*method_args|
+              permissions.call.send("may#{severity}", self, action_path, *method_args)
+            end
+            send(method_name, *args)
           else
             method_missing_without_aegis_permissions(symb, *args)
           end
@@ -77,12 +78,8 @@ module Aegis
         alias_method_chain :method_missing, :aegis_permissions
 
         send :define_method, :respond_to_with_aegis_permissions? do |symb, *args|
-          if symb.to_s =~ may_pattern
-            true
-          else
-            include_private = args.first.nil? ? false : args.first
-            respond_to_without_aegis_permissions?(symb, include_private)
-          end
+          include_private = args.first.nil? ? false : args.first
+          respond_to_without_aegis_permissions?(symb, include_private) || (symb.to_s =~ may_pattern)
         end
 
         alias_method_chain :respond_to?, :aegis_permissions

data/lib/aegis/loader.rb

@@ -4,7 +4,7 @@ module Aegis
 
       def paths
         [ 'ostruct',
-
+          'aegis/util',
           'aegis/errors',
           'aegis/action',
           'aegis/compiler',

data/lib/aegis/permissions.rb

@@ -75,16 +75,17 @@ module Aegis
         compile
         action = nil
         action_name = action_name.to_s
-        guess_action_paths(resource_name, action_name, map).detect do |path|
+        possible_paths = guess_action_paths(resource_name, action_name, map)
+        possible_paths.detect do |path|
           action = find_action_by_path(path, false)
         end
-        handle_missing_action(action)
+        handle_missing_action(action, possible_paths.first)
       end
 
       def find_action_by_path(path, handle_missing = true)
         compile
         action = @actions_by_path[path.to_s]
-        action = handle_missing_action(action) if handle_missing
+        action = handle_missing_action(action, path) if handle_missing
         action
       end
 
@@ -117,12 +118,12 @@ module Aegis
         end
       end
 
-      def handle_missing_action(possibly_missing_action)
+      def handle_missing_action(possibly_missing_action, path)
         possibly_missing_action ||= case @missing_action_strategy
           when :default_permission then Aegis::Action.undefined
           when :allow then Aegis::Action.allow_to_all
           when :deny then Aegis::Action.deny_to_all
-          when :error then raise Aegis::MissingAction, "Undefined Aegis action: #{action}"
+          when :error then raise Aegis::MissingAction, "Missing action: #{path}"
         end
       end
 

data/lib/aegis/util.rb

@@ -0,0 +1,12 @@
+module Aegis
+  class Util
+    class << self
+
+      def define_class_method(object, method, &body)
+        prototype = object.respond_to?(:singleton_class) ? object.singleton_class : object.metaclass
+        prototype.send(:define_method, method, &body)
+      end
+
+    end
+  end
+end

data/spec/aegis/has_role_spec.rb

@@ -151,6 +151,12 @@ describe Aegis::HasRole do
       lambda { user.nonexisting_method }.should raise_error(NoMethodError)
     end
 
+    it 'should define a missing Aegis method so that method is used directly from there on' do
+      user = @user_class.new
+      user.should_receive_and_execute(:method_missing).once
+      2.times { user.may_do_action? }
+    end
+
   end
 
   describe 'respond_to?' do

data/spec/aegis/permissions_spec.rb

@@ -632,12 +632,12 @@ describe Aegis::Permissions do
       @permissions.may?(@admin, 'missing_action').should be_false
     end
 
-    it "should raise an error if the strategy is :error" do
+    it "should raise an error naming the missing action if the strategy is :error" do
       @permissions.class_eval do
         missing_action_means :error
       end
-      lambda { @permissions.may?(@user, 'missing_action') }.should raise_error(Aegis::MissingAction)
-      lambda { @permissions.may?(@admin, 'missing_action') }.should raise_error(Aegis::MissingAction)
+      lambda { @permissions.may?(@user, 'missing_action') }.should raise_error(Aegis::MissingAction, 'Missing action: missing_action')
+      lambda { @permissions.may?(@admin, 'missing_action') }.should raise_error(Aegis::MissingAction, 'Missing action: missing_action')
     end
 
   end

data/spec/spec_helper.rb

@@ -18,3 +18,7 @@ Spec::Runner.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
 end
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}

data/spec/support/spec_candy.rb

@@ -0,0 +1,20 @@
+# Abbreviated from http://makandra.com/notes/627-the-definitive-spec_candy-rb-rspec-helper
+
+Object.class_eval do
+
+  # a should receive that executes the expected method as usual. does not work with and_return
+  def should_receive_and_execute(method)
+    method_called = "_#{method}_called"
+
+    prototype = respond_to?(:singleton_class) ? singleton_class : metaclass
+    prototype.class_eval do
+      define_method method do |*args|
+        send(method_called, *args)
+        super
+      end
+    end
+
+    should_receive(method_called)
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aegis
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 5
-  - 1
-  version: 2.5.1
+  - 2
+  version: 2.5.2
 platform: ruby
 authors: 
 - Henning Koch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,6 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -52,6 +51,7 @@ files:
 - lib/aegis/sieve.rb
 - lib/aegis/spec.rb
 - lib/aegis/spec/matchers.rb
+- lib/aegis/util.rb
 - spec/aegis/controller_spec.rb
 - spec/aegis/has_role_spec.rb
 - spec/aegis/loader_spec.rb
@@ -83,6 +83,7 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/spec_candy.rb
 has_rdoc: true
 homepage: http://github.com/makandra/aegis
 licenses: []
@@ -148,3 +149,4 @@ test_files:
 - spec/aegis/sieve_spec.rb
 - spec/aegis/spec/matchers_spec.rb
 - spec/aegis/controller_spec.rb
+- spec/support/spec_candy.rb

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    aegis (2.5.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.8)
-      actionpack (= 2.3.8)
-    actionpack (2.3.8)
-      activesupport (= 2.3.8)
-      rack (~> 1.1.0)
-    activerecord (2.3.8)
-      activesupport (= 2.3.8)
-    activeresource (2.3.8)
-      activesupport (= 2.3.8)
-    activesupport (2.3.8)
-    columnize (0.3.1)
-    linecache (0.43)
-    rack (1.1.0)
-    rails (2.3.8)
-      actionmailer (= 2.3.8)
-      actionpack (= 2.3.8)
-      activerecord (= 2.3.8)
-      activeresource (= 2.3.8)
-      activesupport (= 2.3.8)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rspec (1.2.9)
-    rspec-rails (1.2.9)
-      rack (>= 1.0.0)
-      rspec (>= 1.2.9)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aegis!
-  rails (= 2.3.8)
-  rspec (= 1.2.9)
-  rspec-rails (= 1.2.9)
-  ruby-debug