esp-permissions 0.0.18 → 0.1.0

data/app/assets/stylesheets/esp_permissions/application.css

@@ -3,5 +3,9 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require_tree .
-*/
+ *= require esp_permissions/buttons
+ *= require esp_permissions/jquery_ui
+ *= require esp_permissions/pagination
+ *= require esp_permissions/permissions
+ *= require esp_permissions/shared
+ */

data/app/assets/stylesheets/esp_permissions/permissions.sass

@@ -1,7 +1,6 @@
 @import "compass/utilities"
 @import "compass/reset"
 @import "compass/css3"
-@import "buttons"
 
 body
   background: #73351F image_url('esp_permissions/wood.jpg') no-repeat center top fixed
@@ -46,16 +45,6 @@ body
       margin: 0 0 15px 0
       text-align: right
 
-    .logged_info
-      border-bottom: 1px solid #A17345
-      margin: 0 0 15px
-      padding: 0 0 5px
-      text-align: right
-      width: 100%
-
-      .back_link
-        float: left
-
     .permission_list
       display: none
 

data/app/assets/stylesheets/esp_permissions/shared.sass

@@ -0,0 +1,84 @@
+@import 'compass/utilities'
+@import 'compass/css3'
+
+$espp_body_margin_top: 35px !default
+$espp_body_margin_bottom: 40px !default
+
+$espp_font_size: 11px !default
+$espp_font_family: Arial, Verdana, sans-serif !default
+
+$espp_text_color: #000 !default
+$espp_background_color: window !default
+$espp_link_color: #031074 !default
+$espp_underline_link: true !default
+$espp_hover_link_color: #000055 !default
+$espp_underline_hover_link: false !default
+
+body
+  margin-top: $espp_body_margin_top
+  margin-bottom: $espp_body_margin_bottom
+
+=fixed_block
+  +nested-reset
+  +single-box-shadow
+  font-size: $espp_font_size
+  font-family: $espp_font_family
+  background-color: $espp_background_color
+  line-height: 1.5
+  color: $espp_text_color
+  position: fixed
+  width: 100%
+  z-index: 99999
+  a
+    color: $espp_link_color
+    @if $espp_underline_link
+      text-decoration: underline
+    @else
+      text-decoration: none
+    &:hover
+      color: $espp_hover_link_color
+      @if $espp_underline_hover_link
+        text-decoration: underline
+      @else
+        text-decoration: none
+    &.selected
+      color: $espp_text_color
+      @if $espp_underline_link
+        text-decoration: none
+      @else
+        text-decoration: underline
+
+.espp_header_wrapper
+  +fixed_block
+  top: 0
+  left: 0
+  border-bottom: 1px solid #999
+
+  .espp_header
+    +clearfix
+    margin: 5px 10px
+    .navigation
+      float: left
+      a
+        margin-right: 5px
+    .auth
+      float: right
+      .current_user
+        margin-right: 5px
+
+
+.espp_footer_wrapper
+  +fixed_block
+  bottom: 0
+  left: 0
+  border-top: 1px solid #999
+
+  .espp_footer
+    +clearfix
+    margin: 5px 10px
+    .info
+      float: left
+    .developer
+      float: right
+      .range
+        margin-right: 5px

data/app/views/esp_permissions/shared/_footer.html.erb

@@ -0,0 +1,12 @@
+<div class='espp_footer_wrapper'>
+  <div class='espp_footer'>
+    <div class='info'>
+      <%= [request.remote_addr, request.remote_ip].join(', ').split(', ').uniq.join(', ') %>
+      <%= request.env['HTTP_USER_AGENT'] %>
+    </div>
+    <div class='developer'>
+      <span class='range'>2011&ndash;<%= Date.today.year %></span>
+      <a href='http://openteam.ru/' title='Сделано с любовью в OpenTeam'>OpenTeam</a>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,24 @@
+<div class='espp_header_wrapper'>
+  <div class='espp_header'>
+    <% if current_user %>
+      <% current = controller_path.match(/^([a-z_]+)/)[0].inquiry %>
+      <div class='navigation'>
+        <% if current_user.permissions.exists? %>
+          <%= link_to 'Публичный вид', '/', :class => current.manage? || current.esp_permissions? ? nil : 'selected' %>
+          <%= link_to 'Система управления', '/manage', :class => current.manage? ? 'selected' : nil %>
+        <% end %>
+        <% if current_user.permissions.for_roles(:manager).exists? %>
+          <%= link_to 'Права доступа', '/manage/permissions', :class => current.esp_permissions? ? 'selected' : nil %>
+        <% end %>
+      </div>
+      <div class='auth'>
+        <span class='current_user'><%= current_user.name %></span>
+        <a href='/sso/sign_out'>Выход</a>
+      </div>
+    <% else %>
+      <div class='auth'>
+        <a href='/sso/sign_in'>Вход в систему</a>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/layouts/esp_permissions/application.html.erb

