ab_admin 0.4.0 → 0.5.0

data/lib/ab_admin/views/admin_navigation_helpers.rb

@@ -187,14 +187,19 @@ module AbAdmin
         end
       end
 
-      def id_link(item, edit=true)
-        opts = {remote: settings[:list_edit], class: 'resource_id_link'}
-        if edit && can?(:edit, item)
-          link_to item.id, edit_resource_path(item), opts
+      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'}
+        if options[:edit] && can?(:edit, item)
+          link_to options[:title], edit_resource_path(item), link_html
         elsif can?(:read, item)
-          link_to item.id, resource_path(item), opts
+          link_to options[:title], resource_path(item), link_html
         else
-          item.id
+          options[:title]
         end
       end
 

data/lib/ab_admin/views/form_builder.rb

@@ -13,7 +13,6 @@ module AbAdmin
       map_type :editor, to: ::AbAdmin::Views::Inputs::EditorInput
       map_type :date_picker, :time_picker, :datetime_picker, to: ::AbAdmin::Views::Inputs::DateTimePickerInput
       map_type :token, to: ::AbAdmin::Views::Inputs::TokenInput
-      map_type :capture_block, to: ::AbAdmin::Views::Inputs::CaptureBlockInput
       map_type :uploader, to: ::AbAdmin::Views::Inputs::UploaderInput
 
       def input(attribute_name, options = {}, &block)
@@ -100,6 +99,11 @@ module AbAdmin
         HTML
       end
 
+      # ugly check for nested form
+      def nested?
+        object_name.include?('_attributes][')
+      end
+
       protected
 
       def fetch_nested_options(attribute_name)

data/lib/ab_admin/views/search_form_builder.rb

@@ -23,7 +23,7 @@ module AbAdmin
           end
 
           if collection.first.try(:respond_to?, :id)
-            collection.map!{|r| [AbAdmin.display_name(r), r.id] }
+            collection = collection.map{|r| [AbAdmin.display_name(r), r.id] }
           end
 
           options[:input_html] ||= {}

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

@@ -8,7 +8,7 @@ module AbAdmin
 
       argument :name, type: :string, default: 'fake'
 
-      def create_migration
+      def create_glob_migration
         migration_template 'migration.erb', "db/migrate/#{migration_name}.rb"
       end
 
@@ -17,7 +17,7 @@ module AbAdmin
       def model_attrs
         @model_attrs ||= begin
           models.each_with_object({}) do |m, h|
-            h[m.name] = m.translated_attribute_names.map { |attr| ":#{attr} => :#{get_type(attr)}" }.join(', ')
+            h[m.name] = m.translated_attribute_names.map { |attr| "#{attr}: :#{get_type(attr)}" }.join(', ')
           end
         end
       end
@@ -37,7 +37,10 @@ module AbAdmin
       end
 
       def all_models
-        Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').each { |file| require file }
+        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.table_exists? }
       end
 

data/lib/generators/ab_admin/install/install_generator.rb

@@ -24,7 +24,7 @@ module AbAdmin
         template('script/unicorn.sh', 'script/unicorn.sh')
         template('config/settings.yml', 'config/settings/settings.yml')
         template('config/settings.yml', 'config/settings/settings.local.yml')
-        copy_file('config/unicorn_config.rb', 'config/unicorn_config.rb')
+        copy_file('config/unicorn/production.rb', 'config/unicorn/production.rb')
         copy_file('config/robots.txt', 'config/robots.txt')
         copy_file('gitignore', '.gitignore')
       end

data/lib/generators/ab_admin/install/templates/config/{unicorn_config.rb → unicorn/production.rb}

@@ -1,17 +1,14 @@
-APP_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__)))
-
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
-require 'bundler/setup'
+APP_ROOT = File.expand_path('../../..', __FILE__)
 
 require 'redis'
-worker_processes 2
+worker_processes 4
 
 #user "unprivileged_user", "unprivileged_group"
 
 working_directory APP_ROOT
 
 listen "#{APP_ROOT}/tmp/sockets/unicorn.sock", backlog: 64
-listen 8080, tcp_nopush: true
+#listen 8080, tcp_nopush: true
 
 timeout 90
 
@@ -22,7 +19,7 @@ stdout_path "#{APP_ROOT}/log/unicorn.stdout.log"
 
 preload_app true
 GC.respond_to?(:copy_on_write_friendly=) and
-  GC.copy_on_write_friendly = true
+    GC.copy_on_write_friendly = true
 
 before_fork do |server, worker|
   defined?(ActiveRecord::Base) and
@@ -45,8 +42,8 @@ after_fork do |server, worker|
   # addr = "127.0.0.1:#{9293 + worker.nr}"
   # server.listen(addr, tries: -1, delay: 5, tcp_nopush: true)
 
