active_scaffold_vho 3.0.20 → 3.0.21

data/Gemfile

@@ -8,6 +8,7 @@ source "http://rubygems.org"
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  #gem "jeweler", "~> 1.5.2"
+  gem "jeweler", :git => 'git://github.com/vhochstein/jeweler.git'
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,12 +1,17 @@
+GIT
+  remote: git://github.com/vhochstein/jeweler.git
+  revision: 5cdcbb9aff001309bf82e3df4060b8e2b485b8ea
+  specs:
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+
 GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
+    rake (0.9.2)
     rcov (0.9.9)
     shoulda (2.11.3)
 
@@ -15,6 +20,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  jeweler!
   rcov
   shoulda

data/README

@@ -20,7 +20,8 @@ http://code.google.com/p/recordselect/
 
 Please note the following list of Active Scaffold branches and Rails versions. Master will not work with Rails < 2.2
 
-Active Scaffold master currently supports rails-2.3.5, but incompatible changes can be introduced, if you want an stable version, use rails-2.3
+Active Scaffold master currently supports rails-3.1, but incompatible changes can be introduced, if you want an stable version, use rails-2.3
+Rails 3.0.*: Active Scaffold rails-3.0
 Rails 2.3.*: Active Scaffold rails-2.3
 Rails 2.2.*: Active Scaffold rails-2.2
 Rails 2.1.*: Active Scaffold rails-2.1
@@ -37,13 +38,13 @@ Since Rails 3.0, https://github.com/rails/verification.git is also needed.
 If you want to install as plugins under vendor/plugins, install these versions:
   rails plugin install git://github.com/vhochstein/render_component.git
   rails plugin install git://github.com/rails/verification.git
-  rails plugin install git://github.com/vhochstein/active_scaffold.git
+  rails plugin install git://github.com/vhochstein/active_scaffold.git -r 'rails-3.0'
 
 If you want to use the gem, add to your Gemfile:
   gem "active_scaffold_vho"
 
 In case you would like to use most recent commit:
-  gem 'active_scaffold_vho', :git => 'git://github.com/vhochstein/active_scaffold.git'
+  gem 'active_scaffold_vho', :git => 'git://github.com/vhochstein/active_scaffold.git', :branch => 'rails-3.0'
 
 == Pick your own javascript framework
 
@@ -66,4 +67,8 @@ To configure the javascript framework when installed as a gem:
 Add a config/initializers/active_scaffold.rb containing:
 ActiveScaffold.js_framework = :jquery # :prototype is the default
 
