esp-auth 1.3.2 → 1.3.3

data/app/controllers/esp_auth/audits_controller.rb

@@ -11,7 +11,7 @@ class EspAuth::AuditsController < ApplicationController
 
   protected
     def authorize_user_can_view_audits!
-      render :file => "#{Rails.root}/public/403", :formats => [:html], :status => 403, :layout => false unless can?(:manage, Context.first)
+      render :file => "#{Rails.root}/public/403", :formats => [:html], :status => 403, :layout => false unless can?(:manage, :audits)
     end
 
     def end_of_association_chain

data/app/views/esp_auth/shared/_header.html.erb

@@ -14,7 +14,7 @@
         <% if can? :manage, :permissions %>
           <%= link_to 'Права доступа', esp_auth.root_path, :class => controller_namespace[0].esp_auth? && controller_name != 'audits'? 'selected' : nil %>
         <% end %>
-        <% if current_user.manager_of?(::Context.first) %>
+        <% if can? :manage, :audits %>
           <%= link_to 'Журнал операций', esp_auth.audits_path, :class => controller_namespace[0].esp_auth? && controller_name == 'audits' ? 'selected' : nil %>
         <% end %>
       </div>

data/lib/esp_auth/version.rb

@@ -1,3 +1,3 @@
 module EspAuth
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/lib/generators/esp_auth/install/templates/app/models/ability.rb

@@ -29,6 +29,10 @@ class Ability
       user.manager?
     end
 
+    can :manage, :audits do
+      user.manager_of? Context.first
+    end
+
     ## app specific
     can :manage, Subcontext do | subcontext |
       user.manager_of? subcontext.context

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-auth
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &19879140 !ruby/object:Gem::Requirement
+  requirement: &18142240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19879140
+  version_requirements: *18142240
 - !ruby/object:Gem::Dependency
   name: audited-activerecord
-  requirement: &19878720 !ruby/object:Gem::Requirement
+  requirement: &18141800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19878720
+  version_requirements: *18141800
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19878300 !ruby/object:Gem::Requirement
+  requirement: &18141380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19878300
+  version_requirements: *18141380
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &19877880 !ruby/object:Gem::Requirement
+  requirement: &18140960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19877880
+  version_requirements: *18140960
 - !ruby/object:Gem::Dependency
   name: default_value_for
-  requirement: &19877460 !ruby/object:Gem::Requirement
+  requirement: &18140540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19877460
+  version_requirements: *18140540
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19877040 !ruby/object:Gem::Requirement
+  requirement: &18140120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19877040
+  version_requirements: *18140120
 - !ruby/object:Gem::Dependency
   name: devise-russian
-  requirement: &19876620 !ruby/object:Gem::Requirement
+  requirement: &18139700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19876620
+  version_requirements: *18139700
 - !ruby/object:Gem::Dependency
   name: esp-commons
-  requirement: &19876200 !ruby/object:Gem::Requirement
+  requirement: &18139280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19876200
+  version_requirements: *18139280
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &19875780 !ruby/object:Gem::Requirement
+  requirement: &18138860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19875780
+  version_requirements: *18138860
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &19875360 !ruby/object:Gem::Requirement
+  requirement: &18138440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19875360
+  version_requirements: *18138440
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &19874820 !ruby/object:Gem::Requirement
+  requirement: &18137900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19874820
+  version_requirements: *18137900
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &19874280 !ruby/object:Gem::Requirement
+  requirement: &18137360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19874280
+  version_requirements: *18137360
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &19873840 !ruby/object:Gem::Requirement
+  requirement: &18136940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19873840
+  version_requirements: *18136940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &19873420 !ruby/object:Gem::Requirement
+  requirement: &18136520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19873420
+  version_requirements: *18136520
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &19873000 !ruby/object:Gem::Requirement
+  requirement: &18136100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19873000
+  version_requirements: *18136100
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &19872580 !ruby/object:Gem::Requirement
+  requirement: &18135680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19872580
+  version_requirements: *18135680
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &19872160 !ruby/object:Gem::Requirement
+  requirement: &18135260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19872160
+  version_requirements: *18135260
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &19871740 !ruby/object:Gem::Requirement
+  requirement: &18134840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19871740
+  version_requirements: *18134840
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &19871320 !ruby/object:Gem::Requirement
+  requirement: &18134420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19871320
+  version_requirements: *18134420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19870900 !ruby/object:Gem::Requirement
+  requirement: &18134000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19870900
+  version_requirements: *18134000
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19870480 !ruby/object:Gem::Requirement
+  requirement: &18133580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19870480
+  version_requirements: *18133580
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &19870060 !ruby/object:Gem::Requirement
+  requirement: &18133160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19870060
+  version_requirements: *18133160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19869640 !ruby/object:Gem::Requirement
+  requirement: &18132740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19869640
+  version_requirements: *18132740
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19869220 !ruby/object:Gem::Requirement
+  requirement: &18132320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19869220
+  version_requirements: *18132320
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &19868800 !ruby/object:Gem::Requirement
+  requirement: &18131900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19868800
+  version_requirements: *18131900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19868380 !ruby/object:Gem::Requirement
+  requirement: &18131480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19868380
+  version_requirements: *18131480
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &19867960 !ruby/object:Gem::Requirement
+  requirement: &18131060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19867960
+  version_requirements: *18131060
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19867400 !ruby/object:Gem::Requirement
+  requirement: &18130620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19867400
+  version_requirements: *18130620
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &19866880 !ruby/object:Gem::Requirement
+  requirement: &18130020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19866880
+  version_requirements: *18130020
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19866440 !ruby/object:Gem::Requirement
+  requirement: &18129560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19866440
+  version_requirements: *18129560
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &19866020 !ruby/object:Gem::Requirement
+  requirement: &18129100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -351,10 +351,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19866020
+  version_requirements: *18129100
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &19865580 !ruby/object:Gem::Requirement
+  requirement: &18128680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -362,10 +362,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19865580
+  version_requirements: *18128680
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &19865160 !ruby/object:Gem::Requirement
+  requirement: &18128260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -373,7 +373,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19865160
+  version_requirements: *18128260
 description: Description of EspAuth.
 email:
 - mail@openteam.ru
@@ -448,7 +448,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1361170322291104469
+      hash: 782434614314551131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -457,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1361170322291104469
+      hash: 782434614314551131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15