ab_admin 0.3.6 → 0.4.0

data/config/routes.rb

@@ -17,6 +17,8 @@ Rails.application.routes.draw do
     resources :assets, only: [:create, :destroy] do
       post :rotate, :main, :crop, on: :member
       post :sort, on: :collection
+      get :batch_edit, on: :collection
+      post :batch_update, on: :collection
     end
 
     resource :settings, only: [:edit, :update] do
@@ -36,13 +38,14 @@ Rails.application.routes.draw 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'
+        match '/custom_action', to: :custom_action, as: 'collection_action', via: :all
 
         scope ':id' do
           get '/edit', to: :edit, as: 'edit'
-          match '/custom_action', to: :custom_action, as: 'member_action'
+          get '/history', to: :history, as: 'history'
+          match '/custom_action', to: :custom_action, as: 'member_action', via: :all
           get '/', to: :show, as: 'show'
-          put '/', to: :update, as: 'update'
+          patch '/', to: :update, as: 'update'
           delete '/', to: :destroy, as: 'destroy'
         end
 

data/db/migrate/20130101000001_create_users.rb

@@ -1,9 +1,8 @@
 class CreateUsers < ActiveRecord::Migration
-  def self.up
+  def change
     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.string :first_name
       t.string :last_name
@@ -50,18 +49,15 @@ class CreateUsers < ActiveRecord::Migration
       t.string   :unlock_token # Only if unlock strategy is :email or :both
       t.datetime :locked_at
 
-      # Token authenticatable
-      # t.string :authentication_token
+      ## Token authenticatable
+      ## t.string :authentication_token
 
       t.timestamps
     end
 
-    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
-    drop_table :users
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    add_index :users, :confirmation_token, :unique => true
+    add_index :users, :unlock_token, :unique => true
   end
 end

data/db/migrate/20130101000003_create_assets.rb

@@ -1,5 +1,5 @@
 class CreateAssets < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :assets do |t|
       t.string  :data_file_name, null: false
       t.string  :data_content_type
@@ -19,16 +19,16 @@ class CreateAssets < ActiveRecord::Migration
 
       t.boolean :is_main, default: false, null: false
       t.string  :original_name
+      t.string  :data_secure_token, limit: 20
+      t.string  :cached_alt
+      t.string  :cached_title
 
       t.timestamps
     end
     
     add_index :assets, [:assetable_type, :type, :assetable_id]
     add_index :assets, :guid
+    add_index :assets, :data_secure_token
     add_index :assets, :user_id
   end
-
-  def self.down
-    drop_table :assets
-  end
 end

data/db/migrate/20130101000004_create_headers.rb

@@ -1,7 +1,7 @@
 class CreateHeaders < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :headers do |t|
-      t.string    :headerable_type, limit: 30, null: false
+      t.string    :headerable_type, limit: 50, null: false
       t.integer   :headerable_id, null: false
       
       t.timestamps
@@ -9,8 +9,4 @@ class CreateHeaders < ActiveRecord::Migration
     
     add_index :headers, [:headerable_type, :headerable_id], unique: true
   end
-
-  def self.down
-    drop_table :headers
-  end
 end

data/db/migrate/20130101000005_create_static_pages.rb

@@ -1,5 +1,5 @@
 class CreateStaticPages < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :static_pages do |t|
       t.integer   :structure_id, null: false
       t.references :user
@@ -11,8 +11,4 @@ class CreateStaticPages < ActiveRecord::Migration
     add_index :static_pages, :user_id
     add_index :static_pages, :structure_id
   end
-
-  def self.down
-    drop_table :static_pages
-  end
 end

data/db/migrate/20130101000006_create_structures.rb

@@ -1,9 +1,9 @@
 class CreateStructures < ActiveRecord::Migration
-  def self.up
+  def change
     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.integer :structure_type_id, limit: 1, default: 1
+      t.integer :position_type_id, limit: 1, default: 1
       t.references :user
       t.boolean :is_visible, default: true, null: false
 
@@ -15,13 +15,9 @@ class CreateStructures < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :structures, :user_id
-    add_index :structures, [:slug, :kind], unique: true
+    add_index :structures, [:slug, :structure_type_id], unique: true
+    add_index :structures, :position_type_id
     add_index :structures, :parent_id
     add_index :structures, [:lft, :rgt]
   end
-
-  def self.down
-    drop_table :structures
-  end
 end

data/db/migrate/20130101000007_base_translations.rb

@@ -1,13 +1,15 @@
 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
+    Header.create_translation_table! title: :string, h1: :string, keywords: :string, description: :text, seo_block: :text
     Structure.create_translation_table! title: :string, redirect_url: :string
+    Asset.create_translation_table! name: :string, alt: :string
   end
 
   def self.down
     StaticPage.drop_translation_table!
     Header.drop_translation_table!
     Structure.drop_translation_table!
+    Asset.drop_translation_table!
   end
 end

data/db/migrate/20130101000008_create_admin_comments.rb

@@ -1,18 +1,18 @@
 class CreateAdminComments < ActiveRecord::Migration
   def change
     create_table :admin_comments do |t|
-      t.integer :user_id
-      t.integer :author_id, null: false
-      t.string :author_name
+      t.references :user
+      t.string :user_name
       t.integer :resource_id, null: false
-      t.string :resource_type, limit: 30, null: false
+      t.string :resource_type, limit: 50, null: false
+      t.references :resource_user
       t.text :body
 
       t.timestamps
     end
 
     add_index :admin_comments, :user_id
-    add_index :admin_comments, :author_id
+    add_index :admin_comments, :resource_user_id
     add_index :admin_comments, [:resource_type, :resource_id]
   end
 end

data/db/migrate/20130101000009_create_tracks.rb

@@ -0,0 +1,20 @@
+class CreateTracks < ActiveRecord::Migration
+  def change
+    create_table :tracks do |t|
+      t.string :name
+      t.string :key
+      t.belongs_to :trackable, polymorphic: true
+      t.belongs_to :user
+      t.belongs_to :owner
+      t.column :trackable_changes, :mediumtext
+      t.text :parameters
+
+      t.timestamps
+    end
+
+    add_index :tracks, [:trackable_type, :trackable_id]
+    add_index :tracks, :owner_id
+    add_index :tracks, :user_id
+    add_index :tracks, :key
+  end
+end

data/lib/ab_admin.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'inherited_resources'
 require 'rack-pjax'
 require 'has_scope'
@@ -11,7 +10,6 @@ require 'ab_admin/engine'
 module AbAdmin
   autoload :Utils, 'ab_admin/utils'
   autoload :Devise, 'ab_admin/devise'
-  autoload :MenuBuilder, 'ab_admin/menu_builder'
   autoload :AbstractResource, 'ab_admin/abstract_resource'
 
   module Config
@@ -28,6 +26,14 @@ module AbAdmin
     autoload :OptionalDisplay, 'ab_admin/config/optional_display'
   end
 
+  module Menu
+    autoload :Builder, 'ab_admin/menu/builder'
+    autoload :AbstractBuilder, 'ab_admin/menu/abstract_builder'
+    autoload :Group, 'ab_admin/menu/group'
+    autoload :BaseGroup, 'ab_admin/menu/base_group'
+    autoload :Item, 'ab_admin/menu/item'
+  end
+
   module Utils
     autoload :XlsDocument, 'ab_admin/utils/xls_document'
     autoload :CsvDocument, 'ab_admin/utils/csv_document'
@@ -51,6 +57,9 @@ module AbAdmin
     autoload :NestedSet, 'ab_admin/concerns/nested_set'
     autoload :Validations, 'ab_admin/concerns/validations'
     autoload :Reloadable, 'ab_admin/concerns/reloadable'
+    autoload :HasTracking, 'ab_admin/concerns/has_tracking'
+    autoload :AssetHumanNames, 'ab_admin/concerns/asset_human_names'
+    autoload :Fileuploads, 'ab_admin/concerns/fileuploads'
   end
 
   module Controllers
@@ -58,6 +67,7 @@ module AbAdmin
     autoload :HeadOptions, 'ab_admin/controllers/head_options'
     autoload :Tree, 'ab_admin/controllers/tree'
     autoload :CanCanManagerResource, 'ab_admin/controllers/can_can_manager_resource'
+    autoload :Fv, 'ab_admin/controllers/fv'
   end
 
   module Mailers
@@ -74,6 +84,8 @@ module AbAdmin
     autoload :Locator, 'ab_admin/models/locator'
     autoload :Settings, 'ab_admin/models/settings'
     autoload :User, 'ab_admin/models/user'
+    autoload :Track, 'ab_admin/models/track'
+    autoload :AdminComment, 'ab_admin/models/admin_comment'
   end
 
   module Views
@@ -84,13 +96,16 @@ module AbAdmin
     autoload :FormBuilder, 'ab_admin/views/form_builder'
     autoload :SearchFormBuilder, 'ab_admin/views/search_form_builder'
     autoload :UrlForRoutes, 'ab_admin/views/url_for_routes'
+    autoload :ContentOnlyWrapper, 'ab_admin/views/content_only_wrapper'
 
     module Inputs
       autoload :CkeditorInput, 'ab_admin/views/inputs/ckeditor_input'
       autoload :ColorInput, 'ab_admin/views/inputs/color_input'
       autoload :EditorInput, 'ab_admin/views/inputs/editor_input'
-      autoload :DateTimeInput, 'ab_admin/views/inputs/date_time_input'
+      autoload :DateTimePickerInput, 'ab_admin/views/inputs/date_time_picker_input'
       autoload :TokenInput, 'ab_admin/views/inputs/token_input'
+      autoload :CaptureBlockInput, 'ab_admin/views/inputs/capture_block_input'
+      autoload :UploaderInput, 'ab_admin/views/inputs/uploader_input'
     end
   end
 
@@ -125,7 +140,7 @@ module AbAdmin
   @@image_types = %w(image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png)
 
   mattr_accessor :display_name_methods
-  @@display_name_methods = [:title, :name, :full_name]
+  @@display_name_methods = [:title, :name, :full_name, :id]
 
   mattr_accessor :translate_models
   @@translate_models = %w(User Asset Structure StaticPage Header AdminComment)
@@ -133,6 +148,23 @@ module AbAdmin
   mattr_accessor :assets
   @@assets = %w(ab_admin/devise.css bootstrap.js)
 
+  mattr_accessor :test_settings
+  @@test_settings = {}
+
+  mattr_accessor :footer_notes
+
+  mattr_accessor :default_url_options
+
+  mattr_accessor :locale
+
+  mattr_accessor :fileupload_url
+  @@fileupload_url = '/admin/assets'
+
+  mattr_accessor :uploads_dir
+  @@uploads_dir = 'uploads'
+
+  mattr_accessor :base_url
+
   extend Utils
 
   def self.setup

data/lib/ab_admin/abstract_resource.rb

@@ -4,14 +4,17 @@ module AbAdmin
 
     include Singleton
 
-    ACTIONS = [:index, :show, :new, :edit, :create, :update, :destroy, :preview, :batch, :rebuild, :custom_action] unless self.const_defined?(:ACTIONS)
+    unless self.const_defined?(:ACTIONS)
+      ACTIONS = [:index, :show, :new, :edit, :create, :update, :destroy, :preview, :batch, :rebuild, :custom_action, :history]
+    end
 
-    attr_accessor :table, :search, :export, :form, :show, :preview_path, :actions, :settings, :custom_settings,
+    attr_accessor :model, :table, :search, :export, :form, :modal_form, :show, :preview_path, :actions, :custom_settings,
                   :batch_action_list, :action_items, :disabled_action_items, :resource_action_items, :tree_node_renderer,
                   :parent_resources, :custom_actions
 
     def initialize
       @actions = ACTIONS
+      @custom_settings = {}
       @batch_action_list = [AbAdmin::Config::BatchAction.new(:destroy, confirm: I18n.t('admin.delete_confirmation'))]
       @action_items = []
       @disabled_action_items = []
@@ -25,7 +28,7 @@ module AbAdmin
 
     def add_admin_addition_to_model
       return unless @model
-      @model.send(:include, AbAdmin::Concerns::AdminAddition) unless @model.included_modules.include?(AbAdmin::Concerns::AdminAddition)
+      @model.send(:include, AbAdmin::Concerns::AdminAddition) unless has_module?(AbAdmin::Concerns::AdminAddition)
     end
 
     class << self
@@ -45,6 +48,10 @@ module AbAdmin
         instance.form = ::AbAdmin::Config::Form.new(options, &block)
       end
 
+      def modal_form(options={}, &block)
+        instance.modal_form = ::AbAdmin::Config::ModalForm.new(options, &block)
+      end
+
       def show(options={}, &block)
         instance.show = ::AbAdmin::Config::Show.new(options, &block)
       end
@@ -66,13 +73,20 @@ module AbAdmin
 
       def settings(value)
         instance.custom_settings = value
+        if instance.custom_settings[:history]
+          instance.custom_settings[:history] = {} unless instance.custom_settings[:history].is_a?(Hash)
+          instance.model.send(:include, AbAdmin::Concerns::HasTracking) unless instance.has_module?(AbAdmin::Concerns::HasTracking)
+        end
+        if instance.custom_settings[:comments]
+          instance.custom_settings[:comments] = {} unless instance.custom_settings[:comments].is_a?(Hash)
+        end
       end
 
       def batch_action(name, options={}, &block)
-        if !options
-          instance.batch_action_list.reject!{|a| a.name == name }
+        if options
+          instance.batch_action_list << AbAdmin::Config::BatchAction.new(name.to_sym, options, &block)
         else
-          instance.batch_action_list << AbAdmin::Config::BatchAction.new(name, options, &block)
+          instance.batch_action_list.reject!{|a| a.name == name.to_sym }
         end
       end
 
