active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/locale/es.yml

@@ -8,8 +8,8 @@ es:
     click_to_edit: 'Pulsa para editar'
     click_to_reset: 'Pulsa para restaurar'
     close: 'Cerrar'
-    config_list: 'Configure'
-    config_list_model: 'Configure Columns for %{model}'
+    config_list: 'Configurar'
+    config_list_model: 'Configurar columnas de %{model}'
     create: 'Crear'
     create_model: 'Crear %{model}'
     create_another: 'Crear Otro %{model}'
@@ -31,7 +31,7 @@ es:
     live_search: 'Buscar en Vivo'
     loading: 'Cargando…'
     nested_for_model: '%{nested_model} de %{parent_model}'
-    nested_of_model: '%{nested_model} of %{parent_model}'
+    nested_of_model: '%{nested_model} de %{parent_model}'
     next: 'Siguiente'
     no_entries: 'Sin entradas'
     no_options: 'sin opciones'
@@ -67,31 +67,31 @@ es:
     contains: 'Contiene'
     begins_with: 'Empieza con'
     ends_with: 'Termina con'
-    today: 'Today'
-    yesterday: 'Yesterday'
-    tomorrow: 'Tommorrow'
-    this_week: 'This Week'
-    prev_week: 'Last Week'
-    next_week: 'Next Week'
-    this_month: 'This Month'
-    prev_month: 'Last Month'
-    next_month: 'Next Month'
-    this_year: 'This Year'
-    prev_year: 'Last Year'
-    next_year: 'Next Year'
-    past: 'Past'
-    future: 'Future'
-    range: 'Range'
-    seconds: 'Seconds'
-    minutes: 'Minutes'
-    hours: 'Hours'
-    days: 'Days'
-    weeks: 'Weeks'
-    months: 'Months'
-    years: 'Years'
-    optional_attributes: 'Further Options'
-    null: 'Null'
-    not_null: 'Not Null'
+    today: 'Hoy'
+    yesterday: 'Ayer'
+    tomorrow: 'Mañana'
+    this_week: 'Esta semana'
+    prev_week: 'Semana pasada'
+    next_week: 'Próxima semana'
+    this_month: 'Este mes'
+    prev_month: 'Mes pasado'
+    next_month: 'Próximo mes'
+    this_year: 'Este año'
+    prev_year: 'Año pasado'
+    next_year: 'Próximo año'
+    past: 'Pasado'
+    future: 'Futuro'
+    range: 'Rango'
+    seconds: 'Segundos'
+    minutes: 'Minutos'
+    hours: 'Horas'
+    days: 'Días'
+    weeks: 'Semanas'
+    months: 'Meses'
+    years: 'Años'
+    optional_attributes: 'Más opciones'
+    null: 'Nulo'
+    not_null: 'No Nulo'
     date_picker_options:
       weekHeader: 'Sm'
       firstDay: 1
@@ -104,12 +104,12 @@ es:
     errors:
       template:
         header:
-          one: "1 error prohibited this %{model} from being saved."
-          other: "%{count} errors prohibited this %{model} from being saved"
-        body: "There were problems with the following fields:"
+          one: "No se pudo guardar debido a un error."
+          other: "No se pudo guardar debido a %{count} errores."
+        body: "Hubo problemas con los siguientes campos:"
 
     # error_messages
     cant_destroy_record: "No se pudo borrar %{record}"
     internal_error: 'Petición fallida (código 500, error interno)'
     version_inconsistency: 'Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.'
-    no_authorization_for_action: "No Authorization for action %{action}"
+    no_authorization_for_action: "No dispone de autorización para la acción %{action}"

data/lib/active_scaffold/locale/fr.yml

