rocket_cms 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce1854eaf25938d7ea58a74a06a4eb82d963227
-  data.tar.gz: 7b4b25149df42192f5090be2aebf78eb2d8f9347
+  metadata.gz: c561a9c54c086e5e2c2841a5bda68989ac749a54
+  data.tar.gz: 9dadffa15b78de9ad6b319e1da5cca44b204a8cf
 SHA512:
-  metadata.gz: 70a9ddede1141ddf3992614aed954fdae5a58b7d6ba014b2fc38cab30822eead6ddc7dbd25680da259bb0ee21ddcec32fdfc49039deb6aaaa25b27740b3517fb
-  data.tar.gz: cb14941d9e54717e6ee4ed4c9d02eb2685a73723da4fd67be9933ed9f10b45d86c6e7e65e7b7f4e0ff4243ec89d42bb436082eed914f0afc85862c383a6d52a7
+  metadata.gz: 390a696a45e6c1020d6ac16f3554218b7d112f954f1ec801c16d10058b6fdaa57e31e48ef7db0977eb28da9cb00f22b568e8e29d148128b6094b1c82b803d748
+  data.tar.gz: a24fb04e148f58f00af442464cc50cf47aa5ac5d5983bc3fe3c5555930de9dcaece10a86df8d8f4e8986157a48df3dbb097deefe56b52a8978c0b6750df36f14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.9.1)
+    rocket_cms (0.9.2)
       addressable
       coffee-rails
       devise
@@ -113,7 +113,7 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.2)
-    mini_magick (4.3.3)
+    mini_magick (4.3.6)
     mini_portile (0.6.2)
     minitest (5.8.1)
     nested_form (0.3.2)
@@ -174,7 +174,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.18)
+    sass (3.4.19)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -191,7 +191,7 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.3.5)
+    sprockets (3.4.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)

data/app/models/page.rb

@@ -8,4 +8,3 @@ class Page
   RocketCMS.apply_patches self
   rails_admin &RocketCMS.page_config
 end
-

data/app/views/search/index.html.haml

@@ -8,11 +8,25 @@
     - @results.each do |r|
       - any = true
       %li
