ab_admin 0.3.6 → 0.4.0

data/lib/ab_admin/controllers/can_can_manager_resource.rb

@@ -1,8 +1,9 @@
 class AbAdmin::Controllers::CanCanManagerResource < CanCan::InheritedResource
-  delegate :resource_class, to: :@controller
-
   def instance_name
     @controller.send(:resource_instance_name)
   end
 
+  def resource_class
+    @controller.send(:resource_class)
+  end
 end

data/lib/ab_admin/controllers/fv.rb

@@ -0,0 +1,16 @@
+module AbAdmin
+  module Controllers
+    module Fv
+      extend ActiveSupport::Concern
+
+      included do
+        attr_writer :fv
+        helper_method :fv
+      end
+
+      def fv
+        @fv ||= OpenStruct.new
+      end
+    end
+  end
+end

data/lib/ab_admin/controllers/head_options.rb

@@ -6,7 +6,7 @@ module AbAdmin
       def head_options(record, options = {})
         return if record.nil?
         
-        options = { splitter: AbAdmin.title_splitter, append_title: true }.merge(options)
+        options = { splitter: AbAdmin.title_splitter, append_title: true, desc_prefix: true }.merge(options)
 
         header = options[:header] || (record.respond_to?(:header) ? record.header : nil)
 
@@ -22,12 +22,14 @@ module AbAdmin
           page_title = []
 	        page_title << options[:title] if options.key?(:title)
           page_title << view_title
-          page_title << I18n.t('page.title') if options[:append_title]
+          page_title << I18n.t('seo.title') if options[:append_title]
 
           page_title.flatten.compact.uniq.join(options[:splitter])
         end
-        @page_title = [I18n.t('page.page_title', page: options[:page]), @page_title].join(options[:splitter]) if options[:page]
-        @page_description = [I18n.t('page.prefix'), @page_description].compact.join(' - ')
+        @page_title = "#{I18n.t('seo.page', page: options[:page])} #{@page_title}" if options[:page]
+        description_parts = [@page_description, options[:desc_suffix]]
+        description_parts.unshift(I18n.t('seo.prefix')) if options[:desc_prefix]
+        @page_description = description_parts.compact.join(' - ')
       end
 
     end

data/lib/ab_admin/core_ext/hash.rb

@@ -1,4 +1,5 @@
 class Hash
+
   def reverse_deep_merge!(other_hash)
     other_hash.each_pair do |k, v|
       tv = self[k]
@@ -7,20 +8,6 @@ class Hash
     self
   end
 
-  def self.convert_hash_to_ordered_hash(object)
-    if object.is_a?(Hash)
-      array = object.to_a
-      array.sort! { |a, b| a[0].to_s <=> b[0].to_s }
-      array.each_with_object(ActiveSupport::OrderedHash.new) { |v, h| h[v[0]] = convert_hash_to_ordered_hash(v[1]) }
-#    elsif object.is_a?(Array)
-#      array = Array.new
-#      object.each_with_index { |v, i| array[i] = convert_hash_to_ordered_hash(v) }
-#      return array
-    else
-      object
-    end
-  end
-
   def deep_clear_values
     self.each_key do |key|
       if self[key].is_a?(Hash)
@@ -40,17 +27,18 @@ class Hash
     result
   end
 
-  def deep_diff(other_hash)
-    other_hash.each_pair do |k, v|
-      if self[k].is_a?(Hash) && v.is_a?(Hash)
-        self[k] = self[k].deep_diff(v)
-        self.delete(k) if self[k].empty?
-        self[k]
-      else
-        self.delete(k)
+  def deep_diff(b)
+    a = self
+    (a.keys | b.keys).inject({}) do |diff, k|
+      if a[k] != b[k]
+        if a[k].respond_to?(:deep_diff) && b[k].respond_to?(:deep_diff)
+          diff[k] = a[k].deep_diff(b[k])
+        else
+          diff[k] = [a[k], b[k]]
+        end
       end
+      diff
     end
-    self
   end
 
   def deep_add(other_hash)
@@ -105,55 +93,22 @@ class Hash
   end
 
   def no_blank
-    reject { |k, v| v.blank? }
+    reject { |_, v| v.blank? }
   end
 
