active_scaffold 3.0.5 → 3.0.11

data/lib/active_scaffold/locale/ru.yml

@@ -2,61 +2,118 @@ ru:
   active_scaffold:
     add: 'Добавить запись'
     add_existing: 'Добавить существующую запись'
-    add_existing_model: 'Добавить существующую запись %{model}'
-    are_you_sure_to_delete: 'Вы уверены?'
+    add_existing_model: '%{model}: добавить существующую запись'
+    are_you_sure_to_delete: 'Удалить %{label}?'
     cancel: 'Отмена'
     click_to_edit: 'Нажмите для редактирования'
+    click_to_reset: 'Нажмите для сброса'
     close: 'Закрыть'
-    create: 'Создать запись'
-    create_model: 'Создать запись %{model}'
+    config_list: 'Настройки списка'
+    config_list_model: '%{model}: настройки списка'
+    create: 'Создать'
+    create_model: '%{model}: создать запись'
     create_another: 'Создать другую запись'
-    created_model: 'Создана запись %{model}'
+    created_model: '%{model}: запись создана'
     create_new: 'Создать новую запись'
     customize: 'Настроить'
     delete: 'Удалить'
-    deleted_model: 'Удалена запись %{model}'
+    deleted_model: '%{model}: запись удалена'
     delimiter: 'Разделитель'
     download: 'Загрузить'
     edit: 'Изменить'
     export: 'Экспорт'
     nested_for_model: '%{parent_model} / %{nested_model}'
-    nested_of_model: '%{nested_model} of %{parent_model}'
+    nested_of_model: '%{nested_model} @ %{parent_model}'
+    false: 'Нет'
     filtered: '(Найденное)'
-    found: 'Найдено'
+    found: 
+      one: 'запись'
+      few: 'записи'
+      many: 'записей'
+      other: 'записи'
     hide: 'Скрыть'
     live_search: 'Поиск'
-    loading: 'Загрузка...'
+    loading: 'Загрузка…'
     next: 'Следующее'
     no_entries: 'Нет записей'
-    omit_header: 'Omit Header'
+    no_options: 'Нет вариантов'
+    omit_header: 'Пропустить заголовок'
     options: 'Настройки'
     pdf: 'PDF'
     previous: 'Предыдущее'
-    print: 'Распечатать'
+    print: 'Печать'
     refresh: 'Обновить'
     remove: 'Удалить'
     remove_file: 'Удалить или заменить файл'
     replace_with_new: 'Заменить новым'
-    revisions_for_model: 'Редакции %{model}'
-    reset: 'Сбросить'
-    saving: 'Сохранение...'
+    revisions_for_model: '%{model}: редакции'
+    reset: 'Сброс'
+    saving: 'Сохранение…'
     search: 'Поиск'
     search_terms: 'Ключевые слова'
     _select_: '- выбрать -'
     show: 'Показать'
-    show_model: 'Показать запись %{model}'
+    show_model: '%{model}: показать запись'
     _to_ : ' to '
+    true: 'Да'
     update: 'Обновить запись'
-    update_model: 'Обновить запись %{model}'
-    updated_model: 'Обновлена запись %{model}'
+    update_model: '%{model}: обновить запись'
+    updated_model: '%{model}: запись обновлена'
     '=': '='
     '>=': '>='
     '<=': '<='
     '>': '>'
     '<': '<'
     '!=': '!='
-    between: 'Между'
+    between: 'В интервале'
+    contains: 'Содержит'
+    begins_with: 'Начинается с'
+    ends_with: 'Оканчивается на'
+    today: 'Сегодня'
+    yesterday: 'Вчера'
+    tomorrow: 'Завтра'
+    this_week: 'На этой неделе'
+    prev_week: 'На прошлой неделе'
+    next_week: 'На следующей неделе'
+    this_month: 'В этом месяце'
+    prev_month: 'В прошлом месяце'
+    next_month: 'В следующем месяце'
+    this_year: 'В этом году'
+    prev_year: 'В прошлом году'
+    next_year: 'В следующем году'
+    past: 'Прошлое'
+    future: 'Будущее'
+    range: 'Интервал'
+    seconds: 'секунд'
+    minutes: 'минут'
+    hours: 'часов'
+    days: 'дней'
+    weeks: 'недель'
+    months: 'месяцев'
+    years: 'лет'
+    optional_attributes: 'Дополнительные настройки'
+    null: 'Пусто'
+    not_null: 'Не пусто'
+    date_picker_options:
+      weekHeader: 'Нед.'
+      firstDay: 1
+      isRTL: false
+      showMonthAfterYear: false
+    datetime_picker_options:
+      timeText: 'Время'
+      currentText: 'Сегодня'
+      closeText: 'Закрыть'
+    errors:
+      template:
+        header:
+          one: '%{model}: сохранение не удалось из-за %{count} ошибки'
+          few: '%{model}: сохранение не удалось из-за %{count} ошибок'
+          many: '%{model}: сохранение не удалось из-за %{count} ошибок'
+          other: '%{model}: сохранение не удалось из-за %{count} ошибки'
+        body: 'Проблемы возникли со следующими полями:'
 
     # error_messages
