ab_admin 0.3.6 → 0.4.0

data/lib/generators/ab_admin/ckeditor_assets/ckeditor_assets_generator.rb

@@ -4,7 +4,7 @@ module AbAdmin
     class CkeditorAssetsGenerator < Rails::Generators::Base
       desc 'Copy ckeditor assets to public (prevent it\'s long and buggy precompile)'
 
-      DOWNLOAD_LINK = 'http://dl.dropbox.com/u/48737256/ckeditor_assets.tar'
+      DOWNLOAD_LINK = 'https://dl.dropboxusercontent.com/s/kwzb06hoi9heaoa/ckeditor_assets.tar'
 
       def copy_assets
         archive = 'ckeditor_assets.tar'

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

@@ -25,7 +25,8 @@ module AbAdmin
         template('config/settings.yml', 'config/settings/settings.yml')
         template('config/settings.yml', 'config/settings/settings.local.yml')
         copy_file('config/unicorn_config.rb', 'config/unicorn_config.rb')
-        copy_file 'gitignore', '.gitignore'
+        copy_file('config/robots.txt', 'config/robots.txt')
+        copy_file('gitignore', '.gitignore')
       end
 
       # copy models
@@ -47,7 +48,7 @@ module AbAdmin
 
       def autoload_paths
         log :autoload_paths, 'models/defaults'
