Adman65-AccessControl 0.2.1 → 0.2.2

data/AccessControl.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{AccessControl}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Hawkins"]
@@ -47,13 +47,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Simple role based authorization for rails}
   s.test_files = [
-    "spec/access_controlled_user_spec.rb",
-     "spec/models/permission_spec.rb",
-     "spec/models/role_spec.rb",
-     "spec/spec_helper.rb",
+    "spec/spec_helper.rb",
      "spec/support/access_control_user.rb",
      "spec/support/authorizable.rb",
-     "spec/support/schema.rb"
+     "spec/support/schema.rb",
+     "spec/models/permission_spec.rb",
+     "spec/models/role_spec.rb",
+     "spec/access_controlled_user_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/README.markdown

@@ -1,6 +1,5 @@
 AccessControl
 =============
-**Warning: this is a beta plugin!**
 
 AccessControl is a user authorization plugin. It gives you a role based permission system without having to do any work. There are users and roles, each have permission.
 A user can play any role and inherit permissions through that role. A user may also have individual permissions. For example, you can create a role to update
@@ -14,18 +13,19 @@ Features
 * God permission
 * Easy to use
 
-
 Up and Running
 ================
 
 Install
 -------
 
-First, prepare your application. AccessControl does not create user logins, it soley is a permission system. I'm assuming you have model named user. AccessControl
+First, prepare your application. AccessControl does not create user logins, it soley is a permission system. Your user model must be named User. AccessControl
 also uses two other models: Permission & Role. Once your users can login and log out, you are ready to use AccessControl.
 
 1. Install
-		./script/plugin install git://github.com/Adman65/AccessControl.git
+		(plugin) ./script/plugin install git://github.com/Adman65/AccessControl.git
+		(gem) sudo gem install Adman65-AccessControl
+		(gem) config.gem 'Adman65-AccessControl', :lib => 'access_control'		
 
 2. Prepare the database
 		./script/generate access_control models
@@ -64,7 +64,7 @@ Voilla, Adam can now post_news. But that's no good by itself. So now check agani
 		end
 		
 Your controllers are protected from people who can't post news. Now lets expand our permissions by adding a role:
-		editors = Role.create :name => "Editors", :description => "Manage content around the site."
+		editors = Role.create :name => "Editors", :description => "Manage content around the site." # Description is optional
 		# assuming we have these permissions in the system
 		editors.grant :manage_news
 		editors.grant :manage_categories
@@ -83,29 +83,24 @@ Man, Adam sure got a lot of responsibilities, hopefully you trust him :)
 Using the language
 ==============
 
-Its nice to be able to express concepts in code that when you read the code, you understand what is going on. AccessControl gives you expressive method names
-express authorization inside your code. The methods below can be user on a User or Role.
-		@user.can_manage_news?
-		@user.can? :manage_news
-		@user.can? "manage_news"
-		@user.has_permission :manage_news
-		@user.cannot? :manage_news
-		@user.grant :permission
-		@user.authorize :permission
-		@user.deauthorize :permission
-		@user.permissions (returns an array of all the permissions a user/role has)
-		
-These methods only work on users
-		@user.plays :role_name
-		@user.plays? :role_name
-		@user.is_a_editor?
-
-
-Utilties
-===========
-Sometimes you want to see all the permissions in your application:
-			rake access_control:permissions
-
+Here are the methods available on User & Role objects:
+	Authorizable#authorize(permission)
+	Authorizable#grant(permission)
+	Authorizable#deauthorize(permission)
+	Authorizable#cannot?(permission)
+	Authorizable#god?
+	Authorizable#can_permission_name?
+	Authorizable#can_not_permission_name?
+	Authorizable#permissions
+	Authorizable#has_permission?(permission)
+	Authorizable#can?(permission)
+	
+User Methods:
+	User#plays?(role)
+	User#plays(role)
+	User#does_not_play?(role)
+	User#does_not_play(role)
+	User.roles (and all other has_and_belongs_to_many methods)
 
 
 Copyright (c) 2009 Adam Hawkins, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/generators/access_control/access_control_generator.rb