@@ -8,15 +8,11 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
+  <%= render :partial => "esp_permissions/shared/header" %>
   <h1><%= t('permissions.title') %></h1>
   <div class="container">
-    <div class="logged_info">
-      <%= link_to "&larr; #{t('permissions.back_to_manage')}".html_safe, '/manage', :class => 'back_link' %>
-      <%= t('permissions.You are sign in as') %>
-      <%= "#{current_user.name} &lt;#{current_user.email}&gt;".html_safe %>
-      <%= link_to t('permissions.sign_out'), '/sso/sign_out' %>
-    </div>
     <%= yield %>
   </div>
+  <%= render :partial => "esp_permissions/shared/footer" %>
 </body>
 </html>

data/lib/esp-permissions/version.rb

@@ -1,3 +1,3 @@
 module EspPermissions
-  VERSION = "0.0.18"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-permissions
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &25095440 !ruby/object:Gem::Requirement
+  requirement: &22826600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25095440
+  version_requirements: *22826600
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &25095020 !ruby/object:Gem::Requirement
+  requirement: &22826180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25095020
+  version_requirements: *22826180
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &25094520 !ruby/object:Gem::Requirement
+  requirement: &22825680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.2
   type: :runtime
   prerelease: false
-  version_requirements: *25094520
+  version_requirements: *22825680
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &25094040 !ruby/object:Gem::Requirement
+  requirement: &22825240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25094040
+  version_requirements: *22825240
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &25093580 !ruby/object:Gem::Requirement
+  requirement: &22824760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25093580
+  version_requirements: *22824760
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &25093160 !ruby/object:Gem::Requirement
+  requirement: &22824340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25093160
+  version_requirements: *22824340
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &25092740 !ruby/object:Gem::Requirement
+  requirement: &22823920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25092740
+  version_requirements: *22823920
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &25092320 !ruby/object:Gem::Requirement
+  requirement: &22823480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25092320
+  version_requirements: *22823480
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &25091900 !ruby/object:Gem::Requirement
+  requirement: &22823060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25091900
+  version_requirements: *22823060
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &25091480 !ruby/object:Gem::Requirement
+  requirement: &22822620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25091480
+  version_requirements: *22822620
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &25091060 !ruby/object:Gem::Requirement
+  requirement: &22822200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25091060
+  version_requirements: *22822200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &25090640 !ruby/object:Gem::Requirement
+  requirement: &22839900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25090640
+  version_requirements: *22839900
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &25090220 !ruby/object:Gem::Requirement
+  requirement: &22839460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25090220
+  version_requirements: *22839460
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &25089800 !ruby/object:Gem::Requirement
+  requirement: &22839020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25089800
+  version_requirements: *22839020
 - !ruby/object:Gem::Dependency
   name: sso_client
-  requirement: &25089380 !ruby/object:Gem::Requirement
+  requirement: &22838560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25089380
+  version_requirements: *22838560
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &25088960 !ruby/object:Gem::Requirement
+  requirement: &22838100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25088960
+  version_requirements: *22838100
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &25088540 !ruby/object:Gem::Requirement
+  requirement: &22837660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25088540
+  version_requirements: *22837660
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &25088120 !ruby/object:Gem::Requirement
+  requirement: &22837200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25088120
+  version_requirements: *22837200
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &25087700 !ruby/object:Gem::Requirement
+  requirement: &22836760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25087700
+  version_requirements: *22836760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &25087280 !ruby/object:Gem::Requirement
+  requirement: &22836300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25087280
+  version_requirements: *22836300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &25086860 !ruby/object:Gem::Requirement
+  requirement: &22835800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25086860
+  version_requirements: *22835800
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &25086440 !ruby/object:Gem::Requirement
+  requirement: &22835340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25086440
+  version_requirements: *22835340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &25086020 !ruby/object:Gem::Requirement
+  requirement: &22834880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25086020
+  version_requirements: *22834880
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &25085560 !ruby/object:Gem::Requirement
+  requirement: &22834420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25085560
+  version_requirements: *22834420
 - !ruby/object:Gem::Dependency
   name: ryba
