tabulatr2 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7714cdb5e97ef698c0207c832c9778f107f01aed
-  data.tar.gz: 6193fd43909b6a071223e54c78e628ccb7fcbec3
+  metadata.gz: f6cc8ca903e127f8312818a5a85faf7a01fb7b85
+  data.tar.gz: 90df54794f6c5699ac87809a3513ed5845fa34f5
 SHA512:
-  metadata.gz: 88d9ba05b6785fe460e33266274b13acdb0231db38c29cbc4306492f18d6ed3ed8d5eef47094e9cfbb60bb39693ae1d5090e5556d9eb641a280b22ecab4b39de
-  data.tar.gz: 0ee34fdbaa64d8693333ba27d4cd14ebcc1bfc88117f42635d055871a3e4b77d7d996c449c28f0319b592f7aa0b57f8256f50417111142060a1d834bfe1e24b0
+  metadata.gz: 6c4ce4dfcb2f5caf2e57a9c89b0a380989cc73112a074dceb6055837844817fb1271f0b10f4cab36c89d9f8e80d282a94d401b0d7b14785f061f3b352423b047
+  data.tar.gz: 66121f0ea6dc15b810fbaa31bc86385afd96f5a9632889a0a5ffe44f288a0a02981d48f4e6dccf45b1d524b6ec4eb483a78e83b717775a0c77646a5ebfce567b

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 rvm:
-  - '2.0.0'
+  -  2.0.0
+  -  2.1.0
+  -  jruby
+matrix:
+  allow_failures:
+    - rvm: jruby
 script: "bundle exec rspec spec"
 

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.9.3
+ * Tabulatr is now stopped from retrieving data in endless pagination mode when all data
+   is already on the client.
+
+ * Automatically determine appropriate filter types for the columns
+
+ * Boolean filter is now a `select` field with `yes`, `no`, `both` options
+
+ * User can pass in additional variables to the TabulatrData-Class via the
+   `locals` argument.
+
+  Example:
+  ```
+  tabulatr_for Product, locals: {current_user: current_user}
+  ```
+
 ## 0.9.2
 
 * Fixed bug which caused a reload of the website when clicking on the current

data/Gemfile

@@ -2,14 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'tabulatr2', path: './'
-
 gem 'jquery-rails'
 gem 'slim'
 
 group :development do
   gem 'better_errors'
-  gem 'binding_of_caller'
+  gem 'binding_of_caller', platforms: :ruby
 end
 
 

data/README.md

@@ -226,8 +226,6 @@ the columns in the block of `table_for`.
   th_html: false,
   filter_html: false,
   filter: true,          # whether this column should be filterable
-  checkbox_value: '1',
-  checkbox_label: '',
   sortable: true,        # whethter this column should be sortable
   format: nil,
   map: true,

data/app/assets/javascripts/tabulatr/application.js

@@ -130,6 +130,10 @@ Tabulatr.prototype = {
     return $('tr[data-page] input[type=checkbox]:checked').length > 0;
   },
 
+  currentCount: function(){
+    return $('#'+ this.id +' tbody tr.tabulatr-row').length;
+  },
+
   handleResponse: function(response) {
     this.insertTabulatrData(response);
     this.updatePagination(response.meta.page, response.meta.pages, response.meta.table_id);
@@ -150,11 +154,9 @@ Tabulatr.prototype = {
       this.moreResults = false;
       $('.pagination_trigger[data-table='+ tableId +']').unbind('inview');
     }else{
-      if(response.data.length < response.meta.pagesize){
+      if(this.currentCount() + response.data.length >= response.meta.count){
         this.moreResults = false;
         $('.pagination_trigger[data-table='+ tableId + ']').unbind('inview');
-      }else{
-        this.moreResults = true;
       }
 
       // insert the actual data

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

@@ -47,8 +47,12 @@ form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote=
             .col-md-5
               input.tabulatr_filter.form-control type="text" id="#{name}_to" data-tabulatr-attribute="#{name}_to" name="#{iname}[to]"
           - elsif column.filter == :checkbox
-            = check_box_tag(iname, column.checkbox_value, false, {})
-            = column.checkbox_label
+            .col-md-11
+              = select_tag(iname, options_for_select([ \
+                  [t('tabulatr.boolean_filter.both'), ""],
+                  [t('tabulatr.boolean_filter.no'), "false"],
+                  [t('tabulatr.boolean_filter.yes'), "true"]] \
+                ), class: 'form-control')
           - elsif column.filter == :exact
             .col-md-11
               input.tabulatr_filter.form-control type="text" id="#{name}_exact" data-tabulatr-attribute="#{name}" name="#{iname}"

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

@@ -19,5 +19,5 @@
 /  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 /  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-div.tabulatr_count data-table="#{klass.to_s.gsub(/::/, '--').downcase}_table" data-format-string=I18n.t('tabulatr.count')
+div.tabulatr_count data-table=table_id data-format-string=I18n.t('tabulatr.count')
 

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

@@ -19,8 +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.
 
-- formatted_name = "#{klass.to_s.gsub(/::/, '--').downcase}"
-- table_id = "#{formatted_name}_table"
 - opts = { columns: columns, table_options: table_options, \
     klass: klass, classname: classname, table_id: table_id,
     formatted_name: formatted_name }

data/lib/tabulatr/data/data.rb

@@ -35,11 +35,12 @@ class Tabulatr::Data
     @batch_actions = nil
     @row = self.class.instance_variable_get('@row')
     table_columns.map do |col|
-      col.klass = @base
+      col.klass = @base.reflect_on_association(col.table_name).try(:klass) || @base
+      col.determine_appropriate_filter! if col.filter === true
     end
   end
 
-  def data_for_table(params, &block)
+  def data_for_table(params, locals: {}, &block)
 
     @batch_actions = block if block_given?
 
@@ -60,11 +61,10 @@ class Tabulatr::Data
     # TODO: batch actions and checked ids
 
     # get the records
-    found = apply_formats()
+    found = apply_formats(locals: locals)
 
     append = params[:append].present? ? Tabulatr::Utility.string_to_boolean(params[:append]) : false
 
-
     # prepare result for rendering
     found.define_singleton_method(:__pagination) do
       { :page => pagination[:page],

data/lib/tabulatr/data/filtering.rb

@@ -62,7 +62,9 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_condition(n,v)
-    if v.is_a?(String)
+    if ['true', 'false'].include?(v)
+      @relation = @relation.where(:"#{n}" => Tabulatr::Utility.string_to_boolean(v))
+    elsif v.is_a?(String)
       apply_string_condition("#{n} = ?", v)
     elsif v.is_a?(Hash)
       apply_hash_condition(n, v)

data/lib/tabulatr/data/formatting.rb

@@ -23,8 +23,8 @@
 
 module Tabulatr::Data::Formatting
 
-  def apply_formats()
-    view = Data::Proxy.new
+  def apply_formats(locals: {})
+    view = Data::Proxy.new(locals: locals)
     return @relation.map do |record|
       view.record = record
       h = HashWithIndifferentAccess.new

data/lib/tabulatr/data/pagination.rb

@@ -33,7 +33,6 @@ module Tabulatr::Data::Pagination
     pagesize, page = pagesize.to_i, page.to_i
 
     pages = (count/pagesize.to_f).ceil
-    page = [page, pages].min
 
     {
       offset: [0,((page-1)*pagesize).to_i].max,

data/lib/tabulatr/data/proxy.rb

@@ -25,9 +25,13 @@ class Data::Proxy < ActionView::Base
 
   attr_accessor :record
 
-  def initialize(record=nil)
+  def initialize(record=nil, locals: {})
     self.class._init
     @record = record
+    locals.each do |nam, val|
+      raise "cowardly refusing to override `#{nam}'" if respond_to? nam
+      define_singleton_method nam do val end
+    end
   end
 
   def self._init

data/lib/tabulatr/rails/action_controller.rb

@@ -22,11 +22,11 @@
 #++
 
 class ActionController::Base
-  def tabulatr_for(relation, tabulatr_data_class: nil, serializer: nil, render_action: nil, &block)
+  def tabulatr_for(relation, tabulatr_data_class: nil, serializer: nil, render_action: nil, locals: {}, &block)
     klass = relation.respond_to?(:klass) ? relation.klass : relation
     respond_to do |format|
       format.json {
-        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, &block)
+        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, &block)
         render json: records.to_tabulatr_json(serializer)
       }
       format.html {

data/lib/tabulatr/renderer/association.rb

@@ -23,9 +23,7 @@
 
 class Tabulatr::Renderer::Association < Tabulatr::Renderer::Column
   def human_name
-    header ||
-      klass.reflect_on_association(table_name.to_sym).klass.model_name.human + ' ' +
-      klass.reflect_on_association(table_name.to_sym).klass.human_attribute_name(name)
+    header || klass.model_name.human + ' ' + klass.human_attribute_name(name)
   end
 
   def coltype() 'association' end

data/lib/tabulatr/renderer/column.rb

@@ -25,7 +25,7 @@ class Tabulatr::Renderer::Column
   include ActiveModel::Model
 
   attr_accessor *%i{name header width align valign wrap type th_html filter_html
-    filter checkbox_value checkbox_label filter_width range_filter_symbol
+    filter filter_width range_filter_symbol
     sortable table_name block klass format map classes cell_style header_style}
 
   def self.from(
@@ -40,8 +40,6 @@ class Tabulatr::Renderer::Column
     th_html: false,
     filter_html: false,
     filter: true,
-    checkbox_value: '1',
-    checkbox_label: '',
     sortable: true,
     format: nil,
     map: true,
@@ -62,8 +60,6 @@ class Tabulatr::Renderer::Column
       th_html: th_html,
       filter_html: filter_html,
       filter: filter,
-      checkbox_value: checkbox_value,
-      checkbox_label: checkbox_label,
       sortable: sortable,
       format: format,
       map: map,
@@ -136,4 +132,17 @@ class Tabulatr::Renderer::Column
     record.send name
   end
 
+  def determine_appropriate_filter!
+    case self.klass.columns_hash[self.name.to_s].try(:type)
+    when :integer, :float, :decimal
+      self.filter = :exact
+    when :string, :text
+      self.filter = :like
+    when :date, :time, :datetime, :timestamp
+      self.filter = :date
+    when :boolean
+      self.filter = :checkbox
+    end
+  end
+
 end

data/lib/tabulatr/renderer/renderer.rb

@@ -64,7 +64,9 @@ class Tabulatr::Renderer
       table_options: @table_options,
       klass: @klass,
       classname: @classname,
-      tabulatr_data: tdc
+      tabulatr_data: tdc,
+      table_id: generate_id,
+      formatted_name: formatted_name
     })
   end
 
@@ -80,6 +82,14 @@ class Tabulatr::Renderer
     })
   end
 
+  def generate_id
+    "#{formatted_name}_table_#{SecureRandom.uuid}"
+  end
+
+  def formatted_name
+    "#{@klass.to_s.gsub(/::/, '--').downcase}"
+  end
+
   def self.build_static_table(records, view, toptions={}, &block)
     return '' unless records.present?
     klass = records.first.class

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

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

@@ -15,6 +15,10 @@ en:
       this_month: This Month
       last_30_days: Last 30 Days
       from_to: From - To
+    boolean_filter:
+      both: All
+      yes: Yes
+      no: No
 
 de:
   tabulatr:
@@ -33,3 +37,7 @@ de:
       this_month: Dieser Monat
       last_30_days: Letzte 30 Tage
       from_to: Von - Bis
+    boolean_filter:
+      both: Alle
+      yes: Ja
+      no: Nein

data/spec/features/tabulatrs_spec.rb

@@ -123,8 +123,8 @@ describe "Tabulatr" do
     end
   end
 
-  describe "Filters", js: true do
-    it "filters with like" do
+  describe "Filters" do
+    it "filters with like", js: true do
       names.each do |n|
         Product.create!(:title => n, :active => true, :price => 10.0)
       end
@@ -137,22 +137,23 @@ describe "Tabulatr" do
       find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
       within(".tabulatr_filter_form") do
         fill_in("product_filter[title][like]", with: "ore")
-        expect(find('#title_like').visible?)
-        click_button("Apply")
+        expect{find('#title_like').visible?}.to be_true
+        find_button("Apply").trigger('click')
       end
-      page.should have_content("lorem")
-      page.should have_content("labore")
-      page.should have_content("dolore")
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'lorem')
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'labore')
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'dolore')
+
       within(".tabulatr_filter_form") do
         fill_in("product_filter[title][like]", :with => "loreem")
-        click_button("Apply")
+        find_button("Apply").trigger('click')
       end
-      page.should_not have_content("lorem")
-      page.should_not have_content("labore")
-      page.should_not have_content("dolore")
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'lorem')
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'labore')
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'dolore')
     end
 
-    it "filters" do
+    it "filters", js: true do
       Product.create!([{title: 'foo', vendor: @vendor1},
                        {title: 'bar', vendor: @vendor2}])
       visit simple_index_products_path
@@ -161,12 +162,10 @@ describe "Tabulatr" do
         find_link('Vendor Name').click
       end
       find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
-      within(".tabulatr_filter_form") do
-        fill_in("product_filter[vendor:name]", with: "producer")
-        click_button("Apply")
-      end
-      page.should have_content(@vendor2.name)
-      page.should have_no_content(@vendor1.name)
+      find('form.tabulatr_filter_form').fill_in("product_filter[vendor:name]", with: "producer")
+      find('form.tabulatr_filter_form').find_button('Apply').trigger('click')
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor1.name)
+      expect(page).to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor2.name)
     end
 
     it "filters with range", js: true do
@@ -181,14 +180,14 @@ describe "Tabulatr" do
       within('.tabulatr_filter_form') do
         fill_in("product_filter[price][from]", :with => 4)
         fill_in("product_filter[price][to]", :with => 10)