@@ -0,0 +1,118 @@
+fr: 
+  active_scaffold: 
+    add: 'Ajouter'
+    add_existing: 'Ajouter un(e) existant(e)'
+    add_existing_model: 'Ajouter un(e) %{model} existant(e)'
+    are_you_sure_to_delete: 'Êtes vous sûr?'
+    cancel: 'Annuler'
+    click_to_edit: 'Cliquer pour éditer'
+    click_to_reset: 'Cliquer pour ré-initialiser'
+    close: 'Fermer'
+    config_list: 'Configure'
+    config_list_model: 'Configure Columns for %{model}'
+    create: 'Créer'
+    create_model: 'Créer %{model}'
+    create_another: 'Créer un autre'
+    created_model: '%{model} créé'
+    create_new: 'Créer un nouveau'
+    customize: 'Personnaliser'
+    delete: 'Supprimer'
+    deleted_model: 'Suppression de %{model}'
+    delimiter: 'Délimiteur'
+    download: 'Télécharger'
+    edit: 'Éditer'
+    export: 'Exporter'
+    nested_for_model: '%{nested_model} pour %{parent_model}'
+    nested_of_model: '%{nested_model} de %{parent_model}'
+    'false': 'Faux'
+    filtered: '(Filtré)'
+    found: 'Trouvé'
+    hide: 'Cacher'
+    live_search: 'Recherche en temps réel'
+    loading: 'Chargement…'
+    next: 'Suivant'
+    no_entries: "Pas d'entrée"
+    no_options: "pas d'option"
+    omit_header: 'Omettre les en-têtes'
+    options: 'Options'
+    pdf: 'PDF'
+    previous: 'Précédent'
+    print: 'Imprimer'
+    refresh: 'Rafraîchir'
+    remove: 'Supprimer'
+    remove_file: 'Supprimer et remplacer le fichier'
+    replace_with_new: 'Remplacer avec le nouveau'
+    revisions_for_model: 'Révision pour %{model}'
+    reset: 'Annuler'
+    saving: 'Sauvegarder…'
+    search: 'Rechercher'
+    search_terms: 'Recherche de termes'
+    _select_: '- sélectionner -'
+    show: 'Montrer'
+    show_model: 'Montrer %{model}'
+    _to_ : ' à '
+    'true': 'Vrai'
+    update: 'Mettre à jour'
+    update_model: 'Mettre à jour le(/la) %{model}'
+    updated_model: 'Mis à jour de %{model}'
+    '=': '='
+    '>=': '>='
+    '<=': '<='
+    '>': '>'
+    '<': '<'
+    '!=': '!='
+    between: 'Entre'
+    contains: 'Contient'
+    begins_with: 'Commençant par'
+    ends_with: 'Se terminant par'
+    today: "Aujourd'hui"
+    yesterday: 'Hier'
+    tomorrow: 'Demain'
+    this_week: 'Cette Semaine'
+    prev_week: 'Semaine dernière'
+    next_week: 'Semaine prochaine'
+    this_month: 'Ce Mois'
+    prev_month: 'Mois dernier'
+    next_month: 'Mois prochain'
+    this_year: 'Cette Année'
+    prev_year: 'Année dernière'
+    next_year: 'Année prochaine'
+    past: 'Passé'
+    future: 'Futur'
+    range: 'Intervale'
+    seconds: 'Secondes'
+    minutes: 'Minutes'
+    hours: 'Heures'
+    days: 'Jours'
+    weeks: 'Semaines'
+    months: 'Mois'
+    years: 'Années'
+    optional_attributes: 'Options additionnelles'
+    null: 'Nulle'
+    not_null: 'Non Nulle'
+    date_picker_options: 
+      weekHeader: 'Sm'
+      firstDay: 1
+      isRTL: false
+      showMonthAfterYear: false
+      
+    datetime_picker_options: 
+      timeText: 'Heure'
+      currentText: 'Maintenant'
+      closeText: 'Fermer'
+      
+    errors: 
+      template: 
+        header: 
+          one:    "1 erreur interdit ce(tte) %{model} d'être sauvegardé."
+          other:  "%{count} erreurs interdit ce(tte) %{model} d'être sauvegardé"
+          
+        body: "Il y avait des problèmes avec les champs suivants :"
+        
+      
+      # error_messages
+    cant_destroy_record: "%{record} ne peut être supprimé"
+    internal_error: 'Erreur de la requête (code 500, Erreur interne)'
+    version_inconsistency: "Version incomplète - Cet enregistrement a été modifié depuis que vous avez commencé à l'éditer."
+    record_not_saved: "Impossible d'enregistrer l'enregistrement à cause d'une erreur inconnue"
+    no_authorization_for_action: "Aucune autorisation pour l'action %{action}"

data/lib/active_scaffold/marked_model.rb