-  defined?(ActiveRecord::Base) and
-      ActiveRecord::Base.establish_connection
+  ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
+  Resque.redis.client.reconnect if defined?(Resque)
 
   $redis = Redis.connect
 end

data/lib/generators/ab_admin/install/templates/script/unicorn.sh

@@ -17,15 +17,16 @@
 
 set -u
 set -e
-# Example init script, this can be used with nginx, too,
-# since nginx and unicorn accept the same signals
 
-# Feel free to change any of the following variables for your app:
-rvm_trust_rvmrcs_flag=1
 APP_ROOT=<%= app_path %>
 PID=$APP_ROOT/tmp/pids/unicorn.pid
-ENV=production
-CMD="$APP_ROOT/bin/unicorn -D -E $ENV -c $APP_ROOT/config/unicorn_config.rb"
+RAILS_ENV=${RAILS_ENV:-"production"}
+
+RVM_RUBY=`cat $APP_ROOT/.ruby-version`
+RVM_GEMSET=`cat $APP_ROOT/.ruby-gemset`
+BUNDLE_PATH=/usr/local/rvm/wrappers/ruby-$RVM_RUBY@$RVM_GEMSET/bundle
+
+CMD="$BUNDLE_PATH exec unicorn -D -E $RAILS_ENV -c $APP_ROOT/config/unicorn/$RAILS_ENV.rb"
 
 old_pid="$PID.oldbin"
 

data/lib/generators/template.rb

@@ -34,7 +34,6 @@ gem 'i18n-js'
 gem 'ruby-progressbar'
 gem 'ruby2xlsx'
 gem 'rest-client'
-gem 'russian'
 gem 'nested_form', '~> 0.2.2'
 gem 'puma', require: false
 

data/lib/tasks/assets.rake

@@ -7,6 +7,12 @@ namespace :assets do
     name = (ENV['CLASS'] || ENV['class'] || 'Asset').to_s
     klass = name.safe_constantize
 
+    if ENV['VERSIONS']
+      versions = ENV['VERSIONS'].split(',').map(&:to_sym)
+    else
+      versions = []
+    end
+
     raise "Cannot find a constant with the #{name} specified in the argument string" if klass.nil?
 
     bar = ProgressBar.create(title: name, total: klass.count, format: '%c of %C - %a %e |%b>>%i| %p%% %t')
@@ -14,7 +20,7 @@ namespace :assets do
 
     klass.find_each do |item|
       begin
-        item.data.recreate_versions!
+        item.data.recreate_versions!(*versions)
         bar.increment
       rescue => e
         puts "ERROR recreate_versions for #{name} - #{item.id}: #{e.message}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ab_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-pjax
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.3
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -266,16 +266,16 @@ dependencies:
   name: bootstrap-wysihtml5-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1.24
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -322,16 +322,16 @@ dependencies:
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -374,34 +374,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: generator_spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple and real-life tested Rails::Engine admin interface
 email:
 - leschenko.al@gmail.com
@@ -409,6 +381,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- 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
@@ -431,7 +407,6 @@ files:
 - 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/Jcrop.gif
 - app/assets/images/admin/main_image.png
 - app/assets/images/admin/preloader.gif
 - app/assets/images/admin/transp_cross.png
@@ -475,7 +450,6 @@ files:
 - app/assets/stylesheets/ab_admin/components/_navigation.css.scss
 - app/assets/stylesheets/ab_admin/components/_perms.css.scss
 - app/assets/stylesheets/ab_admin/components/_table_view.css.scss
-- app/assets/stylesheets/ab_admin/components/_text_styles.css.scss
 - app/assets/stylesheets/ab_admin/components/_translations.css.scss
 - app/assets/stylesheets/ab_admin/components/_tree_view.css.scss
 - app/assets/stylesheets/ab_admin/components/_view_layout.css.scss
@@ -562,6 +536,7 @@ files:
 - config/locales/ru.devise.yml
 - config/locales/ru.yml
 - config/locales/uk.devise.yml
+- config/locales/uk.yml
 - config/routes.rb
 - db/migrate/20130101000001_create_users.rb
 - db/migrate/20130101000003_create_assets.rb
@@ -571,6 +546,7 @@ files:
 - db/migrate/20130101000007_base_translations.rb
 - db/migrate/20130101000008_create_admin_comments.rb
 - db/migrate/20130101000009_create_tracks.rb
+- lib/ab_admin.rb
 - lib/ab_admin/abstract_resource.rb
 - lib/ab_admin/carrierwave/base_uploader.rb
 - lib/ab_admin/carrierwave/file_size_validator.rb
