tabulatr 0.3.0 → 0.4.0

data/.gitignore

@@ -3,3 +3,6 @@ tabulatr-*.gem
 Gemfile.lock
 .bundle
 spec/dummy_app/tmp/*
+tags
+
+.DS_Store

data/Changelog.textile

@@ -1,5 +1,25 @@
 h1. Changelog for tabulatr
 
+h2. 0.4.0
+
+* Mongoid now really works.
+* A lot of cleanup in the finder code (million thanks to <a href="https://github.com/plukevdh">plukevdh</a>)
+* You can use <tt>table_for</tt> for 'normal' arrays that weren't found with <tt>find_for_table</tt>.
+* Added a :name_mapping option to find_for_table to allow filtering by compund expressions, example:
+
+  <pre>
+  @customers = Customer.find_for_table(params,
+    name_mapping: {
+      name: '("addresses"."firstname" || \' \' || "addresses"."lastname")',
+      address: '("addresses"."street" || \' \' || "addresses"."zip_code" || \' \' || "addresses"."city")'
+    },
+    default_order: 'updated_at desc'
+  )
+  </pre>
+
+* Added Mysql2Adapter to the ActiveRecord connection list (thanks to <a href="https://github.com/AaronLasseigne">AaronLasseigne</a>).
+* Monkeypatch mongoid only if it is present. (thanks to <a href="https://github.com/rwz">rwz</a>)
+
 h2. 0.3.0
 
 * Converted into a Rails 3.1 engine and moved css and images to use the new asset pipeline. Works with 3.0.x -- 'opefully. Thanks to all that reported the problem.

data/lib/initializers/mongoid.rb

@@ -21,15 +21,17 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-# 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::Finder.find_for_table(self, params, opts, &block)
+# ensure mongoid is loaded *before* monkeypatching
+begin; require 'mongoid'; rescue LoadError; end
+
+if defined? ::Mongoid
+  module Mongoid
+    module Document
+      module ClassMethods
+        def find_for_table(params, opts={}, &block)
+          Tabulatr::Finder.find_for_table(self, params, opts, &block)
+        end
       end
     end
   end
-end
+end

data/lib/tabulatr/tabulatr.rb

@@ -59,14 +59,30 @@ class Tabulatr
     @val = []
     @record = nil
     @row_mode = false
-    @klaz, @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]
+    if @records.respond_to? :__classinfo
+      @klaz, @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]
+    else
+      @classname, @id, @id_type = nil
+      @klaz = @records.first.class
+      @pagination = { :page => 1, :pagesize => records.count, :count => records.count, :pages => 1,
+        :pagesizes => records.count, :total => records.count }
+      @table_options.merge!(
+        :paginate => false,                 # true to show paginator
+        :sortable => false,                 # true to allow sorting (can be specified for every sortable column)
+        :selectable => false,               # true to render "select all", "select none" and the like
+        :info_text => nil,
+        :filter => false
+      )
+      @store_data = []
+      @should_translate = @table_options[:translate]
+    end
   end
 
   # the actual table definition method. It takes an Array of records, a hash of
@@ -116,7 +132,7 @@ class Tabulatr
     when :hidden_submit then "IMPLEMENT ME!"
     when :submit then   make_tag(:input, :type => 'submit',
         :class => @table_options[:submit_class],
-        :value => t(@table_options[:submit_label]))
+        :value => t(@table_options[:submit_label])) if @records.respond_to?(:__classinfo)
     when :reset then   make_tag(:input, :type => 'submit',
         :class => @table_options[:reset_class],
         :name => "#{@classname}#{TABLE_FORM_OPTIONS[:reset_state_postfix]}",
@@ -149,6 +165,7 @@ class Tabulatr
       make_tag(:tbody) do
         render_table_rows(&block)
       end # </tbody>
+      content_for(@table_options[:footer_content]) if @table_options[:footer_content]
     end # </table>
   end
 
@@ -239,12 +256,12 @@ private
     end
     nil
   end
-  
+
   def make_image_button(iname, options)
     inactive = options.delete(:inactive)
     psrc = @view.image_path File.join(@table_options[:image_path_prefix], iname)
     if !inactive
-      make_tag(:input, 
+      make_tag(:input,
         options.merge(
           :type => 'image',
           :src => psrc

data/lib/tabulatr/tabulatr/adapter.rb

@@ -0,0 +1,55 @@
+class Tabulatr::Adapter
+  def initialize(klaz)
+    @base = klaz
+    @relation = klaz
+  end
+
+  delegate :all, :dup, :count, :limit, to: :@relation
+
+  def to_sql
+    @relation.to_sql if @relation.respond_to? :to_sql
+  end
+
+  def class_to_param
+    @relation.to_s.downcase.gsub("/","_")
+  end
+
+  def preconditions_scope(opts)
+    opts[:precondition].present? ? @base.where(opts[:precondition]) : @base
+  end
+
+  def order(sortparam, default)
+    order_by, order_direction = sort_params(sortparam, default)
+    order_by ? { :by => order_by, :direction => order_direction } : nil
+  end
+
+  def sort_params(sortparam, default)
+    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
+    else
+      if default
+        l = default.split(" ")
+        raise(":default_order parameter should be of the form 'id asc' or 'name desc'.") if l.length == 0 or l.length > 2
+
+        order_by = l[0]
+        order_direction = l[1] || 'asc'
+      else
+        order_by = order_direction = nil
+      end
+    end
+
+    return order_by, order_direction
+  end
+end
+
+Dir[File.join(File.dirname(__FILE__), "adapter", "*.rb")].each do |file|
+  require file
+end

data/lib/tabulatr/tabulatr/adapter/active_record.rb

@@ -0,0 +1,72 @@
+class Tabulatr::Adapter::ActiveRecordAdapter < Tabulatr::Adapter
+
+  def initialize(klaz)
+    set_like_statement unless Tabulatr::SQL_OPTIONS[:like]
+
+    super klaz
+  end
+
+  def primary_key
+    @relation.primary_key.to_sym
+  end
+
+  def key_type
+    @relation.columns_hash[primary_key.to_s].type
+  end
+
+  def selected_ids(opts)
+    preconditions_scope(opts).select(:id)
+  end
+
+  def table_name
+    @relation.table_name
+  end
+
+  def table_name_for_association(assoc)
+    @base.reflect_on_association(assoc).table_name
+  end
+
+  def order_for_query(sortparam, default)
+    context = order(sortparam, default)
+    context.values.join(" ") if context
+  end
+
+  def includes(inc)
+    @relation.includes(inc)
+  end
+
+  def includes!(inc)
+    @relation = includes(includes)
+  end
+
+  def add_conditions_from(n,v)
+    like ||= Tabulatr.sql_options[:like]
+    if v.is_a?(String)
+      @relation = @relation.where(n => v) unless v.blank?
+    elsif v.is_a?(Hash)
+      if v[:like].present?
+        @relation = @relation.where("#{n} #{like} ?", "%#{v[:like]}%")
+      else
+        @relation = @relation.where("#{n} >= ?", "#{v[:from]}") if v[:from].present?
+        @relation = @relation.where("#{n} <= ?", "#{v[:to]}") if v[:to].present?
+      end
+    else
+      raise "Wrong filter type: #{v.class}"
+    end
+  end
+
+  private
+  def set_like_statement
+    case ActiveRecord::Base.connection.class.to_s
+      when "ActiveRecord::ConnectionAdapters::MysqlAdapter" then Tabulatr.sql_options(:like => 'LIKE')
+      when "ActiveRecord::ConnectionAdapters::Mysql2Adapter" then Tabulatr.sql_options(:like => 'LIKE')
+      when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter" then Tabulatr.sql_options(:like => 'ILIKE')
+      when "ActiveRecord::ConnectionAdapters::SQLiteAdapter" then Tabulatr.sql_options(:like => 'LIKE')
+      when "ActiveRecord::ConnectionAdapters::SQLite3Adapter" then Tabulatr.sql_options(:like => 'LIKE')
+      else
+        warn("Tabulatr Warning: Don't know which LIKE operator to use for the ConnectionAdapter '#{ActiveRecord::Base.connection.class}'.\n" +
+          "Please specify by `Tabulatr.sql_options(:like => '<likeoperator>')`")
+        Tabulatr.sql_options(:like => 'LIKE')
+    end
+  end
+end

data/lib/tabulatr/tabulatr/adapter/mongoid.rb

@@ -0,0 +1,54 @@
+class Tabulatr::Adapter::MongoidAdapter < Tabulatr::Adapter
+  def primary_key
+    :id
+  end
+
+  def key_type
+    :string
+  end
+
+  def selected_ids(opts)
+    preconditions_scope(opts).only(:id)
+  end
+
+  def table_name
+    if Object.const_defined?("Mongoid") && @relation.is_a?(Mongoid::Criteria)
+      @relation.klass
+    else
+      @relation
+    end.to_s.tableize.gsub('/','_')
+  end
+
+  def table_name_for_association(assoc)
+    assoc.to_s.tableize
+  end
+
+  def order_for_query(sortparam, default)
+    context = order(sortparam, default)
+    context.values.map(&:to_s) if context
+  end
+
+  def includes(includes)
+    @relation   # do nothing with includes
+  end
+
+  def add_conditions_from(n,v)
+    if v.is_a?(String)
+      nn = n.split('.').last
+      @relation = @relation.where(nn => v) unless v.blank?
+    elsif v.is_a?(Hash)
+      if v[:like].present?
+        nn = n.split('.').last
+        @relation = @relation.where(nn => Regexp.new(v[:like]))
+      else
+        nn = n.split('.').last.to_sym
+        @relation = @relation.where(nn.gte => v[:from]) if v[:from].present?
+        @relation = @relation.where(nn.lte => v[:to]) if v[:to].present?
+      end
+    else
+      raise "Wrong filter type: #{v.class}"
+    end
+
+  end
+end
+

data/lib/tabulatr/tabulatr/data_cell.rb

@@ -84,7 +84,7 @@ class Tabulatr
       if opts[:sort_by]
         # TODO: SORTING specified by opts[:sort_by]
       end
-      concat(if (ass.is_a?(Array) or assoc.collection?) and opts[:map]
+      concat(if (ass.is_a?(Array) || ass.respond_to?(:to_ary)) && opts[:map]
         ass.map do |r|
           val = h(r.send(opts[:method] || name))
           if format.is_a?(Proc) then format.call(val)

data/lib/tabulatr/tabulatr/finder.rb

@@ -34,7 +34,7 @@ module Tabulatr::Finder
     elsif list.first.is_a?(Fixnum)
       IdStuffer.stuff(list)
     else
-      "GzB" + Base64.encode64s(
+      "GzB" + Base64.encode64(
         Zlib::Deflate.deflate(
           list.join(Tabulatr.table_form_options[:checked_separator])))
     end
@@ -65,52 +65,4 @@ module Tabulatr::Finder
     end
   end
 
-private
-
-  def self.class_to_param(klaz)
-    klaz.to_s.downcase.gsub("/","_")
-  end
-
-  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]
-    if v.is_a?(String)
-      if v.present?
-        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?
-          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
-        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
-    rel
-  end
 end

data/lib/tabulatr/tabulatr/finder/find_for_table.rb

@@ -23,36 +23,22 @@
 
 # These are extensions for use from ActionController instances
 # In a seperate class call only for clearity
+
 module Tabulatr::Finder
 
   # -------------------------------------------------------------------
   # Called if SomeActveRecordSubclass::find_for_table(params) is called
   #
-  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 
+  def self.find_for_table(klaz, params, options={}, &block)
+    adapter = if klaz.respond_to?(:descends_from_active_record?) then ::Tabulatr::Adapter::ActiveRecordAdapter.new(klaz)
+      elsif klaz.include?(Mongoid::Document) then ::Tabulatr::Adapter::MongoidAdapter.new(klaz)
       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 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')
-        when "ActiveRecord::ConnectionAdapters::SQLiteAdapter" then Tabulatr.sql_options(:like => 'LIKE')
-        when "ActiveRecord::ConnectionAdapters::SQLite3Adapter" then Tabulatr.sql_options(:like => 'LIKE')
-        else 
-          warn("Tabulatr Warning: Don't know which LIKE operator to use for the ConnectionAdapter '#{ActiveRecord::Base.connection.class}'.\n" +
-            "Please specify by `Tabulatr.sql_options(:like => '<likeoperator>')`")
-          Tabulatr.sql_options(:like => 'LIKE')
-      end
-    end
 
-    form_options = Tabulatr.table_form_options
-    opts = Tabulatr.finder_options.merge(o)
-    params ||= {} # just to be sure
-    cname           = class_to_param(klaz)
+    form_options    = Tabulatr.table_form_options
+    opts            = Tabulatr.finder_options.merge(options)
+    params          ||= {} # just to be sure
+    cname           = adapter.class_to_param
     pagination_name = "#{cname}#{form_options[:pagination_postfix]}"
     sort_name       = "#{cname}#{form_options[:sort_postfix]}"
     filter_name     = "#{cname}#{form_options[:filter_postfix]}"
@@ -62,23 +48,25 @@ 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)
+
+    id = adapter.primary_key
+    id_type = adapter.key_type
+
+    # checkboxes
     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?
       batch_param = batch_param.keys.first.to_sym if batch_param.is_a?(Hash)
       yield(Invoker.new(batch_param, selected_ids))
     end
-    
+
     # then, we obey any "select" buttons if pushed
-    precon = rel
-    precon = precon.where(opts[:precondition]) if opts[:precondition].present?
     if checked_param[:select_all]
-      selected_ids = (typ==:ar ? precon.select(:id) : precon.only(:id) ).to_a.map { |r| r.send(id) }
+      selected_ids = adapter.selected_ids(opts).to_a.map { |r| r.send(id) }
     elsif checked_param[:select_none]
       selected_ids = []
     elsif checked_param[:select_visible]
@@ -88,8 +76,8 @@ module Tabulatr::Finder
       visible_ids = uncompress_id_list(checked_param[:visible])
       selected_ids = (selected_ids - visible_ids).sort.uniq
     end
-    
-    # at this point, we've retrieved the filter settings, the sorting setting, the pagination settings and 
+
+    # at this point, we've retrieved the filter settings, the sorting setting, the pagination settings and
     # the selected_ids.
     filter_param = (params[filter_name] || {})
     sortparam = params[sort_name]
@@ -97,12 +85,12 @@ module Tabulatr::Finder
 
     # store the state if appropriate
     if opts[:stateful]
-      session = opts[:stateful]
+      session = options[:stateful]
       sname = "#{cname}#{form_options[:state_session_postfix]}"
       raise "give the session as the :stateful parameter in find_for_table, not a '#{session.class}'" \
-        unless session.is_a?(Rails::version.to_f >= 3.1 ? ActiveSupport::HashWithIndifferentAccess : ActionDispatch::Session::AbstractStore::SessionHash)
+        unless session.respond_to? :[]
       session[sname] ||= {}
-      
+
       if params["#{cname}#{form_options[:reset_state_postfix]}"]
         # clicked reset button, reset all and clear session
         selected_ids = []
@@ -128,59 +116,49 @@ module Tabulatr::Finder
 
     # firstly, get the conditions from the filters
     includes = []
-    rel = rel.where(opts[:precondition]) if opts[:precondition]
+    maps = opts[:name_mapping] || {}
     conditions = filter_param.each do |t|
       n, v = t
       next unless v.present?
       # FIXME n = name_escaping(n)
       if (n != form_options[:associations_filter])
-        table_name = (typ==:ar ? klaz.table_name : klaz.to_s.tableize.gsub('/','_'))
-        rel = condition_from(rel, typ, "#{table_name}.#{n}", v)
+        table_name = adapter.table_name
+        nn = if maps[n] then maps[n] else
+          t = "#{table_name}.#{n}"
+          raise "SECURITY violation, field name is '#{t}'" unless /^[\d\w]+(\.[\d\w]+)?$/.match t
+          t
+        end
+        # puts ">>>>>1>> #{n} -> #{nn}"
+        adapter.add_conditions_from(nn, v)
       else
         v.each do |t|
           n,v = t
           assoc, att = n.split(".").map(&:to_sym)
-          r = klaz.reflect_on_association(assoc)
           includes << assoc
-          table_name = (typ==:ar ? klaz.table_name : klaz.to_s.tableize)
-          nn = "#{table_name}.#{att}"
-          rel = condition_from(rel, typ, nn, v)
+          table_name = adapter.table_name_for_association(assoc)
+          nn = if maps[n] then maps[n] else
+            t = "#{table_name}.#{att}"
+            raise "SECURITY violation, field name is '#{t}'" unless /^[\d\w]+(\.[\d\w]+)?$/.match t
+            t
+          end
+          # puts ">>>>>2>> #{n} -> #{nn}"
+          adapter.add_conditions_from(nn, v)
         end
       end
     end
 
+
     # more button handling
     if checked_param[:select_filtered]
-      all = rel.all
+      all = adapter.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 = rel.dup.all
+      all = adapter.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
-    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
-    else
-      if opts[:default_order]
-        l = opts[:default_order].split(" ")
-        raise(":default_order parameter should be of the form 'id asc' or 'name desc'.") \
-          if l.length == 0 or l.length > 2
-        order_by = l[0]
-        order_direction = l[1] || 'asc'
-      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
+    order = adapter.order_for_query(sortparam, opts[:default_order])
 
     # thirdly, get the pagination data
     paginate_options = Tabulatr.paginate_options.merge(opts).merge(pops)
@@ -188,32 +166,33 @@ module Tabulatr::Finder
     page = paginate_options[:page].to_i
     page += 1 if paginate_options[:page_right]
     page -= 1 if paginate_options[:page_left]
-    c = rel.count
+
+    c = adapter.includes(includes).count
     # Group statments return a hash
     c = c.count unless c.class == Fixnum
+
     pages = (c/pagesize).ceil
     page = [1, [page, pages].min].max
-    total = klaz
-    total = total.where(opts[:precondition]) if opts[:precondition]
+
+    total = adapter.preconditions_scope(opts).count
     # here too
-    total = total.count
     total = total.count unless total.class == Fixnum
-    
+
+
     # Now, actually find the stuff
-    found = rel.limit(pagesize.to_i).offset(((page-1)*pagesize).to_i
-     ).order(order).to_a #, :include => includes
+    found = adapter.limit(pagesize.to_i).offset(((page-1)*pagesize).to_i).order(order).to_a
 
     # finally, inject methods to retrieve the current 'settings'
-    found.define_singleton_method(:__filters) do filter_param end
-    found.define_singleton_method(:__classinfo) do [klaz, cname, id, id_type] end
+    found.define_singleton_method(:__filters) { filter_param }
+    found.define_singleton_method(:__classinfo) { [klaz, cname, id, id_type] }
     found.define_singleton_method(:__pagination) do
       { :page => page, :pagesize => pagesize, :count => c, :pages => pages,
         :pagesizes => paginate_options[:pagesizes],
         :total => total }
     end
-    found.define_singleton_method(:__sorting) do
-      order ? { :by => order_by, :direction => order_direction } : nil
-    end
+
+    found.define_singleton_method(:__sorting) { adapter.order(sortparam, opts[:default_order])  }
+
     visible_ids = (found.map { |r| r.send(id) })
     checked_ids = compress_id_list(selected_ids - visible_ids)
     visible_ids = compress_id_list(visible_ids)
@@ -223,12 +202,9 @@ module Tabulatr::Finder
         :visible => visible_ids
       }
     end
-    found.define_singleton_method(:__stateful) do
-      (opts[:stateful] ? true : false)
-    end
-    found.define_singleton_method(:__store_data) do
-      opts[:store_data] || {}
-    end
+
+    found.define_singleton_method(:__stateful) { (opts[:stateful] ? true : false) }
+    found.define_singleton_method(:__store_data) { opts[:store_data] || {} }
 
     found
   end

data/lib/tabulatr/tabulatr/formattr.rb

@@ -23,6 +23,7 @@
 
 module Tabulatr::Formattr
   ALLOWED_METHODS = [:euro, :dollar, :percent, :lamp]
+  #include ActionView::TagHelpers
   
   def self.format(nam, val)
     nam = nam.to_sym
@@ -45,7 +46,10 @@ module Tabulatr::Formattr
     ("%.2f&thinspace;%%" % 100.0*x).gsub(".", ",")
   end
   
-  def self.lamp(x)
-    
+  def self.lamp(x, mapping)
+    s = mapping[x].to_s
+    return "?" unless %w{g y r n}.member?(s)
+    image_tag("tabulatr/#{s}state.gif").html_safe
   end
+  
 end

data/lib/tabulatr/tabulatr/header_cell.rb

@@ -83,6 +83,7 @@ class Tabulatr
   end
 
   def header_action(opts={}, &block)
+    opts = normalize_column_options opts
     make_tag(:th, opts[:th_html]) do
       concat(t(opts[:header] || ""), :escape_html)
     end

data/lib/tabulatr/tabulatr/settings.rb

@@ -98,7 +98,8 @@ class Tabulatr
     :action => nil,                    # target action of the wrapping form if applicable
     :batch_actions => false,           # :name => value hash of batch action stuff
     :translate => false,               # call t() for all 'labels' and stuff, possible values are true/:translate or :localize
-    :row_classes => ['odd', 'even']    # class for the trs
+    :row_classes => ['odd', 'even'],   # class for the trs
+    :footer_content => false           # if given, add a <%= content_for <footer_content> %> before the </table>
   })
 
   # these settings are considered constant for the whole application, can not be overridden
@@ -163,7 +164,8 @@ class Tabulatr
     :default_pagesize => false,
     :precondition => false,
     :store_data => false,
-    :stateful => false
+    :stateful => false,
+    :name_mapping => nil
   })
 
   # Stupid hack

data/lib/tabulatr/version.rb

@@ -1,3 +1,3 @@
 class Tabulatr
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

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

@@ -9,7 +9,7 @@ if USE_MONGOID
     field :url,         :type => String
     field :active,      :type => Boolean
     field :description, :type => String
-    field :price,       :type => Fixnum
+    field :price,       :type => Float
     field :created_at,  :type => Time
     field :updated_at,  :type => Time
   end

data/spec/dummy_app/config/application.rb

@@ -41,5 +41,5 @@ module DummyApp
   end
 end
 
-USE_MONGOID = File.exists?(File.join(Rails::root, 'tmp', 'use_mongoid.txt'))
-puts("Using #{USE_MONGOID ? 'Mongoid' : 'ActiveRecord'}")
+USE_MONGOID = ENV['USE_MONGOID']
+puts("Using #{USE_MONGOID ? 'Mongoid' : 'ActiveRecord'}")

data/spec/requests/tabulatrs_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Tabulatrs" do
-  
+
   Mongoid.master.collections.select do |collection|
     collection.name !~ /system/
   end.each(&:drop)
@@ -15,23 +15,6 @@ describe "Tabulatrs" do
   "occaecat", "cupidatat", "non", "proident", "sunt", "culpa", "qui",
   "officia", "deserunt", "mollit", "anim", "est", "laborum"]
 
-  # control which tests to run. Just to spped testing up
-  tralse = true
-  # 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 = tralse
-  # Paginatione
-  PAGES_UP_AND_DOWN = JUMPS_TO_CORRECT_PAGE = CHANGES_PAGE_SIZE = tralse
-  # Filters
-  FILTERS = FILTERS_WITH_LIKE = FILTERS_WITH_RANGE = tralse
-  # Sorting
-  KNOWS_HOW_TO_SORT = tralse
-  # Statful
-  SORTS_STATEFULLY = FILTERS_STATEFULLY = SELECTS_STATEFULLY = tralse
-  # selecting and batch actions
-  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)
   tag1 = Tag.create!(:title => 'foo')
@@ -43,7 +26,7 @@ describe "Tabulatrs" do
     it "works in general" do
       get index_simple_products_path
       response.status.should be(200)
-    end if WORKS_IN_GENERAL
+    end
 
     it "contains buttons" do
       visit index_simple_products_path
@@ -53,19 +36,19 @@ describe "Tabulatrs" do
         page.should have_button(Tabulatr::TABLE_OPTIONS[n])
       end
       page.should_not have_button(Tabulatr::TABLE_OPTIONS[:reset_label])
-    end if CONTAINS_BUTTONS
+    end
 
     it "contains column headers" do
       visit index_simple_products_path
       ['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
+    end
 
     it "contains other elements" do
       visit index_simple_products_path
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 0, 0, 0, 0))
-    end if CONTAINS_OTHER_CONTROLS
+    end
 
     it "contains the actual data" do
       product = Product.create!(:title => names[0], :active => true, :price => 10.0, :description => 'blah blah')
@@ -81,7 +64,7 @@ describe "Tabulatrs" do
       ids << product.id
       visit index_simple_products_path
       page.should have_content("ven d'or")
-    end if CONTAINS_ACTUAL_DATA
+    end
 
     it "correctly contains the association data" do
       product = Product.first
@@ -91,7 +74,7 @@ describe "Tabulatrs" do
         page.should have_content tag.title
         page.should have_content(sprintf("--%d--", i+1))
       end
-    end if CONTAINS_ASSOC_DATA
+    end
 
     it "contains the actual data multiple" do
       9.times do |i|
@@ -103,14 +86,14 @@ describe "Tabulatrs" do
         page.should have_content((11.0+i).to_s)
         page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], i+2, i+2, 0, i+2))
       end
-    end if CONTAINS_ACTUAL_DATA_MULTIPLE
+    end
 
     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
+    end
 
     it "contains the further data on the further pages" do
       names[10..-1].each_with_index do |n,i|
@@ -122,7 +105,7 @@ describe "Tabulatrs" do
         page.should_not have_content((30.0+i).to_s)
         page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, i+11, 0, i+11))
       end
-    end if CONTAINS_DATA_ON_FURTHER_PAGES
+    end
   end
 
   describe "Pagination" do
@@ -163,7 +146,7 @@ describe "Tabulatrs" do
           click_button('product_pagination_page_left')
         end
       end
-    end if PAGES_UP_AND_DOWN
+    end
 
     it "jumps to the correct page" do
       visit index_simple_products_path
@@ -187,7 +170,7 @@ describe "Tabulatrs" do
           page.should have_button('product_pagination_page_right')
         end
       end
-    end if JUMPS_TO_CORRECT_PAGE
+    end
 
     it "changes the page size" do
       visit index_simple_products_path
@@ -199,7 +182,7 @@ describe "Tabulatrs" do
         end
         page.should_not have_content(names[s])
       end
-    end if CHANGES_PAGE_SIZE
+    end
   end
 
   describe "Filters" do
@@ -214,7 +197,7 @@ describe "Tabulatrs" do
       click_button("Apply")
       page.should_not have_content("lorem")
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 0, names.length, 0, 0))
-    end if FILTERS
+    end
 
     it "filters with like" do
       visit index_filters_products_path
@@ -226,7 +209,7 @@ describe "Tabulatrs" do
         #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
+    end
 
     it "filters with range" do
       visit index_filters_products_path
@@ -250,7 +233,7 @@ describe "Tabulatrs" do
         tot = n-i*2
         page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], [10,tot].min, n, 0, tot))
       end
-    end if FILTERS_WITH_RANGE
+    end
   end
 
   describe "Sorting" do
@@ -269,11 +252,12 @@ describe "Tabulatrs" do
       (1..10).each do |i|
         page.should have_content snames[i-1]
       end
-    end if KNOWS_HOW_TO_SORT
+    end
   end
 
   describe "statefulness" do
     it "sorts statefully" do
+      Capybara.reset_sessions!
       visit index_stateful_products_path
       click_button("product_sort_title_desc")
       snames = names.sort
@@ -288,7 +272,7 @@ describe "Tabulatrs" do
       (1..10).each do |i|
         page.should have_content names[i-1]
       end
-    end if SORTS_STATEFULLY
+    end
 
     it "filters statefully" do
       Capybara.reset_sessions!
@@ -300,9 +284,10 @@ describe "Tabulatrs" do
       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
+    end
 
     it "selects statefully" do
+      Capybara.reset_sessions!
       visit index_stateful_products_path
       fill_in("product_filter[title]", :with => "")
       click_button("Apply")
@@ -321,7 +306,7 @@ describe "Tabulatrs" do
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], names.length % 10, n, tot, n))
       click_button("Reset")
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, names.length, 0, names.length))
-    end if SELECTS_STATEFULLY
+    end
 
   end
 
@@ -363,7 +348,7 @@ describe "Tabulatrs" do
       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
+    end
 
     it "knows how to select and apply batch actions" do
       visit index_select_products_path
@@ -382,7 +367,7 @@ describe "Tabulatrs" do
       tot = n-3*(n/10)
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 10, tot, 0, tot))
       #save_and_open_page
-    end if KNOWS_HOW_TO_SELECT_AND_APPLY_BATCH_ACTIONS
+    end
   end
 
   # describe "GET /products empty" do

data/tabulatr.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.rdoc_options  = ['--charset=UTF-8']
-  
+
 
   s.add_runtime_dependency('rails', '>= 3.0.0')
   s.add_dependency('whiny_hash', '>= 0.0.2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348423259000 !ruby/object:Gem::Requirement
+  requirement: &70187434600440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348423259000
+  version_requirements: *70187434600440
 - !ruby/object:Gem::Dependency
   name: whiny_hash
-  requirement: &70348423258260 !ruby/object:Gem::Requirement
+  requirement: &70187434599820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348423258260
+  version_requirements: *70187434599820
 - !ruby/object:Gem::Dependency
   name: id_stuffer
-  requirement: &70348423257540 !ruby/object:Gem::Requirement
+  requirement: &70187434599320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70348423257540
+  version_requirements: *70187434599320
 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.
@@ -92,6 +92,9 @@ files:
 - lib/tabulatr.rb
 - lib/tabulatr/engine.rb
 - lib/tabulatr/tabulatr.rb
+- lib/tabulatr/tabulatr/adapter.rb
+- lib/tabulatr/tabulatr/adapter/active_record.rb
+- lib/tabulatr/tabulatr/adapter/mongoid.rb
 - lib/tabulatr/tabulatr/batch_actions.rb
 - lib/tabulatr/tabulatr/check_controls.rb
 - lib/tabulatr/tabulatr/data_cell.rb
@@ -200,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A tight DSL to build tables of ActiveRecord or Mongoid models with sorting,