wheels 0.0.26 → 0.0.27

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/app/models/ability.rb

@@ -1,40 +1,42 @@
 class Ability
   include CanCan::Ability
+  def self.initializers
+    @initializers ||= []
+  end
+
+  def self.initializer(*method_names)
+    method_names.each{|t| initializers << t}
+  end
   initializer :init_wheels
 
   def initialize(user)
-    initializers.each{|t| self.send(t, user)}
+    user ||= User.nobody
+    puts all_aces_for(user).map{|t| "#{t.resource_class_name} #{t.options.inspect}"}.join("\n")
+    self.class.initializers.each{|t| self.send(t, user)}
+    all_aces_for(user).each do |ace|
+      ace.configure(self)
+    end
+  end
+
+  def all_aces_for(user)
+    (user.access_control_entries + user.role.access_control_entries)
   end
 
   def init_wheels(user)
     can :read, :all
-    return cannot :read, User unless user
     roles = Role.all
-    user ||= User.new
     def roles.find_by_name(name); self.select{|t| t.name==name}[0]; end;
-    case user.role_id
-      when roles.find_by_name("Super")
+    case user.role.id
+      when roles.find_by_name("Super").id
         can :manage, :all
-      when roles.find_by_name("Admin")
+      when roles.find_by_name("Admin").id
         can :manage, :all
-      when roles.find_by_name("User")
+      when roles.find_by_name("User").id
         can :manage, Gallery, :user_id => user.id
         can :manage, Blog, :user_id => user.id
         can :edit, Profile, :user_id => user.id
         cannot :read, User
     end
-    can :read, :all
   end
-
-
-  def self.initializer(*method_names)
-    method_names.each{|t| initializers << t}
-  end
-
-  def initializers
-    @initializers ||= []
-  end
-
-
 end
 

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 0
-  - 26
-  version: 0.0.26
+  - 27
+  version: 0.0.27
 platform: ruby
 authors: 
 - Tyler Gannon