activeadmin-cancan 0.1.2 → 0.1.3

data/lib/activeadmin-cancan/authorization.rb

@@ -1,15 +1,23 @@
 require 'activeadmin'
- 
+
 ActiveAdmin::Namespace.class_eval do
   alias_method :old_register, :register
-  
+
   def register(resource_class, options = {}, &block)
     config = find_or_build_resource(resource_class, options)
+
+    # Register the resource
     register_resource_controller(config)
-    resource_dsl.prepare_menu(config)
+
+    if ActiveAdmin::VERSION =~ /^0\.[5-9]/
+      ActiveAdmin::ResourceDSL.new(config).prepare_menu5
+    else
+      resource_dsl.prepare_menu(config)
+    end
+
     config = old_register(resource_class, options, &block)
     config.controller.load_and_authorize_resource
-    config    
+    config
   end
 end
 
@@ -21,12 +29,19 @@ ActiveAdmin::DSL.class_eval do
       menu :if => proc{ can?(:manage, resource) }
     end
   end
+
+  def prepare_menu5
+    resource = controller.resource_class
+    instance_eval do
+      menu :if => proc{ can?(:manage, resource) }
+    end
+  end
 end
 
 CanCan::ControllerResource.class_eval do
   def collection_instance=(instance)
   end
-  
+
   def resource_instance=(instance)
   end
 end

data/lib/activeadmin-cancan/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminCancan
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/activeadmin-cancan_test.rb

@@ -7,7 +7,7 @@ class ActiveadminCancanTest < ActiveSupport::TestCase
   
   test "authorize resource with cancan on register" do
     controller = ActiveAdmin.register(Foo).controller
-    controller.expects(:authorize_resource)
+    controller.expects(:load_and_authorize_resource)
     ActiveAdmin::Resource.any_instance.stubs(:controller).returns(controller)
     ActiveAdmin.register Foo
   end

data/test/dummy/log/test.log

@@ -200,3 +200,7 @@
    (0.1ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.1ms)  rollback transaction
+   (0.5ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-cancan
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70366631082800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70366631082800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70366631081600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70366631081600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: activeadmin
-  requirement: &70366631080100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70366631080100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70366631079060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70366631079060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides CanCan roles to ActiveAdmin
 email:
 - laurent@11factory.fr
@@ -116,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370845984403649450
+      hash: 1516628949132554263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370845984403649450
+      hash: 1516628949132554263
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides CanCan roles to ActiveAdmin