aegis 2.3.0 → 2.4.0

data/Rakefile

@@ -29,6 +29,7 @@ begin
     gemspec.homepage = "http://github.com/makandra/aegis"
     gemspec.description = "Aegis is an authorization solution for Ruby on Rails that supports roles and a RESTish, resource-style declaration of permission rules."
     gemspec.authors = ["Henning Koch", "Tobias Kraze"]
+    gemspec.post_install_message = "Upgrade notice:\nIf you are using Aegis' automatic controller integration, include Aegis::Controller in your ApplicationController\nAlso see http://wiki.github.com/makandra/aegis/controller-integration\n"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/aegis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   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-09-01}
+  s.date = %q{2010-09-03}
   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 = [
@@ -24,7 +24,9 @@ Gem::Specification.new do |s|
      "aegis.gemspec",
      "lib/aegis.rb",
      "lib/aegis/action.rb",
+     "lib/aegis/active_record_ext.rb",
      "lib/aegis/compiler.rb",
+     "lib/aegis/controller.rb",
      "lib/aegis/errors.rb",
      "lib/aegis/has_role.rb",
      "lib/aegis/loader.rb",
@@ -35,9 +37,7 @@ Gem::Specification.new do |s|
      "lib/aegis/sieve.rb",
      "lib/aegis/spec.rb",
      "lib/aegis/spec/matchers.rb",
-     "lib/rails/action_controller.rb",
-     "lib/rails/active_record.rb",
-     "spec/aegis/action_controller_spec.rb",
+     "spec/aegis/controller_spec.rb",
      "spec/aegis/has_role_spec.rb",
      "spec/aegis/loader_spec.rb",
      "spec/aegis/permissions_spec.rb",
@@ -71,6 +71,10 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/makandra/aegis}
+  s.post_install_message = %q{Upgrade notice:
+If you are using Aegis' automatic controller integration, include Aegis::Controller in your ApplicationController
+Also see http://wiki.github.com/makandra/aegis/controller-integration
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
@@ -97,12 +101,12 @@ Gem::Specification.new do |s|
      "spec/app_root/lib/console_with_fixtures.rb",
      "spec/controllers/reviews_controller_spec.rb",
      "spec/spec_helper.rb",
-     "spec/aegis/action_controller_spec.rb",
      "spec/aegis/has_role_spec.rb",
      "spec/aegis/loader_spec.rb",
      "spec/aegis/permissions_spec.rb",
      "spec/aegis/sieve_spec.rb",
-     "spec/aegis/spec/matchers_spec.rb"
+     "spec/aegis/spec/matchers_spec.rb",
+     "spec/aegis/controller_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/{rails/action_controller.rb → aegis/controller.rb}

@@ -1,5 +1,10 @@
 module Aegis
-  module ActionController
+  module Controller
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
 
     module ClassMethods
 
@@ -67,7 +72,3 @@ module Aegis
   end
 end
 
-ActionController::Base.extend Aegis::ActionController::ClassMethods
-ActionController::Base.send :include, Aegis::ActionController::InstanceMethods
-
-

data/lib/aegis/loader.rb

@@ -14,9 +14,8 @@ module Aegis
           'aegis/resource',
           'aegis/role',
           'aegis/sieve',
-
-          'rails/action_controller',
-          'rails/active_record' ]
+          'aegis/controller',
+          'aegis/active_record_ext' ]
       end
 
       def load_paths

data/spec/aegis/{action_controller_spec.rb → controller_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Aegis::ActionController do
+describe Aegis::Controller do
 
   before(:each) do
 
@@ -21,6 +21,7 @@ describe Aegis::ActionController do
     user = @user = @user_class.new(:role_name => 'user')
 
     @controller_class = Class.new(ActionController::Base) do
+      include Aegis::Controller
       define_method :current_user do
         user
       end

data/spec/aegis/spec/matchers_spec.rb

@@ -38,6 +38,7 @@ describe Aegis::Spec::Matchers do
 
     before(:each) do
       @controller = Class.new(ActionController::Base) do
+        include Aegis::Controller
         permissions :post
       end.new
     end

data/spec/app_root/app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include Aegis::Controller
 
   require_permissions
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
+  - 4
   - 0
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +36,9 @@ files:
 - aegis.gemspec
 - lib/aegis.rb
 - lib/aegis/action.rb
+- lib/aegis/active_record_ext.rb
 - lib/aegis/compiler.rb
+- lib/aegis/controller.rb
 - lib/aegis/errors.rb
 - lib/aegis/has_role.rb
 - lib/aegis/loader.rb
@@ -47,9 +49,7 @@ files:
 - lib/aegis/sieve.rb
 - lib/aegis/spec.rb
 - lib/aegis/spec/matchers.rb
-- lib/rails/action_controller.rb
-- lib/rails/active_record.rb
-- spec/aegis/action_controller_spec.rb
+- spec/aegis/controller_spec.rb
 - spec/aegis/has_role_spec.rb
 - spec/aegis/loader_spec.rb
 - spec/aegis/permissions_spec.rb
@@ -85,7 +85,11 @@ has_rdoc: true
 homepage: http://github.com/makandra/aegis
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  Upgrade notice:
+  If you are using Aegis' automatic controller integration, include Aegis::Controller in your ApplicationController
+  Also see http://wiki.github.com/makandra/aegis/controller-integration
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -133,9 +137,9 @@ test_files:
 - spec/app_root/lib/console_with_fixtures.rb
 - spec/controllers/reviews_controller_spec.rb
 - spec/spec_helper.rb
-- spec/aegis/action_controller_spec.rb
 - spec/aegis/has_role_spec.rb
 - spec/aegis/loader_spec.rb
 - spec/aegis/permissions_spec.rb
 - spec/aegis/sieve_spec.rb
 - spec/aegis/spec/matchers_spec.rb
+- spec/aegis/controller_spec.rb