ab_admin 0.8.3 → 0.9.0

data/lib/ab_admin/core_ext/hash.rb

@@ -1,5 +1,4 @@
 class Hash
-
   def reverse_deep_merge!(other_hash)
     other_hash.each_pair do |k, v|
       tv = self[k]
@@ -68,29 +67,13 @@ class Hash
     end
   end
 
-  def val(*array)
-    if array.empty?
-      self
-    else
-      key = array.shift
-      value = self[key]
-      if array.empty?
-        value
-      elsif value.is_a? Hash
-        value.val(*array)
-      else
-        nil
-      end
-    end
-  end
-
-  def store_multi(value, *keys)
+  def dig_store(value, *keys)
     key = keys.shift
     self[key] ||= {}
     if keys.empty?
       self[key] = value
     else
-      self[key] = self[key].store_multi(value, *keys)
+      self[key] = self[key].dig_store(value, *keys)
     end
     self
   end
@@ -107,18 +90,6 @@ class Hash
     reject { |_, v| v.blank? }
   end
 
-  def no_blank
-    ActiveSupport::Deprecation.warn('`no_blank` is deprecated, use `reject_blank` instead')
-    reject_blank
-  end
-
-  def try_keys(*try_keys)
-    try_keys.each do |k|
-      return self[k] if self.has_key?(k)
-    end
-    default
-  end
-
   def deep_stringify_keys
     inject({}) { |result, (key, value)|
       value = value.deep_stringify_keys if value.is_a?(Hash)

data/lib/ab_admin/core_ext/other.rb

@@ -1,9 +1,3 @@
-class NilClass
-  def val(*args)
-    self
-  end
-end
-
 class TrueClass
   def to_i
     1

data/lib/ab_admin/core_ext/string.rb

@@ -1,41 +1,4 @@
 class String
-  # http://lucene.apache.org/core/old_versioned_docs/versions/2_9_1/queryparsersyntax.html
-  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\/)/
-  #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
-
-  KEYBOARDS = {
-      en: 'qwertyuiop[]asdfghjkl;\'zxcvbnm,./',
-      ru: 'йцукенгшщзхъфывапролджэячсмитьбю/'
-  }
-
-  unless defined? LUCENE_ESCAPE_REGEX
-    LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|\^|"|~|\*|\?|:|\\|\/)/
-
-    def lucene_escape
-      self.gsub(LUCENE_ESCAPE_REGEX, "\\\\\\1")
-    end
-  end
-
-  def capitalize_first
-    self.mb_chars[0].capitalize + self.mb_chars[1..-1]
-  end
-
-  def is_int?
-    self =~ /^[-+]?[0-9]+$/
-  end
-
-  def is_number?
-    self =~ /^[-+]?[0-9]+(\.[0-9]+)?$/
-  end
-
-  def to_utc
-    begin
-      Time.zone.parse(self).utc
-    rescue
-      Time.now.utc
-    end
-  end
-
   def no_html
     str = self.dup
     str.gsub!(/<br\/?>/, ' ')
@@ -44,49 +7,6 @@ class String
     str.gsub!('&nbsp;', ' ')
     str
   end
