esp-auth 1.0.3 → 1.0.4

data/app/controllers/esp_auth/omniauth_callbacks_controller.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 class EspAuth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def identity
     user = User.find_or_initialize_by_uid(request.env['omniauth.auth']['uid']).tap do |user|
       user.update_attributes request.env['omniauth.auth']['info']
     end
 
-    flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "Identity"
+    flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => "системы аутентификации"
     sign_in user, :event => :authentication
     redirect_to stored_location_for(:user) || main_app.root_path
   end

data/app/views/esp_auth/permissions/new.html.erb

@@ -9,12 +9,8 @@
     <%= form.input :user_name, :as => :hidden %>
     <%= form.input :user_email, :as => :hidden %>
     <%= form.input :user_search, :as => :string unless @user %>
-    <%= form.input :polimorphic_context,  :as => :select,
-                                          :collection => current_user.contexts_tree,
-                                          :member_value => ->(c) { [c.class.model_name.underscore, c.id].join('_') },
-                                          :member_label => ->(c) { ('&nbsp;' * 2 * c.depth + c.title).html_safe },
-                                          :include_blank => t('permissions.not_selected') %>
-    <%= form.input :role, :as => :select, :collection => Permission.human_enums[:role].invert, :include_blank => t('permissions.not_selected') %>
+    <%= polymorphic_context_tree_for form %>
+    <%= form.input :role, :as => :select, :collection => Permission.human_enums[:role].invert, :include_blank => t('commons.not_selected') %>
   <% end %>
   <%= form.buttons :class => 'button-group' do %>
     <li><%= button_tag t('permissions.create'), :class => 'button icon approve' %></li>

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

@@ -1,18 +1,22 @@
 <div class='esp_auth_header_wrapper'>
   <div class='esp_auth_header'>
     <% if current_user %>
-      <% current = controller_path.match(/^([a-z_]+)/)[0].inquiry %>
+      <% controller_namespace = controller_path.split('/').map(&:inquiry) %>
       <div class='navigation'>
         <% if can? :manage, :application %>
-          <%= link_to 'Публичный вид', '/', :class => current.manage? || current.esp_auth? ? nil : 'selected' %>
-          <%= link_to 'Система управления', '/manage', :class => current.manage? ? 'selected' : nil %>
+          <%= link_to 'Публичный вид', '/', :class => controller_namespace[0].manage? || controller_namespace[0].esp_auth? ? nil : 'selected' %>
+          <% if content_for?(:esp_auth_manage_links)  %>
+            <%= yield(:esp_auth_manage_links) %>
+          <% else %>
+            <%= link_to 'Система управления', '/manage', :class => controller_namespace[0].manage? ? 'selected' : nil %>
+          <% end %>
         <% end %>
         <% if can? :manage, :permissions %>
-          <%= link_to 'Права доступа', esp_auth.root_path, :class => current.esp_auth? ? 'selected' : nil %>
+          <%= link_to 'Права доступа', esp_auth.root_path, :class => controller_namespace[0].esp_auth? ? 'selected' : nil %>
         <% end %>
       </div>
       <div class='auth'>
-        <span class='current_user'><%= current_user.name %></span>
+        <span class='current_user'><%= current_user %></span>
         <%= link_to('Выход', esp_auth.destroy_user_session_path) %>
       </div>
     <% else %>

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

@@ -34,10 +34,10 @@
               <% permissions.each do |permission| %>
                 <li>
                   <%= permission.context %>
-                  <%= link_to t('permissions.delete'),
+                  <%= link_to t('commons.delete'),
                     esp_auth.permission_path(permission),
                     :method => :delete,
-                    :confirm => t('permissions.Are you sure?'),
+                    :confirm => t('commons.confirm'),
                     :class => 'buttton icon remove danger' if can?(:destroy, permission) %>
                 </li>
               <% end %>

data/config/locales/ru.yml

@@ -19,8 +19,6 @@ ru:
       truncate:               ...
 
   permissions:
-    'Are you sure?':          Вы уверены, в том что хотите удалить запись?
-    'You are sign in as':     Вы вошли как
     'You are adding role to': Вы добавляете роль для
     back_to_manage:           Назад в раздел управления контентом
     cancel:                   Отмена
@@ -28,7 +26,6 @@ ru:
     create_permission:        Создать право доступа
     delete:                   Удалить
     new:                      Добавить право доступа
-    not_selected:             -- не выбрано --
     search:                   Поиск
     show_permissions:         Показать права доступа
     sign_out:                 Выход

data/lib/esp_auth/engine.rb

@@ -12,11 +12,6 @@ module EspAuth
 
     initializer "sso_client.devise", :before => 'devise.omniauth' do |app|
       require File.expand_path("../../../lib/omniauth/strategies/identity", __FILE__)
-
-      Settings.define 'sso.url',    :env_var => 'SSO_URL',    :required => true
-      Settings.define 'sso.key',    :env_var => 'SSO_KEY',    :required => true
-      Settings.define 'sso.secret', :env_var => 'SSO_SECRET', :required => true
-
       Devise.setup do |config|
         config.omniauth :identity, Settings['sso.key'], Settings['sso.secret'], :client_options => {:site => Settings['sso.url']}
       end
@@ -24,22 +19,34 @@ module EspAuth
 
     config.to_prepare do
       ActionController::Base.class_eval do
+        helper_method :polymorphic_context_tree_for
+
         def self.esp_load_and_authorize_resource
           before_filter :authenticate_user!
           before_filter :authorize_user_can_manage_application!
           inherit_resources
           load_and_authorize_resource
+          skip_load_and_authorize_resource :only => :index
           rescue_from CanCan::AccessDenied do |exception|
             render :file => "#{Rails.root}/public/403", :formats => [:html], :status => 403, :layout => false
           end
         end
+
         protected
-        def authorize_user_can_manage_application!
-            authorize! :manage, :application
-        end
+          def authorize_user_can_manage_application!
+              authorize! :manage, :application
+          end
+
+          def polymorphic_context_tree_for(form)
+            form.input :polymorphic_context,  :as => :select,
+                                              :collection => current_user.contexts_tree,
+                                              :member_value => ->(c) { [c.class.model_name.underscore, c.id].join('_') },
+                                              :member_label => ->(c) { (' ' * 2 * c.depth + c.title).html_safe },
+                                              :include_blank => t('commons.not_selected')
+          end
       end
       ActiveRecord::Base.class_eval do
-        def self.esp_authable
+        def self.esp_auth_user
 
           attr_accessible :name, :email, :nickname, :name, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info, :uid
 
@@ -81,6 +88,87 @@ module EspAuth
             .uniq
           end
 
+          define_method :to_s do
+            email? ? "#{name} <#{email}>" : name
+          end
+        end
+
+        def self.esp_auth_permission
+          attr_accessor :user_search, :user_uid, :user_name, :user_email, :polimorphic_context
+
+          belongs_to :context, :polymorphic => true
+          belongs_to :user
+
+          scope :for_role, ->(role) { where(:role => role) }
+          scope :for_context_ancestors, ->(context, ids=context.ancestor_ids) do
+            where(:context_id => ids,
+                  :context_type => (context.class.ancestors - context.class.included_modules).map(&:name))
+          end
+          scope :for_context, ->(context) { where(:context_id => context.id, :context_type => context.class) }
+
+          scope :for_context_type, ->(context_type) { where(:context_type => context_type) }
+
+          scope :for_context_and_ancestors, ->(context) do
+            if context.respond_to?(:ancestor_ids)
+              for_context_ancestors(context, context.ancestor_ids + [context.id])
+            else
+              for_context(context)
+            end
+          end
+
+          after_initialize :set_user, :if => :user_uid_present?
+          after_initialize :set_context, :if => :polimorphic_context_present?
+
+          after_create :user_index!
+          after_destroy :user_index!
+
+          validates_presence_of :polimorphic_context, :unless => :context
+
+          validates_presence_of :role, :user, :context
+
+          validates_presence_of :user_search, :unless => :user
+
+          validates_uniqueness_of :role, :scope => [:user_id, :context_id, :context_type]
+
+          has_enum :role
+
+
+          private
+            delegate :index!, :to => :user, :prefix => true
+            delegate :present?, :to => :polimorphic_context, :prefix => true
+            delegate :present?, :to => :user_uid, :prefix => true
+
+            define_method :set_user do
+              self.user = User.find_or_initialize_by_uid(user_uid).tap do |user|
+                user.update_attributes :name => user_name, :email => user_email
+              end
+            end
+
+            define_method :set_context do
+              underscored_context_type, self.context_id = polimorphic_context.match(/(\w+)_(\d+)/)[1..2]
+              self.context_type = underscored_context_type.camelize
+            end
+        end
+
+        def self.esp_auth_context(options={})
+          default_scope order('weight')
+          attr_accessible :id, :title, :ancestry, :weight, :parent
+          has_many :subcontexts, options
+          has_many :permissions, :as => :context
+          has_ancestry
+
+          alias_attribute :to_s, :title
+        end
+
+        def self.esp_auth_subcontext
+          belongs_to :context
+          has_many :permissions, :as => :context
+
+          alias_attribute :to_s, :title
+
+          def depth
+            context.depth + 1
+          end
         end
       end
     end

