tabulatr2 0.9.30 → 0.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8e5204add46d949b53ab203ff3eb544217d60f
-  data.tar.gz: 79455bf0881803cf94f77fb50f553c5ac0a4ea60
+  metadata.gz: 21719e71fe7654c3881b1abf925168d7ee09bb5f
+  data.tar.gz: df5a0301ac3c3e608a96dd62ccf87eb350f884b6
 SHA512:
-  metadata.gz: 5db3fe6c8d03c691e552128fc04300fc95aec3438e3718d298d1794e49661d4bb6dfb5463d8d4d874555ea99951e9b235175af513e841fe991f3b806faf054c8
-  data.tar.gz: 60d58e2003677d4f4949432c3a2b5c4283ca4ce306fac7fcfd4a2a61490e3c74364558f07e8c62ea84c031a632fab9604f4192e3b165342b4eece68cefa152b1
+  metadata.gz: 81785a96b3deb0249269a0b2487ed70b231f0fc810e14383e9bd088aeb97f80e47b0116c916436fefb372985fe829bc9462d49cf8dfc04de199593322617ecdd
+  data.tar.gz: ef55f54530aa2906db178edca61b1ff56ffdd97ec5ca60c88f502baafdcd85ca9d4ac8f6c94f52e0622acf07e740881280f846b749d0b034cd7533375d0558c7

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  -  2.0.0
-  -  2.1.0
-  -  jruby
-matrix:
-  allow_failures:
-    - rvm: jruby
+#  -  2.1.10
+  -  2.2.6
+  -  2.3.3
+#  -  2.4.0 # wait for json > 1.8.3
+  -  jruby-9.1.5.0
 script: "bundle exec rspec spec"
 

data/Gemfile

@@ -15,7 +15,12 @@ end
 
 
 group :development, :test do
-  gem 'sqlite3', :require => 'sqlite3'
+  if defined?(JRUBY_VERSION)
+    gem 'activerecord-jdbc-adapter'
+    gem 'jdbc-sqlite3'
+  else
+    gem 'sqlite3'
+  end
   gem 'minitest'
   gem 'launchy'
   gem 'database_cleaner', '< 1.1.0'

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

@@ -75,6 +75,13 @@ Tabulatr.prototype = {
   },
 
   loadDataFromServer: function(hash){
+    var data = this.getDataForAjax(hash)
+    // deparse existing params http://stackoverflow.com/a/8649003/673826
+    var search = location.search.substring(1);
+    if (search.length){
+      var query = JSON.parse('{"' + decodeURI(search).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}');
+      data = $.extend(query, data);
+    }
     $.ajax({
       context: this,
       type: 'GET',
@@ -82,7 +89,7 @@ Tabulatr.prototype = {
       accepts: {
         json: 'application/json'
       },
-      data: this.getDataForAjax(hash),
+      data: data,
       success: this.handleResponse,
       complete: this.hideLoadingSpinner,
       error: this.handleError

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

@@ -77,17 +77,17 @@
                       option value="last_7_days"= I18n.t("tabulatr.date_filter.last_7_days")
                       option value="this_month"= I18n.t("tabulatr.date_filter.this_month")
                       option value="last_30_days"= I18n.t("tabulatr.date_filter.last_30_days")
-                      option value="from_to"= I18n.t("tabulatr.date_filter.from_to")
+                      option value="from_to"= "#{I18n.t('tabulatr.date_filter.from')} - #{I18n.t('tabulatr.date_filter.to')}"
                     .row.from_to.hidden
                       .col-xs-6
                         .control-group
                           label.control-label for="#{formatted_name}_#{name}_filter_from"
-                            = "Von"
+                            = I18n.t("tabulatr.date_filter.from")
                           input.tabulatr_filter.form-control.date-picker.hidden.from_to type="text" id="#{formatted_name}_#{name}_filter_from" name="#{iname}[date][from]"
                       .col-xs-6
                         .control-group
                           label.control-label for="#{formatted_name}_#{name}_filter_from"
-                            = "Bis"
+                            = I18n.t("tabulatr.date_filter.to")
                           input.tabulatr_filter.form-control.date-picker.from_to.hidden type="text" id="#{formatted_name}_#{name}_filter_to" name="#{iname}[date][to]"
                   - elsif column.filter == :enum
                     select.form-control name=iname data-tabulatr-attribute=name

data/lib/tabulatr/data/data.rb

@@ -43,7 +43,7 @@ class Tabulatr::Data
   def data_for_table(params, locals: {}, controller: nil, &block)
 
     @batch_actions = block if block_given?
-
+    @controller = controller
 
     # count
     total = @relation.count

data/lib/tabulatr/data/filtering.rb

@@ -106,7 +106,7 @@ module Tabulatr::Data::Filtering
   end
 
   def apply_custom_filter(filter, value)
-    filter_result = filter.block.(@relation, value)
+    filter_result = self.instance_exec @relation, value, &filter.block
     handle_search_result(filter_result)
   end
 

data/lib/tabulatr/generators/tabulatr/templates/tabulatr.yml

@@ -14,7 +14,8 @@ en:
       last_7_days: Last 7 Days
       this_month: This Month
       last_30_days: Last 30 Days
-      from_to: From - To
+      from: From
+      to: To
     boolean_filter:
       both: All
       'yes': Yes
@@ -39,7 +40,8 @@ de:
       last_7_days: Letzte 7 Tage
       this_month: Dieser Monat
       last_30_days: Letzte 30 Tage
-      from_to: Von - Bis
+      from: Von
+      to: Bis
     boolean_filter:
       both: Alle
       'yes': Ja

data/lib/tabulatr/renderer/renderer.rb

@@ -85,7 +85,8 @@ class Tabulatr::Renderer
   end
 
   def generate_id
-    "#{Tabulatr::Utility.formatted_name(@klass.name)}_table_#{@view.controller.controller_name}_#{@view.controller.action_name}_#{@view.instance_variable_get(:@_tabulatr_table_index)}"
+    controller_path = @view.controller.class.name.underscore.gsub('/', '-')
+    "#{Tabulatr::Utility.formatted_name(@klass.name)}_table_#{controller_path}_#{@view.controller.action_name}_#{@view.instance_variable_get(:@_tabulatr_table_index)}"
   end
 
   def self.build_static_table(records, view, toptions={}, &block)

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.30"
+  VERSION = "0.9.31"
 end

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

@@ -1,5 +1,8 @@
 class VendorsController < ApplicationController
+  attr_reader :split
+
   def index
+     @split = params[:split] && params[:split].to_f || 100
      tabulatr_for Vendor
   end
 end

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

@@ -7,9 +7,9 @@ class VendorTabulatrData < Tabulatr::Data
   filter :product_price_range do |relation, value|
     relation = relation.joins(:products)
     if value == 'low'
-      relation.group("vendors.id").having('AVG(products.price) <= 100')
+      relation.group("vendors.id").having('AVG(products.price) <= ?', @controller.split)
     elsif value == 'high'
-      relation.group("vendors.id").having('AVG(products.price) > 100')
+      relation.group("vendors.id").having('AVG(products.price) > ?', @controller.split)
     end
   end
 end

data/spec/dummy/app/views/tabulatr/filter/_product_price_range.html.slim

@@ -4,6 +4,6 @@
   select.form-control.no-chosen id=input_id name=input_name
     option= I18n.t("tabulatr.date_filter.none")
     option value="low"
-      | <= 100 Euro
+      | Cheap
     option value="high"
-      | > 100 Euro
+      | Expensive

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

@@ -14,7 +14,8 @@ en:
       last_7_days: Last 7 Days
       this_month: This Month
       last_30_days: Last 30 Days
-      from_to: From - To
+      from: From
+      to: To
     boolean_filter:
       both: All
       'yes': Yes
@@ -38,7 +39,8 @@ de:
       last_7_days: Letzte 7 Tage
       this_month: Dieser Monat
       last_30_days: Letzte 30 Tage
-      from_to: Von - Bis
+      from: Von
+      to: Bis
     boolean_filter:
       both: Alle
       'yes': Ja

data/spec/features/tabulatrs_spec.rb

@@ -228,16 +228,35 @@ feature "Tabulatr" do
       expect(page).to have_css(".tabulatr_table tbody tr", count: 2)
       click_link 'Filter'
       within(".tabulatr_filter_form") do
-        select("> 100 Euro", from: "vendor_filter[product_price_range]")
+        select("Expensive", from: "vendor_filter[product_price_range]")
       end
       expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
       expect(page).to have_css('.tabulatr_table tbody td', text: @vendor2.name)
       within(".tabulatr_filter_form") do
-        select("<= 100 Euro", from: "vendor_filter[product_price_range]")
+        select("Cheap", from: "vendor_filter[product_price_range]")
       end
       expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
       expect(page).to have_css('.tabulatr_table tbody td', text: @vendor1.name)
     end
+
+    scenario 'custom split filters', js: true do
+      Product.create!([{title: 'foo', price: 7.5, vendor: @vendor1}, {title: 'bar', price: 90, vendor: @vendor1}])
+      Product.create!([{title: 'baz', price: 125, vendor: @vendor2}, {title: 'fubar', price: 133.3, vendor: @vendor2}, {title: 'fiz', price: 97, vendor: @vendor2}])
+      visit vendors_path + '?split=5'
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 2)
+      click_link 'Filter'
+      within(".tabulatr_filter_form") do
+        select("Expensive", from: "vendor_filter[product_price_range]")
+      end
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 2)
+      expect(page).to have_css('.tabulatr_table tbody td', text: @vendor1.name)
+      expect(page).to have_css('.tabulatr_table tbody td', text: @vendor2.name)
+      within(".tabulatr_filter_form") do
+        select("Cheap", from: "vendor_filter[product_price_range]")
+      end
+#      wait_for_ajax
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 0, wait: 10)
+    end
   end
 
   feature "Sorting" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.31
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,