enjoy_cms_search 0.4.0 → 0.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9530a7757cc13ca90686bc8b1e26c5bf52eb1522
-  data.tar.gz: cc4671bc864b9582979daeb918680a0dbe0a5d2c
+  metadata.gz: c1de00b50bc01603b9fb6cf5b3d5b22db61599f2
+  data.tar.gz: 1e21da2ff975b56d80ac0d75f2b5848f3a958b39
 SHA512:
-  metadata.gz: 1af519388bdd0c0a7853ac5087d660d5762222268dd57c19c84f6e253b185d46a16c21b41888239170d885ba22794b0ae14d227063aed903dbc6f7fce111b947
-  data.tar.gz: e60f028ad78f0288d318f9fdb3e875d67265743ab025627e1e660fb288d01e878fd3fa6ec5d6bacf95499bbd077ad5ca69a96632217685a274024ec701cd1e6b
+  metadata.gz: e2e4981ca2fe92e6e1ac6c393dcf45e86c44ffda5301cf3ebc8aefbf93c946dccf547a09eca5ce77c994ea79f25f93e9354ee108c900a93a80746d3ce6c79ef2
+  data.tar.gz: 23b65ee2a5307793e9cf21bfa03e5bc8255d900ec2936552465e94ea7a02788309e78ee1d250ab9ee1652e258f66626c7628559e6897d7b8215b260dc0203320

data/lib/enjoy/search/configuration.rb

@@ -0,0 +1,24 @@
+module Enjoy::Search
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+  def self.config
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield configuration
+  end
+
+  class Configuration
+    attr_accessor :breadcrumbs_on_rails_support
+
+    attr_accessor :pages_support
+
+    def initialize
+      @breadcrumbs_on_rails_support = defined?(BreadcrumbsOnRails)
+      
+      @pages_support = defined?(Enjoy::Pages)
+    end
+  end
+end

data/lib/enjoy/search/controllers/search.rb

@@ -4,29 +4,25 @@ module Enjoy::Search
       extend ActiveSupport::Concern
 
       def index
-        if search_redirecter
-          return redirect_to url_for(params)
-        end
+        return redirect_to url_for(params) if search_redirecter
 
-        if defined?(BreadcrumbsOnRails)
-          add_breadcrumb "search",  [:enjoy_search]
+        if Enjoy::Search.config.breadcrumbs_on_rails_support
+          add_breadcrumb "search",  [:enjoy_search],                  if: :insert_breadcrumbs
+          add_breadcrumb "results", [:enjoy_search, {q: params[:q]}], if: :insert_breadcrumbs
         end
 
         if params[:q].blank?
           @results = []
         else
-          query = params[:q].to_s.gsub(/\P{Word}+/, ' ').gsub(/ +/, ' ').strip
-          @results = search_model_class.page(params[:page]).per(10).send(fts_method, query)
-        end
-
-        if defined?(BreadcrumbsOnRails)
-          add_breadcrumb "results", [:enjoy_search, {q: params[:q]}]
+          @results = search_model_class.page(params[:page]).per(per_page).send(fts_method, query)
         end
       end
 
       private
       def search_model_class
-        Enjoy::Catalog::Item
+        if Enjoy::Search.config.pages_support
+          Enjoy::Pages::Page
+        end
       end
 
       def fts_method
@@ -43,6 +39,18 @@ module Enjoy::Search
         false
       end
 
+      def insert_breadcrumbs
+        true
+      end
+
+      def per_page
+        10
+      end
+
+      def query
+        params[:q].to_s.gsub(/\P{Word}+/, ' ').gsub(/ +/, ' ').strip
+      end
+
     end
   end
 end

data/lib/enjoy/search/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Search
-    VERSION = "0.4.0"
+    VERSION = "0.4.0.1"
   end
 end

data/lib/enjoy_cms_search.rb

@@ -1,4 +1,5 @@
 require "enjoy/search/version"
+require "enjoy/search/configuration"
 require "enjoy/search/engine"
 require "enjoy/search/routes"
 
@@ -6,8 +7,6 @@ if Enjoy.active_record?
   require 'pg_search'
 end
 
-# require 'enjoy_cms'
-
 module Enjoy::Search
   class << self
     def orm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_search
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.0.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - bin/console
 - bin/setup
 - enjoy_cms_search.gemspec
+- lib/enjoy/search/configuration.rb
 - lib/enjoy/search/controllers/search.rb
 - lib/enjoy/search/engine.rb
 - lib/enjoy/search/routes.rb