data/lib/esp_auth/spec_helper.rb

@@ -52,7 +52,7 @@ module EspAuth
     Permission.enums[:role].each do | role |
       define_method "#{role}_of" do |context|
         user.tap do | user |
-          user.permissions.create! :context => context, :role => role
+          user.permissions.create!(:context => context, :role => role) unless user.send("#{role}_of?", context)
         end
       end
     end

data/lib/esp_auth/version.rb

@@ -1,3 +1,3 @@
 module EspAuth
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/generators/esp_auth/install/install_generator.rb

@@ -38,10 +38,10 @@ module EspAuth
       end
 
       def create_migrations
-        migration_template 'db/migrate/esp_auth_create_users.rb'
-        migration_template 'db/migrate/esp_auth_create_contexts.rb'
-        migration_template 'db/migrate/esp_auth_create_permissions.rb'
-        migration_template 'db/migrate/esp_auth_create_subcontexts.rb'
+        migration_template 'db/migrate/create_users.rb'
+        migration_template 'db/migrate/create_contexts.rb'
+        migration_template 'db/migrate/create_permissions.rb'
+        migration_template 'db/migrate/create_subcontexts.rb'
       end
 
     end

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

@@ -1,18 +1,7 @@
 class Context < ActiveRecord::Base
-
-  default_scope order('weight')
-
-  attr_accessible :id, :title, :ancestry, :weight, :parent
-
-  has_many :subcontexts
-  has_many :permissions, :as => :context
-
-
-  alias_attribute :to_s, :title
-
-  has_ancestry
-
+  esp_auth_context
 end
+
 # == Schema Information
 #
 # Table name: contexts

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

@@ -1,57 +1,5 @@
 class Permission < ActiveRecord::Base
-  attr_accessor :user_search, :user_uid, :user_name, :user_email, :polimorphic_context
-
-  belongs_to :context, :polymorphic => true
-  belongs_to :user
-
-  scope :for_role, ->(role) { where(:role => role) }
-  scope :for_context_ancestors, ->(context, ids=context.ancestor_ids) do
-    where(:context_id => ids,
-          :context_type => (context.class.ancestors - context.class.included_modules).map(&:name))
-  end
-  scope :for_context, ->(context) { where(:context_id => context.id, :context_type => context.class) }
-
-  scope :for_context_and_ancestors, ->(context) do
-    if context.respond_to?(:ancestor_ids)
-      for_context_ancestors(context, context.ancestor_ids + [context.id])
-    else
-      for_context(context)
-    end
-  end
-
-  after_initialize :set_user, :if => :user_uid_present?
-  after_initialize :set_context, :if => :polimorphic_context_present?
-
-  after_create :user_index!
-  after_destroy :user_index!
-
-  validates_presence_of :polimorphic_context, :unless => :context
-
-  validates_presence_of :role, :user, :context
-
-  validates_presence_of :user_search, :unless => :user
-
-  validates_uniqueness_of :role, :scope => [:user_id, :context_id, :context_type]
-
-  has_enum :role
-
-
-  private
-
-    def set_user
-      self.user = User.find_or_initialize_by_uid(user_uid).tap do |user|
-        user.update_attributes :name => user_name, :email => user_email
-      end
-    end
-
-    def set_context
-      underscored_context_type, self.context_id = polimorphic_context.match(/(\w+)_(\d+)/)[1..2]
-      self.context_type = underscored_context_type.camelize
-    end
-
-    delegate :index!, :to => :user, :prefix => true
-    delegate :present?, :to => :polimorphic_context, :prefix => true
-    delegate :present?, :to => :user_uid, :prefix => true
+  esp_auth_permission
 end
 
 # == Schema Information

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

@@ -1,13 +1,7 @@
 class Subcontext < ActiveRecord::Base
-  belongs_to :context
-  has_many :permissions, :as => :context
-
-  alias_attribute :to_s, :title
-
-  def depth
-    context.depth + 1
-  end
+  esp_auth_subcontext
 end
+
 # == Schema Information
 #
 # Table name: subcontexts

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

@@ -1,11 +1,7 @@
 class User < ActiveRecord::Base
-
-  esp_authable
-
+  esp_auth_user
 end
 
-
-
 # == Schema Information
 #
 # Table name: users

data/lib/generators/esp_auth/install/templates/db/migrate/{esp_auth_create_contexts.rb → create_contexts.rb}

@@ -1,4 +1,4 @@
-class EspAuthCreateContexts < ActiveRecord::Migration
+class CreateContexts < ActiveRecord::Migration
   def change
     create_table :contexts do |t|
       t.string :title

data/lib/generators/esp_auth/install/templates/db/migrate/{esp_auth_create_permissions.rb → create_permissions.rb}

@@ -1,4 +1,4 @@
-class EspAuthCreatePermissions < ActiveRecord::Migration
+class CreatePermissions < ActiveRecord::Migration
   def change
     create_table :permissions do |t|
       t.references :user

data/lib/generators/esp_auth/install/templates/db/migrate/{esp_auth_create_subcontexts.rb → create_subcontexts.rb}

@@ -1,4 +1,4 @@
-class EspAuthCreateSubcontexts < ActiveRecord::Migration
+class CreateSubcontexts < ActiveRecord::Migration
   def change
     create_table :subcontexts do |t|
       t.string :title

data/lib/generators/esp_auth/install/templates/db/migrate/{esp_auth_create_users.rb → create_users.rb}

@@ -1,4 +1,4 @@
-class EspAuthCreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do | t |
       t.string  :uid                # omniauth[:uid]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &19520500 !ruby/object:Gem::Requirement
+  requirement: &26067780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19520500
+  version_requirements: *26067780
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &19520080 !ruby/object:Gem::Requirement
+  requirement: &26067300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19520080
+  version_requirements: *26067300
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &19519540 !ruby/object:Gem::Requirement
+  requirement: &26083120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.12.alpha.4
   type: :runtime
   prerelease: false
-  version_requirements: *19519540
+  version_requirements: *26083120
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &19519080 !ruby/object:Gem::Requirement
+  requirement: &26082700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19519080
+  version_requirements: *26082700
 - !ruby/object:Gem::Dependency
   name: default_value_for
-  requirement: &19518600 !ruby/object:Gem::Requirement
+  requirement: &26082240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19518600
+  version_requirements: *26082240
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19518140 !ruby/object:Gem::Requirement
+  requirement: &26081820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19518140
+  version_requirements: *26081820
 - !ruby/object:Gem::Dependency
   name: devise-russian
-  requirement: &19517700 !ruby/object:Gem::Requirement
+  requirement: &26081400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19517700
+  version_requirements: *26081400
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &19533640 !ruby/object:Gem::Requirement
+  requirement: &26080980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19533640
+  version_requirements: *26080980
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &19533200 !ruby/object:Gem::Requirement
+  requirement: &26076760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19533200
+  version_requirements: *26076760
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &19532760 !ruby/object:Gem::Requirement
+  requirement: &26076340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19532760
+  version_requirements: *26076340
 - !ruby/object:Gem::Dependency
   name: has_enum
-  requirement: &19532320 !ruby/object:Gem::Requirement
+  requirement: &26075920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19532320
+  version_requirements: *26075920
 - !ruby/object:Gem::Dependency
   name: has_scope
-  requirement: &19531880 !ruby/object:Gem::Requirement
+  requirement: &26075500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19531880
+  version_requirements: *26075500
 - !ruby/object:Gem::Dependency
   name: has_searcher
