ab_admin 0.3.6 → 0.4.0

data/lib/ab_admin/menu/item.rb

@@ -0,0 +1,23 @@
+module AbAdmin
+  module Menu
+    class Item
+      include ::AbAdmin::Utils::EvalHelpers
+
+      def initialize(title, path, options)
+        @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
+        @path = path
+        @options = options
+      end
+
+      def render(template)
+        return if @options[:if] && !call_method_or_proc_on(template, @options[:if])
+        return if @options[:unless] && call_method_or_proc_on(template, @options[:unless])
+
+        active = template.request.path.split('/')[2] == @path.split('/')[2]
+        <<-HTML.html_safe
+      <li class="#{'active' if active}">#{template.link_to @title, @path, @options.except(:if, :unless)}</li>
+        HTML
+      end
+    end
+  end
+end

data/lib/ab_admin/models/admin_comment.rb

@@ -0,0 +1,68 @@
+module AbAdmin
+  module Models
+    module AdminComment
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :resource, polymorphic: true
+        belongs_to :resource_user, class_name: 'User'
+        belongs_to :user
+
+        has_many :attachment_files, as: :assetable, dependent: :destroy
+
+        validates_presence_of :resource
+        validates_presence_of :body
+
+        before_save :set_user_name, :set_resource_user
+        after_create :increment_counter_cache
+        before_destroy :decrement_counter_cache
+
+        scope :admin, lambda { includes(:user, :attachment_files) }
+        
+        fileuploads :attachment_files
+      end
+
+      module ClassMethods
+        def resource_type(record)
+          record.class.base_class.name.to_s
+        end
+
+        def find_for_resource(resource)
+          where(resource_type: resource_type(resource), resource_id: resource.id).includes(:attachment_files)
+        end
+
+        def find_resource(resource_type, resource_id)
+          resource_type.constantize.find(resource_id)
+        end
+      end
+
+      def set_user_name
+        self.user_name = user.name.presence || user.email
+        true
+      end
+
+      def set_resource_user
+        self.resource_user = resource.try(:user) if resource.respond_to?(:user)
+        true
+      end
+
+      def for_form
+        {id: id, body: body, user_name: user.try(:name), user_id: user.try(:id), created_at: I18n.l(created_at, format: :long)}
+      end
+
+      def increment_counter_cache
+        resource.increment!(:admin_comments_count) if resource_counter_cache?
+        true
+      end
+
+      def decrement_counter_cache
+        resource.decrement!(:admin_comments_count) if resource_counter_cache?
+        true
+      end
+
+      def resource_counter_cache?
+        resource.class.column_names.include?('admin_comments_count')
+      end
+    end
+  end
+end

data/lib/ab_admin/models/asset.rb

@@ -10,7 +10,7 @@ module AbAdmin
         # Store options for image manipulation
         attr_reader :cropper_geometry, :rotate_degrees
 
-        delegate :url, :original_filename, to: :data
+        delegate :url, to: :data
 
         class_attribute :thumb_size, :max_size
         self.thumb_size = :thumb
@@ -18,7 +18,7 @@ module AbAdmin
 
         before_save :reprocess
 
-        alias_attribute :filename, :original_filename
+        alias_attribute :filename, :data_file_name
         alias_attribute :size, :data_file_size
         alias_attribute :content_type, :data_content_type
       end
@@ -34,10 +34,19 @@ module AbAdmin
         end
 
         def clean!
-          where(:created_at.lt => 1.week.ago).where('assetable_id IS NULL OR assetable_id = 0').destroy_all
+          where('assetable_id IS NULL OR assetable_id = 0 AND created_at < ?', 1.week.ago).destroy_all
         end
       end
 
+      def store_model_filename(record)
+        data.store_model_filename(record) and save!(validate: false)
+      end
+
+      # allow to build custom human file name
+      def build_filename(base_filename, record=nil)
+        nil
+      end
+
       def thumb_url
         data.url(self.thumb_size) if image?
       end
@@ -52,8 +61,8 @@ module AbAdmin
 
       def as_json(options = nil)
         options = {
-            only: [:id, :guid, :assetable_id, :assetable_type, :user_id,
-                      :data_file_size, :data_content_type, :is_main, :original_name],
+            only: [:id, :guid, :assetable_id, :assetable_type, :user_id, :data_file_size, :data_content_type, :is_main,
+                   :original_name, :cached_alt, :cached_title],
             root: 'asset',
             methods: [:filename, :url, :thumb_url, :width, :height]
         }.merge(options || {})
@@ -69,6 +78,17 @@ module AbAdmin
         AbAdmin.image_types.include?(self.data_content_type)
       end
 
+      def base_filename
+        base = File.basename(data_file_name, '.*')
+        base == data_secure_token ? File.basename(original_name, '.*') : base
+      end
+
+      def base_filename=(value)
+        return false if value.blank? || File.basename(data_file_name, '.*') == value
+        self.original_name = value + File.extname(data_file_name)
+        rename!(value)
+      end
+
       def main!
         self.class.update_all('is_main=0', ['assetable_type=? AND assetable_id=? AND type=?', assetable_type, assetable_id, type])
         update_column(:is_main, true)
@@ -92,18 +112,10 @@ module AbAdmin
         self
       end
 
-      def rename!
-        rename
-        save!
-      end
-
-      def rename
-        file = data.file
-        path = data.path
-        ext = File.extname(path)
-        new_path = File.join(File.dirname(path), "#{File.basename(path).chomp(ext)}_#{rand(99)}#{ext}")
-        new_file = ::CarrierWave::SanitizedFile.new file.move_to(new_path)
-        data.cache!(new_file)
+      def rename!(name=nil)
+        normalized_name = name ? data.normalize_filename(name) : rand(9999)
+        return false if normalized_name.blank?
+        data.rename_via_move "#{normalized_name}#{File.extname(data_file_name)}"
       end
 
       def refresh_assetable
@@ -114,8 +126,7 @@ module AbAdmin
       end
 
       def full_url(*args)
-        host = Rails.application.config.action_mailer.default_url_options[:host] || 'www.example.com'
-        "//#{host}#{data.url(*args)}"
+        AbAdmin.full_url data.url(*args)
       end
 
       def cropper_geometry=(value)

data/lib/ab_admin/models/attachment_file.rb

@@ -6,6 +6,7 @@ module AbAdmin
 
       included do
         include ActionView::Helpers::NumberHelper
+        alias_method :is_image, :image?
       end
 
       def file_css_class
@@ -21,7 +22,7 @@ module AbAdmin
       end
 
       def as_json(options={})
-        options.reverse_merge!(methods: [:filename, :url, :file_css_class, :human_filesize, :created_at])
+        options.reverse_merge!(methods: [:filename, :url, :is_image, :file_css_class, :human_filesize, :created_at])
         super
       end
     end

data/lib/ab_admin/models/header.rb

@@ -4,7 +4,10 @@ module AbAdmin
       extend ActiveSupport::Concern
 
       included do
+        include ActionView::Helpers::SanitizeHelper
+
         belongs_to :headerable, polymorphic: true
+        before_save :normalize_html
       end
       
       def empty?
@@ -19,6 +22,18 @@ module AbAdmin
         value = read_attribute(key)
         value.blank? ? nil : value
       end
+
+      def normalize_html
+        ::I18n.available_locales.each do |loc|
+          %w(title h1 keywords description).each do |attr|
+            send("#{attr}_#{loc}=", send("#{attr}_#{loc}").to_s.no_html)
+          end
+        end
+        ::I18n.available_locales.each do |loc|
+          send("seo_block_#{loc}=", sanitize(send("seo_block_#{loc}").to_s))
+        end
+      end
+
     end
   end
 end

data/lib/ab_admin/models/locator.rb

