tabulatr2 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c84d124ea6a79ae026aa59ba8a1365a1bc6ae16
-  data.tar.gz: 85d817921b527a2a5ab2f0427080b64d14830a86
+  metadata.gz: 8bc8b3d34ed931fa24fe85981c1b2e5763248c6c
+  data.tar.gz: 7752208548f494554ab70a4d754df3bfdaa329fd
 SHA512:
-  metadata.gz: 8de26639ec20250a03e347ee476320bd9f7eddf964bd5893266828c77350d35ccebe99cc3f8ab4e9de82e04280235c8a932cc7b76a89d7ad5244a45313c97635
-  data.tar.gz: 7a003812abef8c87fbe511f3950c9d9d9d31312190a13720d7c996a3c1a8d4f5f760dd71d5e27a338b9691c9532fd9f080ff0fad68603469524dd3cb5dba50b7
+  metadata.gz: b7cef62c4f02e49c3469a786e796d74fa5c3d32e65715c836b9ad63a87bd37b8f7f63199893bf799bd21a7711e1051624b8bfa85595b5df044d14c4630312307
+  data.tar.gz: dbebfc21118fdac9f3b13deb6c077881d76ca48faa574d0e3757fd8c1b2ba711c7bb5cb1c124e1c85f3606b15605f25d52319a889a123984e21729d38574ed1b

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

@@ -0,0 +1,2 @@
+@import 'tabulatr/application';
+@import 'font-awesome';

data/lib/tabulatr/engine.rb

@@ -22,6 +22,7 @@
 #++
 
 require 'slim'
+require 'font-awesome-rails'
 class Tabulatr::Engine < Rails::Engine
 
 end

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
 end

data/spec/dummy/config/application.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-require 'font-awesome-rails'
 
 Bundler.require(*Rails.groups)
 

data/spec/features/tabulatrs_spec.rb

@@ -129,24 +129,16 @@ describe "Tabulatr" do
         Product.create!(:title => n, :active => true, :price => 10.0)
       end
       visit simple_index_products_path
-      find(".tabulatr-filter-menu-wrapper a.btn").click
-      within(".tabulatr-filter-menu-wrapper .dropdown.open") do
-        find_link('Title').click
-      end
-      expect(find('.dropdown-menu').visible?)
-      find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
-      within(".tabulatr_filter_form") do
-        fill_in("product_filter[products:title][like]", with: "ore")
-        expect{find('#title_like').visible?}.to be_true
-        find_button("Apply").trigger('click')
-      end
+      click_link 'Filter'
+      fill_in("product_filter[products:title][like]", with: "ore")
+      find('.tabulatr-submit-table').click
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'lorem')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'labore')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'dolore')
 
       within(".tabulatr_filter_form") do
         fill_in("product_filter[products:title][like]", :with => "loreem")
-        find_button("Apply").trigger('click')
+        find('.tabulatr-submit-table').click
       end
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'lorem')
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'labore')
@@ -157,13 +149,9 @@ describe "Tabulatr" do
       Product.create!([{title: 'foo', vendor: @vendor1},
                        {title: 'bar', vendor: @vendor2}])
       visit simple_index_products_path
-      find(".tabulatr-filter-menu-wrapper a.btn").click
-      within(".tabulatr-filter-menu-wrapper .dropdown.open") do
-        find_link('Vendor Name').click
-      end
-      find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
+      click_link 'Filter'
       find('form.tabulatr_filter_form').fill_in("product_filter[vendor:name]", with: "producer")
-      find('form.tabulatr_filter_form').find_button('Apply').trigger('click')
+      find('.tabulatr-submit-table').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
@@ -172,22 +160,19 @@ describe "Tabulatr" do
       n = names.length
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 17}])
       visit simple_index_products_path
-      find(".tabulatr-filter-menu-wrapper a.btn").click
-      within(".tabulatr-filter-menu-wrapper .dropdown.open") do
-        find_link('Price').click
-      end
-      find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
+
+      click_link 'Filter'
       within('.tabulatr_filter_form') do
         fill_in("product_filter[products:price][from]", :with => 4)
         fill_in("product_filter[products:price][to]", :with => 10)
-        find_button("Apply").trigger('click')
+        find('.tabulatr-submit-table').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[products:price][from]", :with => 12)
         fill_in("product_filter[products:price][to]", :with => 19)
-        find_button("Apply").trigger('click')
+        find('.tabulatr-submit-table').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}']")
@@ -196,24 +181,14 @@ describe "Tabulatr" do
     it 'removes the filters', js: true do
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 5}])
       visit simple_index_products_path
-      find(".tabulatr-filter-menu-wrapper a.btn").click
-      within(".tabulatr-filter-menu-wrapper .dropdown.open") do
-        find_link('Title').click
-      end
-      expect(find('.dropdown-menu').visible?)
-      find(".tabulatr-filter-menu-wrapper a.btn").trigger('click')
+      click_link 'Filter'
       within(".tabulatr_filter_form") do
         fill_in("product_filter[products:title][like]", with: "foo")
-        # expect(find('#products--title_like').visible?)
-        find_button("Apply").trigger('click')
+        find('.tabulatr-submit-table').click
       end
-      # expect(page).to have_content('foo')
-      # expect(page).to have_no_content('bar')
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'bar')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'foo')
-      find("a[data-hide-table-filter='products:title']").trigger('click')
-      # expect(page).to have_content('foo')
-      # expect(page).to have_content('bar')
+      find('.tabulatr-reset-table').click
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'bar')
       expect(page).to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'foo')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,7 +97,7 @@ files:
 - app/assets/javascripts/tabulatr/_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.css.scss
 - app/assets/stylesheets/tabulatr/application.css.scss
 - app/assets/stylesheets/tabulatr/bootstrap2_fixes.css.scss
 - app/views/tabulatr/_tabulatr_actual_table.html.slim

data/app/assets/stylesheets/tabulatr.css

@@ -1,5 +0,0 @@
-/*
-*
-*= require tabulatr/application
-*= require font-awesome
-*/