-  requirement: &19531440 !ruby/object:Gem::Requirement
+  requirement: &26099580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19531440
+  version_requirements: *26099580
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &19531020 !ruby/object:Gem::Requirement
+  requirement: &26099160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19531020
+  version_requirements: *26099160
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &19530580 !ruby/object:Gem::Requirement
+  requirement: &26098720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19530580
+  version_requirements: *26098720
 - !ruby/object:Gem::Dependency
   name: progress_bar
-  requirement: &19530160 !ruby/object:Gem::Requirement
+  requirement: &26098280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19530160
+  version_requirements: *26098280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19529720 !ruby/object:Gem::Requirement
+  requirement: &26097820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19529720
+  version_requirements: *26097820
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &19529280 !ruby/object:Gem::Requirement
+  requirement: &26097380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19529280
+  version_requirements: *26097380
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &19528840 !ruby/object:Gem::Requirement
+  requirement: &26096920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19528840
+  version_requirements: *26096920
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &19528400 !ruby/object:Gem::Requirement
+  requirement: &26096480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19528400
+  version_requirements: *26096480
 - !ruby/object:Gem::Dependency
   name: whenever
-  requirement: &19527940 !ruby/object:Gem::Requirement
+  requirement: &26096040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19527940
+  version_requirements: *26096040
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19527500 !ruby/object:Gem::Requirement
+  requirement: &26095580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19527500
+  version_requirements: *26095580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19527060 !ruby/object:Gem::Requirement
+  requirement: &26095140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19527060
+  version_requirements: *26095140
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &19526600 !ruby/object:Gem::Requirement
+  requirement: &26094680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19526600
+  version_requirements: *26094680
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19526140 !ruby/object:Gem::Requirement
+  requirement: &26094240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19526140
+  version_requirements: *26094240
 - !ruby/object:Gem::Dependency
   name: russian
-  requirement: &19525720 !ruby/object:Gem::Requirement
+  requirement: &26093800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19525720
+  version_requirements: *26093800
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19541640 !ruby/object:Gem::Requirement
+  requirement: &26093360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19541640
+  version_requirements: *26093360
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &19541200 !ruby/object:Gem::Requirement
+  requirement: &26092920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19541200
+  version_requirements: *26092920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19540760 !ruby/object:Gem::Requirement
+  requirement: &26092480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19540760
+  version_requirements: *26092480
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &19540300 !ruby/object:Gem::Requirement
+  requirement: &26092040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19540300
+  version_requirements: *26092040
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &19539860 !ruby/object:Gem::Requirement
+  requirement: &26091580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -351,10 +351,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19539860
+  version_requirements: *26091580
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &19539420 !ruby/object:Gem::Requirement
+  requirement: &26107540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -362,7 +362,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19539420
+  version_requirements: *26107540
 description: Description of EspAuth.
 email:
 - mail@openteam.ru
@@ -407,10 +407,10 @@ files:
 - lib/generators/esp_auth/install/templates/app/controllers/manage/application_controller.rb
 - lib/generators/esp_auth/install/templates/config/schedule.rb
 - lib/generators/esp_auth/install/templates/config/locales/permissions_enum.ru.yml
-- lib/generators/esp_auth/install/templates/db/migrate/esp_auth_create_users.rb
-- lib/generators/esp_auth/install/templates/db/migrate/esp_auth_create_contexts.rb
-- lib/generators/esp_auth/install/templates/db/migrate/esp_auth_create_subcontexts.rb
-- lib/generators/esp_auth/install/templates/db/migrate/esp_auth_create_permissions.rb
+- lib/generators/esp_auth/install/templates/db/migrate/create_users.rb
+- lib/generators/esp_auth/install/templates/db/migrate/create_subcontexts.rb
+- lib/generators/esp_auth/install/templates/db/migrate/create_contexts.rb
+- lib/generators/esp_auth/install/templates/db/migrate/create_permissions.rb
 - lib/generators/esp_auth/install/templates/db/seeds.rb
 - lib/tasks/sync.rake
 - lib/esp_auth/engine.rb
@@ -434,7 +434,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3144382037214944273
+      hash: -1606857420949617094
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3144382037214944273
+      hash: -1606857420949617094
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15