-  requirement: &25085140 !ruby/object:Gem::Requirement
+  requirement: &22834000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25085140
+  version_requirements: *22834000
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &25084720 !ruby/object:Gem::Requirement
+  requirement: &22833560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25084720
+  version_requirements: *22833560
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &25084300 !ruby/object:Gem::Requirement
+  requirement: &22833140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25084300
+  version_requirements: *22833140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &25083880 !ruby/object:Gem::Requirement
+  requirement: &22832720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25083880
+  version_requirements: *22832720
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &25083460 !ruby/object:Gem::Requirement
+  requirement: &22832300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25083460
+  version_requirements: *22832300
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &25083040 !ruby/object:Gem::Requirement
+  requirement: &22849460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25083040
+  version_requirements: *22849460
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &25082620 !ruby/object:Gem::Requirement
+  requirement: &22849040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -351,7 +351,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25082620
+  version_requirements: *22849040
 description: Description of EspPermissions.
 email:
 - mail@openteam.ru
@@ -359,43 +359,45 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/esp_permissions/inline_error_arrow.png
+- app/views/layouts/esp_permissions/application.html.erb
+- app/views/esp_permissions/permissions/new.html.erb
+- app/views/esp_permissions/users/index.html.erb
+- app/views/esp_permissions/shared/_header.html.erb
+- app/views/esp_permissions/shared/_footer.html.erb
 - app/assets/images/esp_permissions/wood.jpg
+- app/assets/images/esp_permissions/inline_error_arrow.png
 - app/assets/images/esp_permissions/gh_icons.png
-- app/assets/stylesheets/esp_permissions/pagination.sass
+- app/assets/stylesheets/esp_permissions/buttons.sass
+- app/assets/stylesheets/esp_permissions/permissions.sass
 - app/assets/stylesheets/esp_permissions/application.css
+- app/assets/stylesheets/esp_permissions/shared.sass
 - app/assets/stylesheets/esp_permissions/jquery_ui.sass
-- app/assets/stylesheets/esp_permissions/permissions.sass
-- app/assets/stylesheets/esp_permissions/buttons.sass
+- app/assets/stylesheets/esp_permissions/pagination.sass
+- app/assets/javascripts/esp_permissions/permissions.js
 - app/assets/javascripts/esp_permissions/jquery.noisy.min.js
 - app/assets/javascripts/esp_permissions/application.js
-- app/assets/javascripts/esp_permissions/permissions.js
-- app/helpers/esp_permissions/permissions_helper.rb
-- app/models/user_search.rb
-- app/controllers/esp_permissions/users_controller.rb
 - app/controllers/esp_permissions/application_controller.rb
 - app/controllers/esp_permissions/permissions_controller.rb
-- app/views/layouts/esp_permissions/application.html.erb
-- app/views/esp_permissions/permissions/new.html.erb
-- app/views/esp_permissions/users/index.html.erb
+- app/controllers/esp_permissions/users_controller.rb
+- app/models/user_search.rb
 - config/routes.rb
 - config/locales/ru.yml
+- lib/esp-permissions/version.rb
+- lib/esp-permissions/engine.rb
+- lib/tasks/esp-permissions_tasks.rake
 - lib/generators/esp_permissions/install/install_generator.rb
-- lib/generators/esp_permissions/install/templates/spec/models/ability_spec.rb
-- lib/generators/esp_permissions/install/templates/app/models/permission.rb
-- lib/generators/esp_permissions/install/templates/app/models/user.rb
-- lib/generators/esp_permissions/install/templates/app/models/context.rb
-- lib/generators/esp_permissions/install/templates/app/models/ability.rb
 - lib/generators/esp_permissions/install/templates/config/schedule.rb
 - lib/generators/esp_permissions/install/templates/config/locales/permissions_enum.ru.yml
-- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.rb
-- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_permissions.rb
+- lib/generators/esp_permissions/install/templates/spec/models/ability_spec.rb
+- lib/generators/esp_permissions/install/templates/db/seeds.rb
 - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb
+- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_permissions.rb
+- lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_role_user_id_context_id_index_to_permissions.rb
 - lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_add_permissions_count_to_users.rb
-- lib/generators/esp_permissions/install/templates/db/seeds.rb
-- lib/esp-permissions/engine.rb
-- lib/esp-permissions/version.rb
-- lib/tasks/esp-permissions_tasks.rake
+- lib/generators/esp_permissions/install/templates/app/models/user.rb
+- lib/generators/esp_permissions/install/templates/app/models/context.rb
+- lib/generators/esp_permissions/install/templates/app/models/ability.rb
+- lib/generators/esp_permissions/install/templates/app/models/permission.rb
 - lib/esp-permissions.rb
 - MIT-LICENSE
 - Rakefile
@@ -414,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2495887122547989523
+      hash: 3181294768831660947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -423,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2495887122547989523
+      hash: 3181294768831660947
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/helpers/esp_permissions/permissions_helper.rb

@@ -1,4 +0,0 @@
-module EspPermissions
-  module PermissionsHelper
-  end
-end