ab_admin 0.7.0 → 0.8.0

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -49,7 +49,7 @@ module AbAdmin
         html_options = options.delete(:html_options) || {}
         html_options[:class] = ['sort_link', current_dir, html_options[:class]].compact.join(' ')
 
-        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"))
+        options.merge!(q: search_params.merge(s: "#{attr_name} #{new_dir}"), **scope_params)
         link_to [name, order_indicator_for(current_dir)].join(' ').html_safe, url_for(options), html_options
       end
 
@@ -63,6 +63,10 @@ module AbAdmin
         end
       end
 
+      def scope_params
+        params.slice(*button_scopes.map(&:first)).permit!.to_h.symbolize_keys
+      end
+
       def short_action_link(action, item)
         case action
           when :edit
@@ -211,12 +215,8 @@ module AbAdmin
       end
 
       def id_link(item, options={})
-        if options.is_a?(TrueClass) || options.is_a?(FalseClass)
-          ActiveSupport::Deprecation.warn("use `id_link(item, edit: false)` instead of`id_link(item, false)`")
-          options = {edit: edit}
-        end
         options.reverse_merge!(edit: true, title: item.id)
-        link_html = {remote: settings[:list_edit], class: 'resource_id_link'}
+        link_html = (options[:link_html] || {}).reverse_merge!(remote: settings[:list_edit], class: 'resource_id_link')
         if options[:edit] && can?(:edit, item)
           link_to options[:title], edit_resource_path(item), link_html
         elsif can?(:read, item)

data/lib/ab_admin/views/form_builder.rb

@@ -31,7 +31,10 @@ module AbAdmin
           end
         end
 
-        attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale]
+        if options[:locale]
+          options[:label] ||= object.class.han(attribute_name, locale: options[:locale])
+          attribute_name = "#{attribute_name}_#{options[:locale]}"
+        end
 
         options[:disabled] = disabled_attribute?(attribute_name) unless options.has_key?(:disabled)
 

data/lib/ab_admin/views/helpers.rb

@@ -39,46 +39,25 @@ module AbAdmin
         link_to skype, "skype:#{skype.strip}?chat", options
       end
 
