use Wice::ConfigurationProvider.value_for

leikind · Aug 27, 2015 · 83c2d7c · 83c2d7c
1 parent 5660bc0
commit 83c2d7c
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 29 deletions.
diff --git a/lib/generators/wice_grid/templates/wice_grid_config.rb b/lib/generators/wice_grid/templates/wice_grid_config.rb
@@ -174,8 +174,9 @@
 
   # The name of the page method (should correspond to Kaminari.config.page_method_name)
   Wice::Defaults::PAGE_METHOD_NAME = :page
-
-  # by default Wice-Grid always use unscoped,set to true to force use of default_scope by default instead
+
+  # By default ActiveRecord calls are always executed inside Model.unscoped{}.
+  # Setting <tt>USE_DEFAULT_SCOPE</tt> to true will use the default scope for all queries.
   Wice::Defaults::USE_DEFAULT_SCOPE = false
 
 end
diff --git a/lib/wice/active_record_column_wrapper.rb b/lib/wice/active_record_column_wrapper.rb
@@ -88,11 +88,11 @@ def wg_generate_conditions  #:nodoc:
 
       filter_type = case column_type
       when :date
-        Wice::Defaults::DEFAULT_FILTER_FOR_DATE
+        ConfigurationProvider.value_for(:DEFAULT_FILTER_FOR_DATE)
       when :datetime
-        Wice::Defaults::DEFAULT_FILTER_FOR_DATETIME
+        ConfigurationProvider.value_for(:DEFAULT_FILTER_FOR_DATETIME)
       when :timestamp
-        Wice::Defaults::DEFAULT_FILTER_FOR_DATETIME
+        ConfigurationProvider.value_for(:DEFAULT_FILTER_FOR_DATETIME)
       else
         column_type
       end

diff --git a/lib/wice/columns/column_string.rb b/lib/wice/columns/column_string.rb
@@ -74,13 +74,13 @@ def generate_conditions(table_alias, opts)   #:nodoc:
         string_matching_operator = ::Wice.get_string_matching_operators(@column_wrapper.model)
 
         comparator = if string_matching_operator == 'CI_LIKE'
-                       " #{negation}  UPPER(#{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name}) LIKE  UPPER(?)"
-                     else
-                       " #{negation}  #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} #{string_matching_operator} ?"
-                     end
-        [
-          comparator, '%' + string_fragment + '%'
-        ]
+           " #{negation}  UPPER(#{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name}) LIKE  UPPER(?)"
+         else
+           " #{negation}  #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} #{string_matching_operator} ?"
+         end
+
+        [ comparator, '%' + string_fragment + '%' ]
+
       end
     end
   end

diff --git a/lib/wice/grid_renderer.rb b/lib/wice/grid_renderer.rb
@@ -278,24 +278,24 @@ def action_column(opts = {}, &block)
 
     def column(opts = {}, &block)
       options = {
-        allow_multiple_selection:    Defaults::ALLOW_MULTIPLE_SELECTION,
+        allow_multiple_selection:    ConfigurationProvider.value_for(:ALLOW_MULTIPLE_SELECTION),
         assoc:                       nil,
         attribute:                   nil,
-        auto_reload:                 Defaults::AUTO_RELOAD,
+        auto_reload:                 ConfigurationProvider.value_for(:AUTO_RELOAD),
         boolean_filter_false_label:  NlMessage['boolean_filter_false_label'],
         boolean_filter_true_label:   NlMessage['boolean_filter_true_label'],
         class:                       nil,
         custom_filter:               nil,
         detach_with_id:              nil,
         filter:                      true,
-        filter_all_label:            Defaults::CUSTOM_FILTER_ALL_LABEL,
+        filter_all_label:            ConfigurationProvider.value_for(:CUSTOM_FILTER_ALL_LABEL),
         filter_type:                 nil,
         html:                        {},
         in_csv:                      true,
         in_html:                     true,
         model:                       nil, # will throw an exception with instructions
         name:                        '',
-        negation:                    Defaults::NEGATION_IN_STRING_FILTERS,
+        negation:                    ConfigurationProvider.value_for(:NEGATION_IN_STRING_FILTERS),
         ordering:                    true,
         table_alias:                 nil
       }

diff --git a/lib/wice/wice_grid_misc.rb b/lib/wice/wice_grid_misc.rb
@@ -142,7 +142,7 @@ def get_query_store_model #:nodoc:
 
     def get_string_matching_operators(model)   #:nodoc:
       if defined?(Wice::Defaults::STRING_MATCHING_OPERATORS) && (ops = Wice::ConfigurationProvider.value_for(:STRING_MATCHING_OPERATORS)) &&
-         ops.is_a?(Hash) && (str_matching_operator = ops[model.connection.class.to_s])
+          ops.is_a?(Hash) && (str_matching_operator = ops[model.connection.class.to_s])
         str_matching_operator
       else
         Wice::ConfigurationProvider.value_for(:STRING_MATCHING_OPERATOR)

diff --git a/lib/wice_grid.rb b/lib/wice_grid.rb
@@ -105,23 +105,23 @@ def initialize(klass_or_relation, controller, opts = {})  #:nodoc:
         @options = {
           conditions:                 nil,
           csv_file_name:              nil,
-          csv_field_separator:        Defaults::CSV_FIELD_SEPARATOR,
+          csv_field_separator:        ConfigurationProvider.value_for(:CSV_FIELD_SEPARATOR),
           custom_order:               {},
-          enable_export_to_csv:       Defaults::ENABLE_EXPORT_TO_CSV,
+          enable_export_to_csv:       ConfigurationProvider.value_for(:ENABLE_EXPORT_TO_CSV),
           group:                      nil,
           include:                    nil,
           joins:                      nil,
-          name:                       Defaults::GRID_NAME,
+          name:                       ConfigurationProvider.value_for(:GRID_NAME),
           order:                      nil,
-          order_direction:            Defaults::ORDER_DIRECTION,
+          order_direction:            ConfigurationProvider.value_for(:ORDER_DIRECTION),
           page:                       1,
-          page_method_name:           Defaults::PAGE_METHOD_NAME,
-          per_page:                   Defaults::PER_PAGE,
+          page_method_name:           ConfigurationProvider.value_for(:PAGE_METHOD_NAME),
+          per_page:                   ConfigurationProvider.value_for(:PER_PAGE),
           saved_query:                nil,
           total_entries:              nil,
           with_paginated_resultset:   nil,
           with_resultset:             nil,
-          use_default_scope:          Defaults::USE_DEFAULT_SCOPE
+          use_default_scope:          ConfigurationProvider.value_for(:USE_DEFAULT_SCOPE)
         }
       rescue NameError
         raise NameError.new('A constant is missing in wice_grid_config.rb: ' + $ERROR_INFO.message +
@@ -626,13 +626,11 @@ def load_query(query_id) #:nodoc:
       query
     end
 
-    def use_default_or_unscoped
-      if @options[:use_default_scope] == true
+    def use_default_or_unscoped #:nodoc:
+      if @options[:use_default_scope]
         yield
       else
-        @klass.unscoped do
-          yield
-        end
+        @klass.unscoped { yield }
       end
     end