tabulatr 0.1.3 → 0.2.0

data/.gitignore

@@ -2,3 +2,4 @@ pkg
 tabulatr-*.gem
 Gemfile.lock
 .bundle
+spec/dummy_app/tmp/*

data/Changelog.textile

@@ -1,5 +1,12 @@
 h1. Changelog for tabulatr
 
+h2. 0.2.0
+
+* Mongoid can also be used in place of ActiveRecord
+* fixed handling of the primary_key column and name
+* Added dom_id to tables tr. Thanks to <a href="https://github.com/sterrym">sterrym (Tim Glen)</a>!
+* Added note on "Request-URI Too Large error" to README
+
 h2. 0.1.3
 
 * nicer table headers. Thanks to <a href="https://github.com/troya2" target="_blank">troya2 (Troy Anderson)</a>!

data/Gemfile

@@ -14,4 +14,5 @@ group :development, :test do
   gem 'capybara'
   gem 'launchy'
   gem 'database_cleaner'
+  gem 'mongoid'
 end

data/README.textile

@@ -4,7 +4,7 @@ h1. Tabulatr - Index Tables made easy, finally
 
 h2. Mission Objective
 
-Tabulatr aims at making the ever-recurring task of creating listings of ActiveRecord models simple and uniform.
+Tabulatr aims at making the ever-recurring task of creating listings of ActiveRecord or Mongoid models simple and uniform.
 
 We found ourselves reinventing the wheel in every project we made, by using
 
@@ -313,16 +313,22 @@ To override these, you should, in an initializer, call
 h2. Dependencies
 
 We use
-* <a href="http://github.com/provideal/whiny_hash">WhinyHash</a> to handle the options in a fail-early-manner,
-* <a href="http://github.com/provideal/id_stuffer">IdStuffer</a> to compress the _remembered_ ids.
+* <a href="http://github.com/provideal/whiny_hash">whiny_hash</a> to handle the options in a fail-early-manner,
+* <a href="http://github.com/provideal/id_stuffer">id_stuffer</a> to compress the _remembered_ ids.
 * And... eh... It's an extension for Rails 3, so it might be handy to have a version of Rails 3 and Ruby 1.8.? or 1.9.?.
 
 h2. Bugs
 
-There are, definitely, roughly 999 bugs in Tabulatr, although we do some testing (see <tt>spec/</tt>). So if you hunt them, please let me know using the <a href="https://github.com/provideal/tabulatr/issues">GitHub Bugtracker</a>.
+h3. Request-URI Too Large error
+
+Since everyhing about the state of the table is intentionally encoded in the URI, the URI may become somewhat bloated if fancy selecting is used. By using <a href="http://github.com/provideal/id_stuffer">id_stuffer</a>, we drastically reduced the size of the URI (that's the reason we actually made it), but it may still become rather large. This is a problem particulary when using WEBrick, because WEBricks URIs must not exceed 2048 characters. And this limit is hard-coded IIRC. So – If you run into this limitation – please consider using another server. (Thanks to <a href="https://github.com/stepheneb">stepheneb</a> for calling my attention back to this.)
+
+h3. Other, new bugs
+
+There are roughly another 997 bugs in Tabulatr, although we do some testing (see <tt>spec/</tt>). So if you hunt them, please let me know using the <a href="https://github.com/provideal/tabulatr/issues">GitHub Bugtracker</a>.
 
 h2. Contributing to tabulatr
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the <a href="https://github.com/provideal/tabulatr/issues">issue tracker</a> to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/lib/initializers/active_record.rb

@@ -26,7 +26,7 @@
 if Object.const_defined? "ActiveRecord"
   class ActiveRecord::Base
     def self.find_for_table(params, opts={}, &block)
-      Tabulatr::Finder.find_for_active_record_table(self, params, opts, &block)
+      Tabulatr::Finder.find_for_table(self, params, opts, &block)
     end
   end
 end

data/lib/initializers/mongoid.rb

@@ -21,13 +21,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-# buggy like hell
-if Object.const_defined? "Mongoid"
-  raise "Mongoid support is buggy like hell as of now"
-  module Mongoid::Document
+# This is somewhat ugly, for it creates the Mongoid module, no matter 
+# whether it's about to be used. So you will find an empty Mongoid
+# module in every Tabulatr project.
+module Mongoid
+  module Document
     module ClassMethods
       def find_for_table(params, opts={}, &block)
-        Tabulatr.find_for_mongoid_table(self, params, opts, &block)
+        Tabulatr::Finder.find_for_table(self, params, opts, &block)
       end
     end
   end

data/lib/tabulatr/tabulatr/data_cell.rb

@@ -80,8 +80,12 @@ class Tabulatr
     assoc = @record.class.reflect_on_association(relation)
     make_tag(:td, opts[:td_html]) do
       format = opts[:format]
-      concat(if assoc.collection? and opts[:map]
-        @record.send(relation.to_sym).map do |r|
+      ass = @record.send(relation.to_sym)
+      if opts[:sort_by]
+        # TODO: SORTING specified by opts[:sort_by]
+      end
+      concat(if (ass.is_a?(Array) or assoc.collection?) and opts[:map]
+        ass.map do |r|
           val = h(r.send(opts[:method] || name))
           if format.is_a?(Proc) then format.call(val)
           elsif format.is_a?(String) then h(format % val)
@@ -90,8 +94,8 @@ class Tabulatr
           end
         end.join(opts[:join_symbol])
       else
-        ass = @record.send(relation.to_sym)
         return '' unless ass
+        #puts ass.to_s
         val = h(ass.send(opts[:method] || name))
         val = if format.is_a?(Proc) then format.call(val)
         elsif format.is_a?(String) then h(format % val)
@@ -106,10 +110,10 @@ class Tabulatr
     raise "Whatever that's for!" if block_given?
     iname = "#{@classname}#{@table_form_options[:checked_postfix]}[current_page][]"
     make_tag(:td, opts[:td_html]) do
-      checked = @checked[:selected].member?(@record.id.to_s) ? :checked : nil
+      checked = @checked[:selected].member?(@record.send(@id)) ? :checked : nil
       make_tag(:input, :type => 'checkbox', :name => iname,
-        :id => "#{@classname}#{@table_form_options[:checked_postfix]}_#{@record.id.to_s}",
-        :value => @record.id, :checked => checked)
+        :id => "#{@classname}#{@table_form_options[:checked_postfix]}_#{@record.send(@id).to_s}",
+        :value => @record.send(@id), :checked => checked)
     end
   end
 

data/lib/tabulatr/tabulatr/finder/{find_for_active_record_table.rb → find_for_table.rb}

@@ -28,9 +28,15 @@ module Tabulatr::Finder
   # -------------------------------------------------------------------
   # Called if SomeActveRecordSubclass::find_for_table(params) is called
   #
-  def self.find_for_active_record_table(klaz, params, o={}, &block)
+  def self.find_for_table(klaz, params, o={}, &block)
+    rel = klaz
+    typ = if klaz.respond_to?(:descends_from_active_record?) and klaz.descends_from_active_record? then :ar
+      elsif klaz.include?(Mongoid::Document) then :mongoid 
+      else raise("Don't know how to deal with class '#{klaz}'")
+    end
+      
     # on the first run, get the correct like db-operator, can still be ovrrridden
-    unless Tabulatr::SQL_OPTIONS[:like]
+    unless typ != :ar || Tabulatr::SQL_OPTIONS[:like]
       case ActiveRecord::Base.connection.class.to_s
         when "ActiveRecord::ConnectionAdapters::MysqlAdapter" then Tabulatr.sql_options(:like => 'LIKE')
         when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter" then Tabulatr.sql_options(:like => 'ILIKE')
@@ -56,8 +62,11 @@ module Tabulatr::Finder
     # 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 => []}).
       merge(params[check_name] || {})
+    id = (typ==:ar ? klaz.primary_key.to_sym : :id)
+    id_type = (typ==:ar ? klaz.columns_hash[id.to_s].type : :string)
     checked_ids = uncompress_id_list(checked_param[:checked_ids])
     new_ids = checked_param[:current_page]
+    new_ids.map!(&:to_i) if id_type==:integer
     selected_ids = checked_ids + new_ids
     batch_param = params[batch_name]
     if batch_param.present? and block_given?
@@ -66,10 +75,10 @@ module Tabulatr::Finder
     end
     
     # then, we obey any "select" buttons if pushed
-    precondition = opts[:precondition] || "(1=1)"
+    precon = rel
+    precon = precon.where(opts[:precondition]) if opts[:precondition].present?
     if checked_param[:select_all]
-      all = klaz.find :all, :conditions => precondition, :select => :id
-      selected_ids = all.map { |r| r.id.to_s }
+      selected_ids = (typ==:ar ? precon.select(:id) : precon.only(:id) ).to_a.map { |r| r.send(id) }
     elsif checked_param[:select_none]
       selected_ids = []
     elsif checked_param[:select_visible]
@@ -118,33 +127,34 @@ module Tabulatr::Finder
 
     # firstly, get the conditions from the filters
     includes = []
-    precondition = opts[:precondition] || "(1=1)"
-    conditions = filter_param.inject([precondition.dup, []]) do |c, t|
+    rel = rel.where(opts[:precondition]) if opts[:precondition]
+    conditions = filter_param.each do |t|
       n, v = t
+      next unless v.present?
       # FIXME n = name_escaping(n)
       if (n != form_options[:associations_filter])
-        condition_from("#{klaz.table_name}.#{n}",v,c)
+        table_name = (typ==:ar ? klaz.table_name : klaz.to_s.tableize.gsub('/','_'))
+        rel = condition_from(rel, typ, "#{table_name}.#{n}", v)
       else
-        v.inject(c) do |c,t|
+        v.each do |t|
           n,v = t
           assoc, att = n.split(".").map(&:to_sym)
           r = klaz.reflect_on_association(assoc)
           includes << assoc
-          tname = r.table_name
-          nn = "#{tname}.#{att}"
-          condition_from(nn,v,c)
+          table_name = (typ==:ar ? klaz.table_name : klaz.to_s.tableize)
+          nn = "#{table_name}.#{att}"
+          rel = condition_from(rel, typ, nn, v)
         end
       end
     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
+      all = rel.all
+      selected_ids = (selected_ids + all.map { |r| i=r.send(id); i.is_a?(Fixnum) ? i : i.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
+      all = rel.dup.all
+      selected_ids = (selected_ids - all.map { |r| i=r.send(id); i.is_a?(Fixnum) ? i : i.to_s }).sort.uniq
     end
 
     # secondly, find the order_by stuff
@@ -158,7 +168,6 @@ module Tabulatr::Finder
       end
       raise "SECURITY violation, sort field name is '#{n}'" unless /^[\w]+$/.match order_direction
       raise "SECURITY violation, sort field name is '#{n}'" unless /^[\d\w]+$/.match order_by
-      order = "#{order_by} #{order_direction}"
     else
       if opts[:default_order]
         l = opts[:default_order].split(" ")
@@ -166,11 +175,11 @@ module Tabulatr::Finder
           if l.length == 0 or l.length > 2
         order_by = l[0]
         order_direction = l[1] || 'asc'
-        order = "#{order_by} #{order_direction}"
       else
         order = order_by = order_direction = nil
       end
     end
+    order = (typ==:ar ? "#{order_by} #{order_direction}" : [order_by.to_s, order_direction.to_s]) if order_by
 
     # thirdly, get the pagination data
     paginate_options = Tabulatr.paginate_options.merge(opts).merge(pops)
@@ -178,40 +187,41 @@ module Tabulatr::Finder
     page = paginate_options[:page].to_i
     page += 1 if paginate_options[:page_right]
     page -= 1 if paginate_options[:page_left]
-    c = klaz.count :conditions => conditions, :include => includes
+    c = rel.count
     pages = (c/pagesize).ceil
     page = [1, [page, pages].min].max
-
+    total = klaz
+    total = total.where(opts[:precondition]) if opts[:precondition]
+    total = total.count
+    
     # Now, actually find the stuff
-    found = klaz.find :all, :conditions => conditions,
-      :limit => pagesize.to_i, :offset => ((page-1)*pagesize).to_i,
-      :order  => order, :include => includes
+    found = rel.limit(pagesize.to_i).offset(((page-1)*pagesize).to_i)
+      .order(order).to_a #, :include => includes
 
     # finally, inject methods to retrieve the current 'settings'
-    fio = Tabulatr.finder_inject_options
-    found.define_singleton_method(fio[:filters]) do filter_param end
-    found.define_singleton_method(fio[:classname]) do cname end
-    found.define_singleton_method(fio[:pagination]) do
+    found.define_singleton_method(:__filters) do filter_param end
+    found.define_singleton_method(:__classinfo) do [cname, id, id_type] end
+    found.define_singleton_method(:__pagination) do
       { :page => page, :pagesize => pagesize, :count => c, :pages => pages,
         :pagesizes => paginate_options[:pagesizes],
-        :total => klaz.count(:conditions => precondition) }
+        :total => total }
     end
-    found.define_singleton_method(fio[:sorting]) do
+    found.define_singleton_method(:__sorting) do
       order ? { :by => order_by, :direction => order_direction } : nil
     end
-    visible_ids = (found.map { |r| r.id.to_s })
+    visible_ids = (found.map { |r| r.send(id) })
     checked_ids = compress_id_list(selected_ids - visible_ids)
     visible_ids = compress_id_list(visible_ids)
-    found.define_singleton_method(fio[:checked]) do
+    found.define_singleton_method(:__checked) do
       { :selected => selected_ids,
         :checked_ids => checked_ids,
         :visible => visible_ids
       }
     end
-    found.define_singleton_method(fio[:stateful]) do
+    found.define_singleton_method(:__stateful) do
       (opts[:stateful] ? true : false)
     end
-    found.define_singleton_method(fio[:store_data]) do
+    found.define_singleton_method(:__store_data) do
       opts[:store_data] || {}
     end
 

data/lib/tabulatr/tabulatr/finder.rb

@@ -24,18 +24,32 @@
 # These are extensions for use from ActionController instances
 module Tabulatr::Finder
 
-  require File.join(File.dirname(__FILE__), 'finder', 'find_for_active_record_table')
-  require File.join(File.dirname(__FILE__), 'finder', 'find_for_mongoid_table')
+  require File.join(File.dirname(__FILE__), 'finder', 'find_for_table')
 
   # compress the list of ids as good as I could imagine ;)
   # uses fancy base twisting
   def self.compress_id_list(list)
-    IdStuffer.stuff(list)
+    if list.length == 0
+      ""
+    elsif list.first.is_a?(Fixnum)
+      IdStuffer.stuff(list)
+    else
+      "GzB" + Base64.encode64s(
+        Zlib::Deflate.deflate(
+          list.join(Tabulatr.table_form_options[:checked_separator])))
+    end
   end
 
   # inverse of compress_id_list
   def self.uncompress_id_list(str)
-    IdStuffer.unstuff(str).map &:to_s
+    if !str.present?
+      []
+    elsif str.starts_with?("GzB")
+      Zlib::Inflate.inflate(Base64.decode64(str[3..-1]))
+        .split(Tabulatr.table_form_options[:checked_separator])
+    else
+      IdStuffer.unstuff(str)
+    end
   end
 
   class Invoker
@@ -57,26 +71,46 @@ private
     klaz.to_s.downcase.gsub("/","_")
   end
 
-  def self.condition_from(n,v,c)
+  def self.condition_from(rel, typ, n, v)
     raise "SECURITY violation, field name is '#{n}'" unless /^[\d\w]+(\.[\d\w]+)?$/.match n
     @like ||= Tabulatr.sql_options[:like]
-    nc = c
     if v.is_a?(String)
       if v.present?
-        nc = [c[0] << " AND (#{n} = ?) ", c[1] << v]
+        if typ == :ar
+          rel = rel.where(n => v) 
+        elsif typ == :mongoid 
+          nn = n.split('.').last
+          rel = rel.where(nn => v) 
+        else raise "Unknown db type '#{typ}'"
+        end
       end
     elsif v.is_a?(Hash)
       if v[:like]
         if v[:like].present?
-          nc = [c[0] << " AND (#{n} #{@like} ?) ", c[1] << "%#{v[:like]}%"]
+          if typ==:ar
+            rel = rel.where("#{n} #{@like} ?", "%#{v[:like]}%")
+          elsif typ==:mongoid
+            nn = n.split('.').last
+            rel = rel.where(nn => Regexp.new(v[:like]))
+          else
+            raise "Unknown db type '#{typ}'"
+          end
         end
       else
-        nc = [c[0] << " AND (#{n} >= ?) ", c[1] << "#{v[:from]}"] if v[:from].present?
-        nc = [nc[0] << " AND (#{n} <= ?) ", nc[1] << "#{v[:to]}"] if v[:to].present?
+        if typ==:ar
+          rel = rel.where("#{n} >= ?", "#{v[:from]}") if v[:from].present?
+          rel = rel.where("#{n} <= ?", "#{v[:to]}") if v[:to].present?
+        elsif typ==:mongoid
+          nn = n.split('.').last.to_sym
+          rel = rel.where(nn.gte => v[:from]) if v[:from].present?
+          rel = rel.where(nn.lte => v[:to]) if v[:to].present?
+        else
+          raise "Unknown db type '#{typ}'"
+        end
       end
     else
       raise "Wrong filter type: #{v.class}"
     end
-    nc
+    rel
   end
 end

data/lib/tabulatr/tabulatr/paginator.rb

@@ -27,7 +27,7 @@ class Tabulatr
   def render_paginator
     # get the current pagination state
     pagination_name = "#{@classname}#{TABLE_FORM_OPTIONS[:pagination_postfix]}"
-    pparams = @records.send(FINDER_INJECT_OPTIONS[:pagination])
+    pparams = @records.__pagination
     page = pparams[:page].to_i
     pages = pparams[:pages].to_i
     pagesize = pparams[:pagesize].to_i

data/lib/tabulatr/tabulatr/settings.rb

@@ -153,22 +153,10 @@ class Tabulatr
     :link => false,                     # proc or symbol to make the content a link
     :join_symbol => ', ',               # symbol used to join the elements of 'many' associations
     :map => true,                       # whether to map the call on individual records (true) or call on the list (false)
+    :sort_by => false,                  # sort the elements of an association
     :sortable => true                   # if set, sorting-stuff is added to the header cell
   })
 
-  # these settings are considered constant for the whole application, can not be overridden
-  # on a per-table basis.
-  # That's necessary to allow find_for_table to work properly
-  FINDER_INJECT_OPTIONS = WhinyHash.new({
-    :pagination => :__pagination,
-    :filters => :__filters,
-    :classname => :__classname,
-    :sorting => :__sorting,
-    :checked => :__checked,
-    :store_data => :__store_data,
-    :stateful => :__stateful
-  })
-
   # defaults for the find_for_table
   FINDER_OPTIONS = WhinyHash.new({
     :default_order => false,
@@ -183,11 +171,6 @@ class Tabulatr
     :like => nil
   })
 
-  def self.finder_inject_options(n=nil)
-    FINDER_INJECT_OPTIONS.merge!(n) if n
-    FINDER_INJECT_OPTIONS
-  end
-
   def self.finder_options(n=nil)
     FINDER_OPTIONS.merge!(n) if n
     FINDER_OPTIONS

data/lib/tabulatr/tabulatr.rb

@@ -41,6 +41,7 @@ class Tabulatr
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::TranslationHelper
+  include ActionView::Helpers::RecordTagHelper
 
   # Constructor of Tabulatr
   #
@@ -56,13 +57,13 @@ class Tabulatr
     @val = []
     @record = nil
     @row_mode = false
-    @classname = @records.send(FINDER_INJECT_OPTIONS[:classname])
-    @pagination = @records.send(FINDER_INJECT_OPTIONS[:pagination])
-    @filters = @records.send(FINDER_INJECT_OPTIONS[:filters])
-    @sorting = @records.send(FINDER_INJECT_OPTIONS[:sorting])
-    @checked = @records.send(FINDER_INJECT_OPTIONS[:checked])
-    @store_data = @records.send(FINDER_INJECT_OPTIONS[:store_data])
-    @stateful = @records.send(FINDER_INJECT_OPTIONS[:stateful])
+    @classname, @id, @id_type = @records.__classinfo
+    @pagination = @records.__pagination
+    @filters = @records.__filters
+    @sorting = @records.__sorting
+    @checked = @records.__checked
+    @store_data = @records.__store_data
+    @stateful = @records.__stateful
     @should_translate = @table_options[:translate]
   end
 
@@ -214,7 +215,7 @@ private
       else
         rc = nil
       end
-      make_tag(:tr, row_html.merge(:class => rc)) do
+      make_tag(:tr, row_html.merge(:class => rc, :id => dom_id(record))) do
         yield(data_row_builder(record))
       end # </tr>
     end

data/lib/tabulatr/version.rb

@@ -1,3 +1,3 @@
 class Tabulatr
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/dummy_app/app/models/product.rb

@@ -1,6 +1,23 @@
-class Product < ActiveRecord::Base
+if USE_MONGOID
+  class Product
+    include Mongoid::Document
 
-  has_and_belongs_to_many :tags
-  belongs_to :vendor
-  
-end
+    has_and_belongs_to_many :tags
+    belongs_to :vendor
+
+    field :name,        :type => String
+    field :url,         :type => String
+    field :active,      :type => Boolean
+    field :description, :type => String
+    field :price,       :type => Fixnum
+    field :created_at,  :type => Time
+    field :updated_at,  :type => Time
+  end
+else
+  class Product < ActiveRecord::Base
+
+    has_and_belongs_to_many :tags
+    belongs_to :vendor
+
+  end
+end

data/spec/dummy_app/app/models/tag.rb

@@ -1,3 +1,13 @@
-class Tag < ActiveRecord::Base
-  has_and_belongs_to_many :products
-end
+if USE_MONGOID
+  class Tag
+    include Mongoid::Document
+    has_and_belongs_to_many :products
+    field :title, :type => String
+    field :created_at,  :type => Time
+    field :updated_at,  :type => Time
+  end
+else
+  class Tag < ActiveRecord::Base
+    has_and_belongs_to_many :products
+  end
+end

data/spec/dummy_app/app/models/vendor.rb

@@ -1,5 +1,17 @@
-class Vendor < ActiveRecord::Base
-  
-  has_many :products
-  
+if USE_MONGOID
+  class Vendor
+    include Mongoid::Document
+
+    has_many :products
+    field :name,        :type => String
+    field :url,         :type => String
+    field :active,      :type => Boolean
+    field :description, :type => String
+    field :created_at,  :type => Time
+    field :updated_at,  :type => Time
+  end
+else
+  class Vendor < ActiveRecord::Base
+    has_many :products
+  end
 end

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

@@ -4,6 +4,7 @@
   t.column :price
   t.column :active
 	t.column :created_at
+	t.association :vendor, :created_at
   t.association :vendor, :name
   t.association :tags, :title
   t.association :tags, :count, :map => false, :format => '--%d--'

data/spec/dummy_app/config/application.rb

@@ -40,3 +40,6 @@ module DummyApp
     config.filter_parameters += [:password]
   end
 end
+
+USE_MONGOID = File.exists?(File.join(Rails::root, 'tmp', 'use_mongoid.txt'))
+puts("Using #{USE_MONGOID ? 'Mongoid' : 'ActiveRecord'}")

data/spec/dummy_app/config/mongoid.yml

@@ -0,0 +1,17 @@
+defaults: &defaults
+  host: localhost
+  # slaves:
+  #   - host: slave1.local
+  #     port: 27018
+  #   - host: slave2.local
+  #     port: 27019
+  persist_in_safe_mode: true
+
+development:
+  <<: *defaults
+  database: tabulatr_development
+
+test:
+  <<: *defaults
+  database: tabulatr_test
+

data/spec/requests/tabulatrs_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe "Tabulatrs" do
+  
+  Mongoid.master.collections.select do |collection|
+    collection.name !~ /system/
+  end.each(&:drop)
 
   names = ["lorem", "ipsum", "dolor", "sit", "amet", "consectetur",
   "adipisicing", "elit", "sed", "eiusmod", "tempor", "incididunt", "labore",
@@ -16,7 +20,7 @@ describe "Tabulatrs" do
   # General stuf
   WORKS_IN_GENERAL = CONTAINS_BUTTONS = CONTAINS_COLUMN_HEADERS = CONTAINS_OTHER_CONTROLS = tralse
   # This fills in the data, so rather not cmment this out
-  CONTAINS_ACTUAL_DATA = CONTAINS_ASSOC_DATA = CONTAINS_ACTUAL_DATA_MULTIPLE = CONTAINS_DATA_ON_FURTHER_PAGES = true
+  CONTAINS_ACTUAL_DATA = CONTAINS_ASSOC_DATA = CONTAINS_ACTUAL_DATA_MULTIPLE = CONTAINS_DATA_ON_FURTHER_PAGES = tralse
   # Paginatione
   PAGES_UP_AND_DOWN = JUMPS_TO_CORRECT_PAGE = CHANGES_PAGE_SIZE = tralse
   # Filters
@@ -24,7 +28,7 @@ describe "Tabulatrs" do
   # Sorting
   KNOWS_HOW_TO_SORT = tralse
   # Statful
-  SORTS_STATEFULLY = FILTERS_STATEFULLY = SELECTS_STATEFULLY = true
+  SORTS_STATEFULLY = FILTERS_STATEFULLY = SELECTS_STATEFULLY = tralse
   # selecting and batch actions
   SELECT_BUTTONS_WORK = KNOWS_HOW_TO_SELECT_AND_APPLY_BATCH_ACTIONS = tralse
 
@@ -33,6 +37,7 @@ describe "Tabulatrs" do
   tag1 = Tag.create!(:title => 'foo')
   tag2 = Tag.create!(:title => 'bar')
   tag3 = Tag.create!(:title => 'fubar')
+  ids = []
 
   describe "General data" do
     it "works in general" do
@@ -52,7 +57,7 @@ describe "Tabulatrs" do
 
     it "contains column headers" do
       visit index_simple_products_path
-      ['Id','Title','Price','Active','Created At','Vendor Name','Tags Title','Tags Count'].each do |n|
+      ['Id','Title','Price','Active','Created At','Vendor Created At','Vendor Name','Tags Title','Tags Count'].each do |n|
         page.should have_content(n)
       end
     end if CONTAINS_COLUMN_HEADERS
@@ -69,9 +74,11 @@ describe "Tabulatrs" do
       page.should have_content("true")
       page.should have_content("10.0")
       page.should have_content("--0--")
+      #save_and_open_page
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 1, 1, 0, 1))
       product.vendor = vendor1
       product.save!
+      ids << product.id
       visit index_simple_products_path
       page.should have_content("ven d'or")
     end if CONTAINS_ACTUAL_DATA
@@ -90,6 +97,7 @@ describe "Tabulatrs" do
       9.times do |i|
         product = Product.create!(:title => names[i+1], :active => i.even?, :price => 11.0+i,
           :description => "blah blah #{i}", :vendor => i.even? ? vendor1 : vendor2)
+        ids << product.id
         visit index_simple_products_path
         page.should have_content(names[i])
         page.should have_content((11.0+i).to_s)
@@ -97,10 +105,18 @@ describe "Tabulatrs" do
       end
     end if CONTAINS_ACTUAL_DATA_MULTIPLE
 
+    it "contains row identifiers" do
+      visit index_simple_products_path
+      Product.all.each do |product|
+        page.should have_css("#product_#{product.id}")
+      end
+    end if CONTAINS_ACTUAL_DATA
+
     it "contains the further data on the further pages" do
       names[10..-1].each_with_index do |n,i|
         product = Product.create!(:title => n, :active => i.even?, :price => 20.0+i,
           :description => "blah blah #{i}", :vendor => i.even? ? vendor1 : vendor2)
+        ids << product.id
         visit index_simple_products_path
         page.should_not have_content(n)
         page.should_not have_content((30.0+i).to_s)
@@ -207,6 +223,7 @@ describe "Tabulatrs" do
         click_button("Apply")
         page.should have_content(str)
         tot = (names.select do |s| s.match Regexp.new(str) end).length
+        #save_and_open_page
         page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], [10,tot].min, names.length, 0, tot))
       end
     end if FILTERS_WITH_LIKE
@@ -239,6 +256,7 @@ describe "Tabulatrs" do
   describe "Sorting" do
     it "knows how to sort" do
       visit index_sort_products_path
+      # save_and_open_page
       (1..10).each do |i|
         page.should have_content names[-i]
       end
@@ -273,21 +291,25 @@ describe "Tabulatrs" do
     end if SORTS_STATEFULLY
 
     it "filters statefully" do
+      Capybara.reset_sessions!
       visit index_stateful_products_path
       fill_in("product_filter[title]", :with => "lorem")
       click_button("Apply")
       visit index_stateful_products_path
+      #save_and_open_page
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 1, names.length, 0, 1))
       click_button("Reset")
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, names.length, 0, names.length))
     end if FILTERS_STATEFULLY
-    
+
     it "selects statefully" do
       visit index_stateful_products_path
+      fill_in("product_filter[title]", :with => "")
+      click_button("Apply")
       n = names.length
       (n/10).times do |i|
         (1..3).each do |j|
-          check("product_checked_#{10*i+j}")
+          check("product_checked_#{ids[10*i+j]}")
         end
         click_button("Apply")
         tot = 3*(i+1)
@@ -342,13 +364,13 @@ describe "Tabulatrs" do
       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
       (n/10).times do |i|
         (1..3).each do |j|
-          check("product_checked_#{10*i+j}")
+          check("product_checked_#{ids[10*i+j]}")
         end
         click_button("Apply")
         tot = 3*(i+1)

data/tabulatr.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = "tabulatr"
   s.version     = Tabulatr::VERSION.dup
   s.platform    = Gem::Platform::RUBY
-  s.summary     = "A tight DSL to build tables of ActiveRecord models with sorting, pagination, finding/filtering, selecting and batch actions."
+  s.summary     = "A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions."
   s.email       = "info@provideal.net"
   s.homepage    = "http://github.com/provideal/tabulatr"
-  s.description = "A tight DSL to build tables of ActiveRecord models with sorting, pagination, finding/filtering, selecting and batch actions. " +
+  s.description = "A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions. " +
                   "Tries to do for tables what formtastic and simple_form did for forms."
   s.authors     = ['Peter Horn', 'René Sprotte']
 

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tabulatr
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Peter Horn
@@ -11,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +02:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +26,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -33,6 +40,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
   type: :runtime
   version_requirements: *id002
@@ -44,10 +55,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
   type: :runtime
   version_requirements: *id003
-description: A tight DSL to build tables of ActiveRecord models with sorting, pagination, finding/filtering, selecting and batch actions. Tries to do for tables what formtastic and simple_form did for forms.
+description: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions. Tries to do for tables what formtastic and simple_form did for forms.
 email: info@provideal.net
 executables: []
 
@@ -88,8 +103,7 @@ files:
 - lib/tabulatr/tabulatr/data_cell.rb
 - lib/tabulatr/tabulatr/filter_cell.rb
 - lib/tabulatr/tabulatr/finder.rb
-- lib/tabulatr/tabulatr/finder/find_for_active_record_table.rb
-- lib/tabulatr/tabulatr/finder/find_for_mongoid_table.rb
+- lib/tabulatr/tabulatr/finder/find_for_table.rb
 - lib/tabulatr/tabulatr/formattr.rb
 - lib/tabulatr/tabulatr/header_cell.rb
 - lib/tabulatr/tabulatr/paginator.rb
@@ -136,6 +150,7 @@ files:
 - spec/dummy_app/config/initializers/session_store.rb
 - spec/dummy_app/config/initializers/tabulatr_settings.rb
 - spec/dummy_app/config/locales/en.yml
+- spec/dummy_app/config/mongoid.yml
 - spec/dummy_app/config/routes.rb
 - spec/dummy_app/db/migrate/20110112151112_create_vendors.rb
 - spec/dummy_app/db/migrate/20110112151200_create_products.rb
@@ -184,20 +199,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: tabulatr
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination, finding/filtering, selecting and batch actions.
+summary: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting, pagination, finding/filtering, selecting and batch actions.
 test_files: 
 - spec/dummy_app/.gitignore
 - spec/dummy_app/app/controllers/application_controller.rb
@@ -239,6 +258,7 @@ test_files:
 - spec/dummy_app/config/initializers/session_store.rb
 - spec/dummy_app/config/initializers/tabulatr_settings.rb
 - spec/dummy_app/config/locales/en.yml
+- spec/dummy_app/config/mongoid.yml
 - spec/dummy_app/config/routes.rb
 - spec/dummy_app/db/migrate/20110112151112_create_vendors.rb
 - spec/dummy_app/db/migrate/20110112151200_create_products.rb

data/lib/tabulatr/tabulatr/finder/find_for_mongoid_table.rb

@@ -1,116 +0,0 @@
-#--
-# Copyright (c) 2010-2011 Peter Horn, Provideal GmbH
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-# These are extensions for use from ActionController instances
-# In a seperate class call only for clearity
-module Tabulatr::Finder
-
-  # ----------------------------------------------------------------
-  # Called if SomeMongoidDocument::find_for_table(params) is called
-  #
-  def self.find_for_mongoid_table(klaz, params, opts={})
-    # firstly, get the conditions from the filters
-    cname = class_to_param(klaz)
-    filter_param = (params["#{cname}#{TABLE_FORM_OPTIONS[:filter_postfix]}"] || {})
-    conditions = filter_param.inject({}) do |c, t|
-      n, v = t
-      nc = c
-      # FIXME n = name_escaping(n)
-      raise "SECURITY violation, field name is '#{n}'" unless /^[\d\w]+$/.match n
-      if v.class == String
-        if v.present?
-          nc[n.to_sym] = v
-        end
-      elsif v.is_a?(Hash)
-        if v[:like]
-          if v[:like].present?
-            nc[n.to_sym] = Regexp.new("#{v[:like]}")
-          end
-        else
-          nc[n.to_sym.gte] = "#{v[:from]}" if v[:from].present?
-          nc[n.to_sym.lte] = "#{v[:to]}" if v[:to].present?
-        end
-      else
-        raise "Wrong filter type: #{v.class}"
-      end
-      nc
-    end
-
-    # secondly, find the order_by stuff
-    # FIXME: Implement me! PLEEEZE!
-    sortparam = params["#{cname}#{TABLE_FORM_OPTIONS[:sort_postfix]}"]
-    if sortparam
-      if sortparam[:_resort]
-        order_by = sortparam[:_resort].first.first
-        order_direction = sortparam[:_resort].first.last.first.first
-      else
-        order_by = sortparam.first.first
-        order_direction = sortparam.first.last.first.first
-      end
-      raise "SECURITY violation, sort field name is '#{n}'" unless /^[\w]+$/.match order_direction
-      raise "SECURITY violation, sort field name is '#{n}'" unless /^[\d\w]+$/.match order_by
-      order = [order_by, order_direction]
-    else
-      order = nil
-    end
-
-    # thirdly, get the pagination data
-    paginate_options = PAGINATE_OPTIONS.merge(opts).
-      merge(params["#{cname}#{TABLE_FORM_OPTIONS[:pagination_postfix]}"] || {})
-    page = paginate_options[:page].to_i
-    page += 1 if paginate_options[:page_right]
-    page -= 1 if paginate_options[:page_left]
-    pagesize = paginate_options[:pagesize].to_f
-    c = klaz.count :conditions => conditions
-    pages = (c/pagesize).ceil
-    page = [1, [page, pages].min].max
-
-    # Now, actually find the stuff
-    found = klaz.find(:conditions => conditions)
-    found = found.order_by([order]) if order
-    found = found.paginate(:page => page, :per_page => pagesize)
-
-    # finally, inject methods to retrieve the current 'settings'
-    found.define_singleton_method(fio[:filters]) do filter_param end
-    found.define_singleton_method(fio[:classname]) do cname end
-    found.define_singleton_method(fio[:pagination]) do
-      {:page => page, :pagesize => pagesize, :count => c, :pages => pages,
-        :pagesizes => paginate_options[:pagesizes]}
-    end
-    found.define_singleton_method(fio[:sorting]) do
-      order ? { :by => order_by, :direction => order_direction } : nil
-    end
-    checked_param = params["#{cname}#{TABLE_FORM_OPTIONS[:checked_postfix]}"]
-    checked_ids = checked_param[:checked].split(TABLE_FORM_OPTIONS[:checked_separator])
-    new_ids = checked_param[:current_page] || []
-    selected_ids = checked_ids + new_ids
-    ids = found.map { |r| r.id.to_s }
-    checked_ids = selected_ids - ids
-    found.define_singleton_method(fio[:checked]) do
-      { :selected => selected_ids,
-        :checked_ids => checked_ids.join(TABLE_FORM_OPTIONS[:checked_separator]) }
-    end
-    found
-  end
-
-end