Cleanup

lib/datagrid/drivers/abstract_driver.rb

@@ -55,7 +55,7 @@ def less_equal(scope, field, value)
         raise NotImplementedError
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         raise NotImplementedError
       end
 

lib/datagrid/drivers/active_record.rb

@@ -64,7 +64,7 @@ def reverse_order(scope)
       end
 
       def default_order(scope, column_name)
-        has_column?(scope, column_name) ? prefix_table_name(scope, column_name) : nil
+        scope_has_column?(scope, column_name) ? prefix_table_name(scope, column_name) : nil
       end
 
       def greater_equal(scope, field, value)
@@ -75,7 +75,7 @@ def less_equal(scope, field, value)
         scope.where(["#{prefix_table_name(scope, field)} <= ?", value])
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         scope.column_names.include?(column_name.to_s)
       rescue ::ActiveRecord::StatementInvalid
         false
@@ -91,7 +91,7 @@ def contains(scope, field, value)
       end
 
       def normalized_column_type(scope, field)
-        return nil unless has_column?(scope, field)
+        return nil unless scope_has_column?(scope, field)
 
         builtin_type = scope.columns_hash[field.to_s].type
         {
@@ -130,7 +130,7 @@ def can_preload?(scope, association)
       protected
 
       def prefix_table_name(scope, field)
-        has_column?(scope, field) ? [scope.table_name, field].join(".") : field
+        scope_has_column?(scope, field) ? [scope.table_name, field].join(".") : field
       end
 
       def contains_predicate

lib/datagrid/drivers/array.rb

@@ -54,12 +54,12 @@ def less_equal(scope, field, value)
         end
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         scope.any? && scope.first.respond_to?(column_name)
       end
 
       def is_timestamp?(scope, column_name)
-        has_column?(scope, column_name) &&
+        scope_has_column?(scope, column_name) &&
           timestamp_class?(get(scope.first, column_name).class)
       end
 

lib/datagrid/drivers/mongo_mapper.rb

@@ -31,7 +31,7 @@ def desc(scope, order)
       end
 
       def default_order(scope, column_name)
-        has_column?(scope, column_name) ? column_name : nil
+        scope_has_column?(scope, column_name) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)
@@ -42,7 +42,7 @@ def less_equal(scope, field, value)
         scope.where(field => { "$lte" => value })
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         scope.key?(column_name)
       end
 

lib/datagrid/drivers/mongoid.rb

@@ -36,7 +36,7 @@ def desc(scope, order)
       end
 
       def default_order(scope, column_name)
-        has_column?(scope, column_name) ? column_name : nil
+        scope_has_column?(scope, column_name) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)
@@ -47,7 +47,7 @@ def less_equal(scope, field, value)
         scope.where(field => { "$lte" => value })
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         column_names(scope).include?(column_name.to_s)
       end
 

lib/datagrid/drivers/sequel.rb

@@ -33,7 +33,7 @@ def desc(scope, order)
       end
 
       def default_order(scope, column_name)
-        has_column?(scope, column_name) ? ::Sequel.lit(prefix_table_name(scope, column_name)) : nil
+        scope_has_column?(scope, column_name) ? ::Sequel.lit(prefix_table_name(scope, column_name)) : nil
       end
 
       def greater_equal(scope, field, value)
@@ -44,7 +44,7 @@ def less_equal(scope, field, value)
         scope.where(::Sequel.lit("#{prefix_table_name(scope, field)} <= ?", value))
       end
 
-      def has_column?(scope, column_name)
+      def scope_has_column?(scope, column_name)
         scope.columns.include?(column_name.to_sym)
       end
 
@@ -98,11 +98,11 @@ def can_preload?(scope, association)
       protected
 
       def prefix_table_name(scope, field)
-        has_column?(scope, field) ? [to_scope(scope).row_proc.table_name, field].join(".") : field
+        scope_has_column?(scope, field) ? [to_scope(scope).row_proc.table_name, field].join(".") : field
       end
 
       def column_type(scope, field)
-        has_column?(scope, field) ? to_scope(scope).row_proc.db_schema[field.to_sym][:type] : nil
+        scope_has_column?(scope, field) ? to_scope(scope).row_proc.db_schema[field.to_sym][:type] : nil
       end
     end
   end

lib/datagrid/filters/base_filter.rb

@@ -179,7 +179,7 @@ def driver
       def default_filter(value, scope, _grid)
         return nil if dummy?
 
-        if !driver.has_column?(scope, name) && scope.respond_to?(name, true)
+        if !driver.scope_has_column?(scope, name) && scope.respond_to?(name, true)
           scope.public_send(name, value)
         else
           default_filter_where(scope, value)