fix AjaxDatabaseRails::base#search_condition for namespaced model

M. Saiqul Haq · M. Saiqul Haq · commit a297e4abe33c · 2014-11-28T13:18:58.000+07:00
convert rspec syntax to latest using transpec gem
diff --git a/ajax-datatables-rails.gemspec b/ajax-datatables-rails.gemspec
@@ -19,12 +19,14 @@ Gem::Specification.new do |gem|
   gem.require_path = "lib"
 
   gem.add_dependency 'railties',   '>= 3.1'
-  
+
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "generator_spec"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake"
-  
+  gem.add_development_dependency "activerecord", "~> 4.l.6"
+  gem.add_development_dependency "sqlite3"
+
   if RUBY_VERSION == '1.9.2'
     gem.add_development_dependency "rails", "3.1.0"
   else
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -104,7 +104,11 @@ def build_conditions_for(query)
 
     def search_condition(column, value)
       model, column = column.split('.')
-      model = model.singularize.titleize.gsub( / /, '' ).constantize
+      if model.scan("_").any?
+        model = model.singularize.titleize.gsub( / /, '::' ).constantize
+      else
+        model = model.singularize.titleize.gsub( / /, '' ).constantize
+      end
 
       casted_column = ::Arel::Nodes::NamedFunction.new('CAST', [model.arel_table[column.to_sym].as(typecast)])
       casted_column.matches("%#{value}%")
@@ -139,12 +143,12 @@ def per_page
     end
 
     def sort_column(item)
-      sortable_columns[item['column'].to_i]
+      sortable_columns[item[:column].to_i]
     end
 
     def sort_direction(item)
       options = %w(desc asc)
-      options.include?(item['dir']) ? item['dir'].upcase : 'ASC'
+      options.include?(item[:dir]) ? item[:dir].upcase : 'ASC'
     end
   end
 end
diff --git a/spec/ajax-datatables-rails/ajax_datatables_rails_spec.rb b/spec/ajax-datatables-rails/ajax_datatables_rails_spec.rb
@@ -1,23 +1,6 @@
 require 'spec_helper'
 
 describe AjaxDatatablesRails::Base do
-  class Column
-    def matches(query)
-      []
-    end
-  end
-
-  class User
-    def self.arel_table
-      { :foo => Column.new }
-    end
-  end
-
-  class UserData
-    def self.arel_table
-      { :bar => Column.new }
-    end
-  end
 
   params = {
     :draw => '5',
@@ -103,9 +86,9 @@ def self.arel_table
           }
         )
         datatable = AjaxDatatablesRails::Base.new(sort_view)
-        datatable.stub(:sortable_columns) { ['foo', 'bar', 'baz'] }
+        allow(datatable).to receive(:sortable_columns) { ['foo', 'bar', 'baz'] }
 
-        expect(datatable.send(:sort_column)).to eq('bar')
+        expect(datatable.send(:sort_column, sort_view.params[:order]["0"])).to eq('bar')
       end
     end
 
@@ -120,7 +103,7 @@ def self.arel_table
           }
         )
         datatable = AjaxDatatablesRails::Base.new(sorting_view)
-        expect(datatable.send(:sort_direction)).to eq('DESC')
+        expect(datatable.send(:sort_direction, sorting_view.params[:order]["0"])).to eq('DESC')
       end
 
       it 'can only be one option from ASC or DESC' do
@@ -133,7 +116,29 @@ def self.arel_table
           }
         )
         datatable = AjaxDatatablesRails::Base.new(sorting_view)
-        expect(datatable.send(:sort_direction)).to eq('ASC')
+        expect(datatable.send(:sort_direction, sorting_view.params[:order]["0"])).to eq('ASC')
+      end
+    end
+
+    describe "#search_condition" do
+      let(:datatable) { AjaxDatatablesRails::Base.new(view) }
+
+      context "normal model" do
+        it "should return arel object" do
+          expect(datatable.send(:search_condition, 'users.bar', 'bar').class).to eq(Arel::Nodes::Matches)
+        end
+      end
+
+      context "namespaced model" do
+        it "should return arel object" do
+          expect(datatable.send(:search_condition, 'statistics_sessions.bar', 'bar').class).to eq(Arel::Nodes::Matches)
+        end
+      end
+
+      it "should raise uninitialized constant if column not exist" do
+        expect {
+          datatable.send(:search_condition, 'asdusers.bar', 'bar').class
+        }.to raise_error(/uninitialized constant/)
       end
     end
 
@@ -167,20 +172,21 @@ def self.arel_table
 
     describe '#sort_records' do
       it 'calls #order on a collection' do
-        results.should_receive(:order)
+        expect(results).to receive(:order)
         datatable.send(:sort_records, results)
       end
     end
 
     describe '#filter_records' do
-      let(:records) { double('User', :where => []) }
+      let(:records) {  double('User', :where => []) }
       let(:search_view) { double('view', :params => params) }
 
       it 'applies search like functionality on a collection' do
         datatable = AjaxDatatablesRails::Base.new(search_view)
-        datatable.stub(:searchable_columns) { ['users.foo'] }
+        allow(datatable).to receive(:searchable_columns) { ['users.foo'] }
 
-        records.should_receive(:where)
+        expect(records).to receive(:where)
+        records.where
         datatable.send(:filter_records, records)
       end
     end
@@ -191,9 +197,10 @@ def self.arel_table
 
       it 'applies search like functionality on a collection' do
         datatable = AjaxDatatablesRails::Base.new(search_view)
-        datatable.stub(:searchable_columns) { ['user_datas.bar'] }
+        allow(datatable).to receive(:searchable_columns) { ['user_datas.bar'] }
 
-        records.should_receive(:where)
+        expect(records).to receive(:where)
+        records.where
         datatable.send(:filter_records, records)
       end
     end
diff --git a/spec/ajax-datatables-rails/kaminari_spec.rb b/spec/ajax-datatables-rails/kaminari_spec.rb
@@ -18,14 +18,14 @@ class KaminariDatatable < AjaxDatatablesRails::Base
     let(:records) { users_database.all }
 
     it 'calls #page on passed record collection' do
-      records.should_receive(:page)
+      expect(records).to receive(:page)
       datatable.send(:paginate_records, records)
     end
 
     it 'calls #per_page on passed record collection' do
       arry = double('Array', :per => [])
-      records.stub(:page).and_return(arry)
-      arry.should_receive(:per)
+      allow(records).to receive(:page).and_return(arry)
+      expect(arry).to receive(:per)
       datatable.send(:paginate_records, records) 
     end
   end
diff --git a/spec/ajax-datatables-rails/simple_paginator_spec.rb b/spec/ajax-datatables-rails/simple_paginator_spec.rb
@@ -18,14 +18,14 @@ class SimplePaginateDatatable < AjaxDatatablesRails::Base
     let(:records) { users_database.all }
 
     it 'calls #offset on passed record collection' do
-      records.should_receive(:offset)
+      expect(records).to receive(:offset)
       datatable.send(:paginate_records, records)
     end
 
     it 'calls #limit on passed record collection' do
       arry = double('Array', :limit => [])
-      records.stub(:offset).and_return(arry)
-      arry.should_receive(:limit)
+      allow(records).to receive(:offset).and_return(arry)
+      expect(arry).to receive(:limit)
       datatable.send(:paginate_records, records) 
     end
   end
diff --git a/spec/ajax-datatables-rails/will_paginate_spec.rb b/spec/ajax-datatables-rails/will_paginate_spec.rb
@@ -18,7 +18,7 @@ class WillPaginateDatatable < AjaxDatatablesRails::Base
     let(:records) { users_database.all }
 
     it 'calls #page and #per_page on passed record collection' do
-      records.should_receive(:paginate).with(:page=>1, :per_page=>10)
+      expect(records).to receive(:paginate).with(:page=>1, :per_page=>10)
       datatable.send(:paginate_records, records)
     end
   end
diff --git a/spec/models.rb b/spec/models.rb
@@ -0,0 +1,17 @@
+class User < ActiveRecord::Base
+end
+
+class UserData < ActiveRecord::Base
+end
+
+module Statistics
+  def self.table_name_prefix
+    "statistics_"
+  end
+end
+
+class Statistics::Request < ActiveRecord::Base
+end
+
+class Statistics::Session < ActiveRecord::Base
+end
diff --git a/spec/schema.rb b/spec/schema.rb
@@ -0,0 +1,29 @@
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :users, :force => true do |t|
+    t.string :username
+
+    t.timestamps
+  end
+
+  create_table :user_data, :force => true do |t|
+    t.string :address
+
+    t.timestamps
+  end
+
+
+  create_table :statistics_requests, :force => true do |t|
+    t.string :baz
+
+    t.timestamps
+  end
+
+  create_table :statistics_sessions, :force => true do |t|
+    t.string :foo
+    t.integer :bar
+
+    t.timestamps
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,9 @@
 require 'pry'
 require 'rails'
+require 'active_record'
 require 'ajax-datatables-rails'
+
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+load File.dirname(__FILE__) + '/schema.rb'
+require File.dirname(__FILE__) + '/models.rb'
