mighty_grid 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882bea1ae17754a079753be41bbeb7a855b03956
-  data.tar.gz: 44283d60dde96275f986160defedf980b3322996
+  metadata.gz: c8d3b69949a5bd99efae0e4cdb2155b40c4f56e2
+  data.tar.gz: 4d619b1988d418b5d784bd518674af8c3f43be9b
 SHA512:
-  metadata.gz: 9d6444d5e8002af7eb9c30c33873e6174f519ee7da1dfea64792563ac8bdf0efcb76d77df08710f46be319f7c803205ad77c3c6b9af421eea63e8cbecd861299
-  data.tar.gz: d8faca0136abe01cb09ee4aea111d4a1457553f96c93482624fa3dc9f9fbec1d2f545dd0588a871b88e2bf315d962b8729ad2c127faa78f65122b575411f6b99
+  metadata.gz: 6a887f14228bb0c6659cce9d4c1a043f722ebd4632a56ab1f1d7643c30efbe2be88c35c92712b5f8a5474fb85a5844b83949a5c1a92d6b013980333bb7e4a08f
+  data.tar.gz: 705d021a01263bfe8008168b5e65c047e3cdae352743c2b7e39189248d3aaf24390361f2847d9a25143b78788ba7f0bcc3ca0d5d4804b437a34b84951aa0754d

data/lib/mighty_grid/base.rb

@@ -3,8 +3,8 @@ module MightyGrid
     include MightyGrid::Filters
     include MightyGrid::Parameters
 
-    attr_reader :klass, :name, :relation, :options, :mg_params, :params, :controller
-    attr_accessor :output_buffer, :filters
+    attr_reader :klass, :name, :relation, :options, :mg_params, :params, :controller, :use_sphinx, :sphinx_options
+    attr_accessor :output_buffer, :filters, :query
 
     def initialize(params, opts = {})  #:nodoc:
       @controller_params = params
@@ -15,6 +15,9 @@ module MightyGrid
       end
 
       @filters = self.class.filters.dup
