ajax-datatables-rails 0.4.3 → 1.0.0

data/spec/ajax-datatables-rails/orm/active_record_paginate_records_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe AjaxDatatablesRails::ORM::ActiveRecord do
 
-  let(:view) { double('view', params: sample_params) }
-  let(:datatable) { ComplexDatatable.new(view) }
+  let(:datatable) { ComplexDatatable.new(sample_params) }
   let(:records) { User.all }
 
   before(:each) do

data/spec/ajax-datatables-rails/orm/active_record_sort_records_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe AjaxDatatablesRails::ORM::ActiveRecord do
 
-  let(:view) { double('view', params: sample_params) }
-  let(:datatable) { ComplexDatatable.new(view) }
-  let(:nulls_last_datatable) { DatatableOrderNullsLast.new(view) }
+  let(:datatable) { ComplexDatatable.new(sample_params) }
+  let(:nulls_last_datatable) { DatatableOrderNullsLast.new(sample_params) }
   let(:records) { User.all }
 
   before(:each) do
@@ -48,7 +47,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
   describe '#sort_records with nulls last using global config' do
     before { AjaxDatatablesRails.config.nulls_last = true }
     after  { AjaxDatatablesRails.config.nulls_last = false }
-  
+
     it 'can handle multiple sorting columns' do
       # set to order by Users username in ascending order, and
       # by Users email in descending order
@@ -60,7 +59,7 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
       )
     end
   end
-  
+
   describe '#sort_records with nulls last using column config' do
     it 'can handle multiple sorting columns' do
       # set to order by Users username in ascending order, and

data/spec/ajax-datatables-rails/orm/active_record_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe AjaxDatatablesRails::ORM::ActiveRecord do
   context 'Private API' do
-    let(:view) { double('view', params: sample_params) }
-    let(:datatable) { ComplexDatatable.new(view) }
+    let(:datatable) { ComplexDatatable.new(sample_params) }
 
     before(:each) do
       create(:user, username: 'johndoe', email: 'johndoe@example.com')
@@ -13,12 +12,12 @@ describe AjaxDatatablesRails::ORM::ActiveRecord do
     describe '#fetch_records' do
       it 'calls #get_raw_records' do
         expect(datatable).to receive(:get_raw_records) { User.all }
-        datatable.send(:fetch_records)
+        datatable.fetch_records
       end
 
       it 'returns a collection of records' do
         expect(datatable).to receive(:get_raw_records) { User.all }
-        expect(datatable.send(:fetch_records)).to be_a(ActiveRecord::Relation)
+        expect(datatable.fetch_records).to be_a(ActiveRecord::Relation)
       end
     end
   end

data/spec/spec_helper.rb

@@ -24,7 +24,6 @@ RSpec.configure do |config|
   config.after(:each) do
     AjaxDatatablesRails.configure do |c|
       c.db_adapter = ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-      c.orm = :active_record
     end
   end
 
@@ -73,7 +72,6 @@ ActiveRecord::Base.establish_connection(options)
 
 AjaxDatatablesRails.configure do |c|
   c.db_adapter = ActiveRecord::Base.connection.adapter_name.downcase.to_sym
-  c.orm = :active_record
 end
 
 load File.dirname(__FILE__) + '/support/schema.rb'

data/spec/support/datatable_cond_numeric.rb

@@ -42,7 +42,7 @@ end
 
 class DatatableCondInWithRegex < DatatableCondIn
   def view_columns
-    super.deep_merge(post_id: { cond: :in, use_regex: false, orderable: true, formater: ->(str) { cast_regex_value(str) } })
+    super.deep_merge(post_id: { cond: :in, use_regex: false, orderable: true, formatter: ->(str) { cast_regex_value(str) } })
   end
 
   def cast_regex_value(value)

data/spec/support/datatable_cond_string.rb

@@ -30,6 +30,6 @@ end
 
 class DatatableWithFormater < ComplexDatatable
   def view_columns
-    super.deep_merge(last_name: { formater: -> (o) { o.upcase } })
+    super.deep_merge(last_name: { formatter: -> (o) { o.upcase } })
   end
 end

data/spec/support/test_helpers.rb

@@ -53,7 +53,7 @@ def sample_params
 end
 # rubocop:enable Metrics/MethodLength
 
-class ComplexDatatable < AjaxDatatablesRails::Base
+class ComplexDatatable < AjaxDatatablesRails::ActiveRecord
   def view_columns
     @view_columns ||= {
       username:   { source: 'User.username'   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-datatables-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Joel Quenneville
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -242,14 +242,14 @@ files:
 - README.md
 - Rakefile
 - ajax-datatables-rails.gemspec
+- doc/migrate.md
 - doc/webpack.md
-- gemfiles/rails_4.0.13.gemfile
-- gemfiles/rails_4.1.16.gemfile
 - gemfiles/rails_4.2.10.gemfile
 - gemfiles/rails_5.0.7.gemfile
 - gemfiles/rails_5.1.6.gemfile
 - gemfiles/rails_5.2.0.gemfile
 - lib/ajax-datatables-rails.rb
+- lib/ajax-datatables-rails/active_record.rb
 - lib/ajax-datatables-rails/base.rb
 - lib/ajax-datatables-rails/config.rb
 - lib/ajax-datatables-rails/datatable/column.rb

data/gemfiles/rails_4.0.13.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "4.0.13"
-gem "mysql2", "~> 0.3.18"
-gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
-gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
-
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_4.1.16.gemfile

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "4.1.16"
-gem "mysql2", "~> 0.3.18"
-gem "activerecord-oracle_enhanced-adapter", "~> 1.5.0"
-gem "ruby-oci8" if ENV["DB_ADAPTER"] == "oracle_enhanced"
-
-group :test do
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec path: "../"