tabulatr2 0.6.0 → 0.8.0

data/lib/tabulatr/renderer/renderer.rb

@@ -0,0 +1,96 @@
+#--
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, 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::Renderer
+
+  def initialize(klass, view,
+      filter: true,          # false for no filter row at all
+      search: true,          # show fuzzy search field
+      paginate: false,       # true to show paginator
+      pagesize: 20,          # default pagesize
+      sortable: true,        # true to allow sorting (can be specified for every sortable column)
+      batch_actions: false,  # :name => value hash of batch action stuff
+      footer_content: false, # if given, add a <%= content_for <footer_content> %> before the </table>
+      path: '#')             # where to send the AJAX-requests to
+    @klass = klass
+    @view = view
+    @table_options = {
+      filter: filter,
+      search: search,
+      paginate: paginate,
+      pagesize: pagesize,
+      sortable: sortable,
+      batch_actions: batch_actions,
+      footer_content: footer_content,
+      path: path
+    }
+    @classname = @klass.name.underscore
+  end
+
+  def build_table(&block)
+    if block_given?
+      @columns = ColumnsFromBlock.process @klass, &block
+    else
+      tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
+      @columns = tdc.table_columns
+    end
+
+    @view.render(partial: '/tabulatr/tabulatr_table', locals: {
+      columns: @columns,
+      table_options: @table_options,
+      klass: @klass,
+      classname: @classname
+    })
+  end
+
+  def build_static_table(records, &block)
+    @columns = ColumnsFromBlock.process @klass, &block
+
+    @view.render(partial: '/tabulatr/tabulatr_static_table', locals: {
+      columns: @columns,
+      table_options: @table_options,
+      klass: @klass,
+      classname: @classname,
+      records: records
+    })
+  end
+
+  def self.build_static_table(records, view, toptions={}, &block)
+    return '' unless records.present?
+    klass = records.first.class
+    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)
+  end
+
+end
+
+require_relative './column'
+require_relative './association'
+require_relative './action'
+require_relative './checkbox'
+require_relative './columns'
+require_relative './columns_from_block'
+

data/lib/tabulatr/utility/utility.rb

@@ -0,0 +1,46 @@
+#--
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, 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.
+#++
+
+module Tabulatr::Utility
+  def self.like_statement
+    case ActiveRecord::Base.connection.class.to_s
+    when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
+         "ActiveRecord::ConnectionAdapters::Mysql2Adapter",
+         "ActiveRecord::ConnectionAdapters::SQLiteAdapter",
+         "ActiveRecord::ConnectionAdapters::SQLite3Adapter"
+         then 'LIKE'
+    when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter" then 'ILIKE'
+    else
+      warn("Tabulatr Warning: Don't know which LIKE operator to use for the ConnectionAdapter '#{ActiveRecord::Base.connection.class}'.\n")
+      'LIKE'
+    end
+  end
+
+  def self.string_to_boolean str
+    if str.downcase == 'true'
+      true
+    elsif str.downcase == 'false'
+      false
+    end
+  end
+end

data/lib/tabulatr/version.rb

@@ -1,3 +1,26 @@
-class Tabulatr
-  VERSION = "0.6.0"
+#--
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, 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.
+#++
+
+module Tabulatr
+  VERSION = "0.8.0"
 end

data/lib/tabulatr.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Peter Horn, Provideal GmbH
+# Copyright (c) 2010-2014 Peter Horn & Florian Thomas, Provideal GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,14 +21,55 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'tabulatr/tabulatr'
+module Tabulatr
+  def self.config &block
+    yield self
+  end
+
+  mattr_accessor :bootstrap_paginator, instance_accessor: false do
+    'create_ul_paginator'
+  end
+
+  def self.secret_tokens=(secret_tokens)
+    @@secret_tokens = secret_tokens
+  end
+
+  def self.secret_tokens
+    @@secret_tokens ||= []
+  end
+end
+
 require 'tabulatr/engine'
-require 'whiny_hash'
+require 'tabulatr/renderer/renderer'
+require 'tabulatr/data/data'
+require 'tabulatr/json_builder'
+require 'tabulatr/generators/railtie' if defined?(Rails)
 
 #--
 # Mainly Monkey Patching...
 #--
-Dir[File.join(File.dirname(__FILE__), "initializers", "*.rb")].each do |file|
+Dir[File.join(File.dirname(__FILE__), "tabulatr", "rails", "*.rb")].each do |file|
+  require file
+end
+
+#---
+# Utility methods
+#--
+Dir[File.join(File.dirname(__FILE__), "tabulatr", "utility", "*.rb")].each do |file|
+  require file
+end
+
+
+#--
+# Renderer methods
+#--
+#---
+# Utility methods
+#--
+# Dir[File.join(File.dirname(__FILE__), "tabulatr", "renderer", "row_builder.rb")].each do |file|
+#   require file
+# end
+Dir[File.join(File.dirname(__FILE__), "tabulatr", "renderer", "*.rb")].each do |file|
   require file
 end
 

data/lib/tabulatr2.rb

@@ -0,0 +1 @@
+require_relative './tabulatr'

data/spec/dummy/app/assets/stylesheets/application.css.scss

@@ -9,7 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require tabulatr
  */
 
-@import "bootstrap";
+@import "bootstrap";

data/spec/dummy/app/controllers/products_controller.rb

@@ -1,17 +1,22 @@
 class ProductsController < ApplicationController
 
   def simple_index
-    tabulatr_for Product
+    begin
+      tabulatr_for Product
+    rescue Exception => e
+      puts e.backtrace
+      raise e
+    end
   end
 
   def one_item_per_page_with_pagination
     @pagination = true
-    tabulatr_for Product, {action: 'one_item_per_page'}
+    tabulatr_for Product, render_action: 'one_item_per_page'
   end
 
   def one_item_per_page_without_pagination
     @pagination = false
-    tabulatr_for Product, {action: 'one_item_per_page'}
+    tabulatr_for Product, render_action: 'one_item_per_page'
   end
 
   def count_tags
@@ -21,4 +26,23 @@ class ProductsController < ApplicationController
   def stupid_array
     @products = Product.order('price asc').limit(11).to_a
   end
+
+  def with_batch_actions
+    begin
+      tabulatr_for Product, render_action: 'with_batch_actions' do |batch_actions|
+        batch_actions.destroy do |ids|
+          ids.each do |id|
+            Product.find(id).destroy
+          end
+        end
+      end
+    rescue Exception => e
+      puts e.backtrace
+      raise e
+    end
+  end
+
+  def implicit_columns
+    tabulatr_for Product
+  end
 end

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

@@ -1,2 +1,3 @@
 class Vendor < ActiveRecord::Base
+  has_many :products
 end

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

@@ -0,0 +1,29 @@
+class ProductTabulatrData < Tabulatr::Data
+
+  search :vendor_product_name, :price, :title
+
+  # search do |query|
+  #   "products.title LIKE '#{query}'"
+  # end
+
+  column :title
+  column :id
+  column :price 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"
+  #   filter: "firstname || ' ' || lastname"
+  #   do
+  #     "#{firstname} #{lastname}"
+  # end
+  column :vendor_product_name, sort_sql: "products.title || '' || vendors.name", filter_sql: "products.title || '' || vendors.name" do
+    "#{record.title} from #{record.vendor.try(:name)}"
+  end
+  column :active
+  column :updated_at, table_column_options: { filter: :date } do "#{record.updated_at.strftime('%H:%M %d.%m.%Y')}" end
+  association :vendor, :name
+  association :tags, :title do |r|
+    "'#{r.tags.map(&:title).map(&:upcase).join(', ')}'"
+  end
+
+end

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

@@ -0,0 +1 @@
+<%= table_for Product, :paginate => true %>

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

@@ -1,4 +1,4 @@
-<%= table_for Product, :paginate => @pagination, :default_pagesize => 1 do |t|
+<%= table_for Product, :paginate => @pagination, :pagesize => 1 do |t|
   t.checkbox
   t.column :title
   t.column :price, filter: :range

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

@@ -1,9 +1,11 @@
-<%= table_for Product, :paginate => @pagination do |t|
+<%= table_for Product, :paginate => true,
+  batch_actions: {a: "Hallo", b: "Du da!"} do |t|
   t.checkbox
-  t.column :title
+  t.column :title, sortable: true
   t.column :price, filter: :range
-  t.column :active
-  t.column :updated_at
+  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 %>

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

@@ -1,4 +1,4 @@
-<%= table_for @products do |t|
+<%= static_table_for @products do |t|
   t.column :title
   t.column :title, format: :foo_me
   t.column :title, format: ->(a) { bar_me(a) }

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

@@ -0,0 +1,10 @@
+<%= table_for Product, batch_actions: {'destroy' => "Delete"}, :paginate => @pagination do |t|
+  t.checkbox
+  t.column :title, sortable: true
+  t.column :price, filter: :range
+  t.column :active
+  t.column :vendor_product_name, header: 'Product by vendor'
+  t.column :updated_at
+  t.association :vendor, :name, filter: :exact
+  t.association :tags, :title
+end %>

data/spec/dummy/config/locales/tabulatr.yml

@@ -5,10 +5,31 @@ en:
     batch_actions: 'Batch actions'
     count: 'Showing: %{current} of total %{total}. %{per_page} items per page.'
     apply_filters: 'Apply'
+    search: 'Search'
+    date_filter:
+      none: ''
+      today: "Today"
+      yesterday: Yesterday
+      this_week: This Week
+      last_7_days: Last 7 Days
+      this_month: This Month
+      last_30_days: Last 30 Days
+      from_to: From - To
+
 de:
   tabulatr:
     rows_per_page: 'Ergebnisse pro Seite'
     filter: 'Filter'
     batch_actions: 'Batch-Aktionen'
     count: 'Zeige %{current} von insgesamt %{total}. %{per_page} pro Seite.'
-    apply_filters: 'Anwenden'
+    apply_filters: 'Anwenden'
+    search: 'Suche'
+    date_filter:
+      none: ''
+      today: "Heute"
+      yesterday: Gestern
+      this_week: Diese Woche
+      last_7_days: Letzte 7 Tage
+      this_month: Dieser Monat
+      last_30_days: Letzte 30 Tage
+      from_to: Von - Bis

data/spec/dummy/config/routes.rb

@@ -1,11 +1,13 @@
 Rails.application.routes.draw do
-  resources :products, only: [:index] do
+  resources :products, only: [:index, :show] do
     collection do
       get :simple_index
       get :one_item_per_page_with_pagination
       get :one_item_per_page_without_pagination
       get :count_tags
       get :stupid_array
+      get :with_batch_actions
+      get :implicit_columns
     end
   end
 

data/spec/features/tabulatrs_spec.rb

@@ -53,7 +53,7 @@ describe "Tabulatr" do
         product.tags << tag
         product.save
         visit simple_index_products_path
-        page.should have_content tag.title
+        page.should have_content tag.title.upcase
       end
     end
 
@@ -128,17 +128,22 @@ describe "Tabulatr" do
         Product.create!(:title => n, :active => true, :price => 10.0)
       end
       visit simple_index_products_path
-      find('.icon-filter').trigger('click')
-      fill_in("product_filter[title][like]", :with => "ore")
+      find("a[href='#tabulatr_filter_dialog_product']").click()
+      within("#tabulatr_filter_dialog_product") do
+        fill_in("product_filter[title][like]", :with => "ore")
+      end
       click_button("Apply")
-      sleep(2)
       page.should have_content("lorem")
       page.should have_content("labore")
       page.should have_content("dolore")
-      find('.icon-filter').trigger('click')
-      fill_in("product_filter[title][like]", :with => "loreem")
+      find("a[href='#tabulatr_filter_dialog_product']").click()
+      within("#tabulatr_filter_dialog_product") do
+        fill_in("product_filter[title][like]", :with => "loreem")
+      end
       click_button("Apply")
       page.should_not have_content("lorem")
+      page.should_not have_content("labore")
+      page.should_not have_content("dolore")
     end
 
     it "filters" do
@@ -157,7 +162,6 @@ describe "Tabulatr" do
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 17}])
       visit simple_index_products_path
       find('.icon-filter').trigger('click')
-      page.save_screenshot('/Users/crunch/Desktop/file.png')
       within('form.tabulatr_filter_form') do
         fill_in("product_filter[price][from]", :with => 4)
         fill_in("product_filter[price][to]", :with => 10)
@@ -184,14 +188,14 @@ describe "Tabulatr" do
       (1..10).each do |i|
         page.should have_content names[i-1]
       end
-      find("#product_sort_title").trigger('click')
+      find("#product_sort_title").click
       snames = names.sort
       (1..10).each do |i|
-        page.should have_content snames[-i]
+        page.should have_content snames[i-1]
       end
-      find("#product_sort_title").trigger('click')
+      find("#product_sort_title").click
       (1..10).each do |i|
-        page.should have_content snames[i-1]
+        page.should have_content snames[-i]
       end
     end
   end
@@ -224,4 +228,42 @@ describe "Tabulatr" do
       end
     end
   end
+
+  describe "Batch actions", js: true do
+    it "shows the actions" do
+      visit with_batch_actions_products_path
+      find(".tabulatr-wrench").should have_content('Batch actions')
+    end
+
+    it "hides the actions if there are none" do
+      visit simple_index_products_path
+      page.should have_no_selector('.tabulatr-wrench')
+    end
+
+    it 'is initially not active' do
+      visit with_batch_actions_products_path
+      page.should have_selector('.tabulatr-wrench.disabled')
+    end
+
+    it 'becomes active when a checkbox is checked' do
+      product = Product.create!(:title => names[0], :active => true, :price => 10.0)
+      visit with_batch_actions_products_path
+      find('.tabulatr-checkbox').trigger('click')
+      page.should have_no_selector('.tabulatr-wrench.disabled')
+      page.should have_selector('.tabulatr-wrench')
+    end
+
+    it 'executes the action when clicked' do
+      product1 = Product.create!(:title => names[0], :active => true, :price => 10.0)
+      product2 = Product.create!(:title => names[1], :active => true, :price => 10.0)
+      product3 = Product.create!(:title => names[2], :active => true, :price => 10.0)
+      page.has_css?(".tabulatr_table tbody tr", :count => 3)
+      visit with_batch_actions_products_path
+      find(".tabulatr-checkbox[value='#{product1.id}']").trigger('click')
+      find(".tabulatr-checkbox[value='#{product3.id}']").trigger('click')
+      find('.tabulatr-wrench').trigger('click')
+      find("a[name='product_batch\\[destroy\\]']").trigger('click')
+      page.has_css?(".tabulatr_table tbody tr", :count => 1)
+    end
+  end
 end

data/tabulatr.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency('rails', '>= 4.0.0')
-  s.add_dependency('whiny_hash', '>= 0.0.2')
+  s.add_dependency('slim', '>= 2.0.1')
   s.add_runtime_dependency('activerecord_outer_joins', '~> 0.0.1')
 end