Merge pull request #241 from ryanfox1985/development

I don't know why fail.

spec/schema.rb

@@ -0,0 +1,8 @@
+ActiveRecord::Schema.define(version: 20150713103513) do
+  create_table "dummies", force: :cascade do |t|
+    t.string   "name"
+
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+end

spec/spec_helper.rb

@@ -33,6 +33,7 @@
 SimpleCov.start
 
 begin
+  require 'support/active_record'
   require 'action_controller'
   require 'action_view'
 rescue LoadError
@@ -41,6 +42,8 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'wice_grid'
 
+ActiveRecord::ConnectionAdapters::Column.send(:include, ::Wice::WiceGridExtentionToActiveRecordColumn)
+ActiveRecord::Base.send(:include, ::Wice::MergeConditions)
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

spec/support/active_record.rb

@@ -0,0 +1,10 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+
+load 'spec/schema.rb'
+
+class Dummy < ActiveRecord::Base
+end
+
+Dummy.create(name: 'test')

spec/wice/lib/table_column_matrix_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+module Wice
+  describe TableColumnMatrix do
+    GENERAL_CONDITIONS = 'conditions'
+
+    it 'should new' do
+      table = TableColumnMatrix.new
+
+      expect(table.class).to eq(TableColumnMatrix)
+    end
+
+    it 'should add_condition' do
+      table = TableColumnMatrix.new
+      table.add_condition('key', GENERAL_CONDITIONS)
+
+      expect(table.conditions).to include(GENERAL_CONDITIONS)
+    end
+
+    it 'should set default_model_class' do
+      table = TableColumnMatrix.new
+      table.default_model_class = Dummy
+    end
+  end
+end

wice_grid.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.date          = '2015-08-14'
 
+  s.add_dependency 'activerecord',      ['~> 4.2']
   s.add_dependency 'kaminari',          ['~> 0.16']
   s.add_dependency 'coffee-rails',      ['~> 4.0']
   s.add_dependency 'font-awesome-sass', ['~> 4.3']
@@ -27,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rubocop', '~> 0.32')
   s.add_development_dependency('coveralls', '~> 0.8.2')
   s.add_development_dependency('codeclimate-test-reporter', '~> 0.4.7')
+  s.add_development_dependency('sqlite3', '~> 1.3')
 end