-        click_button("Apply")
+        find_button("Apply").trigger('click')
       end
       page.find(".tabulatr_table tbody tr[data-id='#{Product.first.id}']").should have_content('foo')
       page.has_no_css?(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
       within('.tabulatr_filter_form') do
         fill_in("product_filter[price][from]", :with => 12)
         fill_in("product_filter[price][to]", :with => 19)
-        click_button("Apply")
+        find_button("Apply").trigger('click')
       end
       page.should have_selector(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
       page.should have_no_selector(".tabulatr_table tbody tr[data-id='#{Product.first.id}']")
@@ -206,13 +205,17 @@ describe "Tabulatr" do
       within(".tabulatr_filter_form") do
         fill_in("product_filter[title][like]", with: "foo")
         expect(find('#title_like').visible?)
-        click_button("Apply")
+        find_button("Apply").trigger('click')
       end
-      expect(page).to have_content('foo')
-      expect(page).to have_no_content('bar')
-      find("a[data-hide-table-filter='title']").click
-      expect(page).to have_content('foo')
-      expect(page).to have_content('bar')
+      # expect(page).to have_content('foo')
+      # expect(page).to have_no_content('bar')
+      expect(page).not_to have_selector('td[data-tabulatr-column-name="title"]', text: 'bar')
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'foo')
+      find("a[data-hide-table-filter='title']").trigger('click')
+      # expect(page).to have_content('foo')
+      # expect(page).to have_content('bar')
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'bar')
+      expect(page).to have_selector('td[data-tabulatr-column-name="title"]', text: 'foo')
     end
   end
 

data/spec/lib/tabulatr/data/pagination_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Tabulatr::Data::Pagination do
+  class DummySpecClass
+    include Tabulatr::Data::Pagination
+  end
+
+  before(:all) do
+    @dummy = DummySpecClass.new
+  end
+  describe '.compute_pagination' do
+    it "computes an offset" do
+      count = double(count: 20)
+      @dummy.instance_variable_set('@relation', count)
+      pagination = @dummy.compute_pagination(1, 10)
+      expect(pagination[:offset]).to be 0
+      pagination = @dummy.compute_pagination(2, 10)
+      expect(pagination[:offset]).to be 10
+      pagination = @dummy.compute_pagination(3, 10)
+      expect(pagination[:offset]).to be 20
+      pagination = @dummy.compute_pagination(4, 10)
+      expect(pagination[:offset]).to be 30
+    end
+  end
+end

data/spec/lib/tabulatr/renderer/renderer_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Tabulatr::Renderer do
+
+  describe "#generate_id"
+
+  it "generates a 'unique' id for a table" do
+    klass = Product
+    renderer = Tabulatr::Renderer.new(klass, nil)
+    first_id = renderer.generate_id
+    second_id = renderer.generate_id
+    expect(first_id).to_not eq second_id
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,9 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/pagination_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
+- spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
 homepage: http://github.com/provideal/tabulatr2
@@ -270,5 +272,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
+- spec/lib/tabulatr/data/pagination_spec.rb
 - spec/lib/tabulatr/json_builder_spec.rb
+- spec/lib/tabulatr/renderer/renderer_spec.rb
 - spec/spec_helper.rb