tabulatr2 0.8.9 → 0.9.0

data/app/views/tabulatr/_tabulatr_filter_dialog.html.slim

@@ -22,8 +22,8 @@
 
 form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote="true" role='form'
   input name="#{formatted_name}_sort" type="hidden" value=table_options[:order_by]
-  - if table_options[:filter] && columns.filtered_columns.present?
-    - columns.filtered_columns.each do |column|
+  - if table_options[:filter] && columns.select(&:filter).present?
+    - columns.select(&:filter).each do |column|
       - name = column.full_name
       .control-group.form-group data-filter-column-name=name
         - iname = "#{formatted_name}_filter[#{name}]"

data/app/views/tabulatr/_tabulatr_filter_menu.html.slim

@@ -19,12 +19,12 @@
 /  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-- if table_options[:filter] && columns.filtered_columns.present?
+- if table_options[:filter] && columns.select(&:filter).present?
   .dropdown
     a.btn.btn-default data-toggle="dropdown" href="#"
       i.icon-filter.glyphicon.glyphicon-filter.fa.fa-filter'
       i.icon-caret-down.glyphicon.glyphicon-caret-down.fa.fa-caret-down
     ul.dropdown-menu role="menu" aria-labelledby="dLabel"
-      - columns.filtered_columns.each do |column|
+      - columns.select(&:filter).each do |column|
         li
           = link_to column.human_name, '#', "data-show-table-filter" => column.full_name

data/app/views/tabulatr/_tabulatr_fuzzy_search_field.html.slim

@@ -19,6 +19,6 @@
 /  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-form#product_fuzzy_search.form-inline.tabulatr-fuzzy-search.pull-right data-table=table_id role="form"
+form.form-inline.tabulatr-fuzzy-search.pull-right data-table=table_id role="form"
   .form-group
     input.form-control.search id="#{formatted_name}_fuzzy_search_query" placeholder="Search" type="search"

data/app/views/tabulatr/_tabulatr_static_table.html.slim

@@ -19,7 +19,7 @@
 /  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-table.table.tabulatr_table
+table.table.tabulatr_table.tabulatr_static_table
   thead
     tr
      - columns.each do |column|
@@ -27,7 +27,7 @@ table.table.tabulatr_table
          = column.human_name
   tbody
     - records.each do |record|
-      tr
+      tr data-id=record.try(:id)
         - columns.each do |column|
           td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.cell_style
             = column.value_for(record, self)

data/lib/tabulatr/data/data.rb

@@ -33,7 +33,7 @@ class Tabulatr::Data
     @includes   = Set.new()
     @cname      = @base.name.downcase
     @batch_actions = nil
-    table_columns.klass = @base
+    @row = self.class.instance_variable_get('@row')
     table_columns.map do |col|
       col.klass = @base
     end
@@ -139,4 +139,5 @@ require_relative './invoker'
 require_relative './sorting'
 require_relative './pagination'
 require_relative './formatting'
+require_relative './row'
 require_relative './proxy'

data/lib/tabulatr/data/dsl.rb

