esp-permissions 0.0.4 → 0.0.5

data/app/controllers/esp_permissions/application_controller.rb

@@ -1,4 +1,11 @@
 class EspPermissions::ApplicationController < ApplicationController
   inherit_resources
   before_filter :authenticate_user!
+  before_filter :authorize_user!
+
+  protected
+
+    def authorize_user!
+      authorize! :create, Permission.new
+    end
 end

data/app/views/esp_permissions/users/index.html.erb

@@ -9,13 +9,13 @@
 
 <%= link_to "&#43;#{t('permissions.create_permission')}".html_safe,
             esp_permissions.new_permission_path,
-            :class => 'new_permission' if can?(:modify, Permission)%>
+            :class => 'new_permission' %>
 
 <ul class='collection_list'>
   <% collection.each do |user| %>
     <li>
       <div class="name">
-        <%= user.full_name %>
+        <%= user.name %>
       </div>
       <div class="email">
         &lt;<%= mail_to user.email, user.email %>&gt;

data/lib/esp-permissions/version.rb

@@ -1,3 +1,3 @@
 module EspPermissions
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/generators/esp_permissions/install/templates/app/models/permission.rb

@@ -7,7 +7,7 @@ class Permission < ActiveRecord::Base
 
   before_validation :reset_user_id, :unless => :user_id?
 
-  validates_presence_of :role, :user
+  validates_presence_of :role, :user, :context
 
   private
     def reset_user_id

data/lib/generators/esp_permissions/install/templates/app/models/user.rb

@@ -6,22 +6,34 @@ class User < ActiveRecord::Base
   has_many :permissions
   has_many :contexts, :through => :permissions
 
+  searchable do
+    text :name, :email, :nickname, :phone, :last_name, :first_name
+  end
+
   def self.from_omniauth(hash)
     User.find_or_initialize_by_uid(hash['uid']).tap do |user|
       user.update_attributes hash['info']
     end
   end
 
-  def full_name
-    nickname || name || "#{last_name} #{first_name}"
+  def contexts_for(role)
+    contexts.where(:permissions => {:role => role})
   end
 
-  searchable do
-    text :name, :email, :nickname, :phone, :last_name, :first_name
+  def contexts_subtree_for(role)
+    contexts_for(role).map(&:subtree).flatten.uniq
+  end
+
+  def contexts_subtree
+    contexts_subtree_for(Permission.enums[:role])
   end
 
   def available_contexts
-    contexts.where(:permissions => {:role => :manager}).map(&:subtree).flatten.uniq
+    contexts_subtree_for(:manager)
+  end
+
+  def manager?
+    permissions.where(:role => :manager).exists?
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &20315920 !ruby/object:Gem::Requirement
+  requirement: &19894260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20315920
+  version_requirements: *19894260
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &20315500 !ruby/object:Gem::Requirement
+  requirement: &19893700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20315500
+  version_requirements: *19893700
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &20315000 !ruby/object:Gem::Requirement
+  requirement: &19893180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *20315000
+  version_requirements: *19893180
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &20312880 !ruby/object:Gem::Requirement
+  requirement: &19892700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20312880
+  version_requirements: *19892700
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &20312420 !ruby/object:Gem::Requirement
+  requirement: &19892200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20312420
+  version_requirements: *19892200
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &20312000 !ruby/object:Gem::Requirement
+  requirement: &19891760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20312000
+  version_requirements: *19891760
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &20311580 !ruby/object:Gem::Requirement
+  requirement: &19891320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20311580
+  version_requirements: *19891320
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &20311160 !ruby/object:Gem::Requirement
+  requirement: &19890840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20311160
+  version_requirements: *19890840
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &20310740 !ruby/object:Gem::Requirement
+  requirement: &19890400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20310740
+  version_requirements: *19890400
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &20310320 !ruby/object:Gem::Requirement
+  requirement: &19889960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20310320
+  version_requirements: *19889960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20309900 !ruby/object:Gem::Requirement
+  requirement: &19889300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20309900
+  version_requirements: *19889300
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &20309480 !ruby/object:Gem::Requirement
+  requirement: &19888820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20309480
+  version_requirements: *19888820
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &20309060 !ruby/object:Gem::Requirement
+  requirement: &19888280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20309060
+  version_requirements: *19888280
 - !ruby/object:Gem::Dependency
   name: sso_client
-  requirement: &20308640 !ruby/object:Gem::Requirement
+  requirement: &19887840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20308640
+  version_requirements: *19887840
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &20308140 !ruby/object:Gem::Requirement
+  requirement: &19885280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :runtime
   prerelease: false
-  version_requirements: *20308140
+  version_requirements: *19885280
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &20307720 !ruby/object:Gem::Requirement
+  requirement: &19884840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20307720
+  version_requirements: *19884840
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20307260 !ruby/object:Gem::Requirement
+  requirement: &19884360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20307260
+  version_requirements: *19884360
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &20306840 !ruby/object:Gem::Requirement
+  requirement: &19883920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20306840
+  version_requirements: *19883920
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &20306420 !ruby/object:Gem::Requirement
+  requirement: &19883480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20306420
+  version_requirements: *19883480
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &20306000 !ruby/object:Gem::Requirement
+  requirement: &19883060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20306000
+  version_requirements: *19883060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20305580 !ruby/object:Gem::Requirement
+  requirement: &19882640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20305580
+  version_requirements: *19882640
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &20305160 !ruby/object:Gem::Requirement
+  requirement: &19882000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20305160
+  version_requirements: *19882000
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &20301940 !ruby/object:Gem::Requirement
+  requirement: &19881560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20301940
+  version_requirements: *19881560
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &20301520 !ruby/object:Gem::Requirement
+  requirement: &19881100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20301520
+  version_requirements: *19881100
 - !ruby/object:Gem::Dependency
   name: ryba
-  requirement: &20301100 !ruby/object:Gem::Requirement
+  requirement: &19880660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20301100
+  version_requirements: *19880660
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &20300680 !ruby/object:Gem::Requirement
+  requirement: &19880240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20300680
+  version_requirements: *19880240
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &20300260 !ruby/object:Gem::Requirement
+  requirement: &19879820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20300260
+  version_requirements: *19879820
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &20299840 !ruby/object:Gem::Requirement
+  requirement: &19879400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20299840
+  version_requirements: *19879400
 description: Description of EspPermissions.
 email:
 - mail@openteam.ru
@@ -374,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 486234487026628515
+      hash: -691955280667446019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 486234487026628515
+      hash: -691955280667446019
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10