refinerycms-solr 1.0.4 → 1.0.5

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-spec/dummy
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+spec/dummy

data/.travis.yml

@@ -1,18 +1,21 @@
-language: ruby
-bundler_args: --without development
-before_script:
-  - "bundle exec rake refinery:solr:dummy_app"
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-env:
-  - "RAILS_VERSION=4.0.0"
-  - DB=sqlite
-  - DB=mysql
-  - DB=postgresql
-
-notifications:
-  email: true
-
+language: ruby
+bundler_args: --without development
+before_script:
+  - "bundle exec rake refinery:solr:dummy_app"
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - "RAILS_VERSION=4.0.0"
+  matrix:
+    - DB=sqlite3
+    - DB=mysql
+    - DB=postgresql
+
+notifications:
+  email: true
+
 script: "bundle exec rake spec"

data/Gemfile

@@ -1,42 +1,42 @@
-source 'https://rubygems.org'
-
-gemspec
-
-git 'git://github.com/refinery/refinerycms.git', :branch => 'master' do
-  gem 'refinerycms'
-
-  group :development, :test do
-    gem 'refinerycms-testing'
-  end
-end
-
-git 'git://github.com/refinery/refinerycms-i18n.git', :branch => 'master' do
-  gem 'refinerycms-i18n'
-end
-
-git 'git://github.com/sunspot/sunspot.git', :branch => 'master' do
-  gem 'sunspot'
-  gem 'sunspot_rails'
-  gem 'sunspot_solr'
-end
-
-gem 'globalize3', github: 'svenfuchs/globalize3', branch: 'rails4'
-gem 'seo_meta', github: 'parndt/seo_meta', branch: 'master'
-
-group :development, :test do
-  require 'rbconfig'
-
-  gem 'sqlite3', :platform => :ruby
-  gem 'mysql2', :platform => :ruby
-  gem 'pg', :platform => :ruby
-end
-
-# Refinery/rails should pull in the proper versions of these
-group :assets do
-  gem 'sass-rails'
-  gem 'uglifier'
-end
-
-gem 'jquery-rails'
-gem 'protected_attributes'
-gem 'coveralls', require: false
+source 'https://rubygems.org'
+
+gemspec
+
+git 'git://github.com/refinery/refinerycms.git', :branch => 'master' do
+  gem 'refinerycms'
+
+  group :development, :test do
+    gem 'refinerycms-testing'
+  end
+end
+
+git 'git://github.com/refinery/refinerycms-i18n.git', :branch => 'master' do
+  gem 'refinerycms-i18n'
+end
+
+git 'git://github.com/sunspot/sunspot.git', :branch => 'master' do
+  gem 'sunspot'
+  gem 'sunspot_rails'
+  gem 'sunspot_solr'
+end
+
+gem 'globalize3', github: 'svenfuchs/globalize3', branch: 'rails4'
+gem 'seo_meta', github: 'parndt/seo_meta', branch: 'master'
+
+group :development, :test do
+  require 'rbconfig'
+
+  gem 'sqlite3', :platform => :ruby
+  gem 'mysql2', :platform => :ruby
+  gem 'pg', :platform => :ruby
+end
+
+# Refinery/rails should pull in the proper versions of these
+group :assets do
+  gem 'sass-rails'
+  gem 'uglifier'
+end
+
+gem 'jquery-rails'
+gem 'protected_attributes'
+gem 'coveralls', require: false

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2013 Jeff Chaput
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2013 Jeff Chaput
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,27 +1,27 @@
-# Refinery::Solr
-
-[![Gem Version](https://badge.fury.io/rb/refinerycms-solr.png)](http://badge.fury.io/rb/refinerycms-solr)
-[![Build Status](https://travis-ci.org/ixmedia/refinerycms-solr.png?branch=master)](https://travis-ci.org/ixmedia/refinerycms-solr)
-[![Dependency Status](https://gemnasium.com/ixmedia/refinerycms-solr.png)](https://gemnasium.com/ixmedia/refinerycms-solr)
-[![Code Climate](https://codeclimate.com/github/ixmedia/refinerycms-solr.png)](https://codeclimate.com/github/ixmedia/refinerycms-solr)
-[![Coverage Status](https://coveralls.io/repos/ixmedia/refinerycms-solr/badge.png)](https://coveralls.io/r/ixmedia/refinerycms-solr)
-
-Refinery CMS and Solr plugin. Based on [https://github.com/refinery/refinerycms-acts-as-indexed](Refinery CMS ActsAsIndexed integration plugin).
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'refinery-solr', '~> 1.0.0'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install refinery-solr
-
-## Contributing
-
-See [contributing.md](contributing.md)
+# Refinery::Solr
+
+[![Gem Version](https://badge.fury.io/rb/refinerycms-solr.png)](http://badge.fury.io/rb/refinerycms-solr)
+[![Build Status](https://travis-ci.org/ixmedia/refinerycms-solr.png?branch=master)](https://travis-ci.org/ixmedia/refinerycms-solr)
+[![Dependency Status](https://gemnasium.com/ixmedia/refinerycms-solr.png)](https://gemnasium.com/ixmedia/refinerycms-solr)
+[![Code Climate](https://codeclimate.com/github/ixmedia/refinerycms-solr.png)](https://codeclimate.com/github/ixmedia/refinerycms-solr)
+[![Coverage Status](https://coveralls.io/repos/ixmedia/refinerycms-solr/badge.png)](https://coveralls.io/r/ixmedia/refinerycms-solr)
+
+Refinery CMS and Solr plugin. Based on [Refinery CMS ActsAsIndexed integration plugin](https://github.com/refinery/refinerycms-acts-as-indexed).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'refinery-solr', '~> 1.0.0'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install refinery-solr
+
+## Contributing
+
+See [contributing.md](contributing.md)

data/Rakefile

@@ -1,21 +1,21 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-ENGINE_PATH = File.dirname(__FILE__)
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-
-if File.exists?(APP_RAKEFILE)
-  load 'rails/tasks/engine.rake'
-end
-
-require "refinerycms-testing"
-Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
-
-load File.expand_path('../tasks/rspec.rake', __FILE__)
-load File.expand_path('../tasks/solr.rake', __FILE__)
-
-task :default => :spec
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+ENGINE_PATH = File.dirname(__FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+
+if File.exists?(APP_RAKEFILE)
+  load 'rails/tasks/engine.rake'
+end
+
+require "refinerycms-testing"
+Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
+
+load File.expand_path('../tasks/rspec.rake', __FILE__)
+load File.expand_path('../tasks/solr.rake', __FILE__)
+
+task :default => :spec

data/app/decorators/models/refinery/image_decorator.rb

@@ -1,10 +1,10 @@
-require 'sunspot_rails'
-
-begin
-  Refinery::Image.class_eval do
-    searchable do
-      text :title
-    end
-  end
-rescue NameError
-end
+require 'sunspot_rails'
+
+begin
+  Refinery::Image.class_eval do
+    searchable do
+      text :title
+    end
+  end
+rescue NameError
+end

data/app/decorators/models/refinery/page_decorator.rb

@@ -1,14 +1,14 @@
-require 'sunspot_rails'
-
-begin
-  Refinery::Page.class_eval do
-    searchable do
-      text :title, :meta_description, :menu_title, :browser_title
-
-      text :all_page_part_content do
-        parts.map { |part| part.body }
-      end
-    end
-  end
-rescue NameError
-end
+require 'sunspot_rails'
+
+begin
+  Refinery::Page.class_eval do
+    searchable do
+      text :title, :meta_description, :menu_title, :browser_title
+
+      text :all_page_part_content do
+        parts.map { |part| part.body }
+      end
+    end
+  end
+rescue NameError
+end

data/app/decorators/models/refinery/resource_decorator.rb

@@ -1,10 +1,10 @@
-require 'sunspot_rails'
-
-begin
-  Refinery::Resource.class_eval do
-    searchable do
-      text :file_name, :title, :type_of_content
-    end
-  end
-rescue NameError
-end
+require 'sunspot_rails'
+
+begin
+  Refinery::Resource.class_eval do
+    searchable do
+      text :file_name, :title, :type_of_content
+    end
+  end
+rescue NameError
+end

data/app/decorators/models/refinery/user_decorator.rb

@@ -1,10 +1,10 @@
-require 'acts_as_indexed'
-
-begin
-  Refinery::User.class_eval do
-    searchable do
-      text :username, :email
-    end
-  end
-rescue NameError
-end
+require 'acts_as_indexed'
+
+begin
+  Refinery::User.class_eval do
+    searchable do
+      text :username, :email
+    end
+  end
+rescue NameError
+end

data/app/views/refinery/admin/_search.html.erb

@@ -1 +1 @@
-<%= render 'refinery/solr/admin/search', local_assigns if defined?(Refinery::Solr::Engine) %>
+<%= render 'refinery/solr/admin/search', local_assigns if defined?(Refinery::Solr::Engine) %>

data/app/views/refinery/admin/_search_header.html.erb

@@ -1 +1 @@
-<%= render 'refinery/solr/admin/search_header', local_assigns if defined?(Refinery::Solr::Engine) %>
+<%= render 'refinery/solr/admin/search_header', local_assigns if defined?(Refinery::Solr::Engine) %>

data/app/views/refinery/solr/admin/_search.html.erb

@@ -1,7 +1,7 @@
-<form method='GET' action='<%= url %>' class='search_form'>
-  <%= text_field :search, nil, :id => 'search', :type => 'search', :name => 'search', :value => params[:search], :title => t('search_input_notice', :scope => 'refinery.admin.search') %>
-  <%= hidden_field :wymeditor, nil, :name => 'wymeditor', :id => nil, :value => true  if params[:wymeditor].presence %>
-  <%= hidden_field :dialog, nil, :name => 'dialog', :id => nil, :value => true if from_dialog? %>
-  <%= hidden_field :callback, nil, :name => 'callback', :id => nil, :value => @callback if @callback.presence %>
-  <%= submit_tag t('button_text', :scope => 'refinery.admin.search'), :name => nil %>
-</form>
+<form method='GET' action='<%= url %>' class='search_form'>
+  <%= text_field :search, nil, :id => 'search', :type => 'text', :name => 'search', :value => params[:search], :title => t('search_input_notice', :scope => 'refinery.admin.search') %>
+  <%= hidden_field :wymeditor, nil, :name => 'wymeditor', :id => nil, :value => true  if params[:wymeditor].presence %>
+  <%= hidden_field :dialog, nil, :name => 'dialog', :id => nil, :value => true if from_dialog? %>
+  <%= hidden_field :callback, nil, :name => 'callback', :id => nil, :value => @callback if @callback.presence %>
+  <%= submit_tag t('button_text', :scope => 'refinery.admin.search'), :name => nil %>
+</form>

data/app/views/refinery/solr/admin/_search_header.html.erb

@@ -1,4 +1,4 @@
-<% if searching? %>
-  <%= link_to t('cancel_search', :scope => 'refinery.admin.search'), url, :class => "cancel-search" %>
-  <h2><%= t('results_for_html', :scope => 'refinery.admin.search', :query => h(params[:search])).html_safe %></h2>
-<% end %>
+<% if searching? %>
+  <%= link_to t('cancel_search', :scope => 'refinery.admin.search'), url, :class => "cancel-search" %>
+  <h2><%= t('results_for_html', :scope => 'refinery.admin.search', :query => h(params[:search])).html_safe %></h2>
+<% end %>

data/config/sunspot.yml

@@ -1,22 +1,22 @@
-production:
-  solr:
-    hostname: localhost
-    port: 8983
-    log_level: WARNING
-    path: /solr/production
-    # read_timeout: 2
-    # open_timeout: 0.5
-
-development:
-  solr:
-    hostname: localhost
-    port: 8982
-    log_level: INFO
-    path: /solr/development
-
-test:
-  solr:
-    hostname: localhost
-    port: 8981
-    log_level: WARNING
-    path: /solr/test
+production:
+  solr:
+    hostname: localhost
+    port: 8983
+    log_level: WARNING
+    path: /solr/production
+    # read_timeout: 2
+    # open_timeout: 0.5
+
+development:
+  solr:
+    hostname: localhost
+    port: 8982
+    log_level: INFO
+    path: /solr/development
+
+test:
+  solr:
+    hostname: localhost
+    port: 8981
+    log_level: WARNING
+    path: /solr/test

data/contributing.md

@@ -1,17 +1,17 @@
-# Contribution Guidelines #
-
-## Running tests ##
-
-Always run tests first. Quick start for tests (requires a dummy application) :
-
-    bundle install
-    bundle exec rake refinery:solr:dummy_app
-    bundle exec rake spec
-
-## Making a pull request ##
-
-If you'd like to submit a pull request please adhere to the following:
-
-1. Your code *must* be tested. Please TDD your code!
-2. Two-spaces instead of tabs
-3. General Rails/Ruby naming conventions for files and classes
+# Contribution Guidelines #
+
+## Running tests ##
+
+Always run tests first. Quick start for tests (requires a dummy application) :
+
+    bundle install
+    bundle exec rake refinery:solr:dummy_app
+    bundle exec rake spec
+
+## Making a pull request ##
+
+If you'd like to submit a pull request please adhere to the following:
+
+1. Your code *must* be tested. Please TDD your code!
+2. Two-spaces instead of tabs
+3. General Rails/Ruby naming conventions for files and classes

data/lib/refinery/solr.rb

@@ -1,12 +1,12 @@
-module Refinery
-  module Solr
-    class << self
-      def root
-        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
-      end
-    end
-  end
-end
-
-require 'refinery/solr/engine'
-require 'refinery/solr/active_record'
+module Refinery
+  module Solr
+    class << self
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+    end
+  end
+end
+
+require 'refinery/solr/engine'
+require 'refinery/solr/active_record'

data/lib/refinery/solr/active_record.rb

@@ -1,13 +1,13 @@
-require "active_record"
-
-module ActiveRecord
-  module Solr
-    def with_query(query)
-      results = self.name.constantize.search { fulltext query }.results
-      ids = results.inject([]) {|ids, record| ids << record.id}
-      self.where(id: ids)
-    end
-  end
-end
-
+require "active_record"
+
+module ActiveRecord
+  module Solr
+    def with_query(query)
+      results = self.name.constantize.search { fulltext query }.results
+      ids = results.inject([]) {|ids, record| ids << record.id}
+      self.where(id: ids)
+    end
+  end
+end
+
 ActiveRecord::Base.extend ActiveRecord::Solr

data/lib/refinery/solr/engine.rb

@@ -1,13 +1,13 @@
-module Refinery
-  module Solr
-    class Engine < Rails::Engine
-
-      include Refinery::Engine
-
-      config.to_prepare do
-        Decorators.register! ::Refinery::Solr.root
-      end
-
-    end
-  end
-end
+module Refinery
+  module Solr
+    class Engine < Rails::Engine
+
+      include Refinery::Engine
+
+      config.to_prepare do
+        Decorators.register! ::Refinery::Solr.root
+      end
+
+    end
+  end
+end

data/lib/refinery/solr/version.rb

@@ -1,18 +1,18 @@
-module Refinery
-  module Solr
-    class Version
-      @major = 1
-      @minor = 0
-      @tiny  = 4
-      @build = nil
-
-      class << self
-        attr_reader :major, :minor, :tiny, :build
-
-        def to_s
-          [@major, @minor, @tiny, @build].compact.join('.')
-        end
-      end
-    end
-  end
-end
+module Refinery
+  module Solr
+    class Version
+      @major = 1
+      @minor = 0
+      @tiny  = 5
+      @build = nil
+
+      class << self
+        attr_reader :major, :minor, :tiny, :build
+
+        def to_s
+          [@major, @minor, @tiny, @build].compact.join('.')
+        end
+      end
+    end
+  end
+end

data/lib/refinerycms-solr.rb

@@ -1,3 +1,3 @@
-require 'sunspot_rails'
-require 'refinerycms-core'
-require 'refinery/solr'
+require 'sunspot_rails'
+require 'refinerycms-core'
+require 'refinery/solr'

data/refinery-solr.gemspec

@@ -1,33 +1,33 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'refinery/solr/version'
-
-rails_version = ['>= 3.1.11', '< 4.1']
-
-Gem::Specification.new do |spec|
-  spec.name          = "refinerycms-solr"
-  spec.version       = Refinery::Solr::Version.to_s
-  spec.authors       = ["Jeff Chaput"]
-  spec.email         = ["jfc@artkeep.net"]
-  spec.description   = %q{An extension to handle the integration of Refinery CMS and Solr}
-  spec.summary       = %q{Refinery CMS Solr plugin}
-  spec.homepage      = "http://open.ixmedia.com"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-
-  spec.add_dependency    'refinerycms-core',      '~> 3.0.0.dev'
-  spec.add_dependency    'sunspot_rails',         '~> 2.1.0'
-  spec.add_dependency    'sunspot_solr',          '~> 2.1.0'
-
-  spec.add_dependency    'seo_meta',              '~> 1.4.0'
-  spec.add_dependency    'friendly_id',           '~> 5.0.0.rc1'
-  spec.add_dependency    'globalize3',            '~> 0.3.0'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'refinery/solr/version'
+
+rails_version = ['>= 3.1.11', '< 4.1']
+
+Gem::Specification.new do |spec|
+  spec.name          = "refinerycms-solr"
+  spec.version       = Refinery::Solr::Version.to_s
+  spec.authors       = ["Jeff Chaput"]
+  spec.email         = ["jfc@artkeep.net"]
+  spec.description   = %q{An extension to handle the integration of Refinery CMS and Solr}
+  spec.summary       = %q{Refinery CMS Solr plugin}
+  spec.homepage      = "http://open.ixmedia.com"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+
+  spec.add_dependency    'refinerycms-core',      '~> 3.0.0.dev'
+  spec.add_dependency    'sunspot_rails',         '~> 2.1.0'
+  spec.add_dependency    'sunspot_solr',          '~> 2.1.0'
+
+  spec.add_dependency    'seo_meta',              '~> 1.4.0'
+  spec.add_dependency    'friendly_id',           '~> 5.0.0.rc1'
+  spec.add_dependency    'globalize3',            '~> 0.3.0'
+end

data/script/rails

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems installed from the root of your application.
-
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/script/rails',  __FILE__)

data/spec/features/refinery/solr/admin/search_spec.rb

@@ -1,78 +1,78 @@
-require "spec_helper"
-
-module Refinery
-  describe "search" do
-    refinery_login_with :refinery_user
-
-    shared_examples "no result search" do
-      it "returns no results" do
-        fill_in "search", :with => "yada yada"
-        click_button "Search"
-        page.should have_content("Sorry, no results found")
-      end
-    end
-
-    describe "images extension" do
-      let!(:image) { FactoryGirl.create(:image) }
-      before do
-        visit refinery.admin_images_path
-      end
-
-      it "returns found image" do
-        fill_in "search", :with => "beach"
-        click_button "Search"
-
-        within ".actions" do
-          page.should have_selector("a[href$='#{image.image_name}']")
-        end
-      end
-
-      it_behaves_like "no result search"
-    end
-
-    describe "resources extension" do
-      before do
-        FactoryGirl.create(:resource)
-        visit refinery.admin_resources_path
-      end
-
-      it "returns found resource" do
-        fill_in "search", :with => "refinery"
-        click_button "Search"
-        page.should have_content("Refinery Is Awesome.txt")
-      end
-
-      it_behaves_like "no result search"
-    end
-
-    describe "pages extension" do
-      before do
-        FactoryGirl.create(:page, :title => "Ugis Ozols")
-        visit refinery.admin_pages_path
-      end
-
-      it "returns found page" do
-        fill_in "search", :with => "ugis"
-        click_button "Search"
-        page.should have_content("Ugis Ozols")
-      end
-
-      it_behaves_like "no result search"
-    end
-
-    describe "users extension" do
-      before do
-        FactoryGirl.create(:user, :username => "ugis")
-        visit refinery.admin_users_path
-      end
-
-      it "returns found user" do
-        fill_in "search", :with => "ugis"
-        click_button "Search"
-        page.should have_content("ugis")
-      end
-
-      it_behaves_like "no result search"
-    end
-  end
-end
+require "spec_helper"
+
+module Refinery
+  describe "search" do
+    refinery_login_with :refinery_user
+
+    shared_examples "no result search" do
+      it "returns no results" do
+        fill_in "search", :with => "yada yada"
+        click_button "Search"
+        page.should have_content("Sorry, no results found")
+      end
+    end
+
+    describe "images extension" do
+      let!(:image) { FactoryGirl.create(:image) }
+      before do
+        visit refinery.admin_images_path
+      end
+
+      it "returns found image" do
+        fill_in "search", :with => "beach"
+        click_button "Search"
+
+        within ".actions" do
+          page.should have_selector("a[href$='#{image.image_name}']")
+        end
+      end
+
+      it_behaves_like "no result search"
+    end
+
+    describe "resources extension" do
+      before do
+        FactoryGirl.create(:resource)
+        visit refinery.admin_resources_path
+      end
+
+      it "returns found resource" do
+        fill_in "search", :with => "refinery"
+        click_button "Search"
+        page.should have_content("Refinery Is Awesome.txt")
+      end
+
+      it_behaves_like "no result search"
+    end
+
+    describe "pages extension" do
+      before do
+        FactoryGirl.create(:page, :title => "Ugis Ozols")
+        visit refinery.admin_pages_path
+      end
+
+      it "returns found page" do
+        fill_in "search", :with => "ugis"
+        click_button "Search"
+        page.should have_content("Ugis Ozols")
+      end
+
+      it_behaves_like "no result search"
+    end
+
+    describe "users extension" do
+      before do
+        FactoryGirl.create(:user, :username => "ugis")
+        visit refinery.admin_users_path
+      end
+
+      it "returns found user" do
+        fill_in "search", :with => "ugis"
+        click_button "Search"
+        page.should have_content("ugis")
+      end
+
+      it_behaves_like "no result search"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,63 +1,63 @@
-require 'rubygems'
-
-require 'coveralls'
-Coveralls.wear!
-
-# Configure Rails Environment
-ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../dummy/config/environment", __FILE__)
-
-require 'rspec/rails'
-require 'capybara/rspec'
-
-require 'socket'
-require 'timeout'
-
-def is_port_open?(ip, port)
-  begin
-    Timeout::timeout(1) do
-      begin
-        s = TCPSocket.new(ip, port)
-        s.close
-        return true
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-        return false
-      end
-    end
-  rescue Timeout::Error
-  end
-
-  return false
-end
-
-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
-
-  config.before(:suite) do
-    system "bundle exec rake -f #{File.expand_path("../dummy/Rakefile", __FILE__)} sunspot:solr:start"
-    while (!is_port_open?("localhost", 8982))
-      sleep(1)
-    end
-  end
-
-  config.after(:suite) do
-    system "bundle exec rake -f #{File.expand_path("../dummy/Rakefile", __FILE__)} sunspot:solr:stop"
-  end
-end
-
-# set javascript driver for capybara
-Capybara.javascript_driver = :selenium
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories including factories.
-([Rails.root.to_s] | ::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
+require 'rubygems'
+
+require 'coveralls'
+Coveralls.wear!
+
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path("../dummy/config/environment", __FILE__)
+
+require 'rspec/rails'
+require 'capybara/rspec'
+
+require 'socket'
+require 'timeout'
+
+def is_port_open?(ip, port)
+  begin
+    Timeout::timeout(1) do
+      begin
+        s = TCPSocket.new(ip, port)
+        s.close
+        return true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      end
+    end
+  rescue Timeout::Error
+  end
+
+  return false
+end
+
+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
+
+  config.before(:suite) do
+    system "bundle exec rake -f #{File.expand_path("../dummy/Rakefile", __FILE__)} sunspot:solr:start"
+    while (!is_port_open?("localhost", 8982))
+      sleep(1)
+    end
+  end
+
+  config.after(:suite) do
+    system "bundle exec rake -f #{File.expand_path("../dummy/Rakefile", __FILE__)} sunspot:solr:stop"
+  end
+end
+
+# set javascript driver for capybara
+Capybara.javascript_driver = :selenium
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([Rails.root.to_s] | ::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

data/tasks/rspec.rake

@@ -1,4 +1,4 @@
-require 'rspec/core/rake_task'
-
-desc "Run specs"
-RSpec::Core::RakeTask.new
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

data/tasks/solr.rake

@@ -1,18 +1,18 @@
-namespace :refinery do
-  namespace :solr do
-    desc 'Generates a dummy app for testing'
-    task :dummy_app do
-      system 'bundle exec rake refinery:testing:dummy_app'
-      system "cd #{dummy_app_path} && bundle exec rails generate sunspot_rails:install"
-
-      File.open(File.join(dummy_app_path, 'config', 'sunspot.yml'), 'w') do |config|
-        config.puts "development:\n  solr:\n    hostname: localhost\n    port: 8982\n    log_level: WARNING\n    path: /solr/development\n\ntest:\n  solr:\n    hostname: localhost\n    port: 8982\n    log_level: WARNING\n    path: /solr/test"
-      end
-
-    end
-
-    def dummy_app_path
-      Refinery::Testing::Railtie.target_extension_path.join('spec', 'dummy')
-    end
-  end
+namespace :refinery do
+  namespace :solr do
+    desc 'Generates a dummy app for testing'
+    task :dummy_app do
+      system 'bundle exec rake refinery:testing:dummy_app'
+      system "cd #{dummy_app_path} && bundle exec rails generate sunspot_rails:install"
+
+      File.open(File.join(dummy_app_path, 'config', 'sunspot.yml'), 'w') do |config|
+        config.puts "development:\n  solr:\n    hostname: localhost\n    port: 8982\n    log_level: WARNING\n    path: /solr/development\n\ntest:\n  solr:\n    hostname: localhost\n    port: 8982\n    log_level: WARNING\n    path: /solr/test"
+      end
+
+    end
+
+    def dummy_app_path
+      Refinery::Testing::Railtie.target_extension_path.join('spec', 'dummy')
+    end
+  end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-solr
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
+  prerelease: 
 platform: ruby
 authors:
 - Jeff Chaput
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: globalize3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -159,26 +176,27 @@ files:
 homepage: http://open.ixmedia.com
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Refinery CMS Solr plugin
 test_files:
 - spec/features/refinery/solr/admin/search_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0080efa9e519ba69dc04b8c5e46b507bc5887e03
-  data.tar.gz: 275d18a359c9ccca44c03738f3ffeec9b29fded5
-SHA512:
-  metadata.gz: 348ccd3190ceee668ea258da9aafdf27321ae5509eec7b4692960182f4dcf07b32b05e2475db6ca397ee3cb4497cd5d201aa7add97aa4f772771d0a916edce3f
-  data.tar.gz: eafcd2c5fb33913faf27280054f3d55a110aa112c038ead6d2b31987fc829abae900154f1ce41405fd5a33fa07c3a371ca8465cdf60f8a967a003ed705c78ac9