@@ -29,7 +29,7 @@ class AccessControlGenerator < Rails::Generator::NamedBase
 
         m.migration_template File.join("migrate","create_access_control_models.rb"), File.join("db","migrate"), :migration_file_name => "GenerateAccessControlModels".underscore
       when :permission
-        file_name = "create_multiple_permissions" if args.size > 2
+        file_name = "create_multiple_permissions_#{@permission_names.join('_').underscore}" if args.size > 2
         file_name = "create_permission_#{@permission_name}" if args.size.eql? 2        
         m.migration_template "migration:migration.rb", File.join("db","migrate"), :assigns => migration_options, :migration_file_name => file_name        
       end
@@ -40,7 +40,8 @@ class AccessControlGenerator < Rails::Generator::NamedBase
   def migration_options
     assigns = {}
     assigns[:migration_action] = "add"
-    assigns[:class_name] = "create_permission_#{@permission_name}"
+    assigns[:class_name] = "create_multiple_permissions_#{@permission_names.join('_').underscore}".camelize if @permission_names
+    assigns[:class_name] = "create_multiple_permissions" if @permission_name
     assigns[:table_name] = "permissions"
     assigns[:attributes] = @permission_names.map {|name| Rails::Generator::GeneratedAttribute.new(name, "boolean")}
     assigns

data/generators/access_control/templates/migrate/create_access_control_models.rb

@@ -5,6 +5,7 @@ class GenerateAccessControlModels < ActiveRecord::Migration
        t.string   "authorizable_type"
        t.datetime "created_at"
        t.datetime "updated_at"
+       t.boolean "god", :default => false
     end
     
     create_table "roles" do |t|

data/lib/access_control/common_methods.rb

@@ -36,11 +36,6 @@ module AccessControl
       return true if self.permission.god
       self.permission.send(perm)  
     end
-
-    private
-    def create_new_permission
-      self.permission = Permission.create
-    end
-
+    
   end
 end

data/lib/access_control/role_extension.rb

@@ -6,7 +6,7 @@ module AccessControl
         include AccessControl::CommonMethods
         include AccessControl::Language
 
-        has_and_belongs_to_many :users, :join_table => :user_roles#, :foreign_key => :access_control_user_id
+        has_and_belongs_to_many :users, :join_table => :user_roles
         has_one :permission, :as => :authorizable, :dependent => :destroy
 
         alias :has_permission? :has_local_permission?
@@ -17,10 +17,7 @@ module AccessControl
     end
 
     def permissions
-      set = self.permission.set_permissions
-      return nil if set.nil?
-      return set.first if set.size.eql? 0
-      set
+      self.permission.set_permissions
     end
 
   end

data/lib/access_control/user_extension.rb

@@ -32,6 +32,13 @@ module AccessControl
     def does_not_play? role
       !plays? role
     end
+    
+    def does_not_play role
+      role = role.to_s if role.is_a? Symbol
+      actual_role = Role.find_by_name(role.downcase)
+      raise "#{role} does not exist" if actual_role.nil?
+      roles.delete actual_role
+    end
 
     def has_permission? perm
       return true if has_local_permission? perm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Adman65-AccessControl
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Adam Hawkins
@@ -76,10 +76,10 @@ signing_key:
 specification_version: 3
 summary: Simple role based authorization for rails
 test_files: 
-- spec/access_controlled_user_spec.rb
-- spec/models/permission_spec.rb
-- spec/models/role_spec.rb
 - spec/spec_helper.rb
 - spec/support/access_control_user.rb
 - spec/support/authorizable.rb
 - spec/support/schema.rb
+- spec/models/permission_spec.rb
+- spec/models/role_spec.rb
+- spec/access_controlled_user_spec.rb