tabulatr2 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc8b3d34ed931fa24fe85981c1b2e5763248c6c
-  data.tar.gz: 7752208548f494554ab70a4d754df3bfdaa329fd
+  metadata.gz: f23479a544dea98a12d51d712207eb073099c36a
+  data.tar.gz: 5bc9a22c42eb5682f397c2b2906dd78665f7868e
 SHA512:
-  metadata.gz: b7cef62c4f02e49c3469a786e796d74fa5c3d32e65715c836b9ad63a87bd37b8f7f63199893bf799bd21a7711e1051624b8bfa85595b5df044d14c4630312307
-  data.tar.gz: dbebfc21118fdac9f3b13deb6c077881d76ca48faa574d0e3757fd8c1b2ba711c7bb5cb1c124e1c85f3606b15605f25d52319a889a123984e21729d38574ed1b
+  metadata.gz: 1bebe6ba5bf5ae4472fb13b18f679a00f31e1a3f31062945e535037483a44ad03c8fc93503a0a40a991e97dde628927b955ace7fd7299973735414e16bee2569
+  data.tar.gz: 1c288d8b9da7f52c75689feb9eb4eafa32f876d6a46f9d86cc514909ad08ab9a83bb7dc64a418f6e461f90736f51700d2927d71e588eda2289c28a3de5c45fbc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.9.15
+ * Removes bootstrap2 CSS modifications
+
 ## 0.9.6
  * Adds localStorage persistency for tables. It's automatically turned on for paginated
    tables and you can adjust the setting in your template.

data/Gemfile

@@ -12,10 +12,7 @@ end
 
 group :development, :test do
   gem 'sqlite3', :require => 'sqlite3'
-  gem 'rspec', '~> 2.14.1'
-  gem 'rspec-rails', '~> 2.14.0'
   gem 'minitest'
-  gem 'capybara'
   gem 'launchy'
   gem 'database_cleaner', '< 1.1.0'
   gem 'poltergeist'

data/lib/tabulatr/version.rb

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

data/spec/features/tabulatrs_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "Tabulatr" do
+feature "Tabulatr" do
 
   names = ["lorem", "ipsum", "dolor", "sit", "amet", "consectetur",
   "adipisicing", "elit", "sed", "eiusmod", "tempor", "incididunt", "labore",
@@ -19,9 +19,9 @@ describe "Tabulatr" do
     @tag3 = Tag.create!(:title => 'fubar')
   end
 
-  describe "General data" do
+  feature "General data" do
 
-    it "contains buttons" do
+    scenario "contains buttons" do
       visit simple_index_products_path
       ['.tabulatr-filter-menu-wrapper', '.tabulatr-batch-actions-menu-wrapper',
         '.tabulatr-paginator-wrapper'].each do |n|
@@ -29,102 +29,102 @@ describe "Tabulatr" do
       end
     end
 
-    it "contains column headers" do
+    scenario "contains column headers" do
       visit simple_index_products_path
       ['Title','Price','Active','Updated at'].each do |n|
-        find('.tabulatr_table thead').should have_content(n)
+        expect(page).to have_css('.tabulatr_table thead', text: n)
       end
     end
 
-    it "contains the actual data", js: true do
+    scenario "contains the actual data", js: true do
       product = Product.create!(:title => names[0], :active => true, :price => 10.0)
       product.vendor = @vendor1
       product.save!
       visit simple_index_products_path
-      page.should have_content("true")
-      page.should have_content("10.0")
-      product.vendor.name.should eq("ven d'or")
-      find('.tabulatr_table tbody').should have_content(names[0])
-      find('.tabulatr_table tbody').should have_content("ven d'or")
+      expect(page).to have_content("true")
+      expect(page).to have_content("10.0")
+      expect(product.vendor.name).to eq("ven d'or")
+      expect(page).to have_css('.tabulatr_table tbody', text: names[0])
+      expect(page).to have_css('.tabulatr_table tbody', text: "ven d'or")
     end
 
-    it "correctly contains the association data", js: true do
+    scenario "correctly contains the association data", js: true do
       product = Product.create!(:title => names[0], :active => true, :price => 10.0)
       [@tag1, @tag2, @tag3].each_with_index do |tag, i|
         product.tags << tag
         product.save
         visit simple_index_products_path
-        page.should have_content tag.title.upcase
+        expect(page).to have_content(tag.title.upcase)
       end
     end
 
-    it "contains the actual data multiple times", js: true do
+    scenario "contains the actual data multiple times", js: true do
       9.times do |i|
         product = Product.create!(:title => names[i], :active => i.even?, :price => 11.0+i,
           :vendor => i.even? ? @vendor1 : @vendor2)
         visit simple_index_products_path
-        page.should have_content(names[i])
-        page.should have_content((11.0+i).to_s)
+        expect(page).to have_content(names[i])
+        expect(page).to have_content((11.0+i).to_s)
       end
     end
 
-    it "contains the further data on the further pages" do
+    scenario "contains the further data on the further pages" do
       names[10..-1].each_with_index do |n,i|
         product = Product.create!(:title => n, :active => i.even?, :price => 20.0+i,
           :vendor => i.even? ? @vendor1 : @vendor2)
         visit simple_index_products_path
-        page.should_not have_content(/\s+#{n}\s+/)
-        page.should_not have_content((30.0+i).to_s)
+        expect(page).to have_no_content(/\s+#{n}\s+/)
+        expect(page).to have_no_content((30.0+i).to_s)
       end
     end
   end
 
-  describe 'has_many' do
-    it 'displays the count when called with :count', js: true do
+  feature 'has_many' do
+    scenario 'displays the count when called with :count', js: true do
       product = Product.create!(:title => names[0], :active => true, :price => 10.0)
       [@tag1, @tag2, @tag3].each do |tag|
         product.tags << tag
       end
       product.save
       visit count_tags_products_path
-      page.find('tbody td[data-tabulatr-column-name="tags:count"]').should have_content 3
+      expect(page).to have_css('tbody td[data-tabulatr-column-name="tags:count"]', text: '3')
     end
   end
 
-  describe "Pagination" do
+  feature "Pagination" do
 
 
     context 'pagination setting is true' do
-      it 'has pages', js: true do
+      scenario 'has pages', js: true do
         5.times do |i|
           Product.create!(:title => "test #{i}")
         end
         visit one_item_per_page_with_pagination_products_path
-        page.all('.pagination li a[data-page]').count.should eq 5
+        expect(page).to have_css('.pagination li a[data-page]', count: 5)
       end
 
-      it 'shows some pages when there are 20', js: true do
+      scenario 'shows some pages when there are 20', js: true do
         20.times do |i|
           Product.create!
         end
         visit one_item_per_page_with_pagination_products_path
         pages = page.all('.pagination li a[data-page]').map{|a| a['data-page'].to_i}
-        pages.should eq [1,2,3,10,20]
+        expect(pages).to match_array([1,2,3,10,20])
       end
     end
     context 'pagination setting is false' do
-      it 'has no pages', js: true do
+      scenario 'has no pages', js: true do
         5.times do |i|
           Product.create!
         end
         visit one_item_per_page_without_pagination_products_path
-        page.all('.pagination li a').count.should be 0
+        expect(page).to have_no_css('.pagination li a')
       end
     end
   end
 
-  describe "Filters" do
-    it "filters with like", js: true do
+  feature "Filters" do
+    scenario "filters with like", js: true do
       names.each do |n|
         Product.create!(:title => n, :active => true, :price => 10.0)
       end
@@ -145,7 +145,7 @@ describe "Tabulatr" do
       expect(page).not_to have_selector('td[data-tabulatr-column-name="products:title"]', text: 'dolore')
     end
 
-    it "filters", js: true do
+    scenario "filters", js: true do
       Product.create!([{title: 'foo', vendor: @vendor1},
                        {title: 'bar', vendor: @vendor2}])
       visit simple_index_products_path
@@ -156,7 +156,7 @@ describe "Tabulatr" do
       expect(page).to have_selector('td[data-tabulatr-column-name="vendor:name"]', text: @vendor2.name)
     end
 
-    it "filters with range", js: true do
+    scenario "filters with range", js: true do
       n = names.length
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 17}])
       visit simple_index_products_path
@@ -167,18 +167,18 @@ describe "Tabulatr" do
         fill_in("product_filter[products:price][to]", :with => 10)
         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}']")
+      expect(page).to have_css(".tabulatr_table tbody tr[data-id='#{Product.first.id}']", text: 'foo')
+      expect(page).to have_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('.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}']")
+      expect(page).to have_css(".tabulatr_table tbody tr[data-id='#{Product.last.id}']")
+      expect(page).to have_no_css(".tabulatr_table tbody tr[data-id='#{Product.first.id}']")
     end
 
-    it 'removes the filters', js: true do
+    scenario 'removes the filters', js: true do
       Product.create!([{title: 'foo', price: 5}, {title: 'bar', price: 5}])
       visit simple_index_products_path
       click_link 'Filter'
@@ -194,36 +194,35 @@ describe "Tabulatr" do
     end
   end
 
-  describe "Sorting" do
-    it "knows how to sort", js: true do
+  feature "Sorting" do
+    scenario "knows how to sort", js: true do
       names.each do |n|
         Product.create!(title: n, vendor: @vendor1, active: true, price: 10.0)
       end
-      Product.count.should > 10
       visit simple_index_products_path
       l = names.count
       (1..10).each do |i|
-        page.should have_content names[l-i]
+        expect(page).to have_content names[l-i]
       end
       within('.tabulatr_table thead') do
         find('th[data-tabulatr-column-name="products:title"]').click
       end
       snames = names.sort
       (1..10).each do |i|
-        page.should have_content snames[i-1]
+        expect(page).to have_content snames[i-1]
       end
       within('.tabulatr_table thead') do
         find('th[data-tabulatr-column-name="products:title"]').click
       end
       (1..10).each do |i|
-        page.should have_content snames[-i]
+        expect(page).to have_content snames[-i]
       end
     end
   end
 
-  describe "Show simple records" do
+  feature "Show simple records" do
 
-    it "contains the actual data", js: false do
+    scenario "contains the actual data", js: false do
       names.shuffle.each.with_index do |n,i|
         p = Product.new(:title => n, :active => true, :price => 10.0 + i)
         p.vendor = [@vendor1, @vendor2].shuffle.first
@@ -232,50 +231,50 @@ describe "Tabulatr" do
       end
       visit stupid_array_products_path
       Product.order('price asc').limit(11).each do |product|
-        page.should have_content(product.title)
-        page.should have_content(product.title.upcase)
-        page.should have_content(product.price)
-        page.should have_content(product.vendor.name)
-        page.should have_content(product.title)
-        page.should have_content("foo#{product.title}foo")
-        page.should have_content("bar#{product.title}bar")
-        page.should have_content("%08.4f" % product.price)
-        page.should have_content(product.tags.count)
+        expect(page).to have_content(product.title)
+        expect(page).to have_content(product.title.upcase)
+        expect(page).to have_content(product.price)
+        expect(page).to have_content(product.vendor.name)
+        expect(page).to have_content(product.title)
+        expect(page).to have_content("foo#{product.title}foo")
+        expect(page).to have_content("bar#{product.title}bar")
+        expect(page).to have_content("%08.4f" % product.price)
+        expect(page).to have_content(product.tags.count)
         product.tags.each do |tag|
-          page.should have_content(tag.title)
-          page.should have_content("foo#{tag.title}foo")
-          page.should have_content("bar#{tag.title}bar")
+          expect(page).to have_content(tag.title)
+          expect(page).to have_content("foo#{tag.title}foo")
+          expect(page).to have_content("bar#{tag.title}bar")
         end
       end
     end
   end
 
-  describe "Batch actions", js: true do
+  feature "Batch actions", js: true do
 
-    it "hides the actions if there are none" do
+    scenario "hides the actions if there are none" do
       visit one_item_per_page_with_pagination_products_path
-      page.should have_no_selector('.tabulatr-batch-actions-menu-wrapper a')
+      expect(page).to have_no_selector('.tabulatr-batch-actions-menu-wrapper a')
     end
 
 
-    it 'executes the action when clicked' do
+    scenario '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
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 3)
       find(".tabulatr-checkbox[value='#{product1.id}']").trigger('click')
       find(".tabulatr-checkbox[value='#{product3.id}']").trigger('click')
       find('.tabulatr-batch-actions-menu-wrapper a').click
       within('.dropdown.open') do
         click_link 'Delete'
       end
-      page.has_css?(".tabulatr_table tbody tr", :count => 1)
+      expect(page).to have_css(".tabulatr_table tbody tr", count: 1)
     end
   end
 
-  describe "Column options", js: true do
-    it 'applys the given style' do
+  feature "Column options", js: true do
+    scenario 'applys the given style' do
       p = Product.create!(:title => names[0], :active => true, :price => 10.0)
       visit with_styling_products_path
       cell   = find(".tabulatr_table tbody td[data-tabulatr-column-name='products:title']")

data/spec/lib/tabulatr/data/data_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data do
 
@@ -11,7 +11,7 @@ describe Tabulatr::Data do
         filter_sql: "products.title",
         output: ->(record){record.send(:title)}
     )
-    Tabulatr::Data.any_instance.stub(:table_columns).and_return([column])
+    allow_any_instance_of(Tabulatr::Data).to receive(:table_columns).and_return([column])
   end
 
   it 'prefilters the result' do

data/spec/lib/tabulatr/data/dsl_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data::DSL do
   class DummySpecClass

data/spec/lib/tabulatr/data/filtering_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data::Filtering do
   class DummySpecClass
@@ -17,7 +17,7 @@ describe Tabulatr::Data::Filtering do
     @outside_last_thirty_days = Product.create!(publish_at: DateTime.new(2013, 12, 2, 23, 59))
     @this_month = Product.create!(publish_at: DateTime.new(2014, 1, 15, 0, 0))
     @next_year = Product.create!(publish_at: DateTime.new(2015, 1, 1, 12, 0))
-    Date.stub(:today).and_return(Date.new(2014,1,1))
+    allow(Date).to receive(:today).and_return(Date.new(2014,1,1))
   end
   describe '.apply_date_condition' do
     it "filters for 'today'" do

data/spec/lib/tabulatr/data/formatting_spec.rb

@@ -1,8 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data::Formatting do
   class DummySpecClass
     include Tabulatr::Data::Formatting
+    def table_columns; end
   end
 
   before(:each) do

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data::Pagination do
   class DummySpecClass

data/spec/lib/tabulatr/data/sorting_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Data::Sorting do
   class DummySpecClass

data/spec/lib/tabulatr/json_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::JsonBuilder do
 

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Renderer::Checkbox do
 

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Tabulatr::Renderer do
 

data/spec/rails_helper.rb

@@ -0,0 +1,23 @@
+ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'capybara/poltergeist'
+require 'spec_helper'
+
+Capybara.javascript_driver = :poltergeist
+
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, {js_errors: true})
+end
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+end

data/spec/spec_helper.rb

@@ -1,25 +1,43 @@
-ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
-require 'rspec/rails'
-require 'capybara/rspec'
-require 'capybara/poltergeist'
-
-Capybara.javascript_driver = :poltergeist
-
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, {js_errors: true})
-end
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.use_transactional_fixtures = false
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+  config.order = :random
 
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)
@@ -41,5 +59,44 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+
 
 end

data/tabulatr.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency('rails', '~> 4.0')
-  s.add_dependency('slim', '~> 2.0')
+  s.add_dependency('slim', '>= 2.0')
   s.add_dependency('tilt', '~> 1.4', '>= 1.4.1')
-  s.add_dependency('font-awesome-rails', '~> 4.0')
+  s.add_dependency('font-awesome-rails', '>= 4.0')
+  s.add_development_dependency('rspec-rails', '~> 3.1.0')
+  s.add_development_dependency('capybara', '~> 2.4.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -64,16 +64,44 @@ dependencies:
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 description: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
   finding/filtering, selecting and batch actions. Tries to do for tables what formtastic
   and simple_form did for forms.
@@ -99,7 +127,6 @@ files:
 - app/assets/javascripts/tabulatr/jquery.inview.min.js
 - 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
 - app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim
 - app/views/tabulatr/_tabulatr_buttons.html.slim
@@ -215,6 +242,7 @@ files:
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/checkbox_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 - tabulatr.gemspec
 homepage: http://github.com/metaminded/tabulatr2
@@ -314,4 +342,5 @@ test_files:
 - spec/lib/tabulatr/json_builder_spec.rb
 - spec/lib/tabulatr/renderer/checkbox_spec.rb
 - spec/lib/tabulatr/renderer/renderer_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb

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

@@ -1,24 +0,0 @@
-form.tabulatr_filter_form {
-
-  .controls {
-    margin-left: 180px;
-
-    a, input, select { margin-left: 10px; }
-
-    @for $i from 1 through 12 {
-      .col-md-#{$i} {
-        display: inline-block;
-        .span.from_to {
-          min-height: 1px !important;
-          padding-top: 10px;
-          margin-left: 10px;
-        }
-      }
-    }
-  }
-}
-
-.pagination {
-  margin: 0 10px 0 0;
-  padding: 0;
-}