-
-  def tr_lang(from=nil, to=nil)
-    return '' if self.blank?
-
-    unless from || to
-      if KEYBOARDS[:en].index(self[0])
-        from, to = :en, :ru
-      elsif KEYBOARDS[:ru].index(self[0])
-        from, to = :ru, :en
-      else
-        from, to = :en, :ru
-      end
-    end
-
-    self.tr(KEYBOARDS[from], KEYBOARDS[to])
-  end
-
-  def count_words
-    clean_text.scan(/(\p{Alnum}+([-'.]\p{Alnum}+)*)/u).size
-  end
-
-  def words_count
-		frequencies = Hash.new(0)  
-		downcase.scan(/(\w+([-'.]\w+)*)/) { |word, ignore| frequencies[word] += 1 }
-		frequencies
-	end
-	
-	def self.randomize(length = 8)
-	  Array.new(length) { (rand(122-97) + 97).chr }.join
-  end
-
-  def clean_text
-    coder = HTMLEntities.new
-    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

@@ -19,6 +19,7 @@ module AbAdmin
         ActiveRecord::Base.send :extend, AbAdmin::Concerns::Silencer
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Validations
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Fileuploads
+        ActiveRecord::Base.send :extend, AbAdmin::Concerns::TranslationsMacro
         ActiveRecord::Base.send :extend, EnumField::EnumeratedAttribute
       end
 

data/lib/ab_admin/hooks/will_paginate_id_prefetch.rb

@@ -1,3 +1,5 @@
+require 'will_paginate/active_record'
+
 # add `:large` option with make pagination on large tables easier, because `SELECT *` is slow with large `OFFSET`:
 #   first it fetch ids of the records using `SELECT id`
 #   and in the second query it fetch records
@@ -10,7 +12,7 @@ module WillPaginate
         if value.nil?
           paginate_limit || limit_value
         else
-          limit(value)
+          limit(value.to_i)
         end
       end
 
@@ -18,7 +20,7 @@ module WillPaginate
         if value.nil?
           paginate_offset || offset_value
         else
-          super(value)
+          super(value.to_i)
         end
       end
     end
@@ -26,8 +28,8 @@ module WillPaginate
     module Pagination
       def paginate(options)
         options = options.dup
-        page_number = options.fetch(:page) { raise ArgumentError, ':page parameter required' }
-        per_page = options.delete(:per_page) || self.per_page
+        page_number = [1, options[:page].to_i].max
+        per_page = (options.delete(:per_page) || self.per_page).to_i
         total = options.delete(:total_entries)
         large = options.delete(:large)
 
@@ -40,8 +42,8 @@ module WillPaginate
         rel.total_entries = total.to_i unless total.blank?
 
         if large
-          ids = rel.except(:includes).pluck(Arel.sql("#{quoted_table_name}.id"))
-          new_rel = rel.except(:limit, :offset, :where).where(id: ids)
+          ids = rel.except(:includes).pluck(Arel.sql("#{quoted_table_name}.#{primary_key}"))
+          new_rel = rel.except(:limit, :offset, :where).where(primary_key => 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

data/lib/ab_admin/hooks/will_paginate_no_uri.rb

@@ -1,6 +1,6 @@
-# add `:no_uri` options to skip query params in pagination urls
 require 'will_paginate/view_helpers/action_view'
 
+# add `:no_uri` options to skip query params in pagination urls
 WillPaginate::ViewHelpers.pagination_options[:no_uri] = false
 WillPaginate::ActionView::LinkRenderer.class_exec do
   def url(page)

data/lib/ab_admin/i18n_tools/google_translate.rb

@@ -19,7 +19,9 @@ module AbAdmin
 
         if response.code == 200
           json = MultiJson.decode(response)
-          json['data']['translations'][0]['translatedText']
+          res = json['data']['translations'][0]['translatedText'].to_s.gsub(/%\s{/, ' %{')
+          res = "#{res[0].upcase}#{res[1..-1]}" if text.first[/[[:upper:]]/]
+          res
         else
           raise StandardError, response.inspect
         end

data/lib/ab_admin/i18n_tools/model_translator.rb

@@ -7,7 +7,7 @@ module AbAdmin
 
       def initialize(options: {})
         @options = options
-        @locales = Globalize.available_locales
+        @locales = AbAdmin.translated_locales
         @models = AbAdmin.translate_models.map{|m| m.constantize }
         @models_i18n_hash = {}
       end

data/lib/ab_admin/models/header.rb

@@ -24,12 +24,12 @@ module AbAdmin
       end
 
       def normalize_html
-        ::Globalize.available_locales.each do |loc|
+        AbAdmin.translated_locales.each do |loc|
           %w(title h1 keywords description).each do |attr|
             send("#{attr}_#{loc}=", send("#{attr}_#{loc}").to_s.no_html)
           end
         end
-        ::Globalize.available_locales.each do |loc|
+        AbAdmin.translated_locales.each do |loc|
           send("seo_block_#{loc}=", sanitize(send("seo_block_#{loc}").to_s))
         end
       end

data/lib/ab_admin/models/locator.rb

@@ -58,12 +58,38 @@ module AbAdmin
             csv_data.each do |d|
               key_parts = [l.to_s] + d[0].split('.')
               raise "Invalid key #{d[0]}" unless data.dig(*key_parts)
-              data.store_multi(d[i], *key_parts)
+              data.dig_store(d[i], *key_parts)
             end
             save path, data
           end
         end
 
+        INTERPOLATION_REGEXP = /%{[^}]+}/
+        def csv_errors(csv)
+          return ['CSV blank'] if csv.blank?
+          csv_data = CSV.parse(csv)
+          errors = []
+          csv_data.shift.each_with_index do |l, i|
+            next if i.zero?
+            unless I18n.available_locales.include?(l.to_sym)
+              errors << "Unknown locale #{l}"
+              next
+            end
+            csv_data.each do |d|
+              key = d[0]
+              next if d[i].blank?
+              if translations.dig(I18n.default_locale, key)
+                unless translations.dig(I18n.default_locale, key).scan(INTERPOLATION_REGEXP).sort == d[i].scan(INTERPOLATION_REGEXP).sort
+                  errors << "Wrong interpolations #{I18n.default_locale}:'#{translations.dig(I18n.default_locale, key)}' #{l}:#{d[i]}"
+                end
+              else
+                errors << "Extra interpolations #{l}:#{d[i]}" if d[i].scan(INTERPOLATION_REGEXP).present?
+              end
+            end
+          end
+          errors
+        end
+
         def translations
           @translations ||= I18n.backend.send(:translations).slice(*I18n.available_locales).transform_values{|v| v.flatten_hash.transform_keys{|k| k.join('.') } }
         end
@@ -93,7 +119,7 @@ module AbAdmin
         message = nil
         locale_replace_regexp = Regexp.new("(^#{I18n.default_locale}|(?<=\.)#{I18n.default_locale}(?=\.yml))")
 
-        locale_files = @files.map { |path| self.class.prepare_data(path) }
+        locale_files = @files.find_all{|f| f =~ /\/\w+(\.readonly)?\.yml/ }.map { |path| self.class.prepare_data(path) }
         main_locale_files = locale_files.find_all { |file| file.locale == I18n.default_locale }
 
         main_locale_files.each do |main_file|

data/lib/ab_admin/models/user.rb

@@ -6,17 +6,14 @@ module AbAdmin
       included do
         has_one :avatar, as: :assetable, dependent: :destroy, autosave: true
 
-        scope :managers, -> { where(user_role_id: [::UserRoleType.admin.id, ::UserRoleType.moderator.id]) }
         scope :active, -> { where(locked_at: nil) }
         scope :admin, proc { includes(:avatar) }
 
-        after_initialize :init
-        before_validation :generate_login
-        before_validation :set_default_role, unless: :user_role_id?
-
-        validate :check_role
-
         enumerated_attribute :user_role_type, id_attribute: :user_role_id, class: ::UserRoleType
+        delegate *UserRoleType.codes.map{|code| "#{code}?" }, to: :user_role_type
+      end
+
+      def admin_menu_builder
       end
 
       def name
@@ -40,6 +37,10 @@ module AbAdmin
         active_for_authentication?
       end
 
+      def admin_access?
+        admin? || moderator?
+      end
+
       def generate_password!
         raw_password = AbAdmin.test_env? ? '654321' : AbAdmin.friendly_token
         self.password = self.password_confirmation = raw_password
@@ -47,47 +48,10 @@ module AbAdmin
         raw_password
       end
 
-      def admin_access?
-        moderator?
-      end
-
-      def default?
-        has_role?(:default)
-      end
-
-      def redactor?
-        has_role?(:redactor)
-      end
-
-      def moderator?
-        has_role?(:admin) || has_role?(:moderator)
-      end
-
-      def admin?
-        has_role?(:admin)
-      end
-
-      def has_role?(role_name)
-        user_role_type.code == role_name
-      end
-
-      def set_default_role
-        self.user_role_id ||= ::UserRoleType.default.id
-      end
-
-      protected
-
-      def generate_login
-        self.login ||= begin
-          unless email.blank?
-            tmp_login = email.split('@').first
-            tmp_login.parameterize.downcase.gsub(/[^A-Za-z0-9-]+/, '-').gsub(/-+/, '-')
-          end
-        end
-      end
-
-      def check_role
-        errors.add(:user_role_id, :invalid) unless ::UserRoleType.valid?(user_role_id)
+      def password_required?
+        return true if password.present?
+        return false if persisted? && password.blank?
+        super
       end
     end
   end

data/lib/ab_admin/utils/csv_document.rb

@@ -27,12 +27,14 @@ module AbAdmin
         @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.csv'].join
       end
 
-      def render
+      def render(context=nil, options={})
         ::CSV.generate(col_sep: @options[:column_separator] || ',') do |csv|
           csv << columns_names
 
-          each_record do |item|
-            csv << column_data.map { |column| AbAdmin.pretty_data call_method_or_proc_on(item, column, exec: false) }
+          I18n.with_locale options[:locale] do
+            each_record do |item|
+              csv << column_data.map { |column| AbAdmin.pretty_data call_method_or_proc_on(item, column, context: context) }
+            end
           end
         end
       end

data/lib/ab_admin/utils/eval_helpers.rb

@@ -85,15 +85,18 @@ module AbAdmin
       end
 
       def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-        exec = options[:exec].nil? ? true : options[:exec]
+        options.reverse_merge!(exec: true)
         case symbol_or_proc
           when String
-            ActiveSupport::Deprecation.warn('`call_method_or_proc_on` don\'t accept method name as String, use Symbol instead') if symbol_or_proc =~ /\A\w+\z/
             symbol_or_proc
           when Symbol
             obj.public_send(symbol_or_proc.to_sym, *options[:attrs])
           when Proc
-            exec ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
+            if options[:context]
+              options[:context].instance_exec(obj, &symbol_or_proc)
+            else
+              options[:exec] ? obj.instance_exec(&symbol_or_proc) : symbol_or_proc.call(obj)
+            end
         end
       end
     end

data/lib/ab_admin/utils/xls_document.rb

@@ -49,25 +49,27 @@ module AbAdmin
         @filename ||= [@options[:filename] || "#{@klass.model_name.plural}-#{Time.now.strftime('%Y-%m-%d')}", '.xlsx'].join
       end
 
-      def render
+      def render(context, options={})
         date_format = workbook.add_format(num_format: 'dd.mm.yyyy')
         time_format = workbook.add_format(num_format: 'dd.mm.yyyy HH:MM')
 
-        each_with_index do |item, index|
-          row = index + 1
-
-          column_data.each_with_index do |column, num|
-            value = call_method_or_proc_on(item, column, exec: false)
-
-            case value
-              when Date
-                worksheet.write_string(row, num, value.strftime('%Y-%m-%dT'), date_format)
-              when DateTime, Time
-                worksheet.write_date_time(row, num, value.strftime('%Y-%m-%dT%H:%M:%S.%L'), time_format)
-              when String
-                worksheet.write_string(row, num, value)
-              else
-                worksheet.write(row, num, AbAdmin.pretty_data(value))
+        I18n.with_locale options[:locale] do
+          each_with_index do |item, index|
+            row = index + 1
+
+            column_data.each_with_index do |column, num|
+              value = call_method_or_proc_on(item, column, context: context)
+
+              case value
+                when Date
+                  worksheet.write_string(row, num, value.strftime('%Y-%m-%dT'), date_format)
+                when DateTime, Time
+                  worksheet.write_date_time(row, num, value.strftime('%Y-%m-%dT%H:%M:%S.%L'), time_format)
+                when String
+                  worksheet.write_string(row, num, value)
+                else
+                  worksheet.write(row, num, AbAdmin.pretty_data(value))
+              end
             end
           end
         end