quick_search-core 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23539ea74f21394249a312b7eabb3931fb9db0ed
-  data.tar.gz: 2bd211e5230357b90c760babca649e4c4d7b138e
+  metadata.gz: 945a512b7b05c32916eac69f31ae23e60cfd8234
+  data.tar.gz: 59e982a4f144a577864dc288d76f9540126da661
 SHA512:
-  metadata.gz: e71d9c5dbaf542ed012c57906721d8e6558083977b5b671d362711e57aa9268650f26c171ef754e33f30f0066c78e8401315ed35e2d021ffccd092b0dfba2129
-  data.tar.gz: e7228c8b1cd7d08a63fa0ca3f837bdcf92d986b2e00cd7bb689fd902ead185d939fc53783d98d6e495b11bfda82661981718ec8123f0d57e4be59b541b2f9119
+  metadata.gz: 375061e582cdd20159480052993b435759274b0bb2cf25c36deeb5bc48b6eb19e169fbd690b75e7a1b2a70362665c496b76ba4b1c65fae730952acf5fbbf78d8
+  data.tar.gz: 37bf50794ae589a11245b7490b99e50d14514a5e97acfa6d468adbea0cb91e050322956bcb0f468b67e481c9be96ee82c8760b3fb7df013daf98097faac901e8

data/app/views/layouts/quick_search/_best_bets.html.erb

@@ -11,7 +11,21 @@
                     <% end %>
                      <span class='highlight'>Best&nbsp;Bet</span>
                 </h3>
-                <p><%= best_bets[:description] %></p>
+             
+				<p>
+					<% if best_bets[:description].length > 200 %>
+				    <%= truncate(best_bets[:description], length: 200) %>
+				    <%= link_to 'Read more', '', class: "read-more" %>
+				    <script>
+				      $('.read-more').on('click', function(e) {
+				        e.preventDefault()
+				        $(this).parent().html('<%= escape_javascript best_bets[:description] %>')
+				      })
+				    </script>
+				  <% else %>
+				    <%= best_bets[:description] %>
+				  <% end %>
+			  </p>
             </div>
         </div>
     <% end %>

data/lib/quick_search/engine.rb

@@ -2,17 +2,45 @@ module QuickSearch
   class Engine < ::Rails::Engine
     isolate_namespace QuickSearch
 
+    # quick_search initializer
+    #
+    # We want to load the quick_search_config file, and set the loading order of the view paths as follows:
+    # 1. Application which imports gem engine/theme
+    # 2. Theme
+    # 3. Engine
+    #
+    # This way, we can make application specific overrides of views, otherwise fall back to theme,
+    # and finally fall back to the QS core if needed.
+    
     initializer :quick_search, :after => :add_view_paths do
       config_file = File.join(Rails.root, "/config/quick_search_config.yml")
       if File.exist?(config_file)
         QuickSearch::Engine::APP_CONFIG = YAML.load_file(config_file)[Rails.env]
         ActiveSupport.on_load(:action_controller) do
+          # get theme / core engine classes
           theme_engine_class = "#{QuickSearch::Engine::APP_CONFIG['theme'].classify}::Engine".constantize
-          prepend_view_path theme_engine_class.root.join('app', 'views', QuickSearch::Engine::APP_CONFIG['theme'])
+          core_engine_class = "QuickSearch::Engine".constantize
+
+          # get the correct view paths for the application, theme, and engine
+          core_view_path = core_engine_class.root.join('app', 'views')
+          theme_view_path = theme_engine_class.root.join('app', 'views', QuickSearch::Engine::APP_CONFIG['theme'])
+          app_view_path = Rails.root.join('app', 'views')
+
+          # prepend to the existing view path ordering
+          prepend_view_path(core_view_path)
+          prepend_view_path(theme_view_path)
+          prepend_view_path(app_view_path)
         end
       end
     end
 
+    # best_bets initializer
+    #
+    # Here we set up Best Bets. If there is a solr_url defined in the config, then we don't need to do anything,
+    # as Best Bets will be assumed to be in Solr, and the BestBetsSearcher will look there. Otherwise, load the
+    # best_bets.yml file into memory, and search that directly. The latter is only recommended for smaller amounts of
+    # Best Bets. The reason for this dual approach is that it removes Solr as an absolute requirement for QuickSearch.
+
     initializer :best_bets, :after => :quick_search do
       if defined? QuickSearch::Engine::APP_CONFIG and QuickSearch::Engine::APP_CONFIG['best_bets']['solr_url'].empty?
         best_bets_file = File.join(Rails.root, "/config/best_bets.yml")

data/lib/quick_search/version.rb

@@ -1,3 +1,3 @@
 module QuickSearch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quick_search-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kevin Beswick
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails