tabulatr2 0.6.0 → 0.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,19 +27,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: whiny_hash
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: activerecord_outer_joins
   requirement: !ruby/object:Gem::Requirement
@@ -70,49 +70,53 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/tabulatr/buttons_lite_background.png
-- app/assets/images/tabulatr/pager_arrow_left.gif
-- app/assets/images/tabulatr/pager_arrow_left_off.gif
-- app/assets/images/tabulatr/pager_arrow_right.gif
-- app/assets/images/tabulatr/pager_arrow_right_off.gif
-- app/assets/images/tabulatr/sort_arrow_down.gif
-- app/assets/images/tabulatr/sort_arrow_down_off.gif
-- app/assets/images/tabulatr/sort_arrow_up.gif
-- app/assets/images/tabulatr/sort_arrow_up_off.gif
 - app/assets/javascripts/tabulatr.js
 - app/assets/javascripts/tabulatr/application.js
 - app/assets/javascripts/tabulatr/jquery.inview.min.js
 - app/assets/stylesheets/tabulatr.css
-- app/assets/stylesheets/tabulatr/application.css
+- app/assets/stylesheets/tabulatr/application.css.scss
+- app/assets/stylesheets/tabulatr/bootstrap2_fixes.css.scss
+- app/views/tabulatr/_tabulatr_actual_table.html.slim
+- app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim
+- app/views/tabulatr/_tabulatr_filter_dialog.html.slim
+- app/views/tabulatr/_tabulatr_filter_menu.html.slim
+- app/views/tabulatr/_tabulatr_fuzzy_search_field.html.slim
+- app/views/tabulatr/_tabulatr_info_string.html.slim
+- app/views/tabulatr/_tabulatr_paginator.html.slim
+- app/views/tabulatr/_tabulatr_static_table.html.slim
+- app/views/tabulatr/_tabulatr_table.html.slim
 - init.rb
-- lib/generators/tabulatr/install_generator.rb
-- lib/generators/tabulatr/templates/tabulatr.rb
-- lib/generators/tabulatr/templates/tabulatr.yml
-- lib/initializers/action_controller.rb
-- lib/initializers/action_view.rb
-- lib/initializers/active_record.rb
-- lib/initializers/mark_as_localizable.rb
 - lib/tabulatr.rb
+- lib/tabulatr/data/column_name_builder.rb
+- lib/tabulatr/data/data.rb
+- lib/tabulatr/data/dsl.rb
+- lib/tabulatr/data/filtering.rb
+- lib/tabulatr/data/formatting.rb
+- lib/tabulatr/data/invoker.rb
+- lib/tabulatr/data/pagination.rb
+- lib/tabulatr/data/proxy.rb
+- lib/tabulatr/data/sorting.rb
 - lib/tabulatr/engine.rb
-- lib/tabulatr/tabulatr.rb
-- lib/tabulatr/tabulatr/adapter.rb
-- lib/tabulatr/tabulatr/adapter/active_record.rb
-- lib/tabulatr/tabulatr/batch_actions.rb
-- lib/tabulatr/tabulatr/data_cell.rb
-- lib/tabulatr/tabulatr/dummy_record.rb
-- lib/tabulatr/tabulatr/empty_cell.rb
-- lib/tabulatr/tabulatr/filter_cell.rb
-- lib/tabulatr/tabulatr/filter_icon.rb
-- lib/tabulatr/tabulatr/finder.rb
-- lib/tabulatr/tabulatr/finder/find_for_table.rb
-- lib/tabulatr/tabulatr/formattr.rb
-- lib/tabulatr/tabulatr/header_cell.rb
-- lib/tabulatr/tabulatr/json_builder.rb
-- lib/tabulatr/tabulatr/paginator.rb
-- lib/tabulatr/tabulatr/row_builder.rb
-- lib/tabulatr/tabulatr/security.rb
-- lib/tabulatr/tabulatr/settings.rb
+- lib/tabulatr/generators/railtie.rb
+- lib/tabulatr/generators/resource_override.rb
+- lib/tabulatr/generators/tabulatr/install_generator.rb
+- lib/tabulatr/generators/tabulatr/templates/tabulatr.rb
+- lib/tabulatr/generators/tabulatr/templates/tabulatr.yml
+- lib/tabulatr/generators/tabulatr/templates/tabulatr_data.rb
+- lib/tabulatr/json_builder.rb
+- lib/tabulatr/rails/action_controller.rb
+- lib/tabulatr/rails/action_view.rb
+- lib/tabulatr/rails/active_record.rb
+- lib/tabulatr/renderer/action.rb
+- lib/tabulatr/renderer/association.rb
+- lib/tabulatr/renderer/checkbox.rb
+- lib/tabulatr/renderer/column.rb
+- lib/tabulatr/renderer/columns.rb
+- lib/tabulatr/renderer/columns_from_block.rb
+- lib/tabulatr/renderer/renderer.rb
+- lib/tabulatr/utility/utility.rb
 - lib/tabulatr/version.rb