-        .title= link_to (r._highlight.nil? || r._highlight['name'].nil?) ? r.name : r._highlight['name'].join(' ... ').html_safe, url_for(r)
-        .text
-          = raw (r._highlight.nil? || r._highlight['content'].nil?) ? (r.content.blank? ? '' : SmartExcerpt.truncate(r.content)) : r._highlight['content'].join(' ... ')
-          %span.more= link_to '', url_for(r)
-
+        -if RocketCMS.mongoid?
+          .title= link_to (r._highlight.nil? || r._highlight['name'].nil?) ? r.name : r._highlight['name'].join(' ... ').html_safe, url_for(r)
+          .text
+            = raw (r._highlight.nil? || r._highlight['content'].nil?) ? (r.content.blank? ? '' : SmartExcerpt.truncate(r.content)) : r._highlight['content'].join(' ... ')
+            %span.more= link_to '', url_for(r)
+        - else
+          - u = app_url(result.searchable)
+          - next if u.nil?
+          - next if result.searchable.respond_to?(:enabled) && !result.searchable.enabled
+          - any = true
+          %a{href: u}
+            %span
+              %strong= highlight(result.searchable.name, params[:query], highlighter: '<em>\1</em>')
+              |  (#{result.searchable.class.model_name.human})
+            - ex = excerpt(strip_tags(result.searchable.content), params[:query], radius: 150)
+            - if ex.nil?
+              == strip_tags(SmartExcerpt.h.smart_truncate(result.searchable.content, words: 20))
+            - else
+              == highlight(ex, params[:query], highlighter: '<em>\1</em>')
   - unless any
     .rs-search-no-results К сожалению, ничего не найдено
 

data/lib/rails_admin/custom_show_in_app.rb

@@ -14,19 +14,7 @@ module RailsAdmin
 
         register_instance_option :controller do
           Proc.new do
-            if @object.class.name == 'Page'
-              if @object.fullpath.blank?
-                redirect_to main_app.page_url(@object)
-              else
-                redirect_to @object.fullpath
-              end
-            elsif @object.class.name == 'News'
-              redirect_to main_app.news_url(@object)
-            elsif @object.class.name == 'Obj'
-              redirect_to main_app.object_url(@object.category, @object)
-            else
-              redirect_to main_app.url_for(@object)
-            end
+            RocketCMS.app_url(@object)
           end
         end
 

data/lib/rocket_cms.rb

@@ -28,7 +28,7 @@ require 'rocket_cms/seo_helpers'
 require 'rocket_cms/configuration'
 require 'rocket_cms/patch'
 require 'rocket_cms/admin'
-require 'rocket_cms/elastic_search'
+require 'rocket_cms/search'
 require 'rocket_cms/model'
 require 'rocket_cms/rails_admin_menu'
 require 'rocket_cms/engine'
@@ -48,6 +48,24 @@ module RocketCMS
     def orm_specific(name)
       "#{model_namespace}::#{name}".constantize
     end
+
+    def custom_app_url(object)
+      redirect_to Rails.application.routes.url_helpers.url_for(object)
+    end
+
+    def app_url(object)
+      if object.class.name == 'Page'
+        if object.fullpath.blank?
+          redirect_to Rails.application.routes.url_helpers.page_url(object)
+        else
+          redirect_to object.fullpath
+        end
+      elsif object.class.name == 'News'
+        redirect_to Rails.application.routes.url_helpers.news_url(object)
+      else
+        RocketCMS.custom_app_url(object)
+      end
+    end
   end
 
   autoload :Migration, 'rocket_cms/migration'
@@ -85,4 +103,3 @@ module RocketCMS
 end
 
 require 'manual_slug'
-

data/lib/rocket_cms/controller.rb

@@ -6,10 +6,11 @@ module RocketCMS::Controller
     include RsMenu
     protect_from_forgery with: :exception
     helper_method :page_title
+    helper_method :app_url
   end
 
   protected
-  
+
     def page_title
       if @seo_page.nil?
         Settings.default_title
@@ -21,4 +22,8 @@ module RocketCMS::Controller
     def ckeditor_authenticate
       redirect_to '/' unless user_signed_in? && current_user.has_role?('admin')
     end
+
+    def app_url(object)
+      RocketCMS.app_url(object)
+    end
 end

data/lib/rocket_cms/controllers/search.rb

@@ -6,23 +6,27 @@ module RocketCMS
         if params[:query].blank?
           @results = []
         else
-          @results = Mongoid::Elasticsearch.search({
-            body: {
-              query: {
-                query_string: {
-                  query: Mongoid::Elasticsearch::Utils.clean(params[:query])
+          if RocketCMS.mongoid?
+            @results = Mongoid::Search.search({
+              body: {
+                query: {
+                  query_string: {
+                    query: Mongoid::Search::Utils.clean(params[:query])
+                  }
+                },
+                highlight: {
+                  fields: {
+                    name: {},
+                    content: {}
+                  }
                 }
-              },
-              highlight: {
-                fields: {
-                  name: {},
-                  content: {}
-                }
-              }
-            }},
-            page: params[:page],
-            per_page: RocketCMS.config.search_per_page,
-          )
+              }},
+              page: params[:page],
+              per_page: RocketCMS.config.search_per_page,
+            )
+          else
+            @results = PgSearch.multisearch(params[:q])
+          end
         end
       end
     end

data/lib/rocket_cms/models/news.rb

@@ -9,14 +9,14 @@ module RocketCMS
       include ManualSlug
 
       if RocketCMS.config.search_enabled
-        include RocketCMS::ElasticSearch
+        include RocketCMS::Search
       end
 
       included do
         unless RocketCMS.config.news_image_styles.nil?
           validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
         end
-        
+
         validates_presence_of :name
         if RocketCMS.config.news_content_required
           validates_presence_of :content
@@ -52,4 +52,3 @@ module RocketCMS
     end
   end
 end
-

data/lib/rocket_cms/models/page.rb

@@ -10,9 +10,9 @@ module RocketCMS
       include RocketCMS.orm_specific('Page')
 
       if RocketCMS.config.search_enabled
-        include RocketCMS::ElasticSearch
+        include RocketCMS::Search
       end
-        
+
       included do
         has_and_belongs_to_many :menus, inverse_of: :pages
         validates_uniqueness_of :fullpath
@@ -70,7 +70,7 @@ module RocketCMS
           end
         end
       end
-      
+
       def nav_options
         {highlights_on: clean_regexp}
       end

data/lib/rocket_cms/search.rb

@@ -0,0 +1,38 @@
+module RocketCMS::Search
+  extend ActiveSupport::Concern
+  included do
+    if RocketCMS.mongoid?
+      include Mongoid::Elasticsearch
+      elasticsearch!({
+      index_options: {
+        settings: {
+          index: {
+            analysis: {
+              analyzer: {
+                my_analyzer: {
+                  type: "snowball",
+                  language: "Russian"
+                }
+              }
+            }
+          }
+        }
+      },
+      index_mapings: {
+        name: {type: 'string', boost: 10, analyzer: 'my_analyzer'},
+        content: {type: 'string', boost: 1, analyzer: 'my_analyzer'},
+      }
+      })
+    else
+      include PgSearch
+      multisearchable against: [:name, :content]
+    end
+
+    def es_index?
+      enabled
+    end
+    def as_indexed_json
+      {name: name, content: SmartExcerpt.strip_tags(content)}
+    end
+  end
+end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/rocket_cms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  
+
   spec.add_dependency 'rails', '>= 4.1.0', '< 5.0'
 
   spec.add_dependency 'jquery-rails'
@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'stringex'
   spec.add_dependency 'thor'
   spec.add_dependency 'smart_excerpt'
-end
 
+end

data/template.rb

@@ -422,7 +422,7 @@ end
 FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
 
 unless mongoid
-  generate "paper_trail:install"
+  generate "paper_trail:install", "--with-associations"
   generate "friendly_id"
   rake "db:migrate"
 end
@@ -430,4 +430,3 @@ end
 git :init
 git add: "."
 git commit: %Q{ -m 'Initial commit' }
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -452,7 +452,6 @@ files:
 - lib/rocket_cms/controllers/news.rb
 - lib/rocket_cms/controllers/pages.rb
 - lib/rocket_cms/controllers/search.rb
-- lib/rocket_cms/elastic_search.rb
 - lib/rocket_cms/engine.rb
 - lib/rocket_cms/migration.rb
 - lib/rocket_cms/model.rb
@@ -473,6 +472,7 @@ files:
 - lib/rocket_cms/models/seo.rb
 - lib/rocket_cms/patch.rb
 - lib/rocket_cms/rails_admin_menu.rb
+- lib/rocket_cms/search.rb
 - lib/rocket_cms/seo_helpers.rb
 - lib/rocket_cms/simple_form_patch.rb
 - lib/rocket_cms/tasks.rb

data/lib/rocket_cms/elastic_search.rb

@@ -1,32 +0,0 @@
-module RocketCMS::ElasticSearch
-  extend ActiveSupport::Concern
-  included do
-    include Mongoid::Elasticsearch
-    elasticsearch!({
-    index_options: {
-      settings: {
-        index: {
-          analysis: {
-            analyzer: {
-              my_analyzer: {
-                type: "snowball",
-                language: "Russian"
-              }
-            }
-          }
-        }
-      }
-    },
-    index_mapings: {
-      name: {type: 'string', boost: 10, analyzer: 'my_analyzer'},
-      content: {type: 'string', boost: 1, analyzer: 'my_analyzer'},
-    }
-    })
-    def es_index?
-      enabled
-    end
-    def as_indexed_json
-      {name: name, content: SmartExcerpt.strip_tags(content)}
-    end
-  end
-end