Restrict private methods access from generated code

Author: bogdan

lib/datagrid/drivers/array.rb

@@ -13,15 +13,15 @@ def to_scope(scope)
 
       def where(scope, attribute, value)
         scope.select do |object|
-          object.send(attribute) == value
+          object.public_send(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)
+          object.public_send(order)
         end
       end
 
@@ -39,14 +39,14 @@ def reverse_order(scope)
 
       def greater_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field)
+          compare_value = object.public_send(field)
           compare_value.respond_to?(:>=) && compare_value >= value
         end
       end
 
       def less_equal(scope, field, value)
         scope.select do |object|
-          compare_value = object.send(field)
+          compare_value = object.public_send(field)
           compare_value.respond_to?(:<=) && compare_value <= value
         end
       end
@@ -57,12 +57,12 @@ def has_column?(scope, column_name)
 
       def is_timestamp?(scope, column_name)
         has_column?(scope, column_name) &&
-          timestamp_class?(scope.first.send(column_name).class)
+          timestamp_class?(scope.first.public_send(column_name).class)
       end
 
       def contains(scope, field, value)
         scope.select do |object|
-          object.send(field).to_s.include?(value)
+          object.public_send(field).to_s.include?(value)
         end
       end
 

lib/datagrid/filters/base_filter.rb

@@ -68,7 +68,7 @@ def header
   def default(object)
     default = self.options[:default]
     if default.is_a?(Symbol)
-      object.send(default)
+      object.public_send(default)
     elsif default.respond_to?(:call)
       Datagrid::Utils.apply_args(object, &default)
     else
@@ -174,7 +174,7 @@ def driver
   def default_filter(value, scope, grid)
     return nil if dummy?
     if !driver.has_column?(scope, name) && scope.respond_to?(name)
-      scope.send(name, value)
+      scope.public_send(name, value)
     else
       default_filter_where(scope, value)
     end

lib/datagrid/form_builder.rb

@@ -89,7 +89,7 @@ def datagrid_enum_filter(attribute_or_filter, options = {}, &block)
     end
 
     def enum_checkbox_checked?(filter, option_value)
-      current_value = object.send(filter.name)
+      current_value = object.public_send(filter.name)
       if current_value.respond_to?(:include?)
         # Typecast everything to string
         # to remove difference between String and Symbol

lib/datagrid/rspec.rb

@@ -54,7 +54,7 @@
 
         before(:each) do
           subject.attributes = {filter.name => filter_value}
-          subject.send(filter.name).should_not be_nil
+          subject.public_send(filter.name).should_not be_nil
         end
 
         it "should be supported" do

lib/datagrid/utils.rb

@@ -38,15 +38,12 @@ def warn_once(message, delay = 5)
       end
 
       def add_html_classes(options, *classes)
+        return options if classes.empty?
         options = options.clone
-        options[:class] ||= ""
-        if options[:class].is_a?(Array)
-          options[:class] += classes
-        else
-          # suppose that it is a String
-          options[:class] += " " unless options[:class].blank?
-          options[:class] += classes.join(" ")
-        end
+        options[:class] ||= []
+        array = options[:class].is_a?(Array)
+        value = [*options[:class], *classes]
+        options[:class] = array ? value : value.join(" ")
         options
       end