+- lib/tabulatr2.rb
 - spec/dummy/.gitignore
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -131,11 +135,14 @@ files:
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/tag.rb
 - spec/dummy/app/models/vendor.rb
+- spec/dummy/app/tabulatr_data/product_tabulatr_data.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
+- spec/dummy/app/views/products/implicit_columns.html.erb
 - spec/dummy/app/views/products/one_item_per_page.html.erb
 - spec/dummy/app/views/products/simple_index.html.erb
 - spec/dummy/app/views/products/stupid_array.html.erb
+- spec/dummy/app/views/products/with_batch_actions.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -169,7 +176,6 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
-- spec/lib/tabulatr/tabulatr/finder/find_for_table_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
 homepage: http://github.com/provideal/tabulatr2
@@ -216,11 +222,14 @@ test_files:
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/tag.rb
 - spec/dummy/app/models/vendor.rb
+- spec/dummy/app/tabulatr_data/product_tabulatr_data.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/products/count_tags.html.erb
+- spec/dummy/app/views/products/implicit_columns.html.erb
 - spec/dummy/app/views/products/one_item_per_page.html.erb
 - spec/dummy/app/views/products/simple_index.html.erb
 - spec/dummy/app/views/products/stupid_array.html.erb
+- spec/dummy/app/views/products/with_batch_actions.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -254,5 +263,4 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
-- spec/lib/tabulatr/tabulatr/finder/find_for_table_spec.rb
 - spec/spec_helper.rb

data/app/assets/stylesheets/tabulatr/application.css

@@ -1,40 +0,0 @@
-.tabulatr-sort{
-  opacity: 0.3;
-}
-
-.tabulatr-sort:hover{
-  cursor: pointer;
-}
-
-i.sorted{
-  opacity: 1;
-}
-
-i.tabulatr_remove_filter:hover{
-  cursor: pointer;
-}
-
-.tabulatr_filtered_column{
-  text-decoration: underline;
-}
-
-.tabulatr-per-page {
-  margin: 20px 10px;
-  a.active{
-    background-color: red;
-  }
-}
-
-.table-controls div{
-  margin: 20px 10px;
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.table-controls i, .tabulatr_table i{
-  margin-right: 5px;
-}
-
-#tabulatr-wrench{
-  margin-left: 10px;
-}

data/lib/initializers/action_controller.rb

@@ -1,13 +0,0 @@
-class ActionController::Base
-  def tabulatr_for(klaz, serializer: nil, **options, &block)
-    respond_to do |format|
-      format.json {
-        records = klaz.find_for_table(params, options, &block)
-        render json: records.to_tabulatr_json(serializer)
-      }
-      format.html {
-        render action: options[:action] || action_name
-      }
-    end
-  end
-end

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

@@ -1,84 +0,0 @@
-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[:by]} #{context[:direction]}" if context
-  end
-
-  def order_for_query_new(sort_by, orientation)
-    "#{sort_by} #{orientation}"
-  end
-
-  def includes(inc)
-    @relation.includes(inc)
-  end
-
-  def outer_joins(*args)
-    @relation.outer_joins(*args)
-  end
-
-  def select(s)
-    @relation.select(s)
-  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.rb

@@ -1,55 +0,0 @@
-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/data_cell.rb