@@ -16,9 +16,7 @@ module AbAdmin
         end
 
         def save(path, data)
-          File.open(path, 'w') do |file|
-            file.write data.ya2yaml.sub(/\A---\s+/, '').gsub(/:\s+$/, ':').gsub(/^(\s+)(yes|no):/, '\1"\2":')
-          end
+          File.write path, data.deep_stringify_keys.to_yaml.sub(/\A---\s+/, '').gsub(/:\s+$/, ':').gsub(/^(\s+)(yes|no):/, '\1"\2":')
         end
 
         def prepare_data(path)

data/lib/ab_admin/models/settings.rb

@@ -6,12 +6,16 @@ module AbAdmin
       included do
         extend ActiveModel::Naming
         extend ActiveRecord::Translation
-        class_attribute :base_class
+        class_attribute :base_class, :editable_paths
         self.base_class = self
+        self.editable_paths = [
+            Rails.root.join('config', 'settings', "#{Rails.env}.local.yml"),
+            Rails.root.join('config', 'settings', 'settings.local.yml')
+        ]
       end
 
       module ClassMethods
-        def load
+        def load_config
           configatron.configure_from_hash instance.all
           configatron
         end
@@ -24,12 +28,8 @@ module AbAdmin
       end
 
       def find_editable_path
-        edited_settings_paths = [
-            Rails.root.join('config', 'settings', "#{Rails.env}.local.yml"),
-            Rails.root.join('config', 'settings', 'settings.local.yml')
-        ]
-        path = edited_settings_paths.detect { |path| File.exists?(path) }
-        path or raise("Create settings file for editing: #{edited_settings_paths.join(' or ')}")
+        path = editable_paths.detect { |path| File.exists?(path) }
+        path or raise("Create settings file for editing: #{editable_paths.join(' or ')}")
       end
 
       def find_paths
@@ -63,11 +63,11 @@ module AbAdmin
             conf[root_key] = case_value(root_value)
           end
         end
-        File.open(@editable_path, 'w') { |file| file.write conf.to_yaml } and self.class.load
+        File.open(@editable_path, 'w') { |file| file.write conf.to_yaml } and self.class.load_config
       end
 
       def case_value(value)
-        if %w(true false 1 0).include?(value) || value.is_number?
+        if %w(true false).include?(value) || value.to_s.is_number?
           YAML::load(value)
         else
           value

data/lib/ab_admin/models/structure.rb

@@ -6,23 +6,34 @@ module AbAdmin
       included do
         include AbAdmin::Concerns::Headerable
         include AbAdmin::Concerns::NestedSet
+        extend EnumField::EnumeratedAttribute
 
-        enumerated_attribute :structure_type, id_attribute: :kind
-        enumerated_attribute :position_type, id_attribute: :position
+        enumerated_attribute :structure_type
+        enumerated_attribute :position_type
 
-        validates_presence_of :title
-        validates_numericality_of :position, only_integer: true
+        validates_numericality_of :position_type_id, only_integer: true
+        validates_numericality_of :structure_type_id, only_integer: true
 
         has_one :static_page, dependent: :destroy
-        has_many :visible_children, class_name: name, foreign_key: 'parent_id', conditions: {is_visible: true}
+        has_many :visible_children, -> { where(is_visible: true) }, class_name: name, foreign_key: 'parent_id'
 
-        scope :visible, where(is_visible: true)
-        scope :with_kind, proc {|structure_type| where(kind: structure_type.id) }
-        scope :with_position, proc {|position_type| where(position: position_type.id).order('lft DESC') }
+        scope :visible, lambda { where(is_visible: true) }
+        scope :with_type, lambda { |structure_type| where(structure_type_id: structure_type.id) }
+        scope :with_depth, lambda { |level| where(depth: level.to_i) }
+        scope :with_position, lambda { |position_type| where(position_type_id: position_type.id).order('lft DESC') }
+
+        scope :with_kind, lambda { |structure_type|
+          ActiveSupport::Deprecation.warn('with_kind is deprecated, use with_type instead')
+          with_type.call(structure_type)
+        }
       end
 
       def redirect?