+== Rails 3.1 compatible fork of activesaffold by Volker Hochstein:
+under construction
+
+
 Released under the MIT license (included)

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.20"
+  s.version = "3.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-05-27}
+  s.date = %q{2011-09-23}
   s.description = %q{Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -131,6 +131,8 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb",
     "lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb",
     "lib/active_scaffold/bridges/carrierwave/lib/list_ui.rb",
+    "lib/active_scaffold/bridges/country_helper/bridge.rb",
+    "lib/active_scaffold/bridges/country_helper/lib/country_helper_bridge.rb",
     "lib/active_scaffold/bridges/date_picker/bridge.rb",
     "lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb",
     "lib/active_scaffold/bridges/date_picker/public/javascripts/date_picker_bridge.js",
@@ -198,7 +200,6 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/finder.rb",
     "lib/active_scaffold/helpers/association_helpers.rb",
     "lib/active_scaffold/helpers/controller_helpers.rb",
-    "lib/active_scaffold/helpers/country_helpers.rb",
     "lib/active_scaffold/helpers/form_column_helpers.rb",
     "lib/active_scaffold/helpers/human_condition_helpers.rb",
     "lib/active_scaffold/helpers/id_helpers.rb",
@@ -306,54 +307,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails 3 Version of activescaffold supporting prototype and jquery}
-  s.test_files = [
-    "test/bridges/bridge_test.rb",
-    "test/config/base_test.rb",
-    "test/config/create_test.rb",
-    "test/config/list_test.rb",
-    "test/config/show_test.rb",
-    "test/config/update_test.rb",
-    "test/const_mocker.rb",
-    "test/data_structures/action_columns_test.rb",
-    "test/data_structures/action_link_test.rb",
-    "test/data_structures/action_links_test.rb",
-    "test/data_structures/actions_test.rb",
-    "test/data_structures/association_column_test.rb",
-    "test/data_structures/column_test.rb",
-    "test/data_structures/columns_test.rb",
-    "test/data_structures/error_message_test.rb",
-    "test/data_structures/set_test.rb",
-    "test/data_structures/sorting_test.rb",
-    "test/data_structures/standard_column_test.rb",
-    "test/data_structures/virtual_column_test.rb",
-    "test/extensions/active_record_test.rb",
-    "test/extensions/array_test.rb",
-    "test/helpers/form_column_helpers_test.rb",
-    "test/helpers/list_column_helpers_test.rb",
-    "test/helpers/pagination_helpers_test.rb",
-    "test/misc/active_record_permissions_test.rb",
-    "test/misc/attribute_params_test.rb",
-    "test/misc/configurable_test.rb",
-    "test/misc/constraints_test.rb",
-    "test/misc/finder_test.rb",
-    "test/misc/lang_test.rb",
-    "test/mock_app/app/controllers/application_controller.rb",
-    "test/mock_app/app/helpers/application_helper.rb",
-    "test/mock_app/config/boot.rb",
-    "test/mock_app/config/environment.rb",
-    "test/mock_app/config/environments/development.rb",
-    "test/mock_app/config/environments/production.rb",
-    "test/mock_app/config/environments/test.rb",
-    "test/mock_app/config/initializers/backtrace_silencers.rb",
-    "test/mock_app/config/initializers/inflections.rb",
-    "test/mock_app/config/initializers/mime_types.rb",
-    "test/mock_app/config/initializers/new_rails_defaults.rb",
-    "test/mock_app/config/initializers/session_store.rb",
-    "test/mock_app/config/routes.rb",
-    "test/model_stub.rb",
-    "test/run_all.rb",
-    "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -362,7 +315,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<render_component_vho>, [">= 0"])
       s.add_runtime_dependency(%q<verification>, [">= 0"])
@@ -370,7 +323,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<render_component_vho>, [">= 0"])
       s.add_dependency(%q<verification>, [">= 0"])
@@ -379,7 +332,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<render_component_vho>, [">= 0"])
     s.add_dependency(%q<verification>, [">= 0"])

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -34,7 +34,14 @@ $(document).ready(function() {
       } else {
         // hack: jquery requires if you request for javascript that javascript
         // is coming back, however rails has a different mantra
-        if (action_link.position) event.data_type = 'rails';
+        if (action_link.position) {
+          if (parseFloat($.fn.jquery) >= 1.5) {
+            event.data_type = 'text';
+          } else {
+            event.data_type = 'rails';
+          }
+        }
+        
         if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','visible');
         action_link.disable();
       }
@@ -50,7 +57,7 @@ $(document).ready(function() {
       } else {
         action_link.enable();
       }
-      return true;
+      $(this).trigger('as:action_success', action_link);
     }
     return true;
   });
@@ -117,19 +124,6 @@ $(document).ready(function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('span.in_place_editor_field').live('hover', function(event) {
-    $(this).data(); // jquery 1.4.2 workaround
-    if (event.type == 'mouseenter') {
-      if (typeof($(this).data('editInPlace')) === 'undefined') $(this).addClass("hover");
-     }
-    if (event.type == 'mouseleave') {
-      if (typeof($(this).data('editInPlace')) === 'undefined') $(this).removeClass("hover");
-    }
-    return true;
-  });
-  $('span.in_place_editor_field').live('click', function(event) {
-    ActiveScaffold.in_place_editor_field_clicked($(this));
-  });
   $('a.as_paginate').live('ajax:before',function(event) {
     var as_paginate = $(this);
     var history_controller_id = as_paginate.attr('data-page-history');
@@ -230,6 +224,23 @@ $(document).ready(function() {
     }
     return true;
   });
+  $('form.as_form').live('as:form_loaded', function(event) {
+    var as_form = $(this).closest("form");
+    ActiveScaffold.focus_first_element_of_form(as_form);
+    return true;
+  });
+  $('span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]').live('click', function(event) {
+    ActiveScaffold.process_checkbox_inplace_edit($(this).find('input:checkbox'), ActiveScaffold.inplace_edit_options($(this)));
+    return true;
+  });
+  $('tr.record').live('as:list_row_loaded', function(event) {
+    $(this).closest("tr").find('td > span.in_place_editor_field[data-ie_mode!="inline_checkbox"]').each(function(index) {
+      ActiveScaffold.create_inplace_editor($(this));
+    });
+    return true;
+  });
+  ActiveScaffold.trigger_load_events($('[data-as_load]'));
+  
 });
 
 /* Simple Inheritance
@@ -439,6 +450,7 @@ var ActiveScaffold = {
     if (element.attr('id')) {
       element = $('#' + element.attr('id'));
     }
+    ActiveScaffold.trigger_load_events(element.find('[data-as_load]').andSelf());
     return element;
   },
   
@@ -446,6 +458,7 @@ var ActiveScaffold = {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
     element.html(html);
+    ActiveScaffold.trigger_load_events(element.find('[data-as_load]'));
     return element;
   },
   
@@ -498,15 +511,18 @@ var ActiveScaffold = {
     
     if (options.insert_at == 'top') {
       tbody.prepend(html);
+      ActiveScaffold.trigger_load_events(tbody.children().first().find('[data-as_load]'));
       var new_row = tbody.children('tr.record:first-child');
     } else if (options.insert_at == 'bottom') {
       var rows = tbody.children('tr.record, tr.inline-adapter');
       var new_row = null;
       if (rows.length > 0) {
         new_row = rows.last().after(html).next();
+
       } else {
         new_row = tbody.append(html).children().last();
       }
+      ActiveScaffold.trigger_load_events(new_row);
     }
     this.stripe(tbody);
     this.hide_empty_message(tbody);
@@ -590,10 +606,8 @@ var ActiveScaffold = {
     if (column_heading.attr('data-ie_size')) options.text_size = column_heading.attr('data-ie_size');
   }, 
   
-  create_inplace_editor: function(span, options) {
-    span.removeClass('hover');
-    span.editInPlace(options);
-    span.trigger('click.editInPlace');
+  create_inplace_editor: function(span) {
+    span.editInPlace(ActiveScaffold.inplace_edit_options(span));
   },
   
   highlight: function(element) {
@@ -646,6 +660,7 @@ var ActiveScaffold = {
     if (element) {
       if (options.is_subform == false) {
         this.replace(element.closest('dl'), content);
+        ActiveScaffold.trigger_load_events(element.closest('li.form-element'));
       } else {
         this.replace_html(element, content);
       }
@@ -701,9 +716,7 @@ var ActiveScaffold = {
     }
   },
 
-  in_place_editor_field_clicked: function(span) {
-    span.data(); // jquery 1.4.2 workaround
-    if (typeof(span.data('editInPlace')) === 'undefined') {
+  inplace_edit_options: function(span){
       var options = {show_buttons: true,
                      hover_class: 'hover',
                      element_id: 'editor_id',
@@ -756,14 +769,29 @@ var ActiveScaffold = {
         var plural = false;
         if (column_heading.attr('data-ie_plural')) plural = true;
         options.field_type = 'remote';
-        options.editor_url = render_url.replace(/__id__/, record_id)
+        options.editor_url = render_url.replace(/__id__/, record_id);
       }
-      if (mode === 'inline_checkbox') {
-        ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
-      } else {
-        ActiveScaffold.create_inplace_editor(span, options);
+      return options;
+  },
+
+  in_place_checkbox_clicked: function(span) {
+    ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
+  },
+
+  trigger_load_events: function(elements){
+    elements.each(function(index) {
+      switch ($(this).attr('data-as_load')) {
+      case 'tr':
+       $(this).trigger('as:list_row_loaded');
+       break;
+      case 'form':
+       $(this).trigger('as:form_loaded');
+       break;
+      case 'form-element':
+       $(this).trigger('as:form_element_loaded');
+       break;
       }
-    }
+    });
   }
 }
 
@@ -863,6 +891,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.loading_indicator = loading_indicator;
     this.hide_target = false;
     this.position = this.tag.attr('data-position');
+    this.action = this.tag.attr('data-action');
 		
     this.tag.data('action_link', this);
     return this;
@@ -963,10 +992,12 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
     if (this.position == 'after') {
       this.target.after(content);
+      ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
       this.target.before(content);
+      ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
       this.set_adapter(this.target.prev());
     }
     else {
@@ -1027,6 +1058,7 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
   insert: function(content) {
     if (this.position == 'top') {
       this.target.prepend(content);
+      ActiveScaffold.trigger_load_events(this.target.children().first().find('[data-as_load]'));
       this.set_adapter(this.target.children().first());
     }
     else {

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -309,6 +309,12 @@ document.observe("dom:loaded", function() {
     }
     return true;
   });
+  document.on('as:form_loaded', 'form.as_form', function(event) {
+      var as_form = event.findElement('form');
+      ActiveScaffold.focus_first_element_of_form(as_form);
+      return true;
+  });
+  ActiveScaffold.trigger_load_events($$('[data-as_load]'));
 });
 
 
@@ -394,12 +400,16 @@ var ActiveScaffold = {
     element = $(element)
     Element.replace(element, html);
     element = $(element.readAttribute('id'));
+    var elements = element.select('[data-as_load]');
+    elements.unshift(element);
+    ActiveScaffold.trigger_load_events(elements);
     return element;
   },
     
   replace_html: function(element, html) {
     element = $(element);
     element.update(html);
+    ActiveScaffold.trigger_load_events(element.select('[data-as_load]'));
     return element;
   },
   
@@ -454,7 +464,7 @@ var ActiveScaffold = {
       }
       new_row = Selector.findChildElements(tbody, ['tr.record']).last();
     }
-    
+    ActiveScaffold.trigger_load_events(new Array(new_row));
     this.stripe(tbody);
     this.hide_empty_message(tbody);
     this.increment_record_count(tbody.up('div.active-scaffold'));
@@ -581,6 +591,7 @@ var ActiveScaffold = {
     if (element) {
       if (options.is_subform == false) {
         this.replace(element.up('dl'), content);
+        ActiveScaffold.trigger_load_events(new Array(element.up('li.form-element')));
       } else {
         this.replace_html(element, content);
       }
@@ -620,6 +631,22 @@ var ActiveScaffold = {
       }
       mark_all_checkbox.writeAttribute('value', ('' + !options.checked));
     }
+  },
+
+  trigger_load_events: function(elements){
+    elements.each(function(element) {
+      switch (element.readAttribute('data-as_load')) {
+      case 'tr':
+       element.fire('as:list_row_loaded');
+       break;
+      case 'form':
+       element.fire('as:form_loaded');
+       break;
+      case 'form-element':
+       element.fire('as:form_element_loaded');
+       break;
+      }
+    });
   }
 
 }
@@ -854,10 +881,12 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
 
     if (this.position == 'after') {
       this.target.insert({after:content});
+      ActiveScaffold.trigger_load_events(this.target.next().select('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
       this.target.insert({before:content});
+      ActiveScaffold.trigger_load_events(this.target.previous().select('[data-as_load]'));
       this.set_adapter(this.target.previous());
     }
     else {
@@ -916,6 +945,7 @@ ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstrac
   insert: function(content) {
     if (this.position == 'top') {
       this.target.insert({top:content});
+      ActiveScaffold.trigger_load_events(this.target.immediateDescendants().first().select('[data-as_load]'));
       this.set_adapter(this.target.immediateDescendants().first());
     }
     else {

data/frontends/default/views/_add_existing_form.html.erb

@@ -4,7 +4,10 @@
 options = {:id => element_form_id(:action => :add_existing),
            :class => "as_form create",
            :method => :post,
-           'data-loading' => true}
+           'data-loading' => true,
+           'data-as_load' => 'form',
+           'data-as_action' => 'create'
+           }
   options[:remote] = true if xhr
   form_tag url_options, options -%>
 
@@ -25,6 +28,4 @@ options = {:id => element_form_id(:action => :add_existing),
     <%= loading_indicator_tag(:action => :add_existing, :id => params[:id]) %>
   </p>
 
-</form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => :add_existing)}');") %>
-
+</form>

data/frontends/default/views/_base_form.html.erb

@@ -14,7 +14,10 @@ options = {:onsubmit => onsubmit,
            :multipart => multipart,
            :class => "as_form #{form_action.to_s}",
            :method => method,
-           'data-loading' => true}
+           'data-loading' => true,
+           'data-as_load' => 'form',
+           'data-as_action' => form_action
+           }
 cancel_options = {:class => 'as_cancel', 'data-refresh' => false}
 
 cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
@@ -48,4 +51,3 @@ end
   </p>
 
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => form_action)}');") %>

data/frontends/default/views/_field_search.html.erb

@@ -4,7 +4,10 @@ options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",
            :remote => true,
            :method => :get,
-           'data-loading' => true}
+           'data-loading' => true,
+           'data-as_load' => 'form',
+           'data-as_action' => 'search'
+           }
 form_tag url_options, options %>
   <ol class="form">
    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
@@ -28,5 +31,4 @@ form_tag url_options, options %>
     <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
-</form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => 'search')}');") %>
+</form>

data/frontends/default/views/_form.html.erb

@@ -4,7 +4,7 @@
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
-  <li class="sub-section">
+  <li class="sub-section" data-as_load="form-element">
     <h5><%= column.label %></h5>
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id} %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
@@ -12,11 +12,11 @@
   <% elsif column.readonly_association?
     next %>
   <% elsif renders_as == :subform and !override_form_field?(column) -%>
-  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>" id="<%= sub_form_id(:association => column.name) %>">
+  <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>" id="<%= sub_form_id(:association => column.name) %>" data-as_load="form-element">
     <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>">
+  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>" data-as_load="form-element">
     <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% end -%>

data/frontends/default/views/_list_calculations.html.erb

@@ -1,6 +1,6 @@
 <% display_class = ( @records.kind_of?(Array) ? @records.first : @records ) 
    columns ||= list_columns -%>
-<tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
+<tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations" data-as_load="tr">
   <% columns.each do |column| -%>
     <td <%= "id=#{active_scaffold_calculations_id(column)}" if column.calculation? %>>
       <% if column.calculation? -%>

data/frontends/default/views/_list_record.html.erb

@@ -7,7 +7,7 @@ url_options = params_for(:action => :list, :id => record.id)
 action_links ||= active_scaffold_config.action_links.member
 -%>
 
-<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>">
+<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>" data-as_load="tr">
   <%= render :partial => 'list_record_columns', :locals => {:record => record, :columns => columns} %>
   <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options, :action_links => action_links} unless action_links.empty? %>
   <%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>

data/frontends/default/views/_search.html.erb

@@ -4,7 +4,10 @@
 options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",
            :remote => true,
-           :method => :get}
+           :method => :get,
+           'data-as_load' => 'form',
+           'data-as_action' => 'search'
+           }
 options['data-loading'] = true unless live_search
   form_tag url_options, options %>
   <%= text_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off %>
@@ -29,6 +32,5 @@ options['data-loading'] = true unless live_search
   $(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {
      $(<%= "##{search_input_id}".to_json.html_safe %>).parent().trigger("submit");});
 <% end -%>
-ActiveScaffold.focus_first_element_of_form('<%= element_form_id(:action => 'search') %>');
 //]]>
 </script>

data/frontends/default/views/action_confirmation.html.erb

@@ -1,6 +1,6 @@
 <div class="active-scaffold">
   <div class="delete-view view">
-    <%= form_tag params_for(:action => link.action, :id => params[:id]), { :method => link.method } %>
+    <%= form_tag params_for(:action => link.action, :id => params[:id]), { :method => link.method, 'data-as_load' => 'form', 'data-as_action' => link.action} %>
       <h4><%= link.confirm(record.try(:to_label)) -%></h4>
 
       <p class="form-footer">

data/frontends/default/views/delete.html.erb

@@ -1,6 +1,6 @@
 <div class="active-scaffold">
   <div class="delete-view view">
-    <%= form_tag params_for(:action => :destroy, :id => params[:id]), { :method => :delete } %>
+    <%= form_tag params_for(:action => :destroy, :id => params[:id]), { :method => :delete, 'data-as_load' => 'form', 'data-as_action' => :destroy} %>
       <h4><%= as_(:are_you_sure_to_delete, :label => @record.try(:to_label)) -%></h4>
 
       <p class="form-footer">

data/lib/active_scaffold/attribute_params.rb

@@ -39,6 +39,7 @@ module ActiveScaffold
       crud_type = parent_record.new_record? ? :create : :update
       return parent_record unless parent_record.authorized_for?(:crud_type => crud_type)
 
+      attributes = {} unless attributes.is_a?(Hash)
       multi_parameter_attributes = {}
       attributes.each do |k, v|
         next unless k.include? '('

data/lib/active_scaffold/bridges/country_helper/bridge.rb

@@ -0,0 +1,9 @@
+ActiveScaffold::Bridges.bridge "CountryHelper" do
+  install do
+    require File.join(File.dirname(__FILE__), "lib/country_helper_bridge.rb")
+  end
+
+  install? do
+    true
+  end
+end

data/lib/active_scaffold/{helpers/country_helpers.rb → bridges/country_helper/lib/country_helper_bridge.rb}

@@ -1,5 +1,5 @@
 module ActiveScaffold
-  module Helpers
+  module CountryHelperBridge
     module CountryHelpers
       # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
@@ -350,3 +350,9 @@ module ActiveScaffold
     end
   end
 end
+
+ActionView::Base.class_eval do
+  include ActiveScaffold::CountryHelperBridge::CountryHelpers
+  include ActiveScaffold::CountryHelperBridge::FormColumnHelpers
+  include ActiveScaffold::CountryHelperBridge::SearchColumnHelpers
+end

data/lib/active_scaffold/config/search.rb

@@ -42,7 +42,7 @@ module ActiveScaffold::Config
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
       unless @columns
-        self.columns = @core.columns.collect{|c| c.name if c.searchable? and c.column and c.column.text?}.compact
+        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
       end
       @columns
     end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -102,7 +102,7 @@ module ActiveScaffold::DataStructures
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.primary_key_name == current.association_foreign_key
           constrained_fields << current.name.to_sym
-          @child_association = current
+          @child_association = current if current.klass == @parent_model
         end
         if association.primary_key_name == current.primary_key_name
           # show columns for has_many and has_one child associationes

data/lib/active_scaffold/data_structures/sorting.rb

@@ -128,7 +128,7 @@ module ActiveScaffold::DataStructures
 
     def set_sorting_from_order_clause(order_clause, model_table_name = nil)
       clear
-      order_clause.split(',').each do |criterion|
+      order_clause.to_s.split(',').each do |criterion|
         unless criterion.blank?
           order_parts = extract_order_parts(criterion)
           add(order_parts[:column_name], order_parts[:direction]) unless different_table?(model_table_name, order_parts[:table_name])

data/lib/active_scaffold/finder.rb

@@ -93,7 +93,7 @@ module ActiveScaffold
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} LIKE ?", value[:opt].sub('?', value[:from])]
+          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
         elsif value[:opt] == 'BETWEEN'
           ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -26,7 +26,7 @@ module ActiveScaffold
           when :select, :multi_select, :record_select
             associated = value
             associated = [associated].compact unless associated.is_a? Array
-            associated = column.association.klass.find(associated.map(&:to_i)).collect(&:to_label) if column.association
+            associated = column.association.klass.where(["id in (?)", associated.map(&:to_i)]).collect(&:to_label) if column.association
             "#{column.active_record_class.human_attribute_name(column.name)} = #{associated.join(', ')}"
           when :boolean, :checkbox
             label = column.column.type_cast(value) ? as_(:true) : as_(:false)

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -269,7 +269,7 @@ module ActiveScaffold
         id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}
         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}
-
+        tag_options['data-ie_mode'] = :inline_checkbox if column.list_ui == :checkbox
         content_tag(:span, formatted_column, tag_options)
       end
 

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -10,7 +10,6 @@ module ActiveScaffold
       include ActiveScaffold::Helpers::ShowColumnHelpers
       include ActiveScaffold::Helpers::FormColumnHelpers
       include ActiveScaffold::Helpers::SearchColumnHelpers
-      include ActiveScaffold::Helpers::CountryHelpers
       include ActiveScaffold::Helpers::HumanConditionHelpers
 
       ##
@@ -170,6 +169,7 @@ module ActiveScaffold
         html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
         html_options['data-position'] = link.position if link.position and link.inline?
         html_options[:class] += ' as_action' if link.inline?
+        html_options['data-action'] = link.action if link.inline?
         if link.popup?
           html_options['data-popup'] = true
           html_options[:target] = '_blank'
@@ -209,7 +209,7 @@ module ActiveScaffold
           html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
         end
         # if url is nil we would like to generate an anchor without href attribute
-        url.nil? ? html.sub(/href=".*?"/, '') : html 
+        url.nil? ? html.sub(/href=".*?"/, '').html_safe : html.html_safe
       end
       
       def url_options_for_nested_link(column, record, link, url_options, options = {})
@@ -302,7 +302,7 @@ module ActiveScaffold
       end
 
       def column_show_add_new(column, associated, record)
-        value = column.plural_association? || (column.singular_association? and not associated.empty?)
+        value = (column.plural_association? && !column.readonly_association?) || (column.singular_association? and not associated.empty?)
         value = false unless record.class.authorized_for?(:crud_type => :create)
         value
       end

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 3
   - 0
-  - 20
-  version: 3.0.20
+  - 21
+  version: 3.0.21
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +02:00
+date: 2011-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,14 +54,12 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        version: "0"
   requirement: *id003
   type: :development
 - !ruby/object:Gem::Dependency 
@@ -246,6 +244,8 @@ files:
 - lib/active_scaffold/bridges/carrierwave/lib/carrierwave_bridge_helpers.rb
 - lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb
 - lib/active_scaffold/bridges/carrierwave/lib/list_ui.rb
+- lib/active_scaffold/bridges/country_helper/bridge.rb
+- lib/active_scaffold/bridges/country_helper/lib/country_helper_bridge.rb
 - lib/active_scaffold/bridges/date_picker/bridge.rb
 - lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb
 - lib/active_scaffold/bridges/date_picker/public/javascripts/date_picker_bridge.js
@@ -313,7 +313,6 @@ files:
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
-- lib/active_scaffold/helpers/country_helpers.rb
 - lib/active_scaffold/helpers/form_column_helpers.rb
 - lib/active_scaffold/helpers/human_condition_helpers.rb
 - lib/active_scaffold/helpers/id_helpers.rb
@@ -449,50 +448,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails 3 Version of activescaffold supporting prototype and jquery
-test_files: 
-- test/bridges/bridge_test.rb
-- test/config/base_test.rb
-- test/config/create_test.rb
-- test/config/list_test.rb
-- test/config/show_test.rb
-- test/config/update_test.rb
-- test/const_mocker.rb
-- test/data_structures/action_columns_test.rb
-- test/data_structures/action_link_test.rb
-- test/data_structures/action_links_test.rb
-- test/data_structures/actions_test.rb
-- test/data_structures/association_column_test.rb
-- test/data_structures/column_test.rb
-- test/data_structures/columns_test.rb
-- test/data_structures/error_message_test.rb
-- test/data_structures/set_test.rb
-- test/data_structures/sorting_test.rb
-- test/data_structures/standard_column_test.rb
-- test/data_structures/virtual_column_test.rb
-- test/extensions/active_record_test.rb
-- test/extensions/array_test.rb
-- test/helpers/form_column_helpers_test.rb
-- test/helpers/list_column_helpers_test.rb
-- test/helpers/pagination_helpers_test.rb
-- test/misc/active_record_permissions_test.rb
-- test/misc/attribute_params_test.rb
-- test/misc/configurable_test.rb
-- test/misc/constraints_test.rb
-- test/misc/finder_test.rb
-- test/misc/lang_test.rb
-- test/mock_app/app/controllers/application_controller.rb
-- test/mock_app/app/helpers/application_helper.rb
-- test/mock_app/config/boot.rb
-- test/mock_app/config/environment.rb
-- test/mock_app/config/environments/development.rb
-- test/mock_app/config/environments/production.rb
-- test/mock_app/config/environments/test.rb
-- test/mock_app/config/initializers/backtrace_silencers.rb
-- test/mock_app/config/initializers/inflections.rb
-- test/mock_app/config/initializers/mime_types.rb
-- test/mock_app/config/initializers/new_rails_defaults.rb
-- test/mock_app/config/initializers/session_store.rb
-- test/mock_app/config/routes.rb
-- test/model_stub.rb
-- test/run_all.rb
-- test/test_helper.rb
+test_files: []
+