@@ -1,132 +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.
-#++
-
-class Tabulatr
-
-  # the method used to actually define the data cells of the columns,
-  # taking the name of the attribute and a hash of options.
-  #
-  # The following options are evaluated here:
-  # <tt>:td_html</tt>:: a hash with html-attributes added to the <ts>s created
-  # <tt>:method</tt>:: the actual method invoked on the record to retrieve the
-  #                    value for the column, or false if name is to be used.
-  # <tt>:fromat</tt>:: either a String by which the value is <tt>sprinf</tt>ed,
-  #                    a proc/lambda to which the value is passed or false if
-  #                    no specific formatting is desired.
-  def data_column(name, opts={}, &block)
-    raise "Not in data mode!" if @row_mode != :data
-    opts = normalize_column_options(name, opts)
-    make_tag(:td, opts[:td_html]) do
-      href = if opts[:link].class == Symbol || opts[:link].class == String
-          @view.send(opts[:link], @record)
-        elsif opts[:link].respond_to?(:call)
-          opts[:link].call(@record)
-        else
-          nil
-        end
-      make_tag((href ? :a : nil), :href => href) do
-        if block_given?
-          concat(@view.instance_exec(@record, &block))
-        else
-          val = @record.send(opts[:method] || name)
-          format = opts[:format]
-          concat(
-            if format.is_a?(Proc) then @view.instance_exec(val, &format)
-            elsif format.is_a?(String) then h(format % val)
-            elsif format.is_a?(Symbol) then @view.send(format, val)
-            else h(val.to_s)
-          end)
-        end # block_given?
-      end # </a>
-    end # </td>
-  end
-
-  # the method used to actually define the data cells of the columns,
-  # taking the name of the attribute and a hash of options.
-  #
-  # The following options are evaluated here:
-  # <tt>:td_html</tt>:: a hash with html-attributes added to the <ts>s created
-  # <tt>:method</tt>:: the actual method invoked on the record to retrieve the
-  #                    value for the column, or false if name is to be used.
-  # <tt>:format</tt>:: either a String by which the value is <tt>sprinf</tt>ed,
-  #                    a proc/lambda to which the value is passed or false if
-  #                    no specific formatting is desired.
-  def data_association(relation, name, opts={}, &block)
-    raise "Not in data mode!" if @row_mode != :data
-    opts = normalize_column_options(name, opts)
-    if block_given?
-      return @view.instance_exec(@record, &block)
-    end
-    assoc = @record.class.reflect_on_association(relation)
-    make_tag(:td, opts[:td_html]) do
-      format = opts[:format]
-      ass = @record.send(relation.to_sym)
-      if opts[:sort_by]
-        # TODO: SORTING specified by opts[:sort_by]
-      end
-      concat(if (ass.is_a?(Array) || ass.respond_to?(:to_ary)) && (opts[:map] != false)
-        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)
-          elsif format.is_a?(Symbol) then @view.send(format, val)
-          else h(val.to_s)
-          end
-        end.join(opts[:join_symbol] || ', ')
-      else
-        return '' unless ass
-        #puts ass.to_s
-        val = h(ass.send(opts[:method] || name))
-        val = if format.is_a?(Proc) then @view.instance_exec(val, &format)
-        elsif format.is_a?(String) then h(format % val)
-        elsif format.is_a?(Symbol) then @view.send(format, val)
-        else h(val.to_s)
-        end
-      end)
-    end # </td>
-  end
-
-  def data_checkbox(opts={}, &block)
-    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.send(@id)) ? :checked : nil
-      make_tag(:input, :type => 'checkbox', :name => iname,
-        :id => "#{@classname}#{@table_form_options[:checked_postfix]}_#{@record.send(@id).to_s}",
-        :value => @record.send(@id), :checked => checked)
-    end
-  end
-
-  def data_action(opts={}, &block)
-    raise "Not in data mode!" if @row_mode != :data
-    opts = normalize_column_options(:action_column, opts)
-    make_tag(:td, opts[:td_html]) do
-      if block_given?
-        concat(yield(@record))
-      else
-        raise "Always give a block ino action columns"
-      end # block_given?
-    end # </td>
-  end
-
-end

data/lib/tabulatr/tabulatr/dummy_record.rb

@@ -1,40 +0,0 @@
-class Tabulatr::DummyRecord
-
-  def self.for(klaz)
-    c = Class.new(self)
-    c.instance_variable_set("@model_name", klaz.model_name)
-    c.new
-  end
-
-  def to_s
-    @methods ||= []
-    if @methods.any?
-      m = @methods.join(':')
-      @method_names ||= []
-      @method_names << m
-      @methods.clear
-      "{{#{m}}}"
-    else
-      "{{id}}"
-    end
-  end
-
-  def method_missing(sym, *args)
-    @methods ||= []
-    @methods << sym.to_s
-    self
-  end
-
-  def to_key
-    ["{{id}}"]
-  end
-
-  def requested_methods
-    Array(@method_names).try(:uniq)
-  end
-
-  def self.model_name
-    @model_name
-  end
-
-end

data/lib/tabulatr/tabulatr/empty_cell.rb

@@ -1,44 +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.
-#++
-
-class Tabulatr
-
-  # the method used to actually define the filters of the columns,
-  # taking the name of the attribute and a hash of options.
-  #
-  # The following options are evaluated here:
-  # <tt>:filter_html</tt>:: a hash with html-attributes added to the <ts>s created
-  # <tt>:filter</tt>:: may take different values:
-  #                    <tt>false</tt>:: no filter is output for this column
-  #                    a container:: the keys of the hash are used to define a <tt>select</tt>
-  #                             where the values are the <tt>value</tt> of the <tt>options</tt>.
-  #                    an Array:: the elements of that array are used to define a
-  #                               <tt>select</tt>
-  #                    a String:: a <tt>select</tt> is created with that String as options
-  #                               you can use ActionView#collection_select and the like
-  def empty_column(name, opts={}, &block)
-    raise "Not in empty mode!" if @row_mode != :empty
-    opts = normalize_column_options(name, opts)
-    make_tag(:td, opts[:filter_html])
-  end
-end