ab_admin 0.2.1 → 0.2.2

data/app/assets/stylesheets/ab_admin/fileupload.css.scss

@@ -82,5 +82,7 @@
     color: #999;
     font-size: 18px;
   }
-
+  &.error .help-inline {
+    color: #b94a48;
+  }
 }

data/app/views/admin/base/_table.html.slim

@@ -2,7 +2,7 @@ table.table.table-striped.index_table#list
   thead
     tr.pjax_links
       = batch_action_toggle
-      th Id
+      th= sort_link(@search, :id)
       - resource_class.content_columns.map(&:name).without('updated_at').each do |col|
         th= sort_link(@search, col)
       th=t 'admin.table.actions'

data/app/views/admin/fileupload/_container.html.slim

@@ -1,4 +1,5 @@
 = content_tag :div, :id => element_id, :class => css_class, :data => container_data do
+  = error
   .fileupload-drop-area
     span= t('admin.fileupload.drop_here')
   .fileupload-list.clearfix= render :partial => "admin/fileupload/#{asset_render_template}", :collection => assets

data/config/locales/ru.yml

@@ -101,7 +101,7 @@ ru:
       button: "Выберите файл"
       buttons: "Выберите файлы"
       delete: "Удалить файл"
-      drop_here: "Перетащите файлы сюда"
+      drop_here: "или бросьте файл(ы) сюда"
       main_image: "Сделать главным"
       max_size: "Макс разм."
       crop: "Обрезать"

data/features/step_definitions/dsl/batch_actions_steps.rb

@@ -3,7 +3,7 @@ Given /^(\d+) products? exists$/ do |n|
 end
 
 When /^I check (\d+) products in the list$/ do |n|
-  Product.first(n.to_i).pluck(:id).each do |p_id|
+  Product.limit(n.to_i).pluck(:id).each do |p_id|
     check("batch_action_item_#{p_id}")
   end
 end

data/lib/ab_admin.rb

@@ -49,6 +49,7 @@ module AbAdmin
     autoload :Utilities, 'ab_admin/concerns/utilities'
     autoload :Headerable, 'ab_admin/concerns/headerable'
     autoload :NestedSet, 'ab_admin/concerns/nested_set'
+    autoload :Validations, 'ab_admin/concerns/validations'
   end
 
   module Controllers
@@ -59,7 +60,6 @@ module AbAdmin
   end
 
   module Mailers
-    autoload :DevelopmentMailInterceptor, 'ab_admin/mailers/development_mail_interceptor'
     autoload :Helpers, 'ab_admin/mailers/helpers'
     autoload :MailAttachHelper, 'ab_admin/mailers/mail_attach_helper'
   end
@@ -91,6 +91,7 @@ module AbAdmin
       autoload :TreeSelectInput, 'ab_admin/views/inputs/tree_select_input'
       autoload :AssociationInput, 'ab_admin/views/inputs/association_input'
       autoload :DateTimeInput, 'ab_admin/views/inputs/date_time_input'
+      autoload :TokenInput, 'ab_admin/views/inputs/token_input'
     end
   end
 

data/lib/ab_admin/concerns/admin_addition.rb

@@ -13,6 +13,33 @@ module AbAdmin
         self.batch_actions = [:destroy]
       end
 
+      module ClassMethods
+        def for_input_token(r, attr='name_ru')
+          {:id => r.id, :text => r[attr]}
+        end
+      end
+
+      def for_input_token
+        {:id => self.id, :text => self.name}
+      end
+
+      def token_data(method, options={})
+        assoc = self.class.reflect_on_association(method)
+        records = self.send(method)
+        data = Array(records).map(&:for_input_token)
+        data = {
+            :pre => data.to_json,
+            :class => assoc.klass.name,
+            :multi => assoc.collection?,
+            :c => options.delete(:c)
+        }
+        if options[:geo_order]
+          singular = self.class.model_name.singular
+          data[:c] ||= {:with => {:lat => "#{singular}_lat", :lon => "#{singular}_lon"}}.to_json
+        end
+        options.reverse_deep_merge!(:class => 'fancy_select', :data => data)
+      end
+
       def next_prev_by_url(scope, url, prev=false)
         predicates = {'>' => '<', '<' => '>', 'desc' => 'asc', 'asc' => 'desc'}
         query = Rack::Utils.parse_nested_query(URI.parse(url).query).symbolize_keys

data/lib/ab_admin/concerns/validations.rb

@@ -0,0 +1,24 @@
+module AbAdmin
+  module Concerns
+    module Validations
+      class UniqTranslationValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          ::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.foreign_key} != #{record.id || 0}")
+            same = records_scope.where(:name => record.read_attribute(attribute, :locale => l), :locale => l.to_s).exists?
+            record.errors.add("#{attribute}_#{l}", :taken) if same
+          end
+        end
+      end
+
+      class AssetValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          if Array(record.fileupload_asset(attribute)).all?{|a| a.new_record? }
+            record.errors.add(attribute, :blank)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ab_admin/core_ext/array.rb

@@ -22,33 +22,19 @@ class Array
     inject(:+) / size
   end
 
-  def zip_all
-    self[0].zip *self[1..-1]
-  end
-
-  def safe_sd
-    begin
-      self.to_scale.sd
-    rescue
-      0.0
-    end
-  end
-
-  def pearson(b)
-    return 0 if self.size != b.size || !Object.const_defined?("Statsample")
-    Statsample::Bivariate.pearson(self.to_scale, b.to_scale)
-  end
-
-  def pluck!(method, *args)
-    each_index { |x| self[x] = self[x].send method, *args }
-  end
-
-  alias invoke! pluck!
+  #def zip_all
+  #  self[0].zip *self[1..-1]
+  #end
+  #
+  #def pluck!(method, *args)
+  #  each_index { |x| self[x] = self[x].send method, *args }
+  #end
+  #
+  #alias invoke! pluck!
 
   def without(*values)
     copy = self.dup
-    values.flatten.each { |value| copy.delete(value) }
-    copy
+    copy.without!(*values)
   end
 
   def without!(*values)
@@ -80,11 +66,11 @@ class Array
 
 end
 
-module Enumerable
-  def pluck(method, *args)
-    map { |x| x.send method, *args }
-  end
-
-  alias invoke pluck
-end
+#module Enumerable
+#  def pluck(method, *args)
+#    map { |x| x.send method, *args }
+#  end
+#
+#  alias invoke pluck
+#end
 

data/lib/ab_admin/core_ext/string.rb