-      def init_js(js)
-        %Q[<script type='text/javascript'>$(function(){#{js}})</script>].html_safe
+      def init_js(js, delayed: false)
+        if delayed
+          @delayed_js ||= []
+          @delayed_js << js
+          nil
+        else
+          %Q[<script type='text/javascript'>$(function(){#{js}})</script>].html_safe
+        end
+      end
+
+      def render_delayed_js
+        return if @delayed_js.blank?
+        %Q[<script type='text/javascript'>$(function(){#{@delayed_js.join(';')}})</script>].html_safe
       end
 
       def image_tag_if(image, options={})
         return unless image
         image_tag image, options
       end
-
-      def swf_object(swf, id, width, height, flash_version, options = {})
-        options.symbolize_keys!
-
-        params = options.delete(:params) || {}
-        attributes = options.delete(:attributes) || {}
-        flashvars = options.delete(:flashvars) || {}
-
-        attributes[:classid] ||= 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
-        attributes[:id] ||= id
-        attributes[:name] ||= id
-
-        output_buffer = ActiveSupport::SafeBuffer.new
-
-        if options[:create_div]
-          output_buffer << content_tag(:div,
-                                       "This website requires <a href='http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash&promoid=BIOW' target='_blank'>Flash player</a> #{flash_version} or higher.",
-                                       id: id)
-        end
-
-        js = []
-
-        js << "var params = {#{params.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
-        js << "var attributes = {#{attributes.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
-        js << "var flashvars = {#{flashvars.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
-
-        js << "swfobject.embedSWF('#{swf}', '#{id}', '#{width}', '#{height}', '#{flash_version}', '/swf/expressInstall.swf', flashvars, params, attributes);"
-
-        output_buffer << javascript_tag(js.join)
-
-        output_buffer
-      end
     end
   end
 end

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

@@ -3,23 +3,24 @@ module AbAdmin
     module Inputs
       class DateTimePickerInput < ::SimpleForm::Inputs::Base
         def input(wrapper_options=nil)
-          input_html_options[:value] ||= formated_value
+          input_html_options[:value] ||= formatted_value
+          input_html_options[:autocomplete] ||= 'off'
           input_html_classes << input_type
           @builder.text_field(attribute_name, input_html_options)
         end
 
         private
 
-        def formated_value
+        def formatted_value
           object.send(attribute_name).try(:strftime, value_format)
         end
 
         def value_format
           case input_type
             when :date_picker
-              '%d.%m.%Y'
+              '%Y-%m-%d'
             when :datetime_picker
-              '%d.%m.%Y %H:%M'
+              '%Y-%m-%d %H:%M'
             when :time_picker
               '%H:%M'
           end

data/lib/ab_admin/views/manager_helpers.rb

@@ -2,7 +2,7 @@ module AbAdmin
   module Views
     module ManagerHelpers
 
-      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th'}
+      INDEX_VIEW_ICONS = {table: 'list', tree: 'move', grid: 'th', chart: 'signal'}
 
       def table_builder
         manager.table ||= ::AbAdmin::Config::Table.default_for_model(resource_class)
@@ -16,6 +16,10 @@ module AbAdmin
         manager.form ||= ::AbAdmin::Config::Form.default_for_model(resource_class, skip: [:id, :created_at, :updated_at, :lft, :rgt, :depth])
       end
 
+      def chart_builder
+        manager.chart ||= ::AbAdmin::Config::Chart.default_for_model(resource_class)
+      end
+
       def modal_form_builder
         manager.modal_form ||= ::AbAdmin::Config::ModalForm.default_for_model(resource_class, skip: [:id, :created_at, :updated_at, :lft, :rgt, :depth])
       end
@@ -24,6 +28,20 @@ module AbAdmin
         manager.show ||= ::AbAdmin::Config::Show.default_for_model(resource_class)
       end
 
+      def table_item_field(item, field)
+        if field.options[:editable] && field.data.is_a?(Symbol)
+          if field.data.to_s.start_with?('is_')
+            editable_bool(item, field.data)
+          else
+            admin_editable item, field.data, field.options[:editable]
+          end
+        elsif field.options[:image]
+          item_image_link(item, assoc: field.name)
+        else
+          admin_pretty_data call_method_or_proc_on(item, field.data)
+        end
+      end
+
       def action_item_admin_path(name, record=nil)
         custom_action = manager.custom_action_for(name, self)
         if custom_action.collection?
@@ -35,8 +53,8 @@ module AbAdmin
       end
 
       def index_view_link(index_view)
-        options = {class: "btn #{('active' if current_index_view == index_view)}", title: t("admin.index_view.#{index_view}")}
-        url = url_for(index_view: index_view)
+        options = {class: "btn #{('active' if current_index_view == index_view)}", title: t("admin.index_view.#{index_view}", default: index_view.to_s)}
+        url = url_for({index_view: index_view, q: params[:q]}.reject_blank)
         link_to icon(INDEX_VIEW_ICONS[index_view.to_sym]), url, options
       end
     end

data/lib/generators/ab_admin/glob/glob_generator.rb

@@ -6,7 +6,7 @@ module AbAdmin
 
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :name, type: :string, default: 'fake'
+      argument :name, type: :string, default: ''
 
       def create_glob_migration
         migration_template 'migration.erb', "db/migrate/#{migration_name}.rb"
@@ -37,11 +37,8 @@ module AbAdmin
       end
 
       def all_models
-        Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').each do |file|
-          next if file =~ /(?:concerns|shared)\//
-          require file
-        end
-        ActiveRecord::Base.subclasses.find_all { |model| model.connection.data_source_exists?(model.table_name) }
+        Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').reject { |path| path =~ /concerns|shared/ }.each { |file| require file }
+        [ActiveRecord::Base, ApplicationRecord].flat_map{|sc| sc.subclasses.find_all { |model| model.connection.table_exists?(model.table_name) } }
       end
 
       def conn

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

@@ -5,6 +5,6 @@ class Asset < ApplicationRecord
 
   validates_presence_of :data
 
-  default_scope -> { order("#{quoted_table_name}.sort_order") }
+  default_scope -> { order(:sort_order) }
 
 end

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

@@ -3,4 +3,8 @@ class StructureType < AbAdmin::Models::TypeModel
   self.i18n_scope = [:admin, :structure, :kind]
 
   define_enum_by_codes
+
+  def has_static_page?
+    static_page? || main?
+  end
 end

data/lib/generators/ab_admin/install/templates/spec/factories/sequences.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:email) { |n| Forgery::Email.address }
 
   sequence(:time) { |n| Time.now - n.hours }
 
   sequence(:date) { |n| Date.today - n.days }
-end
+end

data/lib/generators/ab_admin/install/templates/spec/factories/structure_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :structure do
     title 'Structure'
     is_visible true

data/lib/generators/ab_admin/install/templates/spec/factories/user_factory.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     email { generate(:email) }
     password '123456'

data/lib/generators/ab_admin/install/templates/spec/spec_helper.rb

@@ -11,7 +11,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
   
   config.extend ControllerMacros, type: :controller
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include Devise::TestHelpers, type: :controller
   config.include MailerMacros
   config.before(:each) { reset_email }

data/lib/generators/ab_admin/install/templates/spec/support/controller_macros.rb

@@ -1,7 +1,7 @@
 module ControllerMacros
   def login_admin
     before(:all) do
-      @admin = FactoryGirl.create(:admin_user)
+      @admin = FactoryBot.create(:admin_user)
     end
     
     before(:each) do
@@ -12,7 +12,7 @@ module ControllerMacros
   
   def login_default
     before(:all) do
-      @user = FactoryGirl.create(:default_user)
+      @user = FactoryBot.create(:default_user)
     end
     
     before(:each) do
@@ -23,7 +23,7 @@ module ControllerMacros
   
   def login_redactor
     before(:all) do
-      @user = FactoryGirl.create(:redactor_user)
+      @user = FactoryBot.create(:redactor_user)
     end
     
     before(:each) do
@@ -34,7 +34,7 @@ module ControllerMacros
   
   def login_moderator
     before(:all) do
-      @user = FactoryGirl.create(:moderator_user)
+      @user = FactoryBot.create(:moderator_user)
     end
     
     before(:each) do

data/lib/generators/template.rb

@@ -45,7 +45,7 @@ gem 'ab_admin', github: 'leschenko/ab_admin', branch: 'rails-5'
 
 gem_group :development, :test do
   gem 'rspec-rails'
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'launchy'
   gem 'forgery'
   gem 'byebug'
@@ -95,4 +95,4 @@ rake('db:seed') if yes?('Run db:seed?')
 generate('ab_admin:ckeditor_assets') if install_ckeditor
 
 # run db seed
-rake('i18n:js:export') if yes?('Export i18n js locales?')
+rake('i18n:js:export') if yes?('Export i18n js locales?')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -366,14 +366,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.10
 description: Simple and real-life tested Rails::Engine admin interface
 email:
 - leschenko.al@gmail.com
@@ -386,27 +386,36 @@ files:
 - Rakefile
 - app/assets/images/admin/Jcrop.gif
 - app/assets/images/admin/empty.gif
-- app/assets/images/admin/flags/b_de.png
-- app/assets/images/admin/flags/b_en.png
-- app/assets/images/admin/flags/b_es.png
-- app/assets/images/admin/flags/b_fr.png
-- app/assets/images/admin/flags/b_it.png
-- app/assets/images/admin/flags/b_ru.png
-- app/assets/images/admin/flags/b_uk.png
-- app/assets/images/admin/flags/flag_de.gif
-- app/assets/images/admin/flags/flag_de_nonact.gif
-- app/assets/images/admin/flags/flag_en.gif
-- app/assets/images/admin/flags/flag_en_nonact.gif
-- app/assets/images/admin/flags/flag_es.gif
-- app/assets/images/admin/flags/flag_es_nonact.gif
-- app/assets/images/admin/flags/flag_fr.gif
-- app/assets/images/admin/flags/flag_fr_nonact.gif
-- app/assets/images/admin/flags/flag_it.gif
-- app/assets/images/admin/flags/flag_it_nonact.gif
-- app/assets/images/admin/flags/flag_ru.gif
-- app/assets/images/admin/flags/flag_ru_nonact.gif
-- app/assets/images/admin/flags/flag_uk.gif
-- app/assets/images/admin/flags/flag_uk_nonact.gif
+- app/assets/images/admin/flags/de.png
+- app/assets/images/admin/flags/en.png
+- app/assets/images/admin/flags/es.png
+- app/assets/images/admin/flags/fr.png
+- app/assets/images/admin/flags/it.png
+- app/assets/images/admin/flags/ja.png
+- app/assets/images/admin/flags/pl.png
+- app/assets/images/admin/flags/ru.png
+- app/assets/images/admin/flags/toremove/b_de.png
+- app/assets/images/admin/flags/toremove/b_en.png
+- app/assets/images/admin/flags/toremove/b_es.png
+- app/assets/images/admin/flags/toremove/b_fr.png
+- app/assets/images/admin/flags/toremove/b_it.png
+- app/assets/images/admin/flags/toremove/b_ru.png
+- app/assets/images/admin/flags/toremove/b_uk.png
+- app/assets/images/admin/flags/toremove/flag_de.gif
+- app/assets/images/admin/flags/toremove/flag_de_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_en.gif
+- app/assets/images/admin/flags/toremove/flag_en_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_es.gif
+- app/assets/images/admin/flags/toremove/flag_es_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_fr.gif
+- app/assets/images/admin/flags/toremove/flag_fr_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_it.gif
+- app/assets/images/admin/flags/toremove/flag_it_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_ru.gif
+- app/assets/images/admin/flags/toremove/flag_ru_nonact.gif
+- app/assets/images/admin/flags/toremove/flag_uk.gif
+- app/assets/images/admin/flags/toremove/flag_uk_nonact.gif
+- app/assets/images/admin/flags/uk.png
 - app/assets/images/admin/main_image.png
 - app/assets/images/admin/preloader.gif
 - app/assets/images/admin/transp_cross.png
@@ -504,6 +513,7 @@ files:
 - app/views/admin/headers/_form.html.slim
 - app/views/admin/locators/edit.html.slim
 - app/views/admin/locators/show.html.slim
+- app/views/admin/manager/_chart.html.slim
 - app/views/admin/manager/_form.html.slim
 - app/views/admin/manager/_modal_form.html.slim
 - app/views/admin/manager/_search_form.html.slim
@@ -511,12 +521,14 @@ files:
 - app/views/admin/manager/_table.html.slim
 - app/views/admin/manager/show.html.slim
 - app/views/admin/settings/_form.html.slim
+- app/views/admin/shared/_action_items.html.slim
 - app/views/admin/shared/_breadcrumbs.html.slim
 - app/views/admin/shared/_columns_hider.html.slim
 - app/views/admin/shared/_content_actions.html.slim
 - app/views/admin/shared/_flash.html.slim
 - app/views/admin/shared/_flash.js.erb
 - app/views/admin/shared/_locale_tabs.html.slim
+- app/views/admin/shared/_main_menu.html.slim
 - app/views/admin/shared/_save_buttons.html.slim
 - app/views/admin/shared/inputs/_checkbox_tree.html.slim
 - app/views/admin/static_pages/_form.html.slim