-        sentinel = /\.autoload_paths\s+\+=\s+\%W\(\#\{config\.root\}\/extras\)\s*$/
+        sentinel = "class Application < Rails::Application\n"
 
         code = 'config.autoload_paths += %W(#{config.root}/app/models/defaults #{config.root}/app/models/ab_admin)'
 

data/lib/generators/ab_admin/install/templates/config/ab_admin.rb.erb

@@ -1,6 +1,6 @@
 require 'ab_admin/hooks'
 
-Settings.load
+Settings.load_config
 
 I18n.available_locales = Globalize.available_locales = [:ru, :en]
 

data/lib/generators/ab_admin/install/templates/config/admin_menu.rb

@@ -1,4 +1,4 @@
-class AdminMenu < AbAdmin::MenuBuilder
+class AdminMenu < AbAdmin::Menu::Builder
   draw do
     link :dashboard, '/admin'
 

data/lib/generators/ab_admin/install/templates/config/i18n-js.yml

@@ -18,4 +18,4 @@
 #
 translations:
  - file: "app/assets/javascripts/i18n/translations.js"
-   only: ["*.admin_js", "*.front_js"]
+   only: ["*.admin.js"]

data/lib/generators/ab_admin/install/templates/config/nginx.conf

@@ -44,16 +44,29 @@ server {
 
   root <%= app_path %>/public;
 
-  #  if (-f $document_root/maintenance.html) {
-  #    rewrite  ^(.*)$  /maintenance.html last;
-  #    break;
-  #  }
+  # Ban most polar spiders by user agent
+  # if ($http_user_agent ~* "(Googlebot|YandexBot|ia_archiver|msnbot|bingbot|Yahoo|Nutch|Twiceler|DotBot|Ask Jeeves|Speedy Spider|Exabot)" ) {
+  #   return 503;
+  # }
+
+  # For public/maintenance.html
+  if (-f $document_root/maintenance.html) {
+    return 503;
+  }
+
+  error_page 503 @maintenance;
+
+  location @maintenance {
+    add_header Cache-Control no-cache;
+    add_header Retry-After 10;
+    rewrite ^(.*)$ /503.html break;
+  }
 
-  #  if ($host != 'www.<%= app_name %>.com' ) {
-  #     rewrite  ^/(.*)$  http://www.<%= app_name %>.com/$1  permanent;
-  #  }
+  # if ($host != 'www.<%= app_name %>.com' ) {
+  #    rewrite  ^/(.*)$  http://www.<%= app_name %>.com/$1  permanent;
+  # }
 
-  location ~ ^/uploads|ckeditor_assets|images|javascripts|stylesheets|static/ {
+  location ~* ^/(uploads|ckeditor_assets|fonts|images|javascripts|static)/ {
     expires max;
     add_header Cache-Control public;
     access_log off;
@@ -63,7 +76,7 @@ server {
     break;
   }
 
-  location ~ ^/assets/ {
+  location ^~ /assets/ {
     #  Uncomment for non GET requests on /assets path
     #  if ($request_method != GET) {
     #    proxy_pass http://<%= app_name %>_upstream;

data/lib/generators/ab_admin/install/templates/config/robots.txt

@@ -0,0 +1,7 @@
+User-Agent: *
+Disallow: */admin*
+Disallow: /redirect
+
+User-Agent: Yandex
+Disallow: */admin*
+Disallow: /redirect

data/lib/generators/ab_admin/install/templates/config/seeds.rb

@@ -5,7 +5,7 @@ def insert_user
   password = Rails.env.production? ? Devise.friendly_token : (1..8).to_a.join
 
   admin = User.new do |u|
-    u.email = 'test@test.com'
+    u.email = 'admin@example.com'
     u.password = password
     u.password_confirmation = password
     u.user_role_id = UserRoleType.admin.id
@@ -23,5 +23,6 @@ def insert_structures
   main_page = Structure.create!({title: 'Главная страница', slug: 'main-page', structure_type: StructureType.main, parent: nil}, as: :admin)
 end
 
+
 insert_user
 insert_structures

data/lib/generators/ab_admin/install/templates/models/ability.rb

@@ -7,12 +7,7 @@ class Ability
     @user = user
 
     if @user
-      case @user.user_role_type.id
-        when ::UserRoleType.default.id then default
-        when ::UserRoleType.redactor.id then redactor
-        when ::UserRoleType.moderator.id then moderator
-        when ::UserRoleType.admin.id then admin
-      end
+      send(@user.user_role_type.code)
     else
       guest
     end
@@ -33,7 +28,7 @@ class Ability
     default
     can :manage, Dashboard
     can [:read, :create], AdminComment
-    can :destroy, AdminComment, author_id: @user.id
+    can :destroy, AdminComment, user_id: @user.id
     cannot :destroy, User, id: @user.id
   end
 

data/lib/generators/ab_admin/install/templates/models/admin_comment.rb

@@ -1,30 +1,5 @@
 class AdminComment < ActiveRecord::Base
-  attr_accessible :body, :resource_id, :resource_type
-
-  belongs_to :resource, polymorphic: true
-  belongs_to :author, class_name: 'User'
-  belongs_to :user
-
-  validates_presence_of :resource
-  validates_presence_of :body
-
-  def set_author(user)
-    return unless user
-    self.author_id = user.id
-    self.author_name = user.name.presence || user.email
-  end
-
-  def self.resource_type(record)
-    record.class.base_class.name.to_s
-  end
-
-  def self.find_for_resource(resource)
-    where(resource_type: resource_type(resource), resource_id: resource.id)
-  end
-
-  def for_form
-    {body: body, id: id, author_name: user.try(:name), author_id: user.try(:id), created_at: I18n.l(created_at, format: :long)}
-  end
-
-end
+  include AbAdmin::Models::AdminComment
 
+  attr_accessible :body, :resource_id, :resource_type
+end

data/lib/generators/ab_admin/install/templates/models/asset.rb

@@ -1,10 +1,12 @@
 class Asset < ActiveRecord::Base
   include AbAdmin::Models::Asset
 
-  attr_accessible :data, :is_main, :original_name
+  attr_accessible :data, :is_main, :original_name, :base_filename
+  translates :name, :alt
+  attr_accessible *all_translated_attribute_names
 
   validates_presence_of :data
 	
-	default_scope order("#{quoted_table_name}.sort_order")
+	default_scope -> { order("#{quoted_table_name}.sort_order") }
 
 end

data/lib/generators/ab_admin/install/templates/models/attachment_file.rb

@@ -1,7 +1,7 @@
 class AttachmentFile < Asset
   include AbAdmin::Models::AttachmentFile
 
-  sunrise_uploader AttachmentFileUploader
+  ab_admin_uploader AttachmentFileUploader
   validates_filesize_of :data, maximum: 150.megabytes
 
   self.max_size = 150

data/lib/generators/ab_admin/install/templates/models/avatar.rb

@@ -1,8 +1,8 @@
 class Avatar < Asset
-  sunrise_uploader AvatarUploader  
+  ab_admin_uploader AvatarUploader
   
 	validates :data_content_type, inclusion: {in: AbAdmin.image_types }
 	validates_integrity_of :data
-	validates_filesize_of :data, maximum: 1.megabyte
+  validates_filesize_of :data, maximum: 1.megabyte
 
 end

data/lib/generators/ab_admin/install/templates/models/gender_type.rb

@@ -1,5 +1,5 @@
 class GenderType < AbAdmin::Models::TypeModel
-  self.codes = [:male, :female]
+  self.codes = [:male, :female, :undefined]
   self.i18n_scope = [:admin, :gender]
 
   define_enum_by_codes

data/lib/generators/ab_admin/install/templates/models/header.rb

@@ -1,8 +1,8 @@
 class Header < ActiveRecord::Base
 
-  attr_accessible :title, :keywords, :description
+  attr_accessible :title, :keywords, :description, :h1, :seo_block
 
-  translates :title, :keywords, :description
+  translates :title, :keywords, :description, :h1, :seo_block, fallbacks_for_empty_translations: false
   attr_accessible *all_translated_attribute_names
 
   include AbAdmin::Models::Header

data/lib/generators/ab_admin/install/templates/models/locator.rb

@@ -1,4 +1,3 @@
-require 'ya2yaml'
 require 'ostruct'
 
 class Locator

data/lib/generators/ab_admin/install/templates/models/picture.rb

@@ -1,5 +1,5 @@
 class Picture < Asset
-  sunrise_uploader PictureUploader
+  ab_admin_uploader PictureUploader
 
 	validates :data_content_type, inclusion: {in: AbAdmin.image_types }
 	validates_integrity_of :data

data/lib/generators/ab_admin/install/templates/models/settings.rb

@@ -5,7 +5,7 @@ class Settings
   include AbAdmin::Models::Settings
   include ::AbAdmin::Concerns::Reloadable
 
-  has_reload_check('settings_reload_key', Rails.logger) { Settings.load }
+  has_reload_check('settings_reload_key', Rails.logger) { Settings.load_config }
 
   attr_accessor :paths, :data
 

data/lib/generators/ab_admin/install/templates/models/structure.rb

@@ -1,24 +1,22 @@
 class Structure < ActiveRecord::Base
   include AbAdmin::Models::Structure
 
-  attr_accessible :kind, :position, :parent_id, :title, :redirect_url, :is_visible,
+  attr_accessible :structure_type_id, :position_type_id, :parent_id, :title, :redirect_url, :is_visible,
                   :structure_type, :position_type, :slug, :parent
 
-  has_one :picture, as: :assetable, dependent: :destroy, conditions: {is_main: true}
-  has_many :pictures, as: :assetable, dependent: :destroy, conditions: {is_main: false}
+  has_one :picture, -> { where(is_main: true) }, as: :assetable, dependent: :destroy
+  has_many :pictures, -> { where(is_main: false) }, as: :assetable, dependent: :destroy
 
   fileuploads :picture
   translates :title, :redirect_url
   attr_accessible *all_translated_attribute_names
 
   include AbAdmin::Concerns::AdminAddition
-  extend FriendlyId
-  friendly_id :title, use: :slugged
+  simple_slug :title
 
-  default_scope nested_set.includes(:translations)
+  default_scope -> { nested_set.includes(:translations) }
 
-  def should_generate_new_friendly_id?
+  def should_generate_new_slug?
     slug.blank? && new_record?
   end
-
 end

data/lib/generators/ab_admin/install/templates/models/track.rb

@@ -0,0 +1,5 @@
+class Track < ActiveRecord::Base
+  include AbAdmin::Models::Track
+
+  attr_accessible :key, :name, :user, :owner, :trackable, :trackable_changes, :parameters
+end

data/lib/generators/ab_admin/install/templates/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :confirmable, :lockable, #:timeoutable,
+  devise :database_authenticatable, :confirmable, :lockable,
          :recoverable, :rememberable, :trackable, :validatable, :registerable,
          :encryptable, encryptor: :sha512
 
@@ -8,7 +8,7 @@ class User < ActiveRecord::Base
                   :time_zone, :locale, :bg_color, :gender
 
 
-  attr_accessible :user_role_id, :trust_state, as: :admin
+  attr_accessible :user_role_id, as: :admin
 
   include AbAdmin::Concerns::AdminAddition
   include AbAdmin::Models::User
@@ -17,7 +17,6 @@ class User < ActiveRecord::Base
 
   def init
     set_default_role
-    self.trust_state ||= ::UserState.pending.id
     self.locale ||= 'ru'
     self.time_zone ||= 'Kiev'
   end

data/lib/generators/ab_admin/install/templates/script/unicorn.sh

@@ -22,7 +22,6 @@ set -e
 
 # Feel free to change any of the following variables for your app:
 rvm_trust_rvmrcs_flag=1
-PATH=/usr/local/rvm/bin:$PATH
 APP_ROOT=<%= app_path %>
 PID=$APP_ROOT/tmp/pids/unicorn.pid
 ENV=production
@@ -31,7 +30,6 @@ CMD="$APP_ROOT/bin/unicorn -D -E $ENV -c $APP_ROOT/config/unicorn_config.rb"
 old_pid="$PID.oldbin"
 
 cd $APP_ROOT || exit 1
-#rvm wrapper ruby-1.9.3-p0@<%= app_name %> unicorn
 git show-ref >> tmp/refs
 
 sig () {

data/lib/generators/ab_admin/install/templates/spec/factories/user_factory.rb

@@ -6,7 +6,6 @@ FactoryGirl.define do
 
     factory :default_user do
       confirmed_at 1.hour.ago
-      trust_state UserState.active.id
       first_name Forgery::Name.first_name
       last_name Forgery::Name.last_name
 
@@ -23,7 +22,7 @@ FactoryGirl.define do
       end
 
       factory :inactive_user do
-        trust_state UserState.suspended.id
+        locked_at Time.current
       end
     end
   end

data/lib/generators/ab_admin/install/templates/uploaders/attachment_file_uploader.rb

@@ -1,5 +1,5 @@
 class AttachmentFileUploader < AbAdmin::CarrierWave::BaseUploader
   def extension_white_list
-    %w(pdf doc docx xls xlsx ppt pptx zip rar csv pln pla dwg dwf 3ds dgn sat psd mat max ai prg fbx dae)
+    %w(pdf doc docx xls xlsx ppt pptx jpg jpeg gif png zip rar csv)
   end
 end

data/lib/generators/ab_admin/install/templates/uploaders/avatar_uploader.rb

@@ -1,6 +1,6 @@
 class AvatarUploader < AbAdmin::CarrierWave::BaseUploader
   
-  process quality: 90
+  process quality: 80
   
   version :thumb do
     process resize_to_fill: [80, 80, 'North']

data/lib/generators/ab_admin/install/templates/uploaders/picture_uploader.rb

@@ -1,6 +1,6 @@
 class PictureUploader < AbAdmin::CarrierWave::BaseUploader
   
-  process quality: 90
+  process quality: 80
   process cropper: :cropper_geometry
 
   version :thumb do

data/lib/generators/ab_admin/model/templates/resource.erb

@@ -1,7 +1,7 @@
 class AbAdmin<%= model.name %> < AbAdmin::AbstractResource
 
 <% if model.respond_to?(:acts_as_nested_set_options) -%>
-  settings index_view: 'tree', search: false, batch: false, well: false
+  settings index_view: 'tree'
 <% else -%>
   table do
 <% index_attrs.without('id', 'updated_at').each do |attr| -%>

data/lib/generators/ab_admin/resource/templates/_form.slim.erb

@@ -1,52 +1,56 @@
 <%
-   def input_by_col(key, col)
-     case col.type
-       when :integer
-         if key.to_s =~ /_id$/
-           if model.reflect_on_association(key.sub(/_id$/, '').to_sym)
-             "= f.association :#{key.sub(/_id$/, '')}"
-           else
-             if key.to_s =~ /_type/
-               "= f.input :#{key}, collection: #{key.sub(/_type.*/, '').camelize}Type.all, include_blank: false"
-             else
-               "= f.input :#{key}"
-             end
-           end
-         else
-           "= f.input :#{key}"
-         end
-       when :string
-         "= f.input :#{key}"
-       when :boolean
-         "= f.input :#{key}"
-       when :text
-         %Q[= f.input :#{key}, as: :editor]
-       else
-         "= f.input :#{key}"
-     end
-   end
+  def input_by_col(key, col)
+    case col.type
+      when :integer
+        if key.to_s =~ /_id$/
+          if model.reflect_on_association(key.sub(/_id$/, '').to_sym)
+            "= f.association :#{key.sub(/_id$/, '')}"
+          else
+            if key.to_s =~ /_type/
+              "= f.input :#{key}, collection: #{key.sub(/_type.*/, '').camelize}Type.all, include_blank: false"
+            else
+              "= f.input :#{key}"
+            end
+          end
+        else
+          "= f.input :#{key}"
+        end
+      when :string
+        "= f.input :#{key}"
+      when :boolean
+        "= f.input :#{key}"
+      when :text
+        %Q[= f.input :#{key}, as: :editor]
+      else
+        "= f.input :#{key}"
+    end
+  end
 
-   def input_by_col_loc(key, col)
-     col = :string if [:name, :web_site, :title].include?(key)
-     case col
-       when :integer
-         %Q[= f.input :#{key}, locale: l]
-       when :string
-         %Q[= f.input :#{key}, locale: l]
-       when :boolean
-         %Q[= f.input :#{key}, locale: l]
-       when :text
-         %Q[= f.input :#{key}, locale: l, as: :editor]
-       else
-         %Q[= f.input :#{key}, locale: l]
-     end
-   end
+  def input_by_col_loc(key, col)
+    col = :string if [:name, :web_site, :title].include?(key)
+    case col
+      when :integer
+        %Q[= f.input :#{key}, locale: l]
+      when :string
+        %Q[= f.input :#{key}, locale: l]
+      when :boolean
+        %Q[= f.input :#{key}, locale: l]
+      when :text
+        %Q[= f.input :#{key}, locale: l, as: :editor]
+      else
+        %Q[= f.input :#{key}, locale: l]
+    end
+  end
+
+  def column_for_attribute(name)
+    model.translation_class.columns_hash[name.to_s]
+  end
 -%>
 = admin_form_for @<%= singular_name %> do |f|
 <% if model.respond_to?(:translates?) && model.translates? -%>
   = f.locale_tabs do |l|
-<% model.translated_columns_hash.each do |key, col| -%>
-    <%= input_by_col_loc(key, col) %>
+<% model.translated_attribute_names.each do |name| -%>
+    <%= input_by_col_loc(name, column_for_attribute(name)) %>
 <% end -%>
 <% end -%>
 
@@ -65,8 +69,8 @@
 
 <% asset_assocs = model.reflect_on_all_associations.find_all { |a| a.options[:as] == :assetable } -%>
 <% asset_assocs.each do |a| -%>
-  = input_set t('admin.<%= a.name %>') do
-    = f.attach_file_field :<%= a.name %>, file_max_size: 2
+  = input_set ha(:<%= a.name %>) do
+    = f.input :<%= a.name %>, as: :uploader
 <% end -%>
 <% unless asset_assocs.empty? %>
   = f.hidden_field :fileupload_guid if f.object.new_record?