-    internal_error: 'Внутренняя ошибка сервера.'
-    version_inconsistency: 'Эта запись была обновлена с того момента, как вы начали ее редактировать.'
+    cant_destroy_record: 'Запись %{record} не может быть удалена'
+    failed_to_save_record: 'Запись  не может быть сохранена из-за неизвестной ошибки'
+    internal_error: '500 Внутренняя ошибка сервера'
+    version_inconsistency: 'Эта запись была обновлена с того момента, как вы начали ее редактировать'

data/lib/active_scaffold/marked_model.rb

@@ -21,12 +21,12 @@ module ActiveScaffold
     end
 
     module ClassMethods
-      # The proc to call that retrieves the marked_records from the ApplicationController.
-      attr_accessor :marked_records_proc
-
-      # Class-level access to the marked_records
       def marked_records
-        (marked_records_proc.call || Set.new) if marked_records_proc
+        Thread.current[:marked_records] ||= Set.new
+      end
+
+      def marked_records=(marked)
+        Thread.current[:marked_records] = marked
       end
     end
 

data/lib/active_scaffold/version.rb

@@ -0,0 +1,9 @@
+module ActiveScaffold
+  module Version
+    MAJOR = 3
+    MINOR = 0
+    PATCH = 11
+
+    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
+  end
+end

data/lib/active_scaffold.rb

@@ -2,13 +2,21 @@ unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 0
   raise "This version of ActiveScaffold requires Rails 3.0 or higher.  Please use an earlier version."
 end
 
-require 'render_component' rescue nil
-require 'verification'
+begin
+  require 'render_component'
+rescue LoadError
+end
+begin
+  require 'verification'
+rescue LoadError
+end
+
+require 'active_scaffold_assets'
+require 'active_scaffold/active_record_permissions'
+require 'active_scaffold/paginator'
+require 'active_scaffold/responds_to_parent'
 
-require 'active_record_permissions'
-require 'dhtml_confirm'
-require 'paginator'
-require 'responds_to_parent'
+require 'active_scaffold/version'
 
 module ActiveScaffold
   autoload :AttributeParams, 'active_scaffold/attribute_params'
@@ -17,8 +25,8 @@ module ActiveScaffold
   autoload :Finder, 'active_scaffold/finder'
   autoload :MarkedModel, 'active_scaffold/marked_model'
 
