ab_admin 0.2.3 → 0.3.0

data/app/views/layouts/admin/application.html.slim

@@ -4,8 +4,8 @@ html id="controller_#{controller_name}"
     meta charset='utf-8'
     meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'
     meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" 
-    title= @page_title || 'Simple Admin'
-    = stylesheet_link_tag 'ab_admin/application', :media => 'all'
+    title= @page_title || 'Ab Admin'
+    = stylesheet_link_tag 'ab_admin/application', media: 'all'
     script(src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js')
     script(src='//ajax.googleapis.com/ajax/libs/jqueryui/1.8.21/jquery-ui.min.js')
     script(src='//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.0.beta6/handlebars.min.js')
@@ -20,7 +20,7 @@ html id="controller_#{controller_name}"
     #main role="main" 
       .container-fluid
         #wrap.row-fluid
-          = render('admin/shared/flash', :flash => flash) if flash
+          = render('admin/shared/flash', flash: flash) if flash
           .wrap_content
             .clearfix[data-pjax-container=true class=layout_css]= yield
           - if collection_action? && settings[:search]

data/app/views/layouts/admin/devise.html.slim

@@ -5,11 +5,11 @@ html id="controller_#{controller_name}"
     meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'
     meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" 
     title= @page_title || 'Ab Admin'
-    = stylesheet_link_tag 'ab_admin/devise', :media => 'all'
+    = stylesheet_link_tag 'ab_admin/devise', media: 'all'
     script(src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js')
     = javascript_include_tag 'bootstrap'
     = csrf_meta_tags
   body.container
-    = render('admin/shared/flash', :flash => flash) if flash
+    = render('admin/shared/flash', flash: flash) if flash
     = yield
 

data/config/locales/ru.yml

@@ -247,6 +247,7 @@ ru:
     user_id: "Пользователь"
     remember_me: "Запомнить"
     password: "Пароль"
+    slug: "Алиас"
   attrs: 
     en: "анг."
     it: "итал."

data/config/routes.rb

@@ -1,30 +1,30 @@
 Rails.application.routes.draw do
 
   namespace :admin do
-    root :to => 'dashboards#index'
-    get 'dashboards', :as => 'dashboards'
+    root to: 'dashboards#index'
+    get 'dashboards', as: 'dashboards'
 
     resources :structures do
-      post :rebuild, :on => :collection
+      post :rebuild, on: :collection
       resource :static_page
     end
 
     resources :users do
-      post :batch, :on => :collection
-      post :activate, :suspend, :send_welcome, :on => :member
+      post :batch, on: :collection
+      post :activate, :suspend, on: :member
     end
 
-    resources :assets, :only => [:create, :destroy] do
-      post :rotate, :main, :crop, :on => :member
-      post :sort, :on => :collection
+    resources :assets, only: [:create, :destroy] do
+      post :rotate, :main, :crop, on: :member
+      post :sort, on: :collection
     end
 
-    resource :settings, :only => [:edit, :update] do
-      post :cache_clear, :on => :collection
+    resource :settings, only: [:edit, :update] do
+      post :cache_clear, on: :collection
     end
 
     resource :locators do
-      post :prepare, :reload, :on => :collection
+      post :prepare, :reload, on: :collection
     end
 
     resources :admin_comments
@@ -32,22 +32,22 @@ Rails.application.routes.draw do
     post 'translate' => AbAdmin::I18nTools::TranslateApp
 
     controller 'manager' do
-      scope '(/:parent_resource/:parent_id)/:model_name' do
-        get '/new', :to => :new, :as => 'new'
-        post '/batch', :to => :batch, :as => 'batch'
-        post '/rebuild', :to => :rebuild, :as => 'rebuild'
-        match '/custom_action', :to => :custom_action, :as => 'collection_action'
+      scope '(/:parent_resource/:parent_resource_id)/:model_name' do
+        get '/new', to: :new, as: 'new'
+        post '/batch', to: :batch, as: 'batch'
+        post '/rebuild', to: :rebuild, as: 'rebuild'
+        match '/custom_action', to: :custom_action, as: 'collection_action'
 
         scope ':id' do
-          get '/edit', :to => :edit, :as => 'edit'
-          match '/custom_action', :to => :custom_action, :as => 'member_action'
-          get '/', :to => :show, :as => 'show'
-          put '/', :to => :update, :as => 'update'
-          delete '/', :to => :destroy, :as => 'destroy'
+          get '/edit', to: :edit, as: 'edit'
+          match '/custom_action', to: :custom_action, as: 'member_action'
+          get '/', to: :show, as: 'show'
+          put '/', to: :update, as: 'update'
+          delete '/', to: :destroy, as: 'destroy'
         end
 
-        get '/', :to => :index, :as => 'index'
-        post '/', :to => :create, :as => 'create'
+        get '/', to: :index, as: 'index'
+        post '/', to: :create, as: 'create'
       end
     end
 

data/db/migrate/20130101000001_create_users.rb

@@ -2,9 +2,9 @@ class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table(:users) do |t|
       t.string :login
-      t.integer :user_role_id, :limit => 1, :default => 1
-      t.integer :trust_state, :limit => 1, :default => 1
-      t.integer :gender, :limit => 1, :default => 1
+      t.integer :user_role_id, limit: 1, default: 1
+      t.integer :trust_state, limit: 1, default: 1
+      t.integer :gender, limit: 1, default: 1
       t.string :first_name
       t.string :last_name
       t.string :patronymic
@@ -15,12 +15,12 @@ class CreateUsers < ActiveRecord::Migration
       t.date :birthday
 
       t.string :time_zone
-      t.string :locale, :limit => 10
-      t.string :bg_color, :default => 'ffffff'
+      t.string :locale, limit: 10
+      t.string :bg_color, default: 'ffffff'
 
       ## Database authenticatable
       t.string :email
-      t.string :encrypted_password, :null => false, :default => ""
+      t.string :encrypted_password, null: false, default: ''
 
       ## Recoverable
       t.string :reset_password_token
@@ -30,7 +30,7 @@ class CreateUsers < ActiveRecord::Migration
       t.datetime :remember_created_at
 
       ## Trackable
-      t.integer :sign_in_count, :default => 0
+      t.integer :sign_in_count, default: 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string :current_sign_in_ip
@@ -46,7 +46,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.integer  :failed_attempts, default: 0 # Only if lock strategy is :failed_attempts
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
@@ -56,9 +56,9 @@ class CreateUsers < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :users, :email, :unique => true
-    add_index :users, :reset_password_token, :unique => true
-    add_index :users, :confirmation_token, :unique => true
+    add_index :users, :email, unique: true
+    add_index :users, :reset_password_token, unique: true
+    add_index :users, :confirmation_token, unique: true
   end
 
   def self.down

data/db/migrate/20130101000003_create_assets.rb

@@ -1,23 +1,23 @@
 class CreateAssets < ActiveRecord::Migration
   def self.up
     create_table :assets do |t|
-      t.string  :data_file_name, :null => false
+      t.string  :data_file_name, null: false
       t.string  :data_content_type
       t.integer :data_file_size
       
-      t.integer :assetable_id, :null => false
-		  t.string  :assetable_type, :limit => 30, :null => false
-      t.string  :type, :limit => 30
-      t.string  :guid, :limit => 10
+      t.integer :assetable_id, null: false
+		  t.string  :assetable_type, limit: 30, null: false
+      t.string  :type, limit: 30
+      t.string  :guid, limit: 10
 
-      t.integer :locale, :limit => 1, :default => 0
+      t.integer :locale, limit: 1, default: 0
       t.integer :user_id
-      t.integer :sort_order, :default => 0
+      t.integer :sort_order, default: 0
 
       t.integer :width
       t.integer :height
 
-      t.boolean :is_main, :default => false, :null => false
+      t.boolean :is_main, default: false, null: false
       t.string  :original_name
 
       t.timestamps

data/db/migrate/20130101000004_create_headers.rb

@@ -1,13 +1,13 @@
 class CreateHeaders < ActiveRecord::Migration
   def self.up
     create_table :headers do |t|
-      t.string    :headerable_type, :limit => 30, :null => false
-      t.integer   :headerable_id, :null => false
+      t.string    :headerable_type, limit: 30, null: false
+      t.integer   :headerable_id, null: false
       
       t.timestamps
     end
     
-    add_index :headers, [:headerable_type, :headerable_id], :unique => true
+    add_index :headers, [:headerable_type, :headerable_id], unique: true
   end
 
   def self.down

data/db/migrate/20130101000005_create_static_pages.rb

@@ -1,9 +1,9 @@
 class CreateStaticPages < ActiveRecord::Migration
   def self.up
     create_table :static_pages do |t|
-      t.integer   :structure_id, :null => false
+      t.integer   :structure_id, null: false
       t.references :user
-      t.boolean :is_visible, :default => true, :null => false
+      t.boolean :is_visible, default: true, null: false
 
       t.timestamps
     end

data/db/migrate/20130101000006_create_structures.rb

@@ -1,22 +1,22 @@
 class CreateStructures < ActiveRecord::Migration
   def self.up
     create_table :structures do |t|
-      t.string :slug, :null => false
-      t.integer :kind, :limit => 1, :default => 1
-      t.integer :position, :limit => 2, :default => 1
+      t.string :slug, null: false
+      t.integer :kind, limit: 1, default: 1
+      t.integer :position, limit: 2, default: 1
       t.references :user
-      t.boolean :is_visible, :default => true, :null => false
+      t.boolean :is_visible, default: true, null: false
 
       t.integer :parent_id
-      t.integer :lft, :default => 0
-      t.integer :rgt, :default => 0
-      t.integer :depth, :default => 0
+      t.integer :lft, default: 0
+      t.integer :rgt, default: 0
+      t.integer :depth, default: 0
 
       t.timestamps
     end
 
     add_index :structures, :user_id
-    add_index :structures, [:slug, :kind], :unique => true
+    add_index :structures, [:slug, :kind], unique: true
     add_index :structures, :parent_id
     add_index :structures, [:lft, :rgt]
   end

data/db/migrate/20130101000007_base_translations.rb

@@ -1,8 +1,8 @@
 class BaseTranslations < ActiveRecord::Migration
   def self.up
-    StaticPage.create_translation_table! :title => :string, :content => :text
-    Header.create_translation_table! :title => :string, :keywords => :string, :description => :text
-    Structure.create_translation_table! :title => :string, :redirect_url => :string
+    StaticPage.create_translation_table! title: :string, content: :text
+    Header.create_translation_table! title: :string, keywords: :string, description: :text
+    Structure.create_translation_table! title: :string, redirect_url: :string
   end
 
   def self.down

data/db/migrate/20130101000008_create_admin_comments.rb

@@ -2,10 +2,10 @@ class CreateAdminComments < ActiveRecord::Migration
   def change
     create_table :admin_comments do |t|
       t.integer :user_id
-      t.integer :author_id, :null => false
+      t.integer :author_id, null: false
       t.string :author_name
-      t.integer :resource_id, :null => false
-      t.string :resource_type, :limit => 30, :null => false
+      t.integer :resource_id, null: false
+      t.string :resource_type, limit: 30, null: false
       t.text :body
 
       t.timestamps

data/features/dsl/action_items.feature

@@ -54,7 +54,7 @@ Feature: Actions items
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        action_item :except => :edit, :if => proc { params[:id].present? } do
+        action_item except: :edit, if: proc { params[:id].present? } do
           link_to 'Secret link', '/'
         end
       end

data/features/dsl/admin_comments.feature

@@ -9,7 +9,7 @@ Feature: Admin comments
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        settings :comments => true
+        settings comments: true
       end
       """
     And I am on the edit admin product page
@@ -21,7 +21,7 @@ Feature: Admin comments
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        settings :comments => true
+        settings comments: true
       end
       """
     And comment "Hello" exists

data/features/dsl/batch_actions.feature

@@ -57,7 +57,7 @@ Feature: Batch actions
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        batch_action :un_publish!, :title => 'Deativate', :confirm => 'Un Publish?'
+        batch_action :un_publish!, title: 'Deativate', confirm: 'Un Publish?'
       end
       """
     And I am on the admin products page

data/features/dsl/config.feature

@@ -40,5 +40,5 @@ Feature: Configuring resource options
   Examples:
     | config            |
     | :index            |
-    | :except => :new   |
-    | :except => [:new] |
+    | except: :new   |
+    | except: [:new] |

data/features/dsl/custom_actions.feature

@@ -10,10 +10,10 @@ Feature: Custom actions
       """
       class AbAdminProduct < AbAdmin::AbstractResource
         action_item do
-          link_to 'Custom action', action_item_admin_path(:custom), :method => :post
+          link_to 'Custom action', action_item_admin_path(:custom), method: :post
         end
 
-        member_action :custom, :method => :post do
+        member_action :custom, method: :post do
           flash[:notice] = 'Custom action done!'
           redirect_to resource_path
         end
@@ -32,7 +32,7 @@ Feature: Custom actions
           link_to 'Custom action', action_item_admin_path(:custom)
         end
 
-        member_action :custom, :method => :post do
+        member_action :custom, method: :post do
           flash[:notice] = 'Custom action done!'
           redirect_to resource_path
         end
@@ -46,10 +46,10 @@ Feature: Custom actions
       """
       class AbAdminProduct < AbAdmin::AbstractResource
         action_item do
-          link_to 'Custom collection action', action_item_admin_path(:custom_collection), :method => :post
+          link_to 'Custom collection action', action_item_admin_path(:custom_collection), method: :post
         end
 
-        collection_action :custom_collection, :method => :post do
+        collection_action :custom_collection, method: :post do
           flash[:notice] = 'Custom collection action done!'
           redirect_to collection_path
         end

data/features/dsl/form.feature

@@ -14,7 +14,7 @@ Feature: Form
             field :price
           end
           field :is_visible
-          field :collection, :as => :association
+          field :collection, as: :association
           locale_tabs do
             field :name
             field :description
@@ -43,7 +43,7 @@ Feature: Form
       """
       = admin_form_for @product do |f|
         = input_set 'My custom fields' do
-          = f.input :sku, :label => 'Identifier'
+          = f.input :sku, label: 'Identifier'
 
         = f.save_buttons
       """
@@ -57,14 +57,14 @@ Feature: Form
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        form :partial => 'admin/products/form_custom'
+        form partial: 'admin/products/form_custom'
       end
       """
     And "app/views/admin/products/_form_custom.html.slim" contains:
       """
       = admin_form_for @product do |f|
         = input_set 'My custom fields' do
-          = f.input :sku, :label => 'Identifier'
+          = f.input :sku, label: 'Identifier'
 
         = f.save_buttons
       """

data/features/dsl/in_place_edit.feature

@@ -8,7 +8,7 @@ Feature: In place edit
       """
       class AbAdminProduct < AbAdmin::AbstractResource
         table do
-          field :sku, :editable => true
+          field :sku, editable: true
           field :name
           field :created_at
         end

data/features/dsl/list_edit.feature

@@ -7,7 +7,7 @@ Feature: Editing records in the list
     And a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
-        settings :list_edit => true
+        settings list_edit: true
       end
       """
     And I am on the admin products page

data/features/dsl/resource_action_items.feature

@@ -32,7 +32,7 @@ Feature: Resource action items
     """
       class AbAdminProduct < AbAdmin::AbstractResource
         resource_action_item do
-          link_to icon('arrow-down'), '/', :title => 'Custom'
+          link_to icon('arrow-down'), '/', title: 'Custom'
         end
       end
       """

data/features/dsl/table.feature

@@ -55,15 +55,15 @@ Feature: Table index view
   Examples:
     | column | config                                                            | ordering   |
     | Sku    | :sku                                                              | sku        |
-    | Name   | :name, :sortable => :id                                           | id         |
-    | Name   | :name, :sortable => {:column => :price, :default_order => 'desc'} | price desc |
+    | Name   | :name, sortable: :id                                           | id         |
+    | Name   | :name, sortable: {column: :price, default_order: 'desc'} | price desc |
 
   Scenario: Disabled sortable column
     Given a configuration of:
       """
       class AbAdminProduct < AbAdmin::AbstractResource
         table do
-          field :created_at, :sortable => false
+          field :created_at, sortable: false
         end
       end
       """

data/features/dsl/tree.feature

@@ -16,7 +16,7 @@ Feature: Sortable tree index view
     Given a configuration of:
       """
       class AbAdminCatalogue < AbAdmin::AbstractResource
-        settings :index_view => 'tree'
+        settings index_view: 'tree'
       end
       """
     And I am on the admin catalogues page
@@ -26,10 +26,10 @@ Feature: Sortable tree index view
     Given a configuration of:
       """
       class AbAdminCatalogue < AbAdmin::AbstractResource
-        settings :index_view => 'tree'
+        settings index_view: 'tree'
 
         tree do |node|
-          link_to "Custom node title", root_path, :class => 'tree-item_link'
+          link_to "Custom node title", root_path, class: 'tree-item_link'
         end
       end
       """

data/features/locators.feature

@@ -16,7 +16,7 @@ Feature: Locale files editor
 
   Scenario: Locale file editing
     Then I follow "en.test.yml"
-    And I fill in "locale_site_title" with "Great app"
+    And I fill in "locale_hash_site_title" with "Great app"
     And press "Save"
     When "config/locales/en.test.yml" should contain:
       """

data/features/menu.feature

@@ -12,12 +12,12 @@ Feature: Admin menu
         model User
         group :system do
           model Structure
-          model Settings, :url => edit_admin_settings_path
+          model Settings, url: edit_admin_settings_path
         end
-        group 'Moderator', :if => proc { moderator? } do
+        group 'Moderator', if: proc { moderator? } do
           link 'for moderator', 'dummy_path'
         end
-        group 'Admin', :if => :admin? do
+        group 'Admin', if: :admin? do
           link :for_admin, 'dummy_path'
         end
       end

data/features/step_definitions/dsl/action_items_steps.rb

@@ -1,13 +1,13 @@
 Then /^I should see an action item to "([^"]*)"$/ do |link|
-  page.should have_css('.resource_actions a', :text => link)
+  page.should have_css('.resource_actions a', text: link)
 end
 
 Then /^I should not see an action item to "([^"]*)"$/ do |link|
-  page.should_not have_css('.resource_actions a', :text => link)
+  page.should_not have_css('.resource_actions a', text: link)
 end
 
 Then /^I should see action items:$/ do |table|
   table.raw.first.each do |link|
-    page.should have_css('.resource_actions a', :text => link)
+    page.should have_css('.resource_actions a', text: link)
   end
 end

data/features/step_definitions/dsl/admin_comments_steps.rb

@@ -6,7 +6,7 @@ Then /^I should see "(.*?)" comment with author$/ do |comment|
 end
 
 Given /^comment "(.*?)" exists$/ do |comment|
-  AdminComment.create(:resource_id => @product.id, :resource_type => 'Product', :body => comment) do |c|
+  AdminComment.create(resource_id: @product.id, resource_type: 'Product', body: comment) do |c|
     c.author = @me
   end
 end

data/features/step_definitions/dsl/batch_actions_steps.rb

@@ -14,7 +14,7 @@ end
 
 When /^I choose batch action "(.*?)"$/ do |action|
   find('.batch_actions .dropdown-toggle').click
-  find('.dropdown-menu a', :text => action).click
+  find('.dropdown-menu a', text: action).click
 end
 
 Then /^I should see (\d+) item in the list$/ do |n|

data/features/step_definitions/dsl/parent_resource_steps.rb

@@ -1,6 +1,6 @@
 Given /^collection "(.*?)" with (\d+) products$/ do |collection, num|
-  @collection = FactoryGirl.create(:collection, :name => collection)
-  num.times { FactoryGirl.create(:product, :collection => @collection) }
+  @collection = FactoryGirl.create(:collection, name: collection)
+  num.times { FactoryGirl.create(:product, collection: @collection) }
 end
 
 Then /^I should see (\d+) products$/ do |num|

data/features/step_definitions/dsl/table_steps.rb

@@ -1,5 +1,5 @@
 Given /^a product with sku "(.*?)"$/ do |sku|
-  @product = FactoryGirl.create(:product, :sku => sku)
+  @product = FactoryGirl.create(:product, sku: sku)
 end
 
 Given /^products? exists with attributes:$/ do |products|
@@ -26,8 +26,8 @@ Then /^I should see pretty formatted products$/ do
   within '#list' do
     page.should have_content(product.sku)
     page.should have_content(product.price)
-    page.should have_content(I18n.l(product.created_at, :format => :long))
-    page.should have_css('span.badge', :text => '+')
+    page.should have_content(I18n.l(product.created_at, format: :long))
+    page.should have_css('span.badge', text: '+')
     page.should have_link(product.collection.name)
     page.should have_css("img[src='#{product.picture.url(:thumb)}']")
   end

data/features/step_definitions/dsl/tree_steps.rb

@@ -1,8 +1,8 @@
 Given /^catalogues tree exists:$/ do |table|
   @tree = table.hashes
   @tree.each do |attrs|
-    parent = Catalogue.where(:name => attrs['parent_name']).first
-    FactoryGirl.create(:catalogue, :name => attrs['title'], :parent => parent)
+    parent = Catalogue.where(name: attrs['parent_name']).first
+    FactoryGirl.create(:catalogue, name: attrs['title'], parent: parent)
   end
 end
 
@@ -11,7 +11,7 @@ Then /^I should see \w+ tree$/ do
     @tree.each do |attrs|
       page.should have_link(attrs['title'])
       if attrs['parent_name'].present?
-        find_link(attrs['title']).first(:xpath, './/../../../../div/a', :text => attrs['parent_name']).should_not be_nil
+        find_link(attrs['title']).first(:xpath, './/../../../../div/a', text: attrs['parent_name']).should_not be_nil
       end
     end
   end

data/features/step_definitions/menu_steps.rb

@@ -3,11 +3,11 @@ Given /^a menu configuration of:$/ do |config|
 end
 
 Then /^I should see menu item for "(.*?)" with path "(.*?)"$/ do |name, path|
-  page.should have_css("header.navbar li a[href='#{path}']", :text => name)
+  page.should have_css("header.navbar li a[href='#{path}']", text: name)
 end
 
 Then /^I should see group "(.*?)" with menu item for "(.*?)"$/ do |group, name|
-  page.should have_css('header.navbar li.dropdown a', :text => group)
-  page.should have_css('header.navbar ul.dropdown-menu a', :text => name)
+  page.should have_css('header.navbar li.dropdown a', text: group)
+  page.should have_css('header.navbar ul.dropdown-menu a', text: name)
 end
 

data/features/step_definitions/structure_steps.rb

@@ -2,6 +2,6 @@ Given /^structures tree exists:$/ do |table|
   @tree = table.hashes
   @tree.each do |attrs|
     parent = Structure.joins(:translations).where("structure_translations.title='#{attrs['parent_name']}'").first
-    FactoryGirl.create(:structure_page, :title => attrs['title'], :parent => parent)
+    FactoryGirl.create(:structure_page, title: attrs['title'], parent: parent)
   end
 end