@@ -1,16 +1,16 @@
 module ActiveScaffold
   module MarkedModel
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
-
+    
     def self.included(base)
       base.extend ClassMethods
       base.scope :marked, lambda {{:conditions => {:id => base.marked_records.to_a}}}
     end
-
+    
     def marked
       marked_records.include?(self.id)
     end
-
+    
     def marked=(value)
       value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       if value == true
@@ -19,17 +19,17 @@ module ActiveScaffold
         marked_records.delete(self.id)
       end
     end
-
+  
     module ClassMethods
       def marked_records
         Thread.current[:marked_records] ||= Set.new
       end
 
       def marked_records=(marked)
-        Thread.current[:marked_records] = marked
+        Thread.current[:marked_records] = marked 
       end
     end
-
+  
     # Instance-level access to the marked_records
     def marked_records
       self.class.marked_records

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 12
+    PATCH = 21
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold_assets.rb

@@ -8,8 +8,6 @@ class ActiveScaffoldAssets
         copy_asset_type(from, available_frontends, asset_type, options)
       end
     end
-  rescue
-    raise $! unless Rails.env == 'production'
   end
 
 protected
@@ -44,4 +42,4 @@ protected
     FileUtils.rm Dir.glob("#{destination}/*") if options[:clean_up_destination]
     FileUtils.cp_r(Dir.glob("#{source}/#{file_mask}"), destination)
   end
-end
+end

data/lib/active_scaffold_env.rb

@@ -1,5 +1,5 @@
 # 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 }
+Dir["#{File.dirname __FILE__}/active_scaffold/extensions/*.rb"].each { |file| require file }
 
 ActionController::Base.send(:include, ActiveScaffold)
 ActionController::Base.send(:include, RespondsToParent)
@@ -11,4 +11,3 @@ ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAcc
 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/generators/active_scaffold/active_scaffold_generator.rb

@@ -6,14 +6,14 @@ module Rails
     class ActiveScaffoldGenerator < ResourceGenerator #metagenerator
       remove_hook_for :resource_controller
       remove_class_option :actions
-
+      
       def add_resource_route
-        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
+        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ") 
         route_config << "resources :#{file_name.pluralize} do as_routes end"
-        route_config << " end" * class_path.size
+        route_config << " end" * class_path.size 
         route route_config
-      end
-
+      end 
+     
       invoke "active_scaffold_controller"
     end
   end

data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb

@@ -16,13 +16,14 @@ module Rails
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template 'helper.rb', File.join('app/helpers', class_path, "#{controller_file_name}_helper.rb")
       end
 
       hook_for :test_framework, :as => :scaffold
 
       def create_view_root_folder
         empty_directory File.join("app/views", controller_file_path)
-      end
+      end 
     end
   end
-end
+end

data/lib/generators/active_scaffold_controller/templates/helper.rb

@@ -0,0 +1,2 @@
+module <%= controller_class_name %>Helper
+end

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -1,8 +1,8 @@
 module Rails
   module Generators
     class ActiveScaffoldSetupGenerator < Rails::Generators::Base #metagenerator
-      argument :js_lib, :type => :string, :default => 'prototype', :desc => 'js_lib for activescaffold (prototype|jquery)'
-
+      argument :js_lib, :type => :string, :default => 'prototype', :desc => 'js_lib for activescaffold (prototype|jquery)' 
+      
       def self.source_root
          @source_root ||= File.join(File.dirname(__FILE__), 'templates')
       end
@@ -19,43 +19,41 @@ module Rails
           get "https://github.com/vhochstein/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js", "public/javascripts/jquery-ui-timepicker-addon.js"
         end
       end
-
+      
       def configure_active_scaffold
+        return unless js_lib == 'jquery'
         if defined?(ACTIVE_SCAFFOLD_PLUGIN)
-          if js_lib == 'jquery'
-            gsub_file 'vendor/plugins/active_scaffold/lib/active_scaffold_env.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
-          end
+          content = "ActiveSupport.on_load(:active_scaffold) { self.js_framework = :jquery }"
         else
-          if js_lib == 'jquery'
-            create_file "config/initializers/active_scaffold.rb", "ActiveScaffold.js_framework = :jquery"
-          end
+          content = "ActiveScaffold.js_framework = :jquery"
         end
+        create_file "config/initializers/active_scaffold.rb", content
       end
-
+      
       def configure_application_layout
         if js_lib == 'prototype'
-          inject_into_file "app/views/layouts/application.html.erb",
+          inject_into_file "app/views/layouts/application.html.erb", 
                     "  <%= active_scaffold_includes %>\n",
                     :after => "<%= javascript_include_tag :defaults %>\n"
         elsif js_lib == 'jquery'
-          inject_into_file "app/views/layouts/application.html.erb",
-"  <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/themes/ui-lightness/jquery-ui.css' %>
-  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.js' %>
+          inject_into_file "app/views/layouts/application.html.erb", 
+"  <%= stylesheet_link_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/ui-lightness/jquery-ui.css' %>
+  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js' %>
   <%= javascript_include_tag 'rails_jquery.js' %>
-  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.4/jquery-ui.js' %>
+  <%= javascript_include_tag 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.js' %>
   <%= javascript_include_tag 'jquery-ui-timepicker-addon.js' %>
   <%= javascript_include_tag 'application.js' %>
   <%= active_scaffold_includes %>\n",
                    :after => "<%= javascript_include_tag :defaults %>\n"
-
+           
           inject_into_file "config/locales/en.yml",
 "  time:
     formats:
-      default: \"%a, %d %b %Y %H:%M:%S\"",
+      default: \"%a, %d %b %Y %H:%M:%S\"",                  
                    :after => "hello: \"Hello world\"\n"
           gsub_file 'app/views/layouts/application.html.erb', /<%= javascript_include_tag :defaults/, '<%# javascript_include_tag :defaults'
         end
-      end
+      end     
     end
   end
-end
+end

data/shoulda_macros/macros.rb

@@ -26,7 +26,7 @@ class ActiveSupport::TestCase
   def self.should_render_as_form_ui(column_name, form_ui)
     should "render column #{column_name} as #{form_ui} form_ui", :before => lambda{
       @rendered_columns = []
-      ActionView::Base.any_instance.expects(:"active_scaffold_input_#{form_ui}").at_least_once.with {|column, options|
+      @controller.view_context_class.any_instance.expects(:"active_scaffold_input_#{form_ui}").at_least_once.with {|column, options|
         @rendered_columns << column.name
         true
       }
@@ -60,7 +60,7 @@ class ActiveSupport::TestCase
   def self.should_render_as_form_hidden(column_name)
     should "render column #{column_name} as form hidden", :before => lambda{
       @rendered_columns = []
-      ActionView::Base.any_instance.expects(:"hidden_field").at_least_once.with {|object, method, options|
+      @controller.view_context_class.any_instance.expects(:"hidden_field").at_least_once.with {|object, method, options|
         @rendered_columns << method
         true
       }
@@ -73,7 +73,7 @@ class ActiveSupport::TestCase
   def self.should_render_as_list_ui(column_name, list_ui)
     should "render column #{column_name} as #{list_ui} list_ui", :before => lambda{
       @rendered_columns = []
-      ActionView::Base.any_instance.expects(:"active_scaffold_column_#{list_ui}").at_least_once.with {|column, options|
+      @controller.view_context_class.any_instance.expects(:"active_scaffold_column_#{list_ui}").at_least_once.with {|column, options|
         @rendered_columns << column.name
         true
       }
@@ -102,7 +102,7 @@ class ActiveSupport::TestCase
       @column = @controller.active_scaffold_config.columns[column_name]
       @rendered_columns = []
       method = @column.list_ui == :checkbox ? :format_column_checkbox : :active_scaffold_inplace_edit
-      ActionView::Base.any_instance.expects(method).at_least_once.with {|model, column, options|
+      @controller.view_context_class.any_instance.expects(method).at_least_once.with {|model, column, options|
         @rendered_columns << column.name
         true
       }

data/test/misc/finder_test.rb

@@ -33,13 +33,13 @@ class FinderTest < Test::Unit::TestCase
     ]
 
     expected_conditions = [
-			'(LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?) AND (LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?)',
+			'("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?) AND ("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
 		  '%foo%', '%foo%', '%bar%', '%bar%'
 		]
     assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns(tokens, columns)
 
     expected_conditions = [
-      '(LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?)',
+      '("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
       '%foo%', '%foo%'
     ]
     assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns('foo', columns)