tabulatr 0.1.0 → 0.1.1

data/Changelog.textile

@@ -1,5 +1,20 @@
 h1. Changelog for tabulatr
 
+h2. 0.1.1
+
+* Fixed bug with "Select ..." buttons introduced in 0.1.0. 
+* Added tests for these buttons.
+
+h2. v0.1.0
+
+* new <tt>find_for_table</tt> option <tt>:stateful</tt>. If 
+
+<pre>
+  MyFancyModel.find_for_table params, :stateful => session
+</pre>
+
+is given, the current sorting, filtering, selecting and paging information is stored to the session and restored when reopened. Great for procession specifically filtered lists. 
+
 h2. v0.0.5 (2011-03-28)
 
 * new column option :map (defaults to true) to disable automatic mapping on the enries of the association as in

data/Gemfile.lock

@@ -36,7 +36,6 @@ GEM
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
     activesupport (3.0.5)
-    archive-tar-minitar (0.5.2)
     arel (2.0.9)
     builder (2.1.2)
     capybara (0.4.1.2)
@@ -66,8 +65,7 @@ GEM
     launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
+    linecache (0.43)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -108,16 +106,11 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.5.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     rubyzip (0.9.4)
     selenium-webdriver (0.1.4)
       childprocess (>= 0.1.7)
@@ -144,6 +137,6 @@ DEPENDENCIES
   launchy
   rspec
   rspec-rails
-  ruby-debug19
+  ruby-debug
   sqlite3-ruby
   tabulatr!

data/README.textile

@@ -1,5 +1,7 @@
 h1. Tabulatr - Index Tables made easy, finally
 
+(there is a <a href="https://github.com/provideal/tabulatr-demo">demo app repository</a>)
+
 h2. Mission Objective
 
 Tabulatr aims at making the ever-recurring task of creating listings of ActiveRecord models simple and uniform.

data/lib/tabulatr/tabulatr/finder/find_for_active_record_table.rb

@@ -52,7 +52,6 @@ module Tabulatr::Finder
     filter_name     = "#{cname}#{form_options[:filter_postfix]}"
     batch_name      = "#{cname}#{form_options[:batch_postfix]}"
     check_name      = "#{cname}#{form_options[:checked_postfix]}"
-    
 
     # before we do anything else, we find whether there's something to do for batch actions
     checked_param = ActiveSupport::HashWithIndifferentAccess.new({:checked_ids => '', :current_page => []}).
@@ -67,6 +66,7 @@ module Tabulatr::Finder
     end
     
     # then, we obey any "select" buttons if pushed
+    precondition = opts[:precondition] || "(1=1)"
     if checked_param[:select_all]
       all = klaz.find :all, :conditions => precondition, :select => :id
       selected_ids = all.map { |r| r.id.to_s }
@@ -78,14 +78,8 @@ module Tabulatr::Finder
     elsif checked_param[:unselect_visible]
       visible_ids = uncompress_id_list(checked_param[:visible])
       selected_ids = (selected_ids - visible_ids).sort.uniq
-    elsif checked_param[:select_filtered]
-      all = klaz.find :all, :conditions => conditions, :select => :id, :include => includes
-      selected_ids = (selected_ids + all.map { |r| r.id.to_s }).sort.uniq
-    elsif checked_param[:unselect_filtered]
-      all = klaz.find :all, :conditions => conditions, :select => :id, :include => includes
-      selected_ids = (selected_ids - all.map { |r| r.id.to_s }).sort.uniq
     end
-
+    
     # at this point, we've retrieved the filter settings, the sorting setting, the pagination settings and 
     # the selected_ids.
     filter_param = (params[filter_name] || {})
@@ -144,6 +138,15 @@ module Tabulatr::Finder
     end
     conditions = [conditions.first] + conditions.last
 
+    # more button handling
+    if checked_param[:select_filtered]
+      all = klaz.find :all, :conditions => conditions, :select => :id, :include => includes
+      selected_ids = (selected_ids + all.map { |r| r.id.to_s }).sort.uniq
+    elsif checked_param[:unselect_filtered]
+      all = klaz.find :all, :conditions => conditions, :select => :id, :include => includes
+      selected_ids = (selected_ids - all.map { |r| r.id.to_s }).sort.uniq
+    end
+
     # secondly, find the order_by stuff
     if sortparam
       if sortparam[:_resort]

data/lib/tabulatr/version.rb

@@ -1,3 +1,3 @@
 class Tabulatr
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/dummy_app/app/views/products/index_select.html.erb

@@ -1,6 +1,6 @@
 <%= table_for @products, :batch_actions => {'delete' => "Delete"} do |t|
   t.checkbox  
   t.column :id
-  t.column :title
+  t.column :title, :filter => :like
   t.column :price
 end %>

data/spec/requests/tabulatrs_spec.rb

@@ -26,7 +26,7 @@ describe "Tabulatrs" do
   # Statful
   SORTS_STATEFULLY = FILTERS_STATEFULLY = SELECTS_STATEFULLY = true
   # selecting and batch actions
-  KNOWS_HOW_TO_SELECT_AND_APPLY_BATCH_ACTIONS = tralse
+  SELECT_BUTTONS_WORK = KNOWS_HOW_TO_SELECT_AND_APPLY_BATCH_ACTIONS = tralse
 
   vendor1 = Vendor.create!(:name => "ven d'or", :active => true)
   vendor2 = Vendor.create!(:name => 'producer', :active => true)
@@ -300,8 +300,46 @@ describe "Tabulatrs" do
 
   end
 
-
   describe "Select and Batch actions" do
+    it "knows how to interpret the select_... buttons" do
+      # Showing 10, total 54, selected 54, matching 54
+      n = names.length
+      visit index_select_products_path
+      click_button('Select All')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, n, n))
+      click_button('Select None')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, 0, n))
+      click_button('Select visible')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, 10, n))
+      click_button('Select None')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, 0, n))
+      fill_in("product_filter[title][like]", :with => "a")
+      click_button("Apply")
+      tot = (names.select do |s| s.match /a/ end).length
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, 0, tot))
+      click_button('Select filtered')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, tot, tot))
+      fill_in("product_filter[title][like]", :with => "")
+      click_button("Apply")
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, tot, n))
+      click_button("Unselect visible")
+      tot -= (names[0..9].select do |s| s.match /a/ end).length
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, tot, n))
+      click_button('Select None')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, 0, n))
+      click_button('Select All')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, n, n))
+      fill_in("product_filter[title][like]", :with => "a")
+      click_button("Apply")
+      tot = (names.select do |s| s.match /a/ end).length
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, n, tot))
+      click_button('Unselect filtered')
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, n-tot, tot))
+      fill_in("product_filter[title][like]", :with => "")
+      click_button("Apply")
+      page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, n, n-tot, n))
+    end if SELECT_BUTTONS_WORK
+    
     it "knows how to select and apply batch actions" do
       visit index_select_products_path
       n = names.length

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabulatr
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Peter Horn
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 0
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
@@ -201,6 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -209,13 +214,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: tabulatr
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination, finding/filtering, selecting and batch actions.