canable 0.1 → 0.1.1

data/Rakefile

@@ -13,11 +13,10 @@ begin
     gem.homepage    = "http://github.com/jnunemaker/canable"
     gem.authors     = ["John Nunemaker"]
     gem.version     = Canable::Version
-    gem.add_development_dependency "shoulda", "2.10.2"
-    gem.add_development_dependency "mongo_mapper", "0.7"
-    gem.add_development_dependency "mocha", "0.9.8"
+    gem.add_development_dependency "shoulda", "~> 2.10.2"
+    gem.add_development_dependency "mocha", "~> 0.9.8"
+    gem.add_development_dependency "mongo_mapper"
     gem.add_development_dependency "yard", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/canable.rb

@@ -1,5 +1,5 @@
 module Canable
-  Version = '0.1'
+  Version = '0.1.1'
 
   # Module that holds all the can_action? methods.
   module Cans; end
@@ -11,8 +11,7 @@ module Canable
   module Enforcers
     def self.included(controller)
       controller.class_eval do
-        Canable.actions.each do |can, able|
-          delegate      "can_#{can}?", :to => :current_user
+        Canable.cans.each do |can|
           helper_method "can_#{can}?" if controller.respond_to?(:helper_method)
           hide_action   "can_#{can}?" if controller.respond_to?(:hide_action)
         end
@@ -32,6 +31,10 @@ module Canable
     @actions
   end
 
+  def self.cans
+    actions.keys
+  end
+
   # Adds an action to actions and the correct methods to can and able modules.
   #
   #   @param [Symbol] can_method The name of the can_[action]? method.
@@ -63,6 +66,10 @@ module Canable
 
     def self.add_enforcer_method(can)
       Enforcers.module_eval <<-EOM
+        def can_#{can}?(resource)
+          current_user.can_#{can}?(resource)
+        end
+
         def enforce_#{can}_permission(resource)
           raise Canable::Transgression unless can_#{can}?(resource)
         end

data/test/helper.rb

@@ -1,8 +1,8 @@
 require 'test/unit'
 
-gem 'mocha', '0.9.8'
-gem 'shoulda', '2.10.2'
-gem 'mongo_mapper', '0.7'
+gem 'mocha', '~> 0.9.8'
+gem 'shoulda', '~> 2.10.2'
+gem 'mongo_mapper'
 
 require 'mocha'
 require 'shoulda'
@@ -13,26 +13,22 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'canable'
 
 class Test::Unit::TestCase
-end
-
-def Doc(name=nil, &block)
-  klass = Class.new do
-    include MongoMapper::Document
-    set_collection_name "test#{rand(20)}"
-
-    if name
-      class_eval "def self.name; '#{name}' end"
-      class_eval "def self.to_s; '#{name}' end"
+  def Doc(name=nil, &block)
+    klass = Class.new do
+      include MongoMapper::Document
+      set_collection_name "test#{rand(20)}"
+
+      if name
+        class_eval "def self.name; '#{name}' end"
+        class_eval "def self.to_s; '#{name}' end"
+      end
     end
-  end
 
-  klass.class_eval(&block) if block_given?
-  klass.collection.remove
-  klass
+    klass.class_eval(&block) if block_given?
+    klass.collection.remove
+    klass
+  end
 end
 
-test_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp')
-FileUtils.mkdir_p(test_dir) unless File.exist?(test_dir)
-
-MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017, {:logger => Logger.new(test_dir + '/test.log')})
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
 MongoMapper.database = 'test'

data/test/test_canable.rb

@@ -22,5 +22,10 @@ class TestCanable < Test::Unit::TestCase
       Canable.add(:publish, :publishable)
       assert_equal :publishable, Canable.actions[:publish]
     end
+    
+    should "know cans" do
+      assert_equal %w(create destroy publish update view), 
+        Canable.cans.map(&:to_s).sort
+    end
   end
 end

data/test/test_enforcers.rb

@@ -7,9 +7,19 @@ class EnforcersTest < Test::Unit::TestCase
         include Canable::Enforcers
         attr_accessor :current_user, :article
 
+        # Overriding example
+        def can_update?(resource)
+          return false if current_user.nil?
+          super
+        end
+
         def show
           enforce_view_permission(article)
         end
+
+        def update
+          enforce_update_permission(article)
+        end
       end
 
       @article                 = mock('article')
@@ -28,5 +38,10 @@ class EnforcersTest < Test::Unit::TestCase
       @user.expects(:can_view?).with(@article).returns(false)
       assert_raises(Canable::Transgression) { @controller.show }
     end
+
+    should "be able to override can_xx? method" do
+      @controller.current_user = nil
+      assert_raises(Canable::Transgression) { @controller.update }
+    end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: canable
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,49 +14,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 -05:00
+date: 2010-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 2
         version: 2.10.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: "0.7"
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: mongo_mapper
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: Simple permissions that I have used on my last several projects so I figured it was time to abstract and wrap up into something more easily reusable.
 email: nunemaker@gmail.com
 executables: []
@@ -87,18 +104,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple permissions that I have used on my last several projects so I figured it was time to abstract and wrap up into something more easily reusable.