-  #def deep_set_key_values
-  #  self.each_key do |key|
-  #    if self[key].is_a?(Hash)
-  #      self[key] = self[key].deep_set_key_values
-  #    else
-  #      self[key] = key.to_s
-  #    end
-  #  end
-  #  self
-  #end
-
-  # invert
-  #def hash_revert
-  #  r = Hash.new { |h, k| h[k] = [] }
-  #  each { |k, v| r[v] << k }
-  #  r
-  #end
-
-  #def set_keys_eval(value, *hash_keys)
-  #  self.instance_eval("self['#{hash_keys.join("']['")}']=%q[#{Hash.convert_hash_to_ordered_hash(value)}]")
-  #  self
-  #end
-
-  #def rewrite mapping
-  #  inject({}) do |rewritten_hash, (original_key, value)|
-  #    rewritten_hash[mapping.fetch(original_key, original_key)] = value
-  #    rewritten_hash
-  #  end
-  #end
+  def try_keys(*try_keys)
+    try_keys.each do |k|
+      return self[k] if self.has_key?(k)
+    end
+    default
+  end
 
-  #def try_keys *keys
-  #  option = last_option keys
-  #  keys.flatten.each do |key|
-  #    return self[key] if self[key]
-  #  end
-  #  return option[:default] if option[:default]
-  #  nil
-  #end
+  def deep_stringify_keys
+    inject({}) { |result, (key, value)|
+      value = value.deep_stringify_keys if value.is_a?(Hash)
+      result[(key.to_s rescue key) || key] = value
+      result
+    }
+  end unless Hash.method_defined?(:deep_stringify_keys)
 
-  #def fetch_keys(*hash_keys)
-  #  hash_keys.each_with_index do |k, i|
-  #    if hash_keys[i+1]
-  #      return self[k].fetch_keys(*hash_keys[1..-1])
-  #    else
-  #      return self[k]
-  #    end
-  #  end
-  #end
 end

data/lib/ab_admin/core_ext/string.rb

@@ -1,15 +1,20 @@
 # -*- encoding : utf-8 -*-
 class String
   # http://lucene.apache.org/core/old_versioned_docs/versions/2_9_1/queryparsersyntax.html
-  LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\)/
+  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\/)/
   #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
+
   KEYBOARDS = {
       en: 'qwertyuiop[]asdfghjkl;\'zxcvbnm,./',
       ru: 'йцукенгшщзхъфывапролджэячсмитьбю/'
   }
 
-  def lucene_escape
-    self.gsub(LUCENE_ESCAPE_REGEX, "\\\\\\1")
+  unless defined? LUCENE_ESCAPE_REGEX
+    LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|\^|"|~|\*|\?|:|\\|\/)/
+
+    def lucene_escape
+      self.gsub(LUCENE_ESCAPE_REGEX, "\\\\\\1")
+    end
   end
 
   def capitalize_first
@@ -21,7 +26,7 @@ class String
   end
 
   def is_number?
-    true if Float(self) rescue false
+    self =~ /^[-+]?[0-9]+(\.[0-9]+)?$/
   end
 
   def to_utc
@@ -34,6 +39,7 @@ class String
 
   def no_html
     str = self.dup
+    str.gsub!(/<br\/?>/, ' ')
     str.gsub!(/<\/?[^>]*>/, '')
     str.strip!
     str.gsub!('&nbsp;', ' ')
@@ -75,6 +81,13 @@ class String
     coder.decode(self.no_html)
   end
 
+  def mb_upcase
+    mb_chars.upcase.to_s
+  end
+
+  def mb_downcase
+    mb_chars.downcase.to_s
+  end
 end
 
 unless ''.respond_to?(:each)

data/lib/ab_admin/engine.rb

@@ -1,6 +1,3 @@
-require 'rails'
-require 'ab_admin'
-
 module AbAdmin
   class Engine < ::Rails::Engine
     engine_name 'ab_admin'
@@ -18,18 +15,15 @@ module AbAdmin
         ActiveRecord::Base.send :include, AbAdmin::Concerns::DeepCloneable
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Utilities
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Silencer
-        ActiveRecord::Base.send :extend,  AbAdmin::Concerns::Silencer
+        ActiveRecord::Base.send :extend, AbAdmin::Concerns::Silencer
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Validations
+        ActiveRecord::Base.send :include, AbAdmin::Concerns::Fileuploads
       end
 
       ActiveSupport.on_load :action_mailer do
         ActionMailer::Base.send :include, AbAdmin::Mailers::Helpers
       end
 
-      ActiveSupport.on_load :action_controller do
-        ActionController::Base.send :include, AbAdmin::Controllers::HeadOptions
-      end
-
       ActiveSupport.on_load :action_view do
         ActionController::Base.helper AbAdmin::Views::Helpers
         ActionController::Base.helper AbAdmin::Views::AdminHelpers

data/lib/ab_admin/hooks.rb

@@ -5,18 +5,23 @@ end
 require 'i18n/core_ext/kernel/surpress_warnings'
 
 ActiveSupport::XmlMini.backend = 'Nokogiri'
+
 InheritedResources.flash_keys = Responders::FlashResponder.flash_keys = AbAdmin.flash_keys
 Responders::FlashResponder.namespace_lookup = true
-YAML::ENGINE.yamler = 'psych'
+
+::SimpleForm.wrapper_mappings ||= {}
+::SimpleForm.wrapper_mappings[:capture_block] = ::SimpleForm.wrapper_mappings[:uploader] = AbAdmin::Views::ContentOnlyWrapper.instance
+
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
 
 Time::DATE_FORMATS[:api] = '%d.%m.%Y'
+Time::DATE_FORMATS[:path] = '%Y_%m_%d_%H_%M_%S'
 Time::DATE_FORMATS[:compare] = '%Y%m%d%H%M'
 Time::DATE_FORMATS[:compare_date] = Date::DATE_FORMATS[:compare_date] = '%Y%m%d'
 
 Kernel.suppress_warnings do
-  ActionView::Base::InstanceTag::DEFAULT_TEXT_AREA_OPTIONS = {'cols' => 93, 'rows' => 5}
+  # fixed in master branch
   Russian::LOCALIZE_MONTH_NAMES_MATCH = /(%d|%e|%-d)(.*)(%B)/ if defined? Russian
-  Ya2YAML::REX_BOOL = /y|Y|Yes|YES|n|N|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF/ if defined? Ya2YAML
 end
 
 if defined?(Sunrise::FileUpload)

data/lib/ab_admin/hooks/active_model_hooks.rb

@@ -22,7 +22,7 @@ module ActiveModel
     class Sanitizer
       def sanitize(attributes, authorizers)
         sanitized_attributes = attributes.reject { |key, value| authorizers.all? { |auth| auth.deny?(key) } }
-        debug_protected_attribute_removal(attributes, sanitized_attributes)
+        #debug_protected_attribute_removal(attributes, sanitized_attributes)
         sanitized_attributes
       end
     end

data/lib/ab_admin/hooks/globalize_hooks.rb

@@ -0,0 +1,35 @@
+module Globalize
+  mattr_accessor :available_locales
+
+  def self.valid_locale?(loc)
+    return false unless loc
+    available_locales.include?(loc.to_sym)
+  end
+end
+
+Globalize::ActiveRecord::ClassMethods.module_eval do
+  def define_translations_reader_with_locale_suffix(name)
+    define_translations_reader_without_locale_suffix(name)
+
+    Globalize.available_locales.each do |locale|
+      define_method :"#{name}_#{locale}" do
+        read_attribute(name, {locale: locale})
+      end
+    end
+  end
+  alias_method_chain :define_translations_reader, :locale_suffix
+
+  def define_translations_writer_with_locale_suffix(name)
+    define_translations_writer_without_locale_suffix(name)
+
+    Globalize.available_locales.each do |locale|
+      define_method :"#{name}_#{locale}=" do |value|
+        changed_attributes[:"#{name}_#{locale}"] = value unless value == read_attribute(name, {locale: locale})
+        write_attribute(name, value, {locale: locale})
+      end
+    end
+  end
+  alias_method_chain :define_translations_writer, :locale_suffix
+end
+
+Globalize::ActiveRecord::Translation.attr_accessible :locale

data/lib/ab_admin/hooks/paginate_hooks.rb

@@ -38,7 +38,8 @@ module WillPaginate
         rel.total_entries = total.to_i unless total.blank?
 
         if large
-          new_rel = rel.except(:limit, :offset, :where).where(id: rel.pluck("#{quoted_table_name}.id"))
+          ids = rel.except(:includes).pluck("#{quoted_table_name}.id")
+          new_rel = rel.except(:limit, :offset, :where).where(id: ids)
           new_rel.paginate_limit = rel.limit_value.to_i
           new_rel.paginate_offset = rel.offset_value.to_i
           new_rel.total_entries = rel.total_entries
@@ -62,6 +63,7 @@ WillPaginate::ActionView::LinkRenderer.class_exec do
 
     url_params = @base_url_params.dup
     add_current_page_param(url_params, page)
+    url_params[param_name.to_sym] = nil if url_params[param_name.to_sym].to_i < 2
 
     link = @template.url_for(url_params)
     @options[:no_uri] ? link.split('?').first : link

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -28,7 +28,7 @@ module AbAdmin
               attributes = model.columns.map(&:name)
               attributes.concat(model.translated_attribute_names.map(&:to_s)) if model.translates?
               attributes.reject! { |el| IGNORE_COLUMNS.include?(el) }
-              h[model.model_name.underscore] = attributes.each_with_object({}) do |attr, o|
+              h[model.model_name.i18n_key.to_s] = attributes.each_with_object({}) do |attr, o|
                 o[attr] = ha(model, attr, locale).presence || attr
                 model.reflect_on_all_associations.map(&:name).map(&:to_s).reject { |a| a =~ /^translation/ }.each do |assoc|
                   o[assoc] = ha(model, assoc, locale)

data/lib/ab_admin/menu/abstract_builder.rb

@@ -0,0 +1,14 @@
+module AbAdmin
+  module Menu
+    class AbstractBuilder < BaseGroup
+      def initialize
+        @menu_tree = []
+      end
+
+      def render(template, options={})
+        inner = render_nested(template)
+        options[:skip_wrap] ? inner.html_safe : %[<ul class="nav">#{inner}</ul>].html_safe
+      end
+    end
+  end
+end

data/lib/ab_admin/menu/base_group.rb

@@ -0,0 +1,26 @@
+module AbAdmin
+  module Menu
+    class BaseGroup
+      include ::Rails.application.routes.url_helpers
+      include ::AbAdmin::Utils::EvalHelpers
+
+      def link(title, path, options={})
+        @menu_tree << Item.new(title, path, options)
+      end
+
+      def model(model, options={})
+        title = model.model_name.human(count: 9)
+        path = options[:url] || "/admin/#{model.model_name.plural}"
+        @menu_tree << Item.new(title, path, options)
+      end
+
+      def group(title, options={}, &block)
+        @menu_tree << Group.new(title, options, &block)
+      end
+
+      def render_nested(template)
+        @menu_tree.map { |item| item.render(template) }.compact.join.html_safe
+      end
+    end
+  end
+end

data/lib/ab_admin/menu/builder.rb

@@ -0,0 +1,16 @@
+module AbAdmin
+  module Menu
+    class Builder < AbstractBuilder
+      include ::Singleton
+
+      def self.draw(&block)
+        I18n.locale = AbAdmin.locale if AbAdmin.locale
+        instance.instance_eval &block if block_given?
+      end
+
+      def self.render(*args)
+        instance.render(*args)
+      end
+    end
+  end
+end

data/lib/ab_admin/menu/group.rb

@@ -0,0 +1,24 @@
+module AbAdmin
+  module Menu
+    class Group < BaseGroup
+      def initialize(title, options, &block)
+        @menu_tree = []
+        @title = title.is_a?(Symbol) ? I18n.t(title, scope: [:admin, :navigation]) : title
+        @options = options
+        instance_eval &block if block_given?
+      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])
+
+        <<-HTML.html_safe
+      <li class="dropdown">
+        <a class="dropdown-toggle" href="#{@options[:url] || '#'}" >#{@title}<b class="caret"></b></a>
+        <ul class="dropdown-menu">#{render_nested(template)}</ul>
+      <li>
+        HTML
+      end
+    end
+  end
+end