+      @query = self.class.try(:query).try(:dup)
+      @use_sphinx = self.class.use_sphinx || false
+      @sphinx_options = {}
 
       @options = {
         page:       1,
@@ -41,7 +44,7 @@ module MightyGrid
     end
 
     class << self
-      attr_reader :klass, :relation
+      attr_reader :klass, :relation, :use_sphinx, :sphinx_options
 
       def scope(&block)
         if block_given?
@@ -50,23 +53,45 @@ module MightyGrid
           @klass = klass_or_relation.is_a?(ActiveRecord::Relation) ? klass_or_relation.klass : klass_or_relation
         end
       end
+
+      def use_thinking_sphinx(bool=false)
+        fail MightyGrid::Exceptions::ArgumentError.new('Parameter should have type Boolean: true or false') unless bool.in? [true, false]
+        @use_sphinx = bool
+      end
+
+      def sphinx_options(options = {})
+        @sphinx_options = options
+      end
     end
 
     def read
-      apply_filters
-      if @mg_params[:order].present? && current_order_direction.present? && !@mg_params[:order].kind_of?(Hash)
-        @relation = @relation.order("#{@mg_params[:order]} #{current_order_direction.to_sym}")
+      search_apply_filter if @use_sphinx
+
+      if @use_sphinx && @query
+        ts_apply_filters
+        if @mg_params[:order].present? && current_order_direction.present? && !@mg_params[:order].kind_of?(Hash)
+          @sphinx_options.merge!(order: "#{@mg_params[:order]} #{current_order_direction.to_sym}")
+        else
+          @sphinx_options.merge!(order: @mg_params[:order])
+        end
+
+        @relation = @klass.search(ThinkingSphinx::Query.escape(@query), @sphinx_options)
       else
-        @relation = @relation.order(@mg_params[:order])
-      end
+        ar_apply_filters
+        if @mg_params[:order].present? && current_order_direction.present? && !@mg_params[:order].kind_of?(Hash)
+          @relation = @relation.order("#{@mg_params[:order]} #{current_order_direction.to_sym}")
+        else
+          @relation = @relation.order(@mg_params[:order])
+        end
 
-      @relation = @relation
-                    .page(@mg_params[:page])
-                    .per(@mg_params[:per_page])
-                    .includes(@options[:include])
-                    .joins(@options[:joins])
-                    .where(@options[:conditions])
-                    .group(@options[:group])
+        @relation = @relation
+                      .page(@mg_params[:page])
+                      .per(@mg_params[:per_page])
+                      .includes(@options[:include])
+                      .joins(@options[:joins])
+                      .where(@options[:conditions])
+                      .group(@options[:group])
+      end
     end
 
     # Get controller parameters

data/lib/mighty_grid/filter_renderer.rb

@@ -1,6 +1,7 @@
 module MightyGrid
   class FilterRenderer
     include ActionView::Helpers
+    include ActionView::Context
 
     def initialize(grid, view)
       @grid = grid
@@ -43,17 +44,26 @@ module MightyGrid
     end
 
     # Get button for Apply filter changes
-    def submit(content = nil, options = {})
+    def submit(content = nil, options = {}, &block)
       content = I18n.t('mighty_grid.filters.submit', default: 'Apply changes') if content.blank?
       options.merge!(type: :submit)
-      content_tag(:button, content, options)
+      if block_given?
+        content_tag(:button, nil, options, &block)
+      else
+        content_tag(:button, content, options)
+      end
+
     end
 
     # Get button for Reset filter changes
-    def reset(content = nil, options = {})
+    def reset(content = nil, options = {}, &block)
       content = I18n.t('mighty_grid.filters.reset', default: 'Reset changes') if content.blank?
       options.merge!(type: :reset)
-      content_tag(:button, content, options)
+      if block_given?
+        content_tag(:button, nil, options, &block)
+      else
+        content_tag(:button, content, options)
+      end
     end
 
     private

data/lib/mighty_grid/filters/base.rb

@@ -2,6 +2,7 @@ module MightyGrid
   module Filters
     class Base
       attr_reader :options, :attribute, :model, :default
+      attr_accessor :search_value
 
       class_attribute :default_options
       self.default_options = {

data/lib/mighty_grid/filters/search_filter.rb

@@ -0,0 +1,6 @@
+module MightyGrid
+  module Filters
+    class SearchFilter < Base
+    end
+  end
+end

data/lib/mighty_grid/filters.rb

@@ -11,11 +11,16 @@ module MightyGrid
     autoload :EnumFilter
     autoload :BooleanFilter
     autoload :CustomFilter
+    autoload :SearchFilter
 
     def self.included(base)
       base.class_eval do
         class_attribute :filters
+        class_attribute :query
+        class_attribute :search_name
         self.filters = {}
+        self.query = nil
+        self.search_name = nil
 
         extend MapType
         map_type :string, to: MightyGrid::Filters::StringFilter
@@ -23,6 +28,7 @@ module MightyGrid
         map_type :enum, to: MightyGrid::Filters::EnumFilter
         map_type :boolean, to: MightyGrid::Filters::BooleanFilter
         map_type :custom, to: MightyGrid::Filters::CustomFilter
+        map_type :search, to: MightyGrid::Filters::SearchFilter
       end
 
       base.send :extend, ClassMethods
@@ -51,18 +57,25 @@ module MightyGrid
         "#{name}[#{filter_param_name}][#{field_name}]"
       end
 
+      def get_search_name
+        self.search_name
+      end
+
+      def get_filter_value(filter_name, filter)
+        if filter_params.present?
+          filter_params[filter_name.to_s]
+        else
+          filter.default.to_s
+        end
+      end
+
       # Apply filters
-      def apply_filters
+      def ar_apply_filters
         @filters.each_pair do |filter_name, filter|
           next if (filter_params.blank?   && filter.default.blank? ||
                    filter_params.present? && filter_params[filter_name.to_s].blank?)
 
-          filter_value =
-            if filter_params.present?
-              filter_params[filter_name.to_s]
-            else
-              filter.default.to_s
-            end
+          filter_value = get_filter_value(filter_name, filter)
 
           table_name = filter.model.table_name
 
@@ -83,6 +96,15 @@ module MightyGrid
           end
         end
       end
+
+      # Thinking Sphinx apply filters
+      def ts_apply_filters
+        # TODO: Make filters for Thinking Sphinx
+      end
+
+      def search_apply_filter
+        self.query = get_filter_value(self.search_name, @filters[self.search_name])
+      end
     end
 
     module ClassMethods
@@ -102,11 +124,17 @@ module MightyGrid
         end
       end
 
+      def search(name)
+        filter(name, :search)
+        self.search_name = name
+      end
+
       protected
 
       def inherited(child_class)
         super(child_class)
         child_class.filters = self.filters.clone
+        child_class.query = self.query.try(:clone)
       end
     end
   end

data/lib/mighty_grid/parameters.rb

@@ -13,7 +13,11 @@ module MightyGrid
         if current_grid_params
           @mg_params.merge!(current_grid_params.symbolize_keys)
           if @mg_params[:order].present? && !@mg_params[:order].to_s.include?('.') && !@mg_params[:order].kind_of?(Hash)
-            @mg_params[:order] = "#{klass.table_name}.#{@mg_params[:order]}"
+            if @use_sphinx
+              @mg_params[:order] = @mg_params[:order].to_s
+            else
+              @mg_params[:order] = "#{klass.table_name}.#{@mg_params[:order]}"
+            end
           end
         end
       end

data/lib/mighty_grid/version.rb

@@ -5,7 +5,7 @@ module MightyGrid
 
   module VERSION
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
     PRE   = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - jurrick
@@ -127,6 +127,7 @@ files:
 - lib/mighty_grid/filters/boolean_filter.rb
 - lib/mighty_grid/filters/custom_filter.rb
 - lib/mighty_grid/filters/enum_filter.rb
+- lib/mighty_grid/filters/search_filter.rb
 - lib/mighty_grid/filters/string_filter.rb
 - lib/mighty_grid/filters/text_filter.rb
 - lib/mighty_grid/grid_renderer.rb