ab_admin 0.6.1 → 0.7.0

data/lib/ab_admin/carrierwave/file_size_validator.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module AbAdmin
   module CarrierWave
     class FileSizeValidator < ActiveModel::EachValidator

data/lib/ab_admin/carrierwave/glue.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 module AbAdmin
   module CarrierWave
     module Glue
@@ -6,11 +5,10 @@ module AbAdmin
 
       module ClassMethods
         def ab_admin_uploader(uploader=nil, options={}, &block)
-          options = { mount_on: :data_file_name }.merge(options)
+          options.reverse_merge!(mount_on: :data_file_name)
+          options.merge!(validate_integrity: false, validate_processing: false, validate_download: false) unless uploader.try!(:enable_processing)
           
           mount_uploader(:data, uploader, options, &block)
-          
-          validates_processing_of :data
         end
 
         def sunrise_uploader(*args)

data/lib/ab_admin/concerns/admin_addition.rb

@@ -32,9 +32,17 @@ module AbAdmin
       end
 
       def new_changes
-        exclude_attrs = respond_to?(:translated_attribute_names) ? translated_attribute_names.dup : []
-        exclude_attrs << :updated_at
-        changes.except(*exclude_attrs).map { |k, v| [k, v.last] }.to_h
+        excluded_attrs = [:updated_at]
+        excluded_attrs += translated_attribute_names if self.class.translates?
+        all_changes = changes.except(*excluded_attrs).map { |k, v| [k, v[1]] }.to_h
+        if self.class.translates?
+          globalize.dirty.each do |attr, changes|
+            changes.each do |change|
+              all_changes["#{attr}_#{change[0]}"] = send("#{attr}_#{change[0]}")
+            end
+          end
+        end
+        all_changes
       end
 
       def admin_comments_count_non_zero
@@ -87,4 +95,4 @@ module AbAdmin
 
     end
   end
-end
+end

data/lib/ab_admin/concerns/deep_cloneable.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module DeepCloneable

data/lib/ab_admin/concerns/fileuploads.rb

@@ -24,7 +24,6 @@ module AbAdmin
             include InstanceMethods
             extend ClassMethods
 
-            attr_accessible :fileupload_guid
             after_create :fileuploads_update, if: :fileupload_changed?
           end
         end

data/lib/ab_admin/concerns/headerable.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module Headerable
@@ -7,8 +6,6 @@ module AbAdmin
       included do
         has_one :header, as: :headerable, dependent: :delete
 
-        attr_accessible :header_attributes
-
         accepts_nested_attributes_for :header, reject_if: :all_blank
 
         ::Header.all_translated_attribute_names.each do |attr|
@@ -25,7 +22,6 @@ module AbAdmin
       def default_header
         header || build_header
       end
-
     end
   end
 end

data/lib/ab_admin/concerns/nested_set.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module NestedSet
@@ -10,8 +9,8 @@ module AbAdmin
 
         attr_accessor :cached_children
 
-        scope :nested_set, -> { order('lft ASC') }
-        scope :reversed_nested_set, -> { order('lft DESC') }
+        scope :nested_set, -> { order(:lft) }
+        scope :reversed_nested_set, -> { order(lft: :desc) }
         scope :with_depth, lambda { |level| where(depth: level) }
       end
 

data/lib/ab_admin/concerns/reloadable.rb

@@ -8,7 +8,6 @@ module AbAdmin
       end
 
       module ClassMethods
-
         def has_reload_check(key=nil, logger=nil, &block)
           self.reload_checker = ::AbAdmin::Concerns::Reloadable::Reloader.new(key, logger, &block)
         end
@@ -16,7 +15,6 @@ module AbAdmin
         def check_reload
           self.reload_checker.check
         end
-
       end
 
       class Reloader

data/lib/ab_admin/concerns/silencer.rb

@@ -1,8 +1,6 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module Silencer
-
       def no_timestamps
         original_setting = ActiveRecord::Base.record_timestamps
         ActiveRecord::Base.record_timestamps = false
@@ -28,7 +26,6 @@ module AbAdmin
           no_versions(&block)
         end
       end
-
     end
   end
 end

data/lib/ab_admin/concerns/utilities.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Concerns
     module Utilities
@@ -29,7 +28,7 @@ module AbAdmin
 
         def all_models
           Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').each { |file| require file }
-          ActiveRecord::Base.descendants.find_all { |model| model.table_exists? }
+          ActiveRecord::Base.descendants.find_all { |model| model.connection.data_source_exists?(model.table_name) }
           #ActiveRecord::Base.descendants.find_all { |model| model.descends_from_active_record? }
         end
 
@@ -86,7 +85,7 @@ module AbAdmin
 
         def all_translated_attribute_names
           if translates?
