active_scaffold 3.2.7 → 3.2.8

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -26,8 +26,8 @@ module ActiveScaffold
         "#{options[:controller_id] || controller_id}-messages"
       end
 
-      def active_scaffold_calculations_id(column = nil)
-        "#{controller_id}-calculations#{'-' + column.name.to_s if column}"
+      def active_scaffold_calculations_id(options = {})
+        "#{options[:controller_id] || controller_id}-calculations#{'-' + options[:column].name.to_s if options[:column]}"
       end
 
       def empty_message_id

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -6,16 +6,16 @@ module ActiveScaffold
       def get_column_value(record, column)
         begin
           # check for an override helper
-          value = if column_override? column
+          value = if (method = column_override(column))
             # we only pass the record as the argument. we previously also passed the formatted_value,
             # but mike perham pointed out that prohibited the usage of overrides to improve on the
             # performance of our default formatting. see issue #138.
-            send(column_override(column), record)
+            send(method, record)
           # second, check if the dev has specified a valid list_ui for this column
-          elsif column.list_ui and override_column_ui?(column.list_ui)
-            send(override_column_ui(column.list_ui), column, record)
-          elsif column.column and override_column_ui?(column.column.type)
-            send(override_column_ui(column.column.type), column, record)
+          elsif column.list_ui and (method = override_column_ui(column.list_ui))
+            send(method, column, record)
+          elsif column.column and (method = override_column_ui(column.column.type))
+            send(method, column, record)
           else
             format_column_value(record, column)
           end
@@ -49,8 +49,11 @@ module ActiveScaffold
           else
             "<a class='disabled'>#{text}</a>".html_safe
           end
+        elsif inplace_edit?(record, column)
+          active_scaffold_inplace_edit(record, column, {:formatted_column => text})
+        elsif active_scaffold_config.list.wrap_tag
+          content_tag active_scaffold_config.list.wrap_tag, text
         else
-          text = active_scaffold_inplace_edit(record, column, {:formatted_column => text}) if inplace_edit?(record, column)
           text
         end
       end
@@ -128,26 +131,17 @@ module ActiveScaffold
         check_box(:record, column.name, options)
       end
 
-      def column_override_name(column, class_prefix = false)
-        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_column"
-      end
-
       def column_override(column)
-        method_with_class = column_override_name(column, true)
-        return method_with_class if respond_to?(method_with_class)
-        method = column_override_name(column)
-        method if respond_to?(method)
+        override_helper column, 'column'
       end
       alias_method :column_override?, :column_override
 
-      def override_column_ui?(list_ui)
-        respond_to?(override_column_ui(list_ui))
-      end
-
       # the naming convention for overriding column types with helpers
       def override_column_ui(list_ui)
-        "active_scaffold_column_#{list_ui}"
+        method = "active_scaffold_column_#{list_ui}"
+        method if respond_to? method
       end
+      alias_method :override_column_ui?, :override_column_ui
 
       ##
       ## Formatting
@@ -262,6 +256,7 @@ module ActiveScaffold
         tag_options = {:id => element_cell_id(id_options), :class => "in_place_editor_field",
                        :title => as_(:click_to_edit), 'data-ie_id' => record.id.to_s}
 
+        content_tag(:span, as_(:click_to_edit), :class => 'handle') <<
         content_tag(:span, formatted_column, tag_options)
       end
 

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -8,20 +8,20 @@ module ActiveScaffold
         options = active_scaffold_search_options(column)
 
         # first, check if the dev has created an override for this specific field for search
-        if override_search_field?(column)
-          send(override_search_field(column), @record, options)
+        if (method = override_search_field(column))
+          send(method, @record, options)
 
         # second, check if the dev has specified a valid search_ui for this column, using specific ui for searches
-        elsif column.search_ui and override_search?(column.search_ui)
-          send(override_search(column.search_ui), column, options)
+        elsif column.search_ui and (method = override_search(column.search_ui))
+          send(method, column, options)
 
         # third, check if the dev has specified a valid search_ui for this column, using generic ui for forms
-        elsif column.search_ui and override_input?(column.search_ui)
-          send(override_input(column.search_ui), column, options)
+        elsif column.search_ui and (method = override_input(column.search_ui))
+          send(method, column, options)
 
         # fourth, check if the dev has created an override for this specific field
-        elsif override_form_field?(column)
-          send(override_form_field(column), @record, options)
+        elsif (method = override_form_field(column))
+          send(method, @record, options)
 
         # fallback: we get to make the decision
         else
@@ -30,11 +30,11 @@ module ActiveScaffold
 
           else # regular model attribute column
             # if we (or someone else) have created a custom render option for the column type, use that
-            if override_search?(column.column.type)
-              send(override_search(column.column.type), column, options)
+            if (method = override_search(column.column.type))
+              send(method, column, options)
             # if we (or someone else) have created a custom render option for the column type, use that
-            elsif override_input?(column.column.type)
-              send(override_input(column.column.type), column, options)
+            elsif (method = override_input(column.column.type))
+              send(method, column, options)
             # final ultimate fallback: use rails' generic input method
             else
               # for textual fields we pass different options
@@ -216,25 +216,13 @@ module ActiveScaffold
       ##
 
       def override_search_field(column)
-        method_with_class = override_search_field_name(column, true)
-        return method_with_class if respond_to?(method_with_class)
-        method = override_search_field_name(column)
-        method if respond_to?(method)
-      end
-      alias_method :override_search_field?, :override_search_field
-
-      # the naming convention for overriding form fields with helpers
-      def override_search_field_name(column, class_prefix = false)
-        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_search_column"
-      end
-
-      def override_search?(search_ui)
-        respond_to?(override_search(search_ui))
+        override_helper column, 'search_column'
       end
 
       # the naming convention for overriding search input types with helpers
       def override_search(form_ui)
-        "active_scaffold_search_#{form_ui}"
+        method = "active_scaffold_search_#{form_ui}"
+        method if respond_to? method
       end
       
       def visibles_and_hiddens(search_config)

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -4,17 +4,17 @@ module ActiveScaffold
     module ShowColumnHelpers
       def show_column_value(record, column)
         # check for an override helper
-        if show_column_override? column
+        if (method = show_column_override(column))
           # we only pass the record as the argument. we previously also passed the formatted_value,
           # but mike perham pointed out that prohibited the usage of overrides to improve on the
           # performance of our default formatting. see issue #138.
-          send(show_column_override(column), record)
+          send(method, record)
         # second, check if the dev has specified a valid list_ui for this column
-        elsif column.list_ui and override_show_column_ui?(column.list_ui)
-          send(override_show_column_ui(column.list_ui), column, record)
+        elsif column.list_ui and (method = override_show_column_ui(column.list_ui))
+          send(method, column, record)
         else
-          if column.column and override_show_column_ui?(column.column.type)
-            send(override_show_column_ui(column.column.type), column, record)
+          if column.column and (method = override_show_column_ui(column.column.type))
+            send(method, column, record)
           else
             get_column_value(record, column)
           end
@@ -25,25 +25,14 @@ module ActiveScaffold
         simple_format(clean_column_value(record.send(column.name)))
       end
 
-      def show_column_override_name(column, class_prefix = false)
-        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_show_column"
-      end
-
       def show_column_override(column)
-        method_with_class = show_column_override_name(column, true)
-        return method_with_class if respond_to?(method_with_class)
-        method = show_column_override_name(column)
-        method if respond_to?(method)
-      end
-      alias_method :show_column_override?, :show_column_override
-
-      def override_show_column_ui?(list_ui)
-        respond_to?(override_show_column_ui(list_ui))
+        override_helper column, 'show_column'
       end
 
       # the naming convention for overriding show types with helpers
       def override_show_column_ui(list_ui)
-        "active_scaffold_show_#{list_ui}"
+        method = "active_scaffold_show_#{list_ui}"
+        method if respond_to? method
       end
     end
   end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -217,7 +217,13 @@ module ActiveScaffold
         class_override_helper = :"#{clean_class_name(record.class.name)}_list_row_class"
         respond_to?(class_override_helper) ? send(class_override_helper, record) : ''
       end
-      
+
+      def column_attributes(column, record)
+        method = override_helper column, 'column_attributes'
+        return send(method, record) if method
+        {}
+      end
+
       def column_class(column, column_value, record)
         classes = []
         classes << "#{column.name}-column"
@@ -231,6 +237,7 @@ module ActiveScaffold
         classes << 'empty' if column_empty? column_value
         classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
         classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
+        classes << 'in_place_editor_field' if inplace_edit?(record, column)
         classes.join(' ').rstrip
       end
       
@@ -293,6 +300,18 @@ module ActiveScaffold
         name.underscore.gsub('/', '_')
       end
      
+      # the naming convention for overriding with helpers
+      def override_helper_name(column, suffix, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_#{suffix}"
+      end
+
+      def override_helper(column, suffix)
+        method_with_class = override_helper_name(column, suffix, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = override_helper_name(column, suffix)
+        method if respond_to?(method)
+      end
+
       def active_scaffold_error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
         options.reverse_merge!(:container_tag => :div, :list_type => :ul)

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 3
   - 2
-  - 7
-  version: 3.2.7
+  - 8
+  version: 3.2.8
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-08 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -152,6 +152,7 @@ files:
 - frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_messages.html.erb
+- frontends/default/views/_refresh_list.js.erb
 - frontends/default/views/_render_field.js.erb
 - frontends/default/views/_row.html.erb
 - frontends/default/views/_search.html.erb
@@ -159,7 +160,9 @@ files:
 - frontends/default/views/_show.html.erb
 - frontends/default/views/_show_columns.html.erb
 - frontends/default/views/_update_actions.html.erb
+- frontends/default/views/_update_calculations.js.erb
 - frontends/default/views/_update_form.html.erb
+- frontends/default/views/_update_messages.js.erb
 - frontends/default/views/_vertical_subform.html.erb
 - frontends/default/views/_vertical_subform_record.html.erb
 - frontends/default/views/action_confirmation.html.erb
@@ -178,6 +181,7 @@ files:
 - frontends/default/views/on_update.js.erb
 - frontends/default/views/refresh_list.js.erb
 - frontends/default/views/render_field.js.erb
+- frontends/default/views/row.js.erb
 - frontends/default/views/search.html.erb
 - frontends/default/views/show.html.erb
 - frontends/default/views/update.html.erb