rocket_cms 0.9.9 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc8d2b701c0e2440c7e2e48cc779b4dd8a9bf716
-  data.tar.gz: 8e206fcf706c65f999a8c95b14d9299f16782718
+  metadata.gz: 084068e3bef81441aef63cd55db82e08db6caccc
+  data.tar.gz: bfd789e2e3cee4cb2baeda11f25a859a5dec2079
 SHA512:
-  metadata.gz: 53e60aea291159f81bc393befff0a17fea3bb7a0c28f994e701b4aed5a46e2dec33898640e1bf508de9664b5a8c456818b481bfb63101610d24280c573246642
-  data.tar.gz: fade693649c9aa2300f6b2a9f02023ffb1104a32e248544d276b52ecb6b885ccf0b27c1b98d83e5606b5dcaeda18c50ff13a0d3223c3a86fa65cc2e7f4519d30
+  metadata.gz: 67db6dd2ab6654dffadf993bf957f2da85800482bd47b7c4214688d225b6402f668597a24a16a8a0df22aa0a8c5334caf950c487b7a2c6ed0b0731b98d7c9dbe
+  data.tar.gz: 5946c05c4a2c181fb1fc37ac5d1bfb049b51a89cef7713c34b33b9b82ff265926e49e69bc8e2c39f12a0decdc46b3fef4d47c423a6ce28b02c3f6eb3144760fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.9.9)
+    rocket_cms (0.10.0)
       addressable
       coffee-rails
       devise

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

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

data/lib/rocket_cms/controllers/search.rb

@@ -25,7 +25,7 @@ module RocketCMS
               per_page: RocketCMS.config.search_per_page,
             )
           else
-            @results = PgSearch.multisearch(params[:query])
+            @results = PgSearch.multisearch(params[:query]).page(params[:page])
           end
         end
       end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.9.9"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.10.0
 platform: ruby
 authors:
 - glebtv