Updated rbacanable gem dependecy, added elementary permissions tests

airhorns · Apr 1, 2010 · 6a06692 · 6a06692
1 parent 91950bb
commit 6a06692
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 644 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ doc
 .DS_Store
 db/*.sqlite3
 .yardoc
+*.tmproj
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -5,6 +5,9 @@
 class User < ActiveRecord::Base
   include Canable::Actor
   default_role Canable::Roles::EmployeeRole
+  role_proc Proc.new { |actor|
+    actor.role
+  }
   acts_as_authentic do |c|
     # for available options see documentation in: Authlogic::ActsAsAuthentic
   end

diff --git a/config/environment.rb b/config/environment.rb
@@ -24,7 +24,7 @@
   config.gem "authlogic"
   config.gem "carmen"
   config.gem "simple_autocomplete"
-  config.gem "rbacanable", :lib => "canable"
+  config.gem "rbacanable", :lib => "canable", :version => "0.2.1"
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named

diff --git a/config/initializers/canable.rb b/config/initializers/canable.rb
diff --git a/db/schema.rb b/db/schema.rb
@@ -43,7 +43,6 @@
     t.string   "fax"
     t.string   "email"
     t.text     "notes"
-    t.integer  "address_id"
     t.integer  "business_id"
     t.datetime "created_at"
     t.datetime "updated_at"