@@ -26,7 +26,7 @@ module Tabulatr::Data::DSL
   def column(name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
     @columns ||= HashWithIndifferentAccess.new
     table_column = Tabulatr::Renderer::Column.from(table_column_options.merge(name: name, klass: @base))
-    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
+    @table_columns ||= []
     @table_columns << table_column
 
     @columns[name.to_sym] = {
@@ -41,7 +41,7 @@ module Tabulatr::Data::DSL
   def association(assoc, name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
     @assocs ||= HashWithIndifferentAccess.new
     @assocs[assoc.to_sym] ||= {}
-    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
+    @table_columns ||= []
     table_column = Tabulatr::Renderer::Association.from(table_column_options.merge(name: name, table_name: assoc, klass: @base))
     @table_columns << table_column
 
@@ -59,6 +59,17 @@ module Tabulatr::Data::DSL
     @search = args.presence || block
   end
 
+  def checkbox(table_column_options: {})
+    @table_columns ||= []
+    box = Tabulatr::Renderer::Checkbox.from(table_column_options.merge(klass: @base, filter: false, sortable: false))
+    @table_columns << box
+  end
+
+  def row &block
+    raise 'Please pass a block to row if you want to use it.' unless block_given?
+    @row = block
+  end
+
 end
 
 Tabulatr::Data.send :extend, Tabulatr::Data::DSL

data/lib/tabulatr/data/filtering.rb

@@ -62,24 +62,17 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_condition(n,v)
-    like ||= Tabulatr::Utility.like_statement
     if v.is_a?(String)
-      @relation = @relation.where("#{n} = ?", v) unless v.blank?
+      apply_string_condition("#{n} = ?", v)
     elsif v.is_a?(Hash)
-      if v[:like].present?
-        @relation = @relation.where("#{n} #{like} ?", "%#{v[:like]}%")
-      elsif v[:date].present?
-        apply_date_condition(n, v[:date])
-      else
-        @relation = @relation.where("#{n} >= ?", "#{v[:from]}") if v[:from].present?
-        @relation = @relation.where("#{n} <= ?", "#{v[:to]}") if v[:to].present?
-      end
+      apply_hash_condition(n, v)
     else
       raise "Wrong filter type: #{v.class}"
     end
   end
 
   def apply_date_condition(n, cond)
+    return unless cond.present?
     today = Date.today
     case cond[:simple]
     when 'none' then return
@@ -88,7 +81,7 @@ module Tabulatr::Data::Filtering
     when 'this_week' then since = today.at_beginning_of_week
     when 'last_7_days' then since = today - 7.day
     when 'this_month' then since = today.at_beginning_of_month
-    when 'last_30_days' then since = today. - 30.day
+    when 'last_30_days' then since = today - 30.day
     when 'from_to'
       since = Date.parse(cond[:from]) if cond[:from].present?
       @relation = @relation.where("#{n} <= ?", Date.parse(cond[:to])) if cond[:to].present?
@@ -96,6 +89,18 @@ module Tabulatr::Data::Filtering
     @relation = @relation.where("#{n} >= ?", since) if since.present?
   end
 
+  def apply_string_condition(replacement_string, value)
+     @relation = @relation.where(replacement_string, value) if value.present?
+  end
+
+  def apply_hash_condition(column_name, hash)
+    like ||= Tabulatr::Utility.like_statement
+    apply_string_condition("#{column_name} #{like} ?", "%#{hash[:like]}%") if hash[:like].present?
+    apply_date_condition(column_name, hash[:date])
+    apply_string_condition("#{column_name} >= ?", "#{hash[:from]}")
+    apply_string_condition("#{column_name} <= ?", "#{hash[:to]}")
+  end
+
 end
 
 Tabulatr::Data.send :include, Tabulatr::Data::Filtering

data/lib/tabulatr/data/formatting.rb

@@ -37,6 +37,7 @@ module Tabulatr::Data::Formatting
           h[table_name][name] = format_association(record, table_name, name, opts, view)
         end
       end # @assocs each
+      h[:_row_config] = format_row(view, @row)
       h
     end # @relation map
   end # apply_formats
@@ -54,7 +55,14 @@ module Tabulatr::Data::Formatting
     opts[:table_column].value_for(record, view)
   end
 
-
+  def format_row(view, row)
+    row_config = Row.new
+    view.instance_exec(view.record, row_config.attributes, &row) if row.is_a?(Proc)
+    view.record.define_singleton_method(:_row_config) do
+      row_config.attributes
+    end
+    row_config.attributes
+  end
 end
 
 Tabulatr::Data.send :include, Tabulatr::Data::Formatting

data/lib/tabulatr/data/row.rb

@@ -0,0 +1,8 @@
+class Tabulatr::Data::Formatting::Row
+
+  attr_accessor :attributes
+
+  def initialize
+    self.attributes = {class: 'tabulatr-row'}
+  end
+end

data/lib/tabulatr/data/sorting.rb

@@ -36,7 +36,7 @@ module Tabulatr::Data::Sorting
         table_name = @base.reflect_on_association(klass.to_sym).try(:table_name)
       end
       nn = build_column_name(col_name, table_name: table_name, assoc_name: assoc_name, use_for: :sort)
-      raise "asasa" unless ['asc', 'desc'].member?(orientation.downcase)
+      raise "Invalid sorting orientation" unless ['asc', 'desc'].member?(orientation.downcase)
       @relation = @relation.order("#{nn} #{orientation}")
     else
       @relation = @relation.order(default_order || "#{@table_name}.#{@base.primary_key} desc")

data/lib/tabulatr/generators/tabulatr/templates/tabulatr_data.rb

@@ -1,18 +1,12 @@
-<% module_namespacing do %>
-class <%= class_name %>TabulatrData < Tabulatr::Data
-  <% attributes = attributes_names %>
-  <% if class_name.constantize.table_exists? %>
-    <% attributes << class_name.constantize.column_names.map(&:to_sym) %>
-  <% end %>
-  <% attributes = attributes.flatten.uniq %>
-  <% if attributes.any? %>
-    search :<%= attributes.last %>
-  <% end %>
-  <% attributes.each do |a| %>
-    column :<%= a %>
-  <% end %>
-  <% association_names.each do |attribute| %>
-    association :<%= attribute %>, :id
-  <% end %>
-end
+<% module_namespacing do %>class <%= class_name %>TabulatrData < Tabulatr::Data
+<% attributes = attributes_names %><% if class_name.constantize.table_exists? %><% attributes << class_name.constantize.column_names.map(&:to_sym) %><% end %><% attributes = attributes.flatten.uniq %><% if attributes.any? %>
+  search :<%= attributes.last %>
+<% end %>
+<% attributes.each do |a| %>
+  column :<%= a %>
 <% end %>
+<% association_names.each do |attribute| %>
+  association :<%= attribute %>, :id
+<% end %>
+end
+<% end %>

data/lib/tabulatr/json_builder.rb

@@ -37,6 +37,7 @@ module Tabulatr::JsonBuilder
         attrs.each do |at|
           insert_attribute_in_hash(at, f, tmp)
         end
+        tmp['_row_config'] = f['_row_config']
         result << tmp
       end
       { data: result, meta: data.__pagination }
@@ -75,18 +76,19 @@ module Tabulatr::JsonBuilder
       #   r["#{at[:relation]}:#{at[:action]}"] = f.try(at[:relation]).try(at[:action])
       # end
       begin
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(rel, f) if !f.has_key?(rel)
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, rel) if !f[rel].has_key?(action)
         r["#{at[:relation]}:#{at[:action]}"] = f[rel][action]
-      rescue NoMethodError => e
-        raise $!, "You requested '#{at[:action]}' on '#{at[:relation]}' but
-          there was no such method included in your TabulatrData", $!.backtrace
+      rescue TypeError, NoMethodError => e
+        Tabulatr::RequestDataNotIncludedError.raise_error(at[:action], at[:relation])
       end
     else
       begin
         action = at[:action].to_sym
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, f) if !f.has_key?(action) && action != :checkbox
         r[at[:action]] = f[action]
-      rescue NoMethodError => e
-        raise $!, "You requested '#{at[:action]}' but
-          there was no such method included in your TabulatrData", $!.backtrace
+      rescue TypeError, NoMethodError => e
+        raise Tabulatr::RequestDataNotIncludedError.raise_error(action, f)
       end
     end
     r

data/lib/tabulatr/rails/action_view.rb

@@ -23,8 +23,8 @@
 
 class ActionView::Base
   # render the table in a view
-  def table_for(klass, opts={}, &block)
-    Tabulatr::Renderer.build_table(klass, self, opts, &block)
+  def table_for(klass, columns: [], **opts, &block)
+    Tabulatr::Renderer.build_table(klass, self, opts, columns, &block)
   end
 
   def static_table_for(records, opts={}, &block)

data/lib/tabulatr/renderer/association.rb

@@ -34,7 +34,7 @@ class Tabulatr::Renderer::Association < Tabulatr::Renderer::Column
 
   def principal_value(record)
     v = record.send(table_name)
-    if v && v.respond_to?(:to_a) && map
+    if v && v.respond_to?(:to_a) && map && name != :count
       v.map(&:"#{name}")
     else
       v.try(name)

data/lib/tabulatr/renderer/checkbox.rb

@@ -29,7 +29,7 @@ class Tabulatr::Renderer::Checkbox < Tabulatr::Renderer::Column
   def coltype() 'checkbox' end
   def column?() false end
   def checkbox?() true end
-
+  def full_name() 'checkbox' end
   def value_for(record, view)
     nil
   end

data/lib/tabulatr/renderer/columns_from_block.rb

@@ -27,7 +27,7 @@ class Tabulatr::Renderer
 
     def initialize(klass)
       @klass = klass
-      @columns ||= Columns.new(klass)
+      @columns ||= []
     end
 
     def column(name, opts={}, &block)

data/lib/tabulatr/renderer/renderer.rb

@@ -49,10 +49,12 @@ class Tabulatr::Renderer
     @classname = @klass.name.underscore
   end
 
-  def build_table(&block)
+  def build_table(columns, &block)
     tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
     if block_given?
       @columns = ColumnsFromBlock.process @klass, &block
+    elsif columns.any?
+      @columns = get_requested_columns(tdc.table_columns, columns)
     else
       @columns = tdc.table_columns
     end
@@ -84,8 +86,17 @@ class Tabulatr::Renderer
     new(klass, view, toptions).build_static_table(records, &block)
   end
 
-  def self.build_table(klass, view, toptions={}, &block)
-    new(klass, view, toptions).build_table(&block)
+  def self.build_table(klass, view, toptions={}, columns, &block)
+    new(klass, view, toptions).build_table(columns, &block)
+  end
+
+  private
+
+  def get_requested_columns(available_columns, requested_columns)
+    requested_columns.collect do |r|
+      r = "#{r.keys.first}:#{r.values.first}" if r.is_a?(Hash) && r.count == 1
+      available_columns.select{|column| column.full_name.to_sym == r.to_sym }
+    end.flatten
   end
 
 end
@@ -94,6 +105,5 @@ require_relative './column'
 require_relative './association'
 require_relative './action'
 require_relative './checkbox'
-require_relative './columns'
 require_relative './columns_from_block'
 

data/lib/tabulatr/utility/request_data_not_included_error.rb

@@ -0,0 +1,9 @@
+module Tabulatr
+  class RequestDataNotIncludedError < StandardError
+
+    def self.raise_error(method, object)
+      raise self, "You requested '#{method}' on '#{object}' but
+          there was no such method included in your TabulatrData"
+    end
+  end
+end

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.8.9"
+  VERSION = "0.9.0"
 end

data/spec/dummy/app/tabulatr_data/product_tabulatr_data.rb

@@ -8,7 +8,7 @@ class ProductTabulatrData < Tabulatr::Data
 
   column :title
   column :id
-  column :price do "#{record.price} EUR" end # <- Block evaluiert im Kontext EINES Records
+  column :price, table_column_options: {filter: :range} do "#{record.price} EUR" end # <- Block evaluiert im Kontext EINES Records
   column :edit_link do link_to "edit #{record.title}", product_path(record) end
   # column :name,
   #   sort: "firstname || ' ' || lastname"
@@ -16,14 +16,18 @@ class ProductTabulatrData < Tabulatr::Data
   #   do
   #     "#{firstname} #{lastname}"
   # end
-  column :vendor_product_name, sort_sql: "products.title || '' || vendors.name", filter_sql: "products.title || '' || vendors.name" do
+  column :vendor_product_name,
+    sort_sql: "products.title || '' || vendors.name",
+    filter_sql: "products.title || '' || vendors.name",
+    table_column_options: {header: 'Product by vendor'} do
     "#{record.title} from #{record.vendor.try(:name)}"
   end
-  column :active
+  column :active, table_column_options: {sortable: false}
   column :updated_at, table_column_options: { filter: :date } do "#{record.updated_at.strftime('%H:%M %d.%m.%Y')}" end
-  association :vendor, :name
+  association :vendor, :name, table_column_options: { filter: :exact }
   association :tags, :title do |r|
     "'#{r.tags.map(&:title).map(&:upcase).join(', ')}'"
   end
+  association :tags, :count
 
 end

data/spec/dummy/app/views/products/simple_index.html.erb

@@ -1,11 +1,4 @@
 <%= table_for Product, :paginate => true,
-  batch_actions: {a: "Hallo", b: "Du da!"} do |t|
-  t.checkbox
-  t.column :title, sortable: true
-  t.column :price, filter: :range
-  t.column :active, sortable: false
-  t.column :vendor_product_name, header: 'Product by vendor'
-  t.column :updated_at, filter: :date
-  t.association :vendor, :name, filter: :exact
-  t.association :tags, :title
-end %>
+  batch_actions: {a: "Hallo", b: "Du da!"},
+  columns: [:title, :price, :active, :vendor_product_name, :updated_at,
+            {vendor: :name}, 'tags:title'] %>

data/spec/dummy/app/views/products/with_styling.html.erb

@@ -6,5 +6,5 @@
   t.column :vendor_product_name, header: 'Product by vendor'
   t.column :updated_at, filter: :date
   t.association :vendor, :name, filter: :exact
-  t.association :tags, :titletd
+  t.association :tags, :title
 end %>

data/spec/dummy/config/application.rb

@@ -14,7 +14,7 @@ module Dummy
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
-
+    config.i18n.enforce_available_locales = true
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de

data/spec/features/tabulatrs_spec.rb

@@ -87,7 +87,7 @@ describe "Tabulatr" do
       end
       product.save
       visit count_tags_products_path
-      page.should have_content 3
+      page.find('tbody td[data-tabulatr-column-name="tags:count"]').should have_content 3
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,6 +95,7 @@ files:
 - lib/tabulatr/data/invoker.rb
 - lib/tabulatr/data/pagination.rb
 - lib/tabulatr/data/proxy.rb
+- lib/tabulatr/data/row.rb
 - lib/tabulatr/data/sorting.rb
 - lib/tabulatr/engine.rb
 - lib/tabulatr/generators/railtie.rb
@@ -111,9 +112,9 @@ files:
 - 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/request_data_not_included_error.rb
 - lib/tabulatr/utility/utility.rb
 - lib/tabulatr/version.rb
 - lib/tabulatr2.rb
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
@@ -267,3 +268,4 @@ test_files:
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
 - spec/spec_helper.rb
+has_rdoc: