esp-permissions 0.0.3 → 0.0.4

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

@@ -41,6 +41,11 @@ body
     padding: 25px 30px
     width: 960px
 
+    .new_permission
+      display: block
+      margin: 0 0 15px 0
+      text-align: right
+
     .logged_info
       border-bottom: 1px solid #A17345
       margin: 0 0 15px
@@ -100,7 +105,7 @@ body
 
     .formtastic
       .inline-errors
-        background: transparent image_url("inline_error_arrow.png") no-repeat left center
+        background: transparent image_url("esp_permissions/inline_error_arrow.png") no-repeat left center
         font-size: 12px
         color: #933
         padding: 0 0 0 18px
@@ -119,6 +124,13 @@ body
           padding: 2px 3px
           width: 954px
 
+        input
+          font-size: 14px
+          height: 20px
+          padding: 3px 4px
+          width: 868px
+
+
       .button-group
         margin: 15px 0
 

data/app/controllers/esp_permissions/permissions_controller.rb

@@ -1,13 +1,28 @@
 class EspPermissions::PermissionsController < EspPermissions::ApplicationController
-  belongs_to :user, :shallow => true
-  actions :new, :create, :destroy
+  belongs_to :user, :optional => true
 
-  #def create
-    #create!{  :users]}
-  #end
+  def create
+    unless params[:user_id] && @user = User.find(params[:user_id])
+      @user = User.find_or_initialize_by_uid(params[:permission][:user_uid]).tap do |user|
+        user.update_attributes :first_name => params[:permission][:user_first_name],
+                               :last_name => params[:permission][:user_last_name],
+                               :email => params[:permission][:user_email]
+      end
+    end
 
-  #def destroy
-    #destroy!{ [:manage, :permissions, :users] }
-  #end
+    @permission = Permission.new(params[:permission].merge(:user_id => @user.id))
 
+    if @permission.save
+      redirect_to esp_permissions.users_path
+    else
+      unless params[:user_id]
+        @user = nil
+        @permission.user_id = nil if params[:permission][:user_search].blank?
+      end
+
+      @permission.valid?
+
+      render :new
+    end
+  end
 end

data/app/controllers/esp_permissions/users_controller.rb

@@ -1,10 +1,15 @@
 class EspPermissions::UsersController < EspPermissions::ApplicationController
   has_searcher
-  actions :index
+
+  actions :index, :new, :create, :destroy, :search
+
   has_scope :page, :default => 1
 
-  protected
+  def search
+    render :json => JSON.parse(Curl::Easy.http_get("#{Settings['sso.url']}/users.json?user_search[keywords]=#{URI.escape(params[:term])}").body_str) and return
+  end
 
+  protected
     def collection
       get_collection_ivar || set_collection_ivar(search_and_paginate_collection)
     end

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

@@ -1,13 +1,18 @@
 <h3>
-  <%= t('permissions.You are adding role to') %>
-  <span>
-    <%= @user.name %>
-    &lt;<%= mail_to @user.email, @user.email %>&gt;
-  </span>
+  <%= "#{t('permissions.You are adding role to')}  #{@user.full_name if @user}" %>
 </h3>
-<%= semantic_form_for resource, :url => esp_permissions.user_permissions_path(@user) do |form| %>
+
+<%= semantic_form_for resource,
+                      :url => (@user ? esp_permissions.user_permissions_path(@user) : esp_permissions.permissions_path) do |form| %>
   <%= form.inputs do  %>
-    <%= form.input :context, :collection => current_user.available_contexts, :member_label => :context_title, :include_blank => t('permissions.not_selected') %>
+    <%= form.input :user_uid, :as => :hidden %>
+    <%= form.input :user_first_name, :as => :hidden %>
+    <%= form.input :user_last_name, :as => :hidden %>
+    <%= form.input :user_email, :as => :hidden %>
+    <%= form.input :user_search, :as => :string unless @user %>
+    <%= form.input :context, :collection => current_user.available_contexts,
+                             :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') %>
   <% end %>
   <%= form.buttons :class => 'button-group' do %>

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

@@ -6,14 +6,18 @@
     <li><%= button_tag t('permissions.search'), :class => 'button icon search' %></li>
   <% end %>
 <% end %>
-<ul class="collection_list">
-  <% collection.each do | user | %>
+
+<%= link_to "&#43;#{t('permissions.create_permission')}".html_safe,
+            esp_permissions.new_permission_path,
+            :class => 'new_permission' if can?(:modify, Permission)%>
+
+<ul class='collection_list'>
+  <% collection.each do |user| %>
     <li>
-      <div class='name'>
-        <%= user.name %>
+      <div class="name">
+        <%= user.full_name %>
       </div>
-
-      <div class='email'>
+      <div class="email">
         &lt;<%= mail_to user.email, user.email %>&gt;
       </div>
 
@@ -34,7 +38,7 @@
                     <%= link_to t('permissions.delete'),
                       esp_permissions.permission_path(permission),
                       :method => :delete,
-                      :confirm => t('Are you sure?'),
+                      :confirm => t('permissions.Are you sure?'),
                       :class => 'buttton icon remove danger' if can?(:destroy, permission) %>
                   </li>
                 <% end %>
@@ -45,9 +49,9 @@
           <li>Нет прав доступа</li>
         <% end %>
       <% end %>
+
     </li>
   <% end %>
 </ul>
 
-
 <%= paginate collection %>

data/config/locales/ru.yml

@@ -4,6 +4,7 @@ ru:
       permission:
         context:              Категория
         role:                 Роль
+        user_search:          Пользователь
 
     models:
       permission:             Право доступа
@@ -14,6 +15,7 @@ ru:
       last:                   Последняя страница
       previous:               "←"
       first:                  Первая страница
+      truncate:               ...
 
   permissions:
     'Are you sure?':          Вы уверены, в том что хотите удалить запись?
@@ -22,6 +24,7 @@ ru:
     back_to_manage:           Назад в раздел управления контентом
     cancel:                   Отмена
     create:                   Создать
+    create_permission:        Создать право доступа
     delete:                   Удалить
     new:                      Добавить право доступа
     not_selected:             -- не выбрано --

data/config/routes.rb

@@ -1,6 +1,11 @@
 EspPermissions::Engine.routes.draw do
+  resources :permissions, :only => [:new, :create, :destroy]
+
   resources :users, :only => :index do
-    resources :permissions, :only => [:new, :create, :destroy], :shallow => true
+    resources :permissions, :only => [:new, :create, :destroy]
   end
+
+  match '/users/search' => "users#search"
+
   root :to => 'users#index'
 end

data/lib/esp-permissions/version.rb

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

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

@@ -1,4 +1,3 @@
-require 'rails/generators'
 require 'rails/generators/migration'
 
 module EspPermissions
@@ -9,16 +8,21 @@ module EspPermissions
       source_root File.expand_path('../templates', __FILE__)
 
       def self.next_migration_number(dirname)
-        Time.now.strftime('%Y%m%d%H%M%S')
+        @number ||= Time.now.strftime('%Y%m%d%H%M%S').to_i
+        @number += 1
       end
 
-     def create_models
-       template 'app/models/user.rb'
-     end
+      def create_models
+        template 'app/models/context.rb'
+        template 'app/models/permission.rb'
+        template 'app/models/user.rb'
+      end
 
       def create_migration
+        migration_template 'db/migrate/esp_permissions_create_contexts.rb'
         migration_template 'db/migrate/esp_permissions_create_permissions.rb'
       end
+
     end
   end
 end

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

@@ -0,0 +1,18 @@
+class Context < ActiveRecord::Base
+
+  default_scope order('weight')
+
+  attr_accessible :id, :title, :ancestry, :weight
+
+  has_many :permissions
+  has_many :users, :through => :permissions
+
+  alias_attribute :to_s, :title
+
+  has_ancestry
+
+  searchable do
+    text :title
+  end
+
+end

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

@@ -0,0 +1,39 @@
+class Permission < ActiveRecord::Base
+  belongs_to :context
+  belongs_to :user
+  has_enum :role, :scopes => true
+
+  attr_accessor :user_search, :user_uid, :user_first_name, :user_last_name, :user_email
+
+  before_validation :reset_user_id, :unless => :user_id?
+
+  validates_presence_of :role, :user
+
+  private
+    def reset_user_id
+      self.user_id = nil
+      clear_attr_accessors
+      self.errors[:user_search] = ::I18n.t('activerecord.errors.models.permission.attributes.user_id.blank')
+    end
+
+    def clear_attr_accessors
+      self.user_uid = nil
+      self.user_first_name = nil
+      self.user_last_name = nil
+      self.user_email = nil
+    end
+end
+
+# == Schema Information
+#
+# Table name: permissions
+#
+#  id           :integer         not null, primary key
+#  context_id   :integer
+#  context_type :string(255)
+#  user_id      :integer
+#  role         :string(255)
+#  created_at   :datetime
+#  updated_at   :datetime
+#
+

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

@@ -1,12 +1,10 @@
 class User < ActiveRecord::Base
   devise :omniauthable, :trackable, :timeoutable
-  attr_accessible :name, :email, :nickname, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info
+  attr_accessible :name, :email, :nickname, :first_name, :last_name, :location, :description, :image, :phone, :urls, :raw_info, :uid
+  validates_presence_of :uid
 
   has_many :permissions
-
-  searchable do
-    text :name, :email, :nickname, :phone
-  end
+  has_many :contexts, :through => :permissions
 
   def self.from_omniauth(hash)
     User.find_or_initialize_by_uid(hash['uid']).tap do |user|
@@ -14,8 +12,16 @@ class User < ActiveRecord::Base
     end
   end
 
+  def full_name
+    nickname || name || "#{last_name} #{first_name}"
+  end
+
+  searchable do
+    text :name, :email, :nickname, :phone, :last_name, :first_name
+  end
+
   def available_contexts
-    []
+    contexts.where(:permissions => {:role => :manager}).map(&:subtree).flatten.uniq
   end
 end
 

data/lib/generators/esp_permissions/install/templates/db/migrate/esp_permissions_create_contexts.rb

@@ -0,0 +1,14 @@
+class EspPermissionsCreateContexts < ActiveRecord::Migration
+  def change
+    create_table :contexts do |t|
+      t.string :type
+      t.string :title
+      t.string :ancestry
+      t.string :weight
+      t.integer :position
+      t.timestamps
+    end
+    add_index :contexts, :weight
+    add_index :contexts, :ancestry
+  end
+end

data/lib/tasks/esp-permissions_tasks.rake

@@ -1,4 +1,17 @@
-# desc "Explaining what the task does"
-# task :esp-permissions do
-#   # Task goes here
-# end
+require 'curb'
+require 'progress_bar'
+
+desc "Syncronize blue-pages tree"
+
+namespace :esp_permissions do
+  task :sync => :environment do
+    remotes = JSON.parse(Curl::Easy.http_get("#{Settings['blue-pages.url']}/categories/2.json?sync=true").body_str)
+    bar = ProgressBar.new(remotes.count)
+    remotes.each do | remote |
+      (Context.find_by_id(remote['id']) || Context.new).tap do | context |
+        context.update_attributes! remote
+      end
+      bar.increment!
+    end
+  end
+end