-  def self.active_scaffold_autoload_subdir(dir, mod=self)
-    Dir["#{File.dirname(__FILE__)}/active_scaffold/#{dir}/*.rb"].each { |file|
+  def self.autoload_subdir(dir, mod=self, root = File.dirname(__FILE__))
+    Dir["#{root}/active_scaffold/#{dir}/*.rb"].each { |file|
       basename = File.basename(file, ".rb")
       mod.module_eval {
         autoload basename.camelcase.to_sym, "active_scaffold/#{dir}/#{basename}"
@@ -27,7 +35,7 @@ module ActiveScaffold
   end
 
   module Actions
-    ActiveScaffold.active_scaffold_autoload_subdir('actions', self)
+    ActiveScaffold.autoload_subdir('actions', self)
   end
 
   module Bridges
@@ -35,15 +43,15 @@ module ActiveScaffold
   end
 
   module Config
-    ActiveScaffold.active_scaffold_autoload_subdir('config', self)
+    ActiveScaffold.autoload_subdir('config', self)
   end
 
   module DataStructures
-    ActiveScaffold.active_scaffold_autoload_subdir('data_structures', self)
+    ActiveScaffold.autoload_subdir('data_structures', self)
   end
 
   module Helpers
-    ActiveScaffold.active_scaffold_autoload_subdir('helpers', self)
+    ActiveScaffold.autoload_subdir('helpers', self)
   end
 
   class ControllerNotFound < RuntimeError; end
@@ -100,58 +108,10 @@ module ActiveScaffold
     @@js_framework ||= :prototype
   end
 
-  ##
-  ## Copy over asset files (javascript/css/images) from directory to public/
-  ##
-  def self.install_assets_from(directory)
-    copy_files("/public", "/public", directory)
-
-    available_frontends = Dir[File.join(directory, 'frontends', '*')].map { |d| File.basename d }
-    [:stylesheets, :javascripts, :images].each do |asset_type|
-      path = "/public/#{asset_type}/active_scaffold"
-      copy_files(path, path, directory)
-
-      File.open(File.join(Rails.root, path, 'DO_NOT_EDIT'), 'w') do |f|
-        f.puts "Any changes made to files in sub-folders will be lost."
-        f.puts "See http://activescaffold.com/tutorials/faq#custom-css."
-      end
-
-      available_frontends.each do |frontend|
-        if asset_type == :javascripts
-          file_mask = '*.js'
-          source = "/frontends/#{frontend}/#{asset_type}/#{ActiveScaffold.js_framework}"
-        else
-          file_mask = '*.*'
-          source = "/frontends/#{frontend}/#{asset_type}"
-        end
-        destination = "/public/#{asset_type}/active_scaffold/#{frontend}"
-        copy_files(source, destination, directory, file_mask)
-      end
-    end
-  end
-
   def self.root
     File.dirname(__FILE__) + "/.."
   end
 
-  def self.delete_stale_assets
-    available_frontends = Dir[File.join(root, 'frontends', '*')].map { |d| File.basename d }
-    [:stylesheets, :javascripts, :images].each do |asset_type|
-      available_frontends.each do |frontend|
-        destination = File.join(Rails.root, "/public/#{asset_type}/active_scaffold/#{frontend}")
-        FileUtils.rm Dir.glob("#{destination}/*")
-      end
-    end
-  end
-
-  private
-  def self.copy_files(source_path, destination_path, directory, file_mask = '*.*')
-    source, destination = File.join(directory, source_path), File.join(Rails.root, destination_path)
-    FileUtils.mkdir_p(destination) unless File.exist?(destination)
-
-    FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
-  end
-
   module ClassMethods
     def active_scaffold(model_id = nil, &block)
       # initialize bridges here
@@ -181,6 +141,7 @@ module ActiveScaffold
       @active_scaffold_custom_paths = []
 
       self.active_scaffold_superclasses_blocks.each {|superblock| self.active_scaffold_config.configure &superblock}
+      self.active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
       self.active_scaffold_config.configure &block if block_given?
       self.active_scaffold_config._configure_sti unless self.active_scaffold_config.sti_children.nil?
       self.active_scaffold_config._load_action_columns
@@ -200,14 +161,33 @@ module ActiveScaffold
 
           # sneak the action links from the actions into the main set
           if link = active_scaffold_config.send(mod).link rescue nil
-            active_scaffold_config.action_links << link
+            if link.is_a? Array
+              link.each {|current| active_scaffold_config.action_links.add_to_group(current, active_scaffold_config.send(mod).action_group)}
+            elsif link.is_a? ActiveScaffold::DataStructures::ActionLink
+              active_scaffold_config.action_links.add_to_group(link, active_scaffold_config.send(mod).action_group)
+            end
           end
         end
       end
       active_scaffold_paths.each do |path|
         self.append_view_path(ActionView::ActiveScaffoldResolver.new(path))
       end
-      self.active_scaffold_config._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
+      self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
+    end
+
+    # To be called after include action modules
+    def _add_sti_create_links
+      new_action_link = active_scaffold_config.action_links.collection['new']
+      unless new_action_link.nil? || active_scaffold_config.sti_children.empty?
+        active_scaffold_config.action_links.collection.delete('new')
+        active_scaffold_config.sti_children.each do |child|
+          new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
+          new_sti_link.label = child.to_s.camelize.constantize.model_name.human
+          new_sti_link.parameters = {:parent_sti => controller_path}
+          new_sti_link.controller = Proc.new { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
+          active_scaffold_config.action_links.collection.create.add(new_sti_link)
+        end
+      end
     end
 
     # Create the automatic column links. Note that this has to happen when configuration is *done*, because otherwise the Nested module could be disabled. Actually, it could still be disabled later, couldn't it?
@@ -215,14 +195,22 @@ module ActiveScaffold
       return unless active_scaffold_config.actions.include? :list and active_scaffold_config.actions.include? :nested
       active_scaffold_config.columns.each do |column|
         next unless column.link.nil? and column.autolink?
-        action_link = link_for_association(column)
-        column.set_link(action_link) unless action_link.nil?
+        #lazy load of action_link, cause it was really slowing down app in dev mode
+        #and might lead to trouble cause of cyclic constantization of controllers
+        #and might be unnecessary cause it is done before columns are configured
+        column.set_link(Proc.new {|col| link_for_association(col)})
       end
     end
 
     def link_for_association(column, options = {})
       begin
-        controller = column.polymorphic_association? ? :polymorph : active_scaffold_controller_for(column.association.klass)
+        controller = if column.polymorphic_association?
+          :polymorph
+        elsif options.include?(:controller)
+          "#{options[:controller].to_s.camelize}Controller".constantize
+        else
+          active_scaffold_controller_for(column.association.klass)
+        end
       rescue ActiveScaffold::ControllerNotFound
         controller = nil
       end
@@ -230,7 +218,7 @@ module ActiveScaffold
       unless controller.nil?
         options.reverse_merge! :label => column.label, :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
         options[:parameters] ||= {}
-        options[:parameters].reverse_merge! :parent_model => column.active_record_class.to_s.underscore, :association => column.association.name
+        options[:parameters].reverse_merge! :parent_scaffold => controller_path, :association => column.association.name
         if column.plural_association?
           # note: we can't create nested scaffolds on :through associations because there's no reverse association.
 
@@ -249,7 +237,7 @@ module ActiveScaffold
     def link_for_association_as_scope(scope, options = {})
       options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
       options[:parameters] ||= {}
-      options[:parameters].reverse_merge! :parent_model => active_scaffold_config.model.to_s.underscore, :named_scope => scope
+      options[:parameters].reverse_merge! :parent_scaffold => controller_path, :named_scope => scope
       ActiveScaffold::DataStructures::ActionLink.new('index', options)
     end
 
@@ -343,30 +331,18 @@ module ActiveScaffold
   end
 end
 
-# TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
-Dir["#{File.dirname __FILE__}/extensions/*.rb"].each { |file| require file }
-
-ActionController::Base.send(:include, ActiveScaffold)
-ActionController::Base.send(:include, RespondsToParent)
-ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers)
-ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
-
-ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
-
-I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold', 'locale', '*.{rb,yml}')]
-#ActiveScaffold.js_framework = :jquery
+require 'active_scaffold_env'
 
 ##
 ## Run the install assets script, too, just to make sure
 ## But at least rescue the action in production
 ##
+
 Rails::Application.initializer("active_scaffold.install_assets") do
   begin
-    ActiveScaffold.delete_stale_assets
-    ActiveScaffold.install_assets_from(ActiveScaffold.root)
+    ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
   rescue
     raise $! unless Rails.env == 'production'
   end
-end
+end if defined?(ACTIVE_SCAFFOLD_GEM)
+

data/lib/active_scaffold_assets.rb

@@ -0,0 +1,45 @@
+class ActiveScaffoldAssets
+
+  def self.copy_to_public(from, options = {})
+    unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
+      copy_files("/public", "/public", from)
+      available_frontends = Dir[File.join(from, 'frontends', '*')].collect { |d| File.basename d }
+      [:stylesheets, :javascripts, :images].each do |asset_type|
+        copy_asset_type(from, available_frontends, asset_type, options)
+      end
+    end
+  end
+
+protected
+
+  def self.copy_asset_type(from, available_frontends, asset_type, options = {})
+    path = "/public/#{asset_type}/active_scaffold"
+    copy_files(path, path, from)
+
+    File.open(File.join(Rails.root, path, 'DO_NOT_EDIT'), 'w') do |f|
+      f.puts "Any changes made to files in sub-folders will be lost."
+      f.puts "See http://activescaffold.com/tutorials/faq#custom-css."
+    end
+
+    available_frontends.each do |frontend|
+      if asset_type == :javascripts
+        file_mask = '*.js'
+        source = "/frontends/#{frontend}/#{asset_type}/#{ActiveScaffold.js_framework}"
+      else
+        file_mask = '*.*'
+        source = "/frontends/#{frontend}/#{asset_type}"
+      end
+      destination = "/public/#{asset_type}/active_scaffold/#{frontend}"
+      copy_files(source, destination, from, file_mask, options)
+    end
+  end
+
+  def self.copy_files(source_path, destination_path, directory, file_mask = '*.*', options = {})
+    source, destination = File.join(directory, source_path), File.join(Rails.root, destination_path)
+    FileUtils.mkdir_p(destination) unless File.exist?(destination)
+    Dir.glob('*.so')
+
+    FileUtils.rm Dir.glob("#{destination}/*") if options[:clean_up_destination]
+    FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
+  end
+end

data/lib/active_scaffold_env.rb

@@ -0,0 +1,14 @@
+# TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
+Dir["#{File.dirname __FILE__}/extensions/*.rb"].each { |file| require file }
+
+ActionController::Base.send(:include, ActiveScaffold)
+ActionController::Base.send(:include, RespondsToParent)
+ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers)
+ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
+
+ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
+ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
+ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
+
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold', 'locale', '*.{rb,yml}')]
+#ActiveScaffold.js_framework = :jquery

data/lib/active_scaffold_vho.rb

@@ -0,0 +1,2 @@
+ACTIVE_SCAFFOLD_GEM = true
+require 'active_scaffold'

data/lib/extensions/active_association_reflection.rb

@@ -0,0 +1,13 @@
+# Bugfix: building an sti model from an association fails
+# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6306-collection-associations-build-method-not-supported-for-sti
+ActiveRecord::Reflection::AssociationReflection.class_eval do
+  def build_association(*opts)
+    col = klass.inheritance_column.to_sym
+    if !col.nil? && opts.first.is_a?(Hash) && (opts.first.symbolize_keys[col])
+      sti_model = opts.first.delete(col)
+      sti_model.to_s.camelize.constantize.new(*opts)
+    else
+      klass.new(*opts)
+    end
+  end
+end

data/lib/extensions/paginator_extensions.rb

@@ -1,4 +1,4 @@
-require 'paginator'
+require 'active_scaffold/paginator'
 
 class Paginator
 

data/lib/extensions/routing_mapper.rb

@@ -2,7 +2,7 @@ module ActionDispatch
   module Routing
     ACTIVE_SCAFFOLD_CORE_ROUTING = {
         :collection => {:show_search => :get, :render_field => :get},
-        :member => {:row => :get, :update_column => :post, :render_field => :get, :delete => :get}
+        :member => {:row => :get, :update_column => :post, :render_field => :get}
     }
     ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING = {
         :collection => {:edit_associated => :get, :new_existing => :get, :add_existing => :post},

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -8,8 +8,10 @@ module Rails
       end
 
       def install_plugins
-        plugin 'verification', :git => 'git://github.com/rails/verification.git'
-        plugin 'render_component', :git => 'git://github.com/vhochstein/render_component.git'
+        unless defined?(ACTIVE_SCAFFOLD_GEM)
+          plugin 'verification', :git => 'git://github.com/rails/verification.git'
+          plugin 'render_component', :git => 'git://github.com/vhochstein/render_component.git'
+        end
         if js_lib == 'prototype'
           get "https://github.com/vhochstein/prototype-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
         elsif js_lib == 'jquery'
@@ -19,8 +21,14 @@ module Rails
       end
 
       def configure_active_scaffold
-        if js_lib == 'jquery'
-          gsub_file 'vendor/plugins/active_scaffold/environment.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
+        unless defined?(ACTIVE_SCAFFOLD_GEM)
+          if js_lib == 'jquery'
+            gsub_file 'vendor/plugins/active_scaffold/lib/active_scaffold_env.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
+          end
+        else
+          if js_lib == 'jquery'
+            create_file "config/initializers/active_scaffold.rb", "ActiveScaffold.js_framework = :jquery"
+          end
         end
       end