-            ::I18n.available_locales.map do |loc|
+            ::Globalize.available_locales.map do |loc|
               translated_attribute_names.map { |attr| "#{attr}_#{loc}" }
             end.flatten
           else
@@ -133,6 +132,5 @@ module AbAdmin
         self[column]
       end
     end
-
   end
 end

data/lib/ab_admin/concerns/validations.rb

@@ -3,7 +3,7 @@ module AbAdmin
     module Validations
       class UniqTranslationValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          ::I18n.available_locales.each do |l|
+          (options[:locales] || ::I18n.available_locales).each do |l|
             next if record.read_attribute(attribute, locale: l).blank?
             records_scope = record.class.const_get(:Translation).where("#{record.class.model_name.singular}_id != #{record.id || 0}")
             same = records_scope.where(name: record.read_attribute(attribute, locale: l), locale: l.to_s).exists?

data/lib/ab_admin/config/base.rb

@@ -20,8 +20,8 @@ module AbAdmin
       def self.default_for_model(model, options={})
         new.tap do |builder|
           builder.field(:id) unless options[:skip].try(:include?, :id)
-          model.content_columns.each do |column|
-            column_name = column.name.to_sym
+          model.column_names.each do |column|
+            column_name = column.to_sym
             next if options[:skip].try(:include?, column_name)
             builder.field(column_name)
           end
@@ -40,7 +40,9 @@ module AbAdmin
 
     class Export < BaseBuilder
       def render_options
-        {column_names: fields.map(&:name), column_data: fields.map(&:data), column_separator: options[:column_separator]}
+        {column_names: fields.map(&:name), column_data: fields.map(&:data),
+         column_separator: options[:column_separator], worksheet_name: options[:worksheet_name],
+         filename: options[:filename]}
       end
     end
 
@@ -108,12 +110,15 @@ module AbAdmin
     end
 
     class BatchAction
-      attr_reader :name, :options, :data, :title
+      attr_reader :name, :options, :data, :title, :form
 
       def initialize(name, options={}, &block)
         @name = name
         @options = options
-        @title = options[:title] || I18n.t("admin.actions.batch_#{name}.link")
+        if options.has_key?(:form)
+          @form = options[:form].is_a?(String) ? options[:form] : "##{name}_batch_form"
+        end
+        @title = options[:title] || I18n.t("admin.actions.batch_#{name}.link", default: name.to_s.humanize)
         @data = block_given? ? block : name.to_sym
       end
 
@@ -152,5 +157,20 @@ module AbAdmin
         options[:collection]
       end
     end
+
+    class Scope
+      attr_reader :name, :options, :data
+
+      def initialize(name, options={}, &block)
+        @name = name
+        @options = options
+        @data = block
+      end
+
+      def apply(relation, params)
+        return relation unless params[name].present?
+        data.is_a?(Proc) ? data.call(relation, params) : relation.public_send(name)
+      end
+    end
   end
-end
+end

data/lib/ab_admin/controllers/callbacks.rb

@@ -9,11 +9,11 @@ module AbAdmin
 
       protected
 
-      #def build_resource
-      #  object = super
-      #  run_build_callbacks object
-      #  object
-      #end
+      def build_resource
+       object = get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, resource_params))
+       # run_build_callbacks object
+       object
+      end
 
       def create_resource(object)
         run_create_callbacks object do
@@ -28,7 +28,7 @@ module AbAdmin
       end
 
       def update_resource(object, attributes)
-        object.assign_attributes(*attributes)
+        object.assign_attributes(attributes)
 
         #run_update_callbacks object do
           save_resource(object)

data/lib/ab_admin/controllers/head_options.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module Controllers
     module HeadOptions

data/lib/ab_admin/controllers/tree.rb

@@ -1,7 +1,6 @@
 module AbAdmin
   module Controllers
     module Tree
-
       def rebuild
         parent_id = params[:parent_id].to_i
         prev_id = params[:prev_id].to_i
@@ -19,7 +18,6 @@ module AbAdmin
 
         head :ok
       end
-
     end
   end
 end

data/lib/ab_admin/core_ext.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
-  require "ab_admin/core_ext/#{File.basename(path, '.rb')}"
+  require "ab_admin/core_ext/#{File.basename(path)}"
 end

data/lib/ab_admin/core_ext/array.rb

@@ -64,7 +64,6 @@ class Array
   def val_detect(attr, val)
     detect{|v| v[attr] == val }
   end
-
 end
 
 #module Enumerable

data/lib/ab_admin/core_ext/hash.rb

@@ -19,6 +19,17 @@ class Hash
     self
   end
 
+  def deep_transform_values!(&block)
+    self.each_key do |key|
+      if self[key].is_a?(Hash)
+        self[key] = self[key].deep_transform_values!(&block)
+      else
+        self[key] = block.call(self[key])
+      end
+    end
+    self
+  end
+
   def clear_values
     result = {}
     self.each_key do |key|

data/lib/ab_admin/core_ext/string.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class String
   # http://lucene.apache.org/core/old_versioned_docs/versions/2_9_1/queryparsersyntax.html
   #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\/)/

data/lib/ab_admin/devise.rb

@@ -23,7 +23,7 @@ module AbAdmin
 
       def after_sign_in_path_for(resource)
         stored_location_for(resource) ||
-            if resource.is_a?(User) && resource.moderator?
+            if resource.is_a?(User) && resource.admin_access?
               admin_root_path
             else
               super

data/lib/ab_admin/engine.rb

@@ -7,9 +7,10 @@ module AbAdmin
     end
 
     initializer 'ab_admin.setup' do
-      ::Mime::Type.register 'application/vnd.ms-excel', :xls
+      ::Mime::Type.register 'application/vnd.ms-excel', :xlsx
 
       ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send :include, ActiveModel::ForbiddenAttributesProtection
         ActiveRecord::Base.send :include, AbAdmin::CarrierWave::Glue
         ActiveRecord::Base.send :include, AbAdmin::Utils::Mysql
         ActiveRecord::Base.send :include, AbAdmin::Concerns::DeepCloneable

data/lib/ab_admin/hooks/globalize_locale_suffix_accessors.rb

@@ -1,54 +1,40 @@
 # add accessors with locale suffix like `title_en`, `title_de`
-Globalize::ActiveRecord::ClassMethods.module_eval do
-  def define_translations_reader_with_locale_suffix(name)
-    translation_attributes = class_variable_defined?(:@@translation_attributes) ? class_variable_get(:@@translation_attributes) : []
-
-    define_translations_reader_without_locale_suffix(name)
+module GlobalizeAccessorsWithLocaleSuffix
+  def define_translated_attr_reader(name)
+    super
 
     Globalize.available_locales.each do |locale|
       method_name = "#{name}_#{locale}"
       define_method method_name.to_sym do
-        read_attribute(name, {locale: locale})
+        Globalize::Interpolation.interpolate(name, self, [locale])
       end
-      translation_attributes.push(method_name)
     end
-    class_variable_set(:@@translation_attributes, translation_attributes)
   end
 
-  alias_method_chain :define_translations_reader, :locale_suffix
-
-  def define_translations_writer_with_locale_suffix(name)
-    define_translations_writer_without_locale_suffix(name)
+  def define_translated_attr_writer(name)
+    super
 
     Globalize.available_locales.each do |locale|
       define_method :"#{name}_#{locale}=" do |value|
-        changed_attributes
-        @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::InstanceMethods.module_eval do
-  private
-
-  # Filters translation attributes from the attribute names.
-  def attributes_for_update(attribute_names)
-    filter_translation_attributes(super)
-  end
+Globalize::ActiveRecord::ClassMethods.module_eval do
+  prepend GlobalizeAccessorsWithLocaleSuffix
+end
 
-  # Filters translation attributes from the attribute names.
-  def attributes_for_create(attribute_names)
-    filter_translation_attributes(super)
-  end
 
-  def filter_translation_attributes(attributes)
-    translation_attributes = self.class.class_variable_get(:@@translation_attributes)
-    attributes.delete_if { |attr| translation_attributes.include? attr }
+module GlobalizeFixResetAttribute
+  def _reset_attribute name
+    old_value = record.changed_attributes[name]
+    record.original_changed_attributes.except!(name)
+    record.send("#{name}=", old_value)
   end
 end
 
-Globalize::ActiveRecord::Translation.attr_accessible :locale
+Globalize::ActiveRecord::AdapterDirty.module_eval do
+  prepend GlobalizeFixResetAttribute
+end

data/lib/ab_admin/hooks/will_paginate_no_uri.rb

@@ -14,6 +14,6 @@ WillPaginate::ActionView::LinkRenderer.class_exec do
     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
+    @options[:no_uri] ? link.split('?').first : link.sub(/\?\z/, '')
   end
 end

data/lib/ab_admin/i18n_tools/google_translate.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'multi_json'
 require 'rest-client'
 

data/lib/ab_admin/i18n_tools/translate_app.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module AbAdmin
   module I18nTools
     class TranslateApp

data/lib/ab_admin/menu/builder.rb

@@ -4,8 +4,9 @@ module AbAdmin
       include ::Singleton
 
       def self.draw(&block)
-        I18n.locale = AbAdmin.locale if AbAdmin.locale
-        instance.instance_eval &block if block_given?
+        I18n.with_locale AbAdmin.locale do
+          instance.instance_eval &block if block_given?
+        end
       end
 
       def self.render(*args)