active_scaffold_batch_vho 3.0.6 → 3.1.0

data/README

@@ -0,0 +1,17 @@
+ActiveScaffold batch is a gem which adds batch_update, batch_delete and batch_destroy actions
+to activescaffold, which means you can perform operations on more than justone record.
+
+Rails 3.0 Gem:
+gem 'active_scaffold_batch_vho'
+or
+gem 'active_scaffold_batch_vho', :git => 'git://github.com/vhochstein/active_scaffold_batch.git', :branch => 'rails-3.0'
+
+Rails 3.1 Gem:
+gem 'active_scaffold_config_batch'
+or
+gem 'active_scaffold_config_batch', :git => 'git://github.com/vhochstein/active_scaffold_batch.git'
+
+
+For further details examples please take a look at:
+http://vhochstein.wordpress.com/2010/12/31/activescaffold-batch-update/
+http://vhochstein.wordpress.com/2011/01/14/activescaffold-batch-destroy/

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{You want to destroy/update many records at once with activescaffold?}
   gem.email = "activescaffold@googlegroups.com"
   gem.authors = ["Volker Hochstein"]
-  gem.add_runtime_dependency 'active_scaffold_vho', '> 3.0.13'
+  gem.add_runtime_dependency 'active_scaffold_vho', '>= 3.1'
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/active_scaffold_batch_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_batch_vho}
-  s.version = "3.0.6"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Volker Hochstein"]
-  s.date = %q{2011-03-14}
+  s.date = %q{2011-11-23}
   s.description = %q{You want to destroy/update many records at once with activescaffold?}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
     "frontends/default/views/_batch_update_form_body.html.erb",
     "frontends/default/views/batch_create.html.erb",
     "frontends/default/views/batch_update.html.erb",
-    "frontends/default/views/on_batch_base.js.rjs",
-    "frontends/default/views/on_batch_create.js.rjs",
-    "frontends/default/views/on_batch_update.js.rjs",
+    "frontends/default/views/on_batch_base.js.erb",
+    "frontends/default/views/on_batch_create.js.erb",
+    "frontends/default/views/on_batch_update.js.erb",
     "init.rb",
     "lib/active_scaffold/actions/batch_base.rb",
     "lib/active_scaffold/actions/batch_create.rb",
@@ -66,24 +66,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<active_scaffold_vho>, ["> 3.0.13"])
+      s.add_runtime_dependency(%q<active_scaffold_vho>, [">= 3.1"])
     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<active_scaffold_vho>, ["> 3.0.13"])
+      s.add_dependency(%q<active_scaffold_vho>, [">= 3.1"])
     end
   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<active_scaffold_vho>, ["> 3.0.13"])
+    s.add_dependency(%q<active_scaffold_vho>, [">= 3.1"])
   end
 end
 

data/frontends/default/views/{on_batch_base.js.rjs → on_batch_base.js.erb}

@@ -1,6 +1,8 @@
+<%
 unless @error_records.empty?
   flash[:error] = @error_records.collect do |record|
     active_scaffold_error_messages_for(record, :object_name => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}", :header_message => '', :message => "#{record.class.model_name.human.downcase}#{record.new_record? ? '' : ": #{record.to_label}"}", :container_tag => nil, :list_type => :br)
   end.join.html_safe
 end
-page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
+%>
+ActiveScaffold.replace_html('<%= active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');

data/frontends/default/views/on_batch_create.js.erb

@@ -0,0 +1,18 @@
+<% form_selector = "#{element_form_id(:action => :batch_create)}" %>
+
+<% if controller.send :batch_successful? %>
+  <% called_by_controller = params.delete(:batch_create_by) %>
+  <% if called_by_controller.nil? %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
+  <% else %>
+    <% options = {:checked => false,
+               :include_mark_all => false} %>
+    <% tbody_id = "#{controller_id(called_by_controller)}-tbody" %>
+    ActiveScaffold.mark_records('<%=tbody_id%>', <%=options.to_json%>);
+  <% end %>
+  ActiveScaffold.find_action_link('<%=form_selector%>').close();
+<% else %>
+  ActiveScaffold.find_action_link('<%=form_selector%>').update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+  ActiveScaffold.replace('<%=form_selector%>', '<%=escape_javascript(render(:partial => 'batch_create_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>

data/frontends/default/views/on_batch_update.js.erb

@@ -0,0 +1,10 @@
+<% form_selector = "#{element_form_id(:action => :batch_update)}" %>
+
+<% if controller.send :batch_successful? %>
+  ActiveScaffold.replace_html('<%= active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
+  ActiveScaffold.find_action_link('<%=form_selector%>').close();
+<% else %>
+  ActiveScaffold.find_action_link('<%=form_selector%>').update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+  ActiveScaffold.replace('<%=form_selector%>', '<%=escape_javascript(render(:partial => 'batch_update_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>

data/lib/active_scaffold/actions/batch_update.rb

@@ -206,6 +206,7 @@ module ActiveScaffold::Actions
 
     def attribute_values_from_params(columns, attributes)
       values = {}
+      attributes = {} unless attributes.is_a?(Hash)
       columns.each :for => new_model, :crud_type => :update, :flatten => true do |column|
         values[column.name] = {:column => column, :value => attributes[column.name].merge(:value => column_value_from_param_value(nil, column, attributes[column.name][:value]))} if selected_columns.include? column.name
       end

data/lib/active_scaffold_batch/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldBatch
   module Version
     MAJOR = 3
-    MINOR = 0
-    PATCH = 6
+    MINOR = 1
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold_batch.rb

@@ -32,7 +32,6 @@ I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold_batch',
 ##
 Rails::Application.initializer("active_scaffold_batch.install_assets", :after => "active_scaffold.install_assets") do
   begin
-    ActiveScaffoldAssets.copy_to_public(ActiveScaffoldBatch.root)
     ActionView::Base.class_eval do
       include ActiveScaffold::Helpers::UpdateColumnHelpers
       if ActiveScaffold.js_framework == :jquery

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_batch_vho
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 3
+  - 1
   - 0
-  - 6
-  version: 3.0.6
+  segments_generated: true
+  version: 3.1.0
 platform: ruby
 authors: 
 - Volker Hochstein
@@ -15,85 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +01:00
+date: 2011-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  requirement: *id001
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
-  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id003
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: active_scaffold_vho
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 3
-        - 0
-        - 13
-        version: 3.0.13
-  requirement: *id005
+        - 1
+        segments_generated: true
+        version: "3.1"
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -118,9 +85,9 @@ files:
 - frontends/default/views/_batch_update_form_body.html.erb
 - frontends/default/views/batch_create.html.erb
 - frontends/default/views/batch_update.html.erb
-- frontends/default/views/on_batch_base.js.rjs
-- frontends/default/views/on_batch_create.js.rjs
-- frontends/default/views/on_batch_update.js.rjs
+- frontends/default/views/on_batch_base.js.erb
+- frontends/default/views/on_batch_create.js.erb
+- frontends/default/views/on_batch_update.js.erb
 - init.rb
 - lib/active_scaffold/actions/batch_base.rb
 - lib/active_scaffold/actions/batch_create.rb
@@ -155,18 +122,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1574814307821251551
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 

data/frontends/default/views/on_batch_create.js.rjs

@@ -1,19 +0,0 @@
-form_selector = "#{element_form_id(:action => :batch_create)}"
-
-if controller.send :batch_successful?
-  called_by_controller = params.delete(:batch_create_by)
-  if called_by_controller.nil?
-    page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
-  else
-    options = {:checked => false,
-               :include_mark_all => false}
-    tbody_id = "#{controller_id(called_by_controller)}-tbody"
-    page << "ActiveScaffold.mark_records('#{tbody_id}', #{options.to_json});"
-  end
-  page << "ActiveScaffold.find_action_link('#{form_selector}').close();"
-else
-  page << "ActiveScaffold.find_action_link('#{form_selector}').update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
-  page.call 'ActiveScaffold.replace', form_selector, render(:partial => 'batch_create_form', :locals => {:xhr => true})
-  page.call 'ActiveScaffold.scroll_to', form_selector
-  #have to uncheck successfully created marked_records
-end

data/frontends/default/views/on_batch_update.js.rjs

@@ -1,10 +0,0 @@
-form_selector = "#{element_form_id(:action => :batch_update)}"
-
-if controller.send :batch_successful?
-  page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
-  page << "ActiveScaffold.find_action_link('#{form_selector}').close();"
-else
-  page << "ActiveScaffold.find_action_link('#{form_selector}').update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
-  page.call 'ActiveScaffold.replace', form_selector, render(:partial => 'batch_update_form', :locals => {:xhr => true})
-  page.call 'ActiveScaffold.scroll_to', form_selector
-end