permiso 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+v0.2.0 2011-08-17 
+
+  * add support for multiple roles

data/Gemfile

@@ -5,6 +5,5 @@ gemspec
 
 
 group :test do
-  gem 'spork'
   gem 'rspec'
 end

data/README.md

@@ -6,6 +6,17 @@ is a lightweight gem for defining and veryfying permissions, or in other words c
 
 Define a class with your abilities, you can name it whatever you want, but Ability is a nice name I borrowed from [cancan](https://github.com/ryanb/cancan).
 
+## Installation
+Choose your weapon, via command line
+
+    gem install permiso
+
+in a `Gemfile`
+
+    gem 'permiso'                                               # latest stable
+    gem 'permiso', :git => 'git://github.com/pzol/permiso.git'  # for the bleeding edge
+
+
 ## Permiso helper methods
 
 * **role**: defines what a named role can do
@@ -54,6 +65,11 @@ Checking is (almost) the same as in the prior example:
     ability = Ability.new(booking)
     ability.can? :admin, :cancel
 
+Multiple roles are also supported:
+
+    ability = Ability.new(booking)
+    ability.can? [:admin, :user], :cancel
+
 In this case, only the admin can cancel the booking, if the status is book_confirmed.
 
 I use dependency injection, to bring in an object on which I conduct test, in this case the booking.
@@ -64,7 +80,7 @@ For that I define a helper
     MyWebApp.helpers do
       def can(action)
         ability = Ability.new(@booking)
-        ability.can? current_user.role, action
+        ability.can? current_user.roles, action
       end
     end
 
@@ -74,3 +90,7 @@ which then allows me to use this in my `haml` file:
       %a{ :href => '/cancel' }
 
 
+## TODO
+* blocks for #can (defining)
+* role priorities?
+

data/lib/permiso/version.rb

@@ -1,3 +1,3 @@
 module Permiso
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/permiso.rb

@@ -8,7 +8,7 @@ module Permiso
     end
 
     def rules
-      @ruls ||= {}
+      @rules ||= {}
     end
 
     def can(ability, subject=nil)
@@ -25,8 +25,9 @@ module Permiso
       rules[name] = block
     end
 
-    def can?(role, action, args={})
-      return false unless role_can?(role, action)
+    def can?(user_roles, action, args={})
+      user_roles = [user_roles] unless user_roles.kind_of? Array
+      return false unless user_roles.detect {|r| role_can?(r, action) }
       rule_allows?(action)
     end
 
@@ -42,8 +43,10 @@ module Permiso
     end
 
     def inspect
-      roles.each {|role, abilities| puts "#{role} can #{abilities.inspect}"}
-      rules.each {|rule| puts "rule #{rule}" }
+      out = {}
+      roles.each {|role, abilities| out[:roles] ||= [] << {role => abilities}}
+      rules.keys.each {|rule| out[:rules] ||= [] << rule }
+      out
     end
   end
 end

data/spec/lib/permiso_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Permiso do
   before(:all) do
-    @user = {:role => 'admin'}
+    @user = {:role => [:admin, :user]}
     @booking = { 'ref_anixe' => '6666', 'status' => 'book_confirmed' }
   end
 
@@ -17,6 +17,10 @@ describe Permiso do
         can :create
       end
 
+      role :user do
+        can :read
+      end
+
       rule :cancel do
         @booking['status'] == 'book_confirmed'
       end
@@ -26,8 +30,16 @@ describe Permiso do
 
   it 'should allow, when role is defined' do
     ability = AbilityTest.new(@booking)
+    p ability
     ability.can?(:admin, :cancel).should be_true
     ability.can?(:admin, :create).should be_true
+    ability.can?(:user, :read).should be_true
+  end
+
+  it 'should allow, when there are multiple roles and at least one is allowed' do
+    ability = AbilityTest.new(@booking)
+    ability.can?([:user, :admin], :read).should be_true
+    ability.can?([:anybody, :else], :read).should be_false
   end
 
   it 'should NOT allow, when role is NOT defined' do

data/spec/spec.rake

@@ -4,19 +4,3 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = "./spec/**/*_spec.rb"
   # Put spec opts in a file named .rspec in root
 end
-
-namespace :spork do
- desc "start spork in background"
- task :start do
-   sh %{spork &}
- end
-
- desc "stop spork"
- task :stop do
-   Process.kill(:TERM, `ps -ef | grep spork | grep -v grep | awk '{ print $2 }'`.to_i)
- end
-
- desc "restart spork"
- task :restart => [:stop, :start]
-end
-

data/spec/spec_helper.rb

@@ -1,12 +1,5 @@
-Spork.prefork do
-  require 'bundler'
-  Bundler.setup
-  Bundler.require(:default, :test)
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-end
-
+require 'bundler'
+Bundler.setup
+Bundler.require(:default, :test)
 
 Dir[File.expand_path("../factories/*.rb", __FILE__)].each { |f| require f }

metadata

@@ -1,31 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: permiso
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Piotr Zolnierek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-12 00:00:00 +02:00
-default_executable: 
+date: 2011-08-17 00:00:00.000000000Z
 dependencies: []
-
 description: see README.md
-email: 
+email:
 - pzolnierek@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -35,35 +30,31 @@ files:
 - spec/lib/permiso_spec.rb
 - spec/spec.rake
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/pzol/permiso
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: permiso
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A lightweight gem for checking permissions
-test_files: 
+test_files:
 - spec/lib/permiso_spec.rb
 - spec/spec.rake
 - spec/spec_helper.rb