datagrid 1.8.1 → 2.0.0.pre.alpha

data/lib/datagrid/drivers/array.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module Datagrid
   module Drivers
     # @!visibility private
     class Array < AbstractDriver
-
       def self.match?(scope)
-        !Datagrid::Drivers::ActiveRecord.match?(scope) && (scope.is_a?(::Array) || scope.is_a?(Enumerator))
+        !Datagrid::Drivers::ActiveRecord.match?(scope) && (
+          scope.is_a?(::Array) || scope.is_a?(Enumerator) ||
+          (defined?(::ActiveRecord::Result) && scope.is_a?(::ActiveRecord::Result))
+        )
       end
 
       def to_scope(scope)
@@ -13,15 +17,16 @@ module Datagrid
 
       def where(scope, attribute, value)
         scope.select do |object|
-          object.send(attribute) == value
+          get(object, attribute) == value
         end
       end
 
       def asc(scope, order)
         return scope unless order
         return scope if order.empty?
+
         scope.sort_by do |object|
-          object.send(order)
+          get(object, order)
         end
       end
 
@@ -29,7 +34,7 @@ module Datagrid
         asc(scope, order).reverse
       end
 
-      def default_order(scope, column_name)
+      def default_order(_scope, column_name)
         column_name
       end
 
@@ -39,38 +44,36 @@ module Datagrid
 
       def greater_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field)
-          compare_value.respond_to?(:>=) && compare_value >= value
+          get(object, field) >= value
         end
       end
 
       def less_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field)
-          compare_value.respond_to?(:<=) && compare_value <= value
+          get(object, 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) &&
-          timestamp_class?(scope.first.send(column_name).class)
+      def timestamp_column?(scope, column_name)
+        scope_has_column?(scope, column_name) &&
+          timestamp_class?(get(scope.first, column_name).class)
       end
 
       def contains(scope, field, value)
         scope.select do |object|
-          object.send(field).to_s.include?(value)
+          get(object, field).to_s.include?(value)
         end
       end
 
-      def column_names(scope)
+      def column_names(_scope)
         []
       end
 
-      def batch_each(scope, batch_size, &block)
+      def batch_each(scope, _batch_size, &block)
         scope.each(&block)
       end
 
@@ -78,9 +81,15 @@ module Datagrid
         asset
       end
 
-      def can_preload?(scope, association)
+      def can_preload?(_scope, _association)
         false
       end
+
+      protected
+
+      def get(object, property)
+        object.is_a?(Hash) ? object[property] : object.public_send(property)
+      end
     end
   end
 end

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Datagrid
   module Drivers
     # @!visibility private
     class MongoMapper < AbstractDriver
-
       def self.match?(scope)
         return false unless defined?(::MongoMapper)
+
         if scope.is_a?(Class)
           scope.ancestors.include?(::MongoMapper::Document)
         else
@@ -29,31 +31,31 @@ module Datagrid
       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)
-        scope.where(field => {"$gte" => value})
+        scope.where(field => { "$gte" => value })
       end
 
       def less_equal(scope, field, value)