@@ -593,17 +569,19 @@ files:
 - lib/ab_admin/controllers/fv.rb
 - lib/ab_admin/controllers/head_options.rb
 - lib/ab_admin/controllers/tree.rb
+- lib/ab_admin/core_ext.rb
 - lib/ab_admin/core_ext/array.rb
 - lib/ab_admin/core_ext/hash.rb
 - lib/ab_admin/core_ext/other.rb
 - lib/ab_admin/core_ext/string.rb
-- lib/ab_admin/core_ext.rb
 - lib/ab_admin/devise.rb
 - lib/ab_admin/engine.rb
-- lib/ab_admin/hooks/active_model_hooks.rb
-- lib/ab_admin/hooks/globalize_hooks.rb
-- lib/ab_admin/hooks/paginate_hooks.rb
 - lib/ab_admin/hooks.rb
+- lib/ab_admin/hooks/active_model_attr_accessible_few_roles.rb
+- lib/ab_admin/hooks/globalize_locale_suffix_accessors.rb
+- lib/ab_admin/hooks/globalize_valid_locale.rb
+- lib/ab_admin/hooks/will_paginate_id_prefetch.rb
+- lib/ab_admin/hooks/will_paginate_no_uri.rb
 - lib/ab_admin/i18n_tools/google_translate.rb
 - lib/ab_admin/i18n_tools/model_translator.rb
 - lib/ab_admin/i18n_tools/translate_app.rb
@@ -624,19 +602,18 @@ files:
 - lib/ab_admin/models/track.rb
 - lib/ab_admin/models/type_model.rb
 - lib/ab_admin/models/user.rb
+- lib/ab_admin/utils.rb
 - lib/ab_admin/utils/csv_document.rb
 - lib/ab_admin/utils/eval_helpers.rb
 - lib/ab_admin/utils/logger.rb
 - lib/ab_admin/utils/mysql.rb
 - lib/ab_admin/utils/xls_document.rb
-- lib/ab_admin/utils.rb
 - lib/ab_admin/version.rb
 - lib/ab_admin/views/admin_helpers.rb
 - lib/ab_admin/views/admin_navigation_helpers.rb
 - lib/ab_admin/views/content_only_wrapper.rb
 - lib/ab_admin/views/form_builder.rb
 - lib/ab_admin/views/helpers.rb
-- lib/ab_admin/views/inputs/capture_block_input.rb
 - lib/ab_admin/views/inputs/ckeditor_input.rb
 - lib/ab_admin/views/inputs/color_input.rb
 - lib/ab_admin/views/inputs/date_time_picker_input.rb
@@ -646,10 +623,10 @@ files:
 - lib/ab_admin/views/manager_helpers.rb
 - lib/ab_admin/views/search_form_builder.rb
 - lib/ab_admin/views/url_for_routes.rb
-- lib/ab_admin.rb
 - lib/generators/ab_admin/ckeditor_assets/ckeditor_assets_generator.rb
 - lib/generators/ab_admin/glob/glob_generator.rb
 - lib/generators/ab_admin/glob/templates/migration.erb
+- lib/generators/ab_admin/install/USAGE
 - lib/generators/ab_admin/install/install_generator.rb
 - lib/generators/ab_admin/install/templates/config/ab_admin.rb.erb
 - lib/generators/ab_admin/install/templates/config/admin_menu.rb
@@ -660,7 +637,7 @@ files:
 - lib/generators/ab_admin/install/templates/config/robots.txt
 - lib/generators/ab_admin/install/templates/config/seeds.rb
 - lib/generators/ab_admin/install/templates/config/settings.yml
-- lib/generators/ab_admin/install/templates/config/unicorn_config.rb
+- lib/generators/ab_admin/install/templates/config/unicorn/production.rb
 - lib/generators/ab_admin/install/templates/gitignore
 - lib/generators/ab_admin/install/templates/helpers/admin/structures_helper.rb
 - lib/generators/ab_admin/install/templates/models/ability.rb
@@ -696,7 +673,6 @@ files:
 - lib/generators/ab_admin/install/templates/uploaders/attachment_file_uploader.rb
 - lib/generators/ab_admin/install/templates/uploaders/avatar_uploader.rb
 - lib/generators/ab_admin/install/templates/uploaders/picture_uploader.rb
-- lib/generators/ab_admin/install/USAGE
 - lib/generators/ab_admin/model/model_generator.rb
 - lib/generators/ab_admin/model/templates/resource.erb
 - lib/generators/ab_admin/resource/resource_generator.rb
@@ -708,9 +684,6 @@ files:
 - lib/tasks/assets.rake
 - lib/tasks/cache.rake
 - lib/tasks/i18n.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/leschenko/ab_admin
 licenses: []
 metadata: {}
@@ -730,7 +703,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simple and real-life tested Rails::Engine admin interface based on slim,