@@ -2,6 +2,10 @@
 class String
   #LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\)/
   LUCENE_ESCAPE_REGEX = /(\+|-|&&|\|\||!|\(|\)|{|}|\[|\]|`|"|~|\?|:|\\|\s)/
+  KEYBOARDS = {
+      :en => %{qwertyuiop[]asdfghjkl;'zxcvbnm,./},
+      :ru => %{йцукенгшщзхъфывапролджэячсмитьбю/}
+  }
 
   def lucene_escape
     self.gsub(LUCENE_ESCAPE_REGEX, "\\\\\\1")
@@ -38,21 +42,17 @@ class String
   def tr_lang(from=nil, to=nil)
     return '' if self.blank?
 
-    keyboard = {}
-    keyboard[:en] = %{qwertyuiop[]asdfghjkl;'zxcvbnm,./}
-    keyboard[:ru] = %{йцукенгшщзхъфывапролджэячсмитьбю/}
-
     unless from || to
-      if keyboard[:en].index(self[0])
+      if KEYBOARDS[:en].index(self[0])
         from, to = :en, :ru
-      elsif keyboard[:ru].index(self[0])
+      elsif KEYBOARDS[:ru].index(self[0])
         from, to = :ru, :en
       else
         from, to = :en, :ru
       end
     end
 
-    self.tr(keyboard[from], keyboard[to])
+    self.tr(KEYBOARDS[from], KEYBOARDS[to])
   end
 
   def count_words

data/lib/ab_admin/engine.rb

@@ -15,6 +15,7 @@ module AbAdmin
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Utilities
         ActiveRecord::Base.send :include, AbAdmin::Concerns::Silencer
         ActiveRecord::Base.send :extend,  AbAdmin::Concerns::Silencer
+        ActiveRecord::Base.send :include, AbAdmin::Concerns::Validations
       end
 
       ActiveSupport.on_load :action_mailer do

data/lib/ab_admin/models/asset.rb

@@ -51,7 +51,7 @@ module AbAdmin
             :only => [:id, :guid, :assetable_id, :assetable_type, :user_id,
                       :data_file_size, :data_content_type, :is_main, :original_name],
             :root => 'asset',
-            :methods => [:filename, :url, :preview_url, :thumb_url, :width, :height]
+            :methods => [:filename, :url, :thumb_url, :width, :height]
         }.merge(options || {})
 
         super

data/lib/ab_admin/models/user.rb

@@ -6,7 +6,7 @@ module AbAdmin
       included do
         has_one :avatar, :as => :assetable, :dependent => :destroy, :autosave => true
 
-        scope :moderators, where(:user_role_id => [::UserRoleType.admin.id, ::UserRoleType.moderator.id])
+        scope :managers, where(:user_role_id => [::UserRoleType.admin.id, ::UserRoleType.moderator.id])
         scope :active, where(:trust_state => ::UserState.active.id)
         scope :admin, includes(:avatar)
 

data/lib/ab_admin/version.rb

@@ -1,3 +1,3 @@
 module AbAdmin
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/ab_admin/views/form_builder.rb

@@ -14,6 +14,7 @@ module AbAdmin
       map_type :tree_select, :to => ::AbAdmin::Views::Inputs::TreeSelectInput
       map_type :association, :to => ::AbAdmin::Views::Inputs::AssociationInput
       map_type :date, :time, :datetime, :to => ::AbAdmin::Views::Inputs::DateTimeInput
+      map_type :token, :to => ::AbAdmin::Views::Inputs::TokenInput
 
       def input(attribute_name, options = {}, &block)
         if options[:fancy]
@@ -118,6 +119,7 @@ module AbAdmin
 
         locals = {
             element_id: element_id,
+            error: error(attribute_name),
             file_title: (options[:file_title] || script_options['allowedExtensions'].join(', ')),
             file_max_size: max_size,
             assets: [value].flatten.delete_if { |v| v.nil? || v.new_record? },
@@ -133,6 +135,8 @@ module AbAdmin
 
         locals[:css_class] = ['fileupload', "#{locals[:asset_render_template]}_asset_type"]
         locals[:css_class] << (script_options['multiple'] ? 'many_assets' : 'one_asset')
+        locals[:css_class] << 'error' if locals[:error]
+
 
         js_opts = [locals[:element_id], template.sort_admin_assets_path(:klass => asset_klass), locals[:multiple]].map(&:inspect).join(', ')
         locals[:js] = <<-JAVASCRIPT

data/lib/ab_admin/views/inputs/token_input.rb

@@ -0,0 +1,15 @@
+module AbAdmin
+  module Views
+    module Inputs
+      class TokenInput < ::SimpleForm::Inputs::StringInput
+
+        def input
+          attr = options.delete(:assoc) || attribute_name.to_s.sub(/^token_|_id$/, '')
+          input_html_options.reverse_deep_merge!(object.token_data(attr.to_sym, options.extract!(:geo_order, :c)))
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/generators/ab_admin/install/templates/models/user_state.rb

@@ -1,19 +1,6 @@
-class UserState
-  include EnumField::DefineEnum
-  def initialize(code)
-    @code = code.to_sym
-  end
+class UserState < AbAdmin::Models::TypeModel
+  self.codes = [:pending, :active, :suspended, :deleted]
+  self.i18n_scope = [:admin, :user, :state]
 
-  define_enum do |builder|
-    builder.member :pending, :object => new('pending')
-    builder.member :active, :object => new('active')
-    builder.member :suspended, :object => new('suspended')
-    builder.member :deleted, :object => new('deleted')
-  end
-
-  attr_reader :code
-
-  def title
-    I18n.t(@code, :scope => [:admin, :user, :state])
-  end
+  define_enum_by_codes
 end

data/spec/models/user_spec.rb

@@ -38,14 +38,14 @@ describe User do
       @inactive = create(:user)
     end
 
-    it 'search for moderators' do
-      User.moderators.should_not include(@user)
-      User.moderators.should include(@moderator)
+    it 'search for managers' do
+      User.managers.should_not include(@user)
+      User.managers.should include(@moderator)
     end
 
     it 'search for active users' do
       User.active.should include(@user)
-      User.moderators.should_not include(@inactive)
+      User.managers.should_not include(@inactive)
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: ab_admin
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Leschenko
@@ -797,6 +797,7 @@ files:
 - lib/ab_admin/concerns/nested_set.rb
 - lib/ab_admin/concerns/silencer.rb
 - lib/ab_admin/concerns/utilities.rb
+- lib/ab_admin/concerns/validations.rb
 - lib/ab_admin/config/base.rb
 - lib/ab_admin/config/optional_display.rb
 - lib/ab_admin/controllers/callbacks.rb
@@ -818,7 +819,6 @@ files:
 - lib/ab_admin/i18n_tools/google_translate.rb
 - lib/ab_admin/i18n_tools/model_translator.rb
 - lib/ab_admin/i18n_tools/translate_app.rb
-- lib/ab_admin/mailers/development_mail_interceptor.rb
 - lib/ab_admin/mailers/helpers.rb
 - lib/ab_admin/mailers/mail_attach_helper.rb
 - lib/ab_admin/menu_builder.rb
@@ -846,6 +846,7 @@ files:
 - lib/ab_admin/views/inputs/color_input.rb
 - lib/ab_admin/views/inputs/date_time_input.rb
 - lib/ab_admin/views/inputs/editor_input.rb
+- lib/ab_admin/views/inputs/token_input.rb
 - lib/ab_admin/views/inputs/tree_select_input.rb
 - lib/ab_admin/views/manager_helpers.rb
 - lib/ab_admin/views/search_form_builder.rb
@@ -1848,7 +1849,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -831432489170112281
+      hash: -2578895605994787711
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -1857,7 +1858,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -831432489170112281
+      hash: -2578895605994787711
   none: false
 requirements: []
 rubyforge_project: 

data/lib/ab_admin/mailers/development_mail_interceptor.rb

@@ -1,11 +0,0 @@
-module AbAdmin
-  module Mailers
-    class DevelopmentMailInterceptor
-      def self.delivering_email(message)
-        message.subject = "[#{message.to}] #{message.subject}"
-        message.to = 'leschenko.al@gmail.com'
-      end
-    end
-  end
-end
-