-        scope.where(field => {"$lte" => 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
 
-      def is_timestamp?(scope, column_name)
-        #TODO implement the support
+      def timestamp_column?(_scope, _column_name)
+        # TODO: implement the support
         false
       end
 
-      def contains(scope, field, value)
+      def contains(_scope, field, value)
         scope(field => Regexp.compile(Regexp.escape(value)))
       end
 
-      def column_names(scope)
+      def column_names(_scope)
         [] # TODO: implement support
       end
 
@@ -62,10 +64,9 @@ module Datagrid
         loop do
           batch = scope.skip(current_page * batch_size).limit(batch_size).to_a
           return if batch.empty?
-          scope.skip(current_page * batch_size).limit(batch_size).each do |item|
-            yield(item)
-          end
-          current_page+=1
+
+          scope.skip(current_page * batch_size).limit(batch_size).each(&block)
+          current_page += 1
         end
       end
 
@@ -77,7 +78,7 @@ module Datagrid
         raise NotImplementedError
       end
 
-      def can_preload?(scope, association)
+      def can_preload?(_scope, _association)
         false
       end
     end

data/lib/datagrid/drivers/mongoid.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Datagrid
   module Drivers
     # @!visibility private
     class Mongoid < AbstractDriver
-
       def self.match?(scope)
         return false unless defined?(::Mongoid)
+
         if scope.is_a?(Class)
           scope.ancestors.include?(::Mongoid::Document)
         else
@@ -21,9 +23,7 @@ module Datagrid
       end
 
       def where(scope, attribute, value)
-        if value.is_a?(Range)
-          value = {"$gte" => value.first, "$lte" => value.last}
-        end
+        value = { "$gte" => value.first, "$lte" => value.last } if value.is_a?(Range)
         scope.where(attribute => value)
       end
 
@@ -36,18 +36,18 @@ module Datagrid
       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)
-        scope.where(field => {"$gte" => value})
+        scope.where(field => { "$gte" => value })
       end
 
       def less_equal(scope, field, value)
-        scope.where(field => {"$lte" => 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
 
@@ -60,10 +60,11 @@ module Datagrid
       end
 
       def normalized_column_type(scope, field)
-        type = to_scope(scope).klass.fields[field.to_s].try(:type)
+        type = to_scope(scope).klass.fields[field.to_s]&.type
         return nil unless type
+
         {
-          [BigDecimal , String, Symbol, Range, Array, Hash, ] => :string,
+          [BigDecimal, String, Symbol, Range, Array, Hash] => :string,
           [::Mongoid::Boolean] => :boolean,
 
           [Date] => :date,
@@ -76,7 +77,7 @@ module Datagrid
         }.each do |keys, value|
           return value if keys.include?(type)
         end
-        return :string
+        :string
       end
 
       def batch_each(scope, batch_size, &block)
@@ -84,10 +85,9 @@ module Datagrid
         loop do
           batch = scope.skip(current_page * batch_size).limit(batch_size).to_a
           return if batch.empty?
-          scope.skip(current_page * batch_size).limit(batch_size).each do |item|
-            yield(item)
-          end
-          current_page+=1
+
+          scope.skip(current_page * batch_size).limit(batch_size).each(&block)
+          current_page += 1
         end
       end
 
@@ -100,10 +100,8 @@ module Datagrid
       end
 
       def can_preload?(scope, association)
-        !! scope.klass.reflect_on_association(association)
+        !!scope.klass.reflect_on_association(association)
       end
-
     end
   end
 end
-

data/lib/datagrid/drivers/sequel.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Datagrid
   module Drivers
     # @!visibility private
     class Sequel < AbstractDriver
-
       def self.match?(scope)
         return false unless defined?(::Sequel)
+
         if scope.is_a?(Class)
           scope.ancestors.include?(::Sequel::Model)
         else
@@ -14,11 +16,8 @@ module Datagrid
 
       def to_scope(scope)
         return scope if scope.is_a?(::Sequel::Dataset)
-        scope.where({})
-      end
 
-      def append_column_queries(assets, columns)
-        super
+        scope.where({})
       end
 
       def where(scope, attribute, value)
@@ -33,12 +32,8 @@ module Datagrid
         scope.order(::Sequel.desc(::Sequel.lit(order)))
       end
 
-      def reverse_order(scope)
-        super
-      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)
@@ -49,7 +44,7 @@ module Datagrid
         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
 
@@ -65,13 +60,14 @@ module Datagrid
       def normalized_column_type(scope, field)
         type = column_type(scope, field)
         return nil unless type
+
         {
-          [:string, :blob, :time] => :string,
-          [:integer, :primary_key] => :integer,
-          [:float, :decimal] => :float,
+          %i[string blob time] => :string,
+          %i[integer primary_key] => :integer,
+          %i[float decimal] => :float,
           [:date] => :date,
           [:datetime] => :timestamp,
-          [:boolean] => :boolean
+          [:boolean] => :boolean,
         }.each do |keys, value|
           return value if keys.include?(type)
         end
@@ -96,18 +92,17 @@ module Datagrid
       end
 
       def can_preload?(scope, association)
-        !! scope.model.association_reflection(association)
+        !!scope.model.association_reflection(association)
       end
 
-
       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

data/lib/datagrid/drivers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "datagrid/drivers/abstract_driver"
 require "datagrid/drivers/active_record"
 require "datagrid/drivers/array"
@@ -5,7 +7,6 @@ require "datagrid/drivers/mongoid"
 require "datagrid/drivers/mongo_mapper"
 require "datagrid/drivers/sequel"
 
-
 module Datagrid
   # @!visibility private
   module Drivers

data/lib/datagrid/engine.rb

@@ -1,12 +1,20 @@
+# frozen_string_literal: true
+
 require "rails/engine"
+require "datagrid/helper"
+require "datagrid/form_builder"
 
 module Datagrid
-  # @!private
+  # @!visibility private
   class Engine < ::Rails::Engine
+    def self.extend_modules
+      ActionView::Base.include(Datagrid::Helper)
+      ActionView::Helpers::FormBuilder.include(Datagrid::FormBuilder)
+    end
+
     initializer "datagrid.helpers" do
-      #TODO: check why it doesn't work
       ActiveSupport.on_load :action_view do
-        include Datagrid::Helper
+        Engine.extend_modules
       end
     end
   end