-        kind == StructureType.redirect.id
+        structure_type_id == StructureType.redirect.id
+      end
+
+      def admin_title
+        [title, structure_type.title, position_type.title, "#{self.class.han(:is_visible)}: #{is_visible ? '+' : '-'}"].join(' | ')
       end
 
     end

data/lib/ab_admin/models/track.rb

@@ -0,0 +1,61 @@
+module AbAdmin
+  module Models
+    module Track
+
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :trackable, polymorphic: true
+        belongs_to :owner, class_name: 'User'
+        belongs_to :user, class_name: 'User'
+
+        serialize :parameters, Hash
+        serialize :trackable_changes, Hash
+
+        before_create :make_trackable, if: :trackable
+
+        class_attribute :tracking_enabled
+        self.tracking_enabled = true
+
+        alias_method :tracking_enabled?, :tracking_enabled
+
+        scope :recently, -> { order('id DESC') }
+      end
+
+      def action_title(params = {})
+        parts = key.split('.')
+        lookups = []
+        if parts.length == 2
+          lookups << [parts[0], 'actions', parts[1], 'title']
+          lookups << [parts[0], 'actions', parts[1]]
+          lookups << ['actions', parts[1], 'title']
+        else
+          lookups << ['actions', key, 'title']
+          lookups << ['actions', key]
+        end
+        lookups.map!{|l| l.join('.').to_sym }
+        lookups << key
+
+        I18n.t(lookups.shift, (parameters.merge(params) || {}).merge(scope: :admin, default: lookups))
+      end
+
+      def trackable_changed_attrs
+        return unless trackable
+        trackable_changes.keys.map { |attr| trackable_han(attr) }.join(', ')
+      end
+
+      def trackable_han(attr)
+        attr_s = attr.to_s
+        trackable.class.han attr_s =~ /_ids$/ ? attr_s.sub(/_ids$/, '').pluralize : attr_s
+      end
+
+      private
+
+      def make_trackable
+        self.name ||= trackable.han
+        self.trackable_changes = trackable.changes.except(:updated_at)
+      end
+
+    end
+  end
+end

data/lib/ab_admin/models/type_model.rb

@@ -13,30 +13,43 @@ module AbAdmin
         @code = code.to_sym
       end
 
-      def self.define_enum_by_codes
-        define_enum do |builder|
-          codes.each do |kind|
-            builder.member kind, object: new(kind.to_s)
+      class << self
+        def define_enum_by_codes
+          define_enum do |builder|
+            codes.each do |kind|
+              builder.member kind, object: new(kind.to_s)
+            end
           end
+          define_question_methods
         end
-      end
 
-      def title
-        I18n.t(@code, scope: i18n_scope)
-      end
+        def define_question_methods
+          codes.each do |code_check|
+            define_method "#{code_check}?" do
+              self.code == code_check
+            end
+          end
+        end
 
-      def self.legal?(value)
-        ActiveSupport::Deprecation.warn('legal? id deprecated, use valid? instead')
-        all.map(&:id).include?(value)
-      end
+        def legal?(value)
+          ActiveSupport::Deprecation.warn('legal? is deprecated, use valid? instead')
+          valid?(value)
+        end
+
+        def valid?(c_id)
+          all.map(&:id).include?(c_id.to_i)
+        end
 
-      def self.valid?(c_id)
-        all.map(&:id).include?(c_id.to_i)
+        def valid_code?(code)
+          return unless code
+          codes.include?(code.to_sym)
+        end
       end
 
-      def self.valid_code?(code)
-        return unless code
-        codes.include?(code.to_sym)
+      def title
+        I18n.t!(@code, scope: i18n_scope)
+      rescue I18n::MissingTranslationData
+        @code.to_s.humanize
       end
 
     end