@@ -129,7 +143,10 @@ module AbAdmin
     def default_action_items_for(action, for_resource)
       @default_action_items_for[action] ||= begin
         base = [:new]
-        base += [:edit, :show, :destroy, :preview] if for_resource
+        if for_resource
+          base += [:edit, :show, :destroy, :preview]
+          base << :history if custom_settings[:history] && !custom_settings[:history][:sidebar]
+        end
         disabled = action == :new ? [] : [action]
         (base - disabled - @disabled_action_items) & @actions
       end
@@ -145,6 +162,10 @@ module AbAdmin
       custom_action
     end
 
+    def has_module?(module_constant)
+      model.included_modules.include?(module_constant)
+    end
+
   end
 
 end

data/lib/ab_admin/carrierwave/base_uploader.rb

@@ -11,6 +11,13 @@ module AbAdmin
       include ::CarrierWave::MimeTypes
       include AbAdmin::Utils::EvalHelpers
 
+      class_attribute :transliterate
+      self.transliterate = true
+
+      attr_accessor :internal_identifier
+
+      before :cache, :save_original_name
+
       storage :file
 
       process :set_content_type
@@ -23,9 +30,81 @@ module AbAdmin
 
       process :set_model_info
 
-      # default store assets path
+      def save_original_name(file)
+        model.original_name ||= file.original_filename if file.respond_to?(:original_filename)
+      end
+
+      def full_filename(for_file=filename)
+        ext = File.extname(for_file)
+        human_filename_part = for_file.chomp(ext)
+        tech_filename_part = "#{version_name || secure_token}#{ext}"
+        human_filename_part == secure_token ? tech_filename_part : "#{human_filename_part}_#{tech_filename_part}"
+      end
+
+      def full_original_filename
+        "#{version_name || secure_token}#{File.extname(store_filename)}"
+      end
+
+      # use secure token in the filename for non processed image
+      def secure_token
+        model.data_secure_token ||= AbAdmin.friendly_token(20).downcase
+      end
+
+      def store_model_filename(record)
+        old_file_name = filename
+        new_file_name = model_filename(old_file_name, record)
+        return if new_file_name.blank? || new_file_name == old_file_name
+        rename_via_move(new_file_name)
+      end
+
+      alias_method :store_filename, :filename
+
+      def filename
+        internal_identifier || model.send("#{mounted_as}_file_name") || (store_filename && "#{secure_token}#{File.extname(store_filename)}")
+      end
+
+      def write_internal_identifier(internal_identifier)
+        self.internal_identifier = internal_identifier
+        versions.values.each{|v| v.internal_identifier = internal_identifier }
+      end
+
+      # transliterate original filename
+      # allow to build custom filename
+      def model_filename(base_filename, record)
+        custom_file_name = model.build_filename(base_filename, record)
+        return unless custom_file_name
+        normalize_filename(custom_file_name) + File.extname(base_filename)
+      end
+
+      def normalize_filename(raw_filename)
+        I18n.transliterate(raw_filename).parameterize('_').gsub(/[\-_]+/, '_').downcase
+      end
+
+      # rename files via move
+      def rename_via_move(new_file_name)
+        dir = File.dirname(path)
+
+        moves = []
+        versions.values.unshift(self).each do |v|
+          from_path = File.join(dir, v.full_filename)
+          to_path = File.join(dir, v.full_filename(new_file_name))
+          return false if from_path == to_path || !File.exists?(from_path)
+          moves << [from_path, to_path]
+        end
+        moves.each { |move| FileUtils.mv(*move) }
+
+        write_internal_identifier new_file_name
+        model.send("write_#{mounted_as}_identifier")
+        retrieve_from_store!(new_file_name)
+        new_file_name
+      end
+
+      private :write_internal_identifier, :store_filename, :model_filename
+
+      # prevent large number of subdirectories
       def store_dir
-        "uploads/#{model.class.to_s.underscore}/#{model.id}"
+        str_id = model.id.to_s.rjust(4, '0')
+        [AbAdmin.uploads_dir, model.class.to_s.underscore, str_id[0..2], str_id[3..-1]].join('/')
       end
 
       # Strips out all embedded information from the image
@@ -86,10 +165,11 @@ module AbAdmin
         end
       end
 
-      def watermark(path_to_file, gravity='SouthEast')
+      def watermark(watermark_path, gravity='SouthEast')
         manipulate! do |img|
-          logo = ::MiniMagick::Image.open(path_to_file)
-          img.composite(logo) { |c| c.gravity gravity }
+          resolved_path = watermark_path.is_a?(Symbol) ? send(watermark_path) : watermark_path
+          watermark_image = ::MiniMagick::Image.open(resolved_path)
+          img.composite(watermark_image) { |c| c.gravity gravity }
         end
       end