refinerycms-search 0.9.8 → 1.0.0

data/app/models/search_engine.rb

@@ -1,17 +1,17 @@
 class SearchEngine
 
-	# How many results should we show per page
-	RESULTS_LIMIT = 10
+  # How many results should we show per page
+  RESULTS_LIMIT = 10
 
-	# Perform search over the specified models
-	def self.search(query, page = 1)
-		results = []
+  # Perform search over the specified models
+  def self.search(query, page = 1)
+    results = []
 
-		Refinery.searchable_models.each do |model|
-			results << model.limit(RESULTS_LIMIT).with_query(query)
-		end if query.present?
+    Refinery.searchable_models.each do |model|
+      results << model.limit(RESULTS_LIMIT).with_query(query)
+    end if query.present?
 
-		results.flatten[0..(RESULTS_LIMIT - 1)]
-	end
+    results.flatten[0..(RESULTS_LIMIT - 1)]
+  end
 
 end

data/app/views/search/show.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_page_title do %>
+<% content_for :body_content_title do %>
   Search Results for '<%=h params[:query] %>'
 <% end %>
 
@@ -9,7 +9,7 @@
         <span class='result_type'>
           <%= result.class.to_s.titleize %>
         </span>
-        <%= link_to raw(result.title.gsub(/(#{params[:query]})/i,'<mark>\1</mark>')), result_url(result) %>
+        <%= link_to raw(result.title.gsub(/(#{Regexp.escape(params[:query])})/i, '<mark>\1</mark>')), result_url(result) %>
       </li>
     <% end %>
   </ul>
@@ -17,7 +17,7 @@
 <% end %>
 
 <%= render :partial => "/shared/content_page" %>
-<% content_for :head do %>
+<% content_for :stylesheets do %>
   <style type='text/css'>
     #search_results {
       list-style: none;
@@ -34,4 +34,4 @@
       color: #CCC;
     }
   </style>
-<% end %>
+<% end %>

data/app/views/shared/_search.html.erb

@@ -1,4 +1,4 @@
-<% form_tag search_url do -%>
+<%= form_tag search_url do -%>
   <%= text_field_tag :query, {}, {:type => "search",
                      :placeholder => "Search site for...", 
                      :value => (params[:query] if params[:query])} %>

data/config/locales/bg.yml

@@ -0,0 +1,5 @@
+bg:
+  plugins:
+    refinerycms_search:
+      title: Търсене
+      description: Допълнителна функционалност при търсене за Refinery CMS

data/db/migrate/01_create_search_page.rb

@@ -0,0 +1,18 @@
+class CreateSearchPage < ActiveRecord::Migration
+
+  def self.up
+    load(Rails.root.join('db', 'seeds', 'refinerycms_search.rb'))
+  end
+
+  def self.down
+    if defined?(UserPlugin)
+      UserPlugin.destroy_all({:name => "refinerycms_search"})
+    end
+
+    if defined?(Page)
+      Page.delete_all({:link_url => "/search"})
+    end
+
+  end
+
+end

data/db/seeds/refinerycms_search.rb

@@ -0,0 +1,25 @@
+if defined?(::User)
+  User.all.each do |user|
+    if user.plugins.where(:name => 'refinerycms_search').blank?
+      user.plugins.create(:name => 'refinerycms_search',
+                          :position => (user.plugins.maximum(:position) || -1) +1)
+    end
+  end
+end
+
+if defined?(::Page)
+  unless Page.where(:menu_match => "^/search.*$").any?
+    page = Page.create(
+      :title => "Search Results",
+      :show_in_menu => false,
+      :link_url => "/search",
+      :deletable => false,
+      :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+      :menu_match => "^/search.*$"
+    )
+
+    Page.default_parts.each do |default_page_part|
+      page.parts.create(:title => default_page_part, :body => nil)
+    end
+  end
+end

data/lib/gemspec.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
-version = '0.9.8'
+# Encoding: UTF-8
+version = '1.0.0'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem$/
 end
 
 gemspec = <<EOF
+# Encoding: UTF-8
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-search}
   s.version           = %q{#{version}}
@@ -14,10 +16,10 @@ Gem::Specification.new do |s|
   s.description       = %q{Provides extra functionality for searching your frontend website using Refinery CMS.}
   s.homepage          = %q{http://refinerycms.com}
   s.email             = %q{info@refinerycms.com}
-  s.authors           = ["Resolve Digital"]
+  s.authors           = ["Uģis Ozols", "Joe Sak", "Philip Arndt"]
   s.require_paths     = %w(lib)
 
-  s.add_dependency    'refinerycms', '>= 0.9.8'
+  s.add_dependency    'refinerycms-core', '~> 1.0'
 
   s.files             = [
     '#{files.join("',\n    '")}'

data/lib/generators/refinerycms_search_generator.rb

@@ -0,0 +1,8 @@
+require 'refinery/generators'
+
+class RefinerycmsSearchGenerator < ::Refinery::Generators::EngineInstaller
+
+  source_root File.expand_path('../../../', __FILE__)
+  engine_name "search"
+
+end

data/lib/refinerycms-search.rb

@@ -18,7 +18,7 @@ module Refinery
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|
           plugin.name = 'refinerycms_search'
-          plugin.version = 1.0
+          plugin.version = 1.1
           plugin.hide_from_menu = true
         end
       end

data/readme.md

@@ -3,41 +3,59 @@
 
 By: [Resolve Digital](http://www.resolvedigital.com)
 
+Powered by: [acts_as_indexed](http://github.com/dougal/acts_as_indexed) - Check his readme and documentation for more info on how it works.
+
 ## Installation
 
 Simply use this by adding the following to your ``Gemfile``:
 
-    gem 'refinerycms-search', '~> 0.9.8'
-
-You'll also need to create a page (from the 'Pages' tab) with a custom URL of '/search'.
-You can set a custom URL for a page in the Advanced Options.
-It's probably also a good idea to uncheck the 'show in menu' option for this page.
+    gem 'refinerycms-search', '~> 1.0.0', :git => 'git://github.com/resolve/refinerycms-search.git'
+    
+    bundle install
+    rails g refinerycms_search
+    rake db:migrate
 
-Remember to restart your web server.
+## Restart your web server and RE-SAVE all records that have not been indexed before.
 
-A sample search form can be found in [views/shared/_search.html.erb](http://github.com/blob/master/app/views/shared/_search.html.erb).
+A sample search form can be found in [views/shared/_search.html.erb](http://github.com/resolve/refinerycms-search/blob/master/app/views/shared/_search.html.erb).
 You can either use this partial directly, or copy the appropriate parts.
 
 ## Searching
 
-The default installation will search in Pages.  
-If you wish to find results in other plugins you have created or installed, you can specify these in ``config/settings.rb`` like so:
+The default installation will search in Pages.
+If you wish to find results in other plugins you have created or installed, you can specify these in ``config/application.rb`` like so:
 
-    Refinery.searchable_models = [Page]
+    config.to_prepare do
+      Refinery.searchable_models = [Page]
+    end
 
 Simply add any additional models you wish to search to this array.  For example, if you have the [portfolio plugin](http://github.com/resolve/refinerycms-portfolio) installed:
 
-    Refinery.searchable_models = [Page, PortfolioEntry]
+    config.to_prepare do
+      Refinery.searchable_models = [Page, PortfolioEntry]
+    end
+
+The above line will add indexing to PortfolioEntry in the portfolio plugin, which does not come indexed.
 
 Any model you wish to search will need to be indexed using acts as indexed. To add indexing, simple add:
 
     acts_as_indexed :fields => [:title, :body]
 
-If your model doesn't use a ``:title attribute``, remember to add an ``alias_attribute``:
+If your model doesn't use a ``:title`` attribute, remember to add an ``alias_attribute``:
 
     alias_attribute :title, :name #for example
 
+You can use any public method, as well. So if you have ``:first_name`` and ``:last_name`` but a method like ``name`` to join them, it can be indexed.
+
+    acts_as_indexed :fields => [:name, :biography]
+
+    #...
+
+    def name
+      (first_name, last_name).compact.join(' ')
+    end
+
 You will need to replace the indexed fields with those appropriate for your model.
-The above line will add indexing to PortfolioEntry in the portfolio plugin, which does not come indexed.
+
 
 If you wish to override the url used in the search results just add a ``url`` method to your model and the result of this method will be used instead.

data/refinerycms-search.gemspec

@@ -1,15 +1,16 @@
+# Encoding: UTF-8
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-search}
-  s.version           = %q{0.9.8}
-  s.date              = %q{2010-10-01}
+  s.version           = %q{1.0.0}
+  s.date              = %q{2012-03-15}
   s.summary           = %q{Extra search handling for Refinery CMS}
   s.description       = %q{Provides extra functionality for searching your frontend website using Refinery CMS.}
   s.homepage          = %q{http://refinerycms.com}
   s.email             = %q{info@refinerycms.com}
-  s.authors           = ["Resolve Digital"]
+  s.authors           = ["Uģis Ozols", "Joe Sak", "Philip Arndt"]
   s.require_paths     = %w(lib)
 
-  s.add_dependency    'refinerycms', '>= 0.9.8'
+  s.add_dependency    'refinerycms-core', '~> 1.0'
 
   s.files             = [
     'app',
@@ -26,10 +27,18 @@ Gem::Specification.new do |s|
     'app/views/shared/_search.html.erb',
     'config',
     'config/locales',
+    'config/locales/bg.yml',
     'config/locales/en.yml',
     'config/routes.rb',
+    'db',
+    'db/migrate',
+    'db/migrate/01_create_search_page.rb',
+    'db/seeds',
+    'db/seeds/refinerycms_search.rb',
     'lib',
     'lib/gemspec.rb',
+    'lib/generators',
+    'lib/generators/refinerycms_search_generator.rb',
     'lib/refinerycms-search.rb',
     'readme.md',
     'refinerycms-search.gemspec'

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-search
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
+  - 1
+  - 0
   - 0
-  - 9
-  - 8
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors: 
-- Resolve Digital
+- "U\xC4\xA3is Ozols"
+- Joe Sak
+- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-01 00:00:00 +13:00
-default_executable: 
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: refinerycms
+  name: refinerycms-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        - 8
-        version: 0.9.8
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 description: Provides extra functionality for searching your frontend website using Refinery CMS.
@@ -48,13 +48,16 @@ files:
 - app/models/search_engine.rb
 - app/views/search/show.html.erb
 - app/views/shared/_search.html.erb
+- config/locales/bg.yml
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/01_create_search_page.rb
+- db/seeds/refinerycms_search.rb
 - lib/gemspec.rb
+- lib/generators/refinerycms_search_generator.rb
 - lib/refinerycms-search.rb
 - readme.md
 - refinerycms-search.gemspec
-has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []
 
@@ -84,9 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Extra search handling for Refinery CMS
 test_files: []
 
+has_rdoc: