refinerycms-search 2.0.0 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2dcb6db86cef21a0525029b1369d7ea9688031b1
+  data.tar.gz: 170dea540b44c912704494c5eab92366f69cbb7c
+SHA512:
+  metadata.gz: 0bb126636386508a6a8b8fb018bd22b81204d9a188778daf8e39578e3510168eca20f4f9c5c5e3c321eebaf7af456cf1fa395b1a78c7f7a501fe4f691242609a
+  data.tar.gz: 05a516165cf4144536d7ced096522b9a4719d24e6b1ff674cc658b3a18f726a5b6c0418545e7832309f6bcae72323ab15e232979178425e5118bc7084242246b

data/.gitignore

@@ -1,3 +1,3 @@
-.DS_Store	
+.DS_Store
 Gemfile.lock
 spec/dummy

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
+cache: bundler
 before_install:
   - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
+  - gem install bundler
+install:
+  - bundle install --without development
 before_script:
   - "bundle exec rake refinery:testing:dummy_app > /dev/null"
 script:
@@ -22,15 +26,10 @@ env:
   - DB=mysql
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
     - rvm: rbx-19mode
     - rvm: jruby-19mode
-    - rvm: jruby-18mode
 rvm:
   - 2.0
   - 1.9.3
-  - 1.8.7
   - rbx-19mode
   - jruby-19mode
-  - rbx-18mode
-  - jruby-18mode

data/Gemfile

@@ -1,12 +1,13 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
 
 group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.0'
-  gem 'guard-rspec', '~> 0.6.0'
+  gem 'refinerycms-testing', '~> 2.1.0'
+  gem 'poltergeist'
 
   platforms :jruby do
     gem 'activerecord-jdbcsqlite3-adapter'
@@ -20,45 +21,27 @@ group :development, :test do
     gem 'mysql2'
     gem 'pg'
   end
+end
 
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
-
-  platforms :ruby do
-    gem 'spork', '~> 0.9.0.rc'
-    gem 'guard-spork'
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
 end
 
+gem 'jruby-openssl', :platform => :jruby
+
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
@@ -66,4 +49,7 @@ group :assets do
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/helpers/refinery/search_helper.rb

@@ -6,7 +6,11 @@ module Refinery
     end
 
     def result_type(result)
-      result.class.to_s.titleize.gsub('Refinery/', '').gsub '/', '::'
+      if result.class.method_defined?(:friendly_search_name)
+        result.friendly_search_name
+      else
+        result.class.to_s.titleize.split("/").last
+      end
     end
 
     # this is where you register your result URLs based on the

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

@@ -19,4 +19,4 @@
   </ul>
 <% end %>
 
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/config/locales/ja.yml

@@ -0,0 +1,10 @@
+ja:
+  refinery:
+    plugins:
+      refinerycms_search:
+        title: '検索'
+        description: 'Refinery CMS の検索プラグイン'
+    search:
+      show:
+        search_results_for: '"%{what}"の検索結果'
+        no_results_for: '"%{what}"に一致するものが見付かりませんでした。'

data/lib/refinery/search.rb

@@ -1,4 +1,5 @@
 require "refinerycms-core"
+require 'refinerycms-acts-as-indexed'
 
 module Refinery
   autoload :SearchGenerator, 'generators/refinery/search_generator'

data/lib/refinery/search/engine.rb

@@ -9,7 +9,6 @@ module Refinery
       initializer "register refinery_search plugin" do
         Refinery::Plugin.register do |plugin|
           plugin.name = 'refinery_search'
-          plugin.version = 2.0
           plugin.hide_from_menu = true
         end
       end

data/readme.md

@@ -1,13 +1,14 @@
 # Search plugin for [Refinery CMS](http://www.refinerycms.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.
+Powered by: [acts_as_indexed](https://github.com/dougal/acts_as_indexed) and [refinerycms-acts-as-indexed](https://github.com/refinery/refinerycms-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`:
 
 ```ruby
-gem 'refinerycms-search', '~> 2.0.0'
+gem 'refinerycms-search', '~> 2.1.0'
 ```
 
 Now, run ``bundle install``
@@ -77,3 +78,14 @@ end
 You will need to replace the indexed fields with those appropriate for your model.
 
 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.
+
+## Displaying a friendlier name for your model
+
+Just define the method `friendly_search_name` to override what is displayed
+for each search result for your model as per [the implementing pull request](https://github.com/refinery/refinerycms-search/pull/38).
+
+```ruby
+def friendly_search_name
+  "Document"
+end
+```

data/refinerycms-search.gemspec

@@ -1,17 +1,19 @@
+# Encoding: UTF-8
+
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-search}
-  s.version           = %q{2.0.0}
-  s.date              = "#{Date.today.strftime("%Y-%m-%d")}"
+  s.version           = %q{2.1.0}
   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           = ["Uģis Ozols", "Joe Sak", "Philip Arndt"]
+  s.authors           = ["Philip Arndt", "Uģis Ozols", "Joe Sak"]
   s.require_paths     = %w(lib)
   s.license           = %q{MIT}
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'refinerycms-core', '~> 2.0.4'
+  s.add_dependency    'refinerycms-core', '~> 2.1.0'
+  s.add_dependency    'refinerycms-acts-as-indexed', '~> 1.0.0'
 end

data/spec/spec_helper.rb

@@ -4,56 +4,31 @@ require 'rubygems'
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../') unless defined?(ENGINE_RAILS_ROOT)
 
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
 
-  require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 
-  require 'rspec/rails'
-  require 'capybara/rspec'
+require 'rspec/rails'
+require 'capybara/rspec'
 
-  Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.remove_silencers!
 
-  RSpec.configure do |config|
-    config.mock_with :rspec
-    config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.filter_run :focus => true
-    config.run_all_when_everything_filtered = true
-  end
-
-  # Set javascript driver for capybara
-  Capybara.javascript_driver = :selenium
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
-def each_run
-  Rails.cache.clear
-  ActiveSupport::Dependencies.clear
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([ENGINE_RAILS_ROOT, Rails.root.to_s].uniq | Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
-end
+# Set javascript driver for capybara
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
 
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
-
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([ENGINE_RAILS_ROOT, Rails.root.to_s].uniq | Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

metadata

@@ -1,34 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-search
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
+- Philip Arndt
 - Uģis Ozols
 - Joe Sak
-- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: refinerycms-acts-as-indexed
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
-    none: false
+        version: 1.0.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
-    none: false
+        version: 1.0.0
 description: Provides extra functionality for searching your frontend website using
   Refinery CMS.
 email: info@refinerycms.com
@@ -39,7 +50,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Guardfile
 - Rakefile
 - app/controllers/refinery/search_controller.rb
 - app/helpers/refinery/search_helper.rb
@@ -48,6 +58,7 @@ files:
 - app/views/refinery/shared/_search.html.erb
 - config/locales/bg.yml
 - config/locales/en.yml
+- config/locales/ja.yml
 - config/locales/sk.yml
 - config/routes.rb
 - db/migrate/01_create_search_page.rb
@@ -64,27 +75,26 @@ files:
 homepage: http://refinerycms.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extra search handling for Refinery CMS
 test_files:
 - spec/models/refinery/search_engine_spec.rb

data/Guardfile

@@ -1,20 +0,0 @@
-guard 'rspec', :version => 2, :cli => "--color" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-end
-
-guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' } do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch(%r{^config/environments/.+\.rb$})
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('spec/spec_helper.rb')
-end