Improve encapsulation

Author: n-rodriguez

lib/ajax-datatables-rails/datatable/datatable.rb

@@ -4,7 +4,7 @@ module AjaxDatatablesRails
   module Datatable
 
     class Datatable
-      attr_reader :datatable, :options
+      attr_reader :options
 
       def initialize(datatable)
         @datatable = datatable
@@ -41,7 +41,7 @@ def search
 
       def columns
         @columns ||= get_param(:columns).map do |index, column_options|
-          Column.new(datatable, index, column_options)
+          Column.new(@datatable, index, column_options)
         end
       end
 
@@ -73,6 +73,10 @@ def get_param(param)
         options[param].to_unsafe_h.with_indifferent_access
       end
 
+      def db_adapter
+        @datatable.db_adapter
+      end
+
     end
   end
 end

lib/ajax-datatables-rails/datatable/simple_order.rb

@@ -11,6 +11,7 @@ class SimpleOrder
       def initialize(datatable, options = {})
         @datatable = datatable
         @options   = options
+        @adapter   = datatable.db_adapter
       end
 
       def query(sort_column)
@@ -42,15 +43,13 @@ def sort_nulls_last?
       def nulls_last_sql
         return unless sort_nulls_last?
 
-        adapter = @datatable.datatable.db_adapter
-
-        case adapter
+        case @adapter
         when :pg, :postgresql, :postgres, :oracle
           'NULLS LAST'
         when :mysql, :mysql2, :sqlite, :sqlite3
           'IS NULL'
         else
-          raise "unsupported database adapter: #{adapter}"
+          raise "unsupported database adapter: #{@adapter}"
         end
       end