Merge pull request #374 from slacker87/master

Fix issue #345 and also add a missing 'setup' instruction in readme

Gemfile

@@ -19,7 +19,7 @@ gem 'mongoid_slug'
 gem 'aws-sdk', '~> 1.55.0'
 gem 'mutations'
 gem 'rack-attack'
-gem 'impressionist'
+gem 'impressionist', '~> 1.5.0'
 gem 'mongoid-history'
 gem 'rack-cors', require: 'rack/cors'
 gem 'delayed_job_mongoid'
@@ -44,6 +44,7 @@ group :test do
   gem 'doc_yo_self'
   gem 'capybara'
   gem 'poltergeist'
+  gem 'phantomjs', '>= 1.8.1', :require => 'phantomjs/poltergeist'
   gem 'simplecov'
   gem 'database_cleaner'
   gem 'vcr'

Gemfile.lock

@@ -144,7 +144,7 @@ GEM
     hashie (3.3.2)
     high_voltage (2.2.1)
     hike (1.2.3)
-    httpclient (2.5.1)
+    httpclient (2.5.3.3)
     i18n (0.6.11)
     impressionist (1.5.1)
       httpclient (~> 2.2)
@@ -202,6 +202,7 @@ GEM
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     patron (0.4.18)
+    phantomjs (1.9.7.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -368,7 +369,7 @@ DEPENDENCIES
   font-awesome-sass
   foundation-rails (~> 5.4.5)
   high_voltage
-  impressionist
+  impressionist (~> 1.5.0)
   jquery-rails
   launchy
   mongoid!
@@ -378,6 +379,7 @@ DEPENDENCIES
   mutations
   ng-rails-csrf
   patron
+  phantomjs (>= 1.8.1)
   poltergeist
   pry
   pry-nav

README.md

@@ -26,6 +26,7 @@ $ git clone https://github.com/openfarmcc/OpenFarm.git
 $ cd OpenFarm
 $ bundle install
 $ rake db:setup
+$ echo "ENV['SECRET_KEY_BASE'] = '$(rake secret)'" >> config/app_environment_variables.rb
 $ rails s
 ```
 

app/controllers/crop_searches_controller.rb

@@ -5,11 +5,13 @@ def search
     query = params[:q].to_s
     @crops = Crop.search(query,
                          limit: 25,
+                         partial: true,
+                         misspellings: {distance: 2},
                          fields: ['name^20',
                                   'common_names^10',
                                   'binomial_name^10',
                                   'description'])
-    if @crops.empty?
+    if query.empty?
       @crops = Crop.search('*', limit: 25)
     end
 

app/models/crop.rb

@@ -41,6 +41,7 @@ def search_data
   end
   slug :name
 
+
   # See https://github.com/aq1018/mongoid-history
   track_history on: [:description, :image],
                 modifier_field: :modifier,

app/views/crop_searches/show.html.erb

@@ -1,6 +1,9 @@
 <div class="crop-search-results row wide-row">
   <div class="crop-results-container small-6 columns">
     <h2 class="text-center">Choose a crop</h2>
+    <% if @crops.empty? %>
+    <p class="no-results">There are no crops matching "<%= params[:q].to_s %>", would you like to <%= link_to "add this crop", new_crop_path %>?</p>
+    <% end %>
     <%= render partial: 'crop_results', object: @crops %>
   </div>
   <div class="guide-results-container small-6 columns">

config/application.rb

@@ -29,5 +29,9 @@ class Application < Rails::Application
       end
     end
     config.middleware.use Rack::Attack
+    config.after_initialize do
+      Crop.reindex unless Rails.env.test?
+    end
   end
 end
+

config/environments/development.rb

@@ -9,4 +9,4 @@
   config.assets.debug = true
   config.quiet_assets = true
   config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-end
+end

spec/features/crop_searches_spec.rb

@@ -3,13 +3,15 @@
 describe 'Crop search', type: :controller do
   let!(:crop) { FactoryGirl.create(:crop, :radish) }
 
-  it 'finds documents' do
+  it 'finds individual crops' do
     visit root_path
     FactoryGirl.create_list(:crop, 10)
+    FactoryGirl.create(:crop, name: 'radish')
     Crop.searchkick_index.refresh
     fill_in 'q', with: 'radish'
     click_button 'Search'
-    expect(page).to have_content(crop.name)
+    expect(page).to have_content('radish')
+    page.should_not have_content('no crops matching')
   end
 
   it 'handles empty searches' do
@@ -21,13 +23,45 @@
     expect(page).to have_content(Crop.last.name)
   end
 
+  it 'handles empty search results' do
+    visit root_path
+    fill_in 'q', with: 'pear'
+    FactoryGirl.create_list(:crop, 10)
+    Crop.searchkick_index.refresh
+    click_button 'Search'
+    expect(page).to have_content("no crops matching")
+  end
+
   it 'handles plurals' do
     visit root_path
     fill_in 'q', with: crop.name
     FactoryGirl.create_list(:crop, 10)
     Crop.searchkick_index.refresh
     click_button 'Search'
     expect(page).to have_content(crop.name)
+    page.should_not have_content('no crops matching')
+  end
+
+  it 'handles misspellings' do
+    visit root_path
+    FactoryGirl.create_list(:crop, 10)
+    FactoryGirl.create(:crop, name: 'radish')
+    Crop.searchkick_index.refresh
+    fill_in 'q', with: 'radis'
+    click_button 'Search'
+    expect(page).to have_content('radish')
+    page.should_not have_content('no crops matching')
+  end
+
+  it 'handles multiple words' do
+    visit root_path
+    FactoryGirl.create_list(:crop, 10)
+    FactoryGirl.create(:crop, name: 'radish')
+    Crop.searchkick_index.refresh
+    fill_in 'q', with: 'pear radish'
+    click_button 'Search'
+    expect(page).to have_content('radish')
+    page.should_not have_content('no crops matching')
   end
 
   it 'has a top nav bar' do

spec/spec_helper.rb

@@ -25,10 +25,10 @@
 Capybara.javascript_driver = :poltergeist
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, js_errors: true)
+  Capybara::Poltergeist::Driver.new(app, :phantomjs => Phantomjs.path)
 end
 # =====
 Delayed::Worker.delay_jobs = false
-
 # ===== VCR stuff (records HTTP requests for playback)
 VCR.configure do |c|
   c.cassette_library_dir = 'vcr'
@@ -53,6 +53,7 @@
   # automatically. This will be the default behavior in future versions of
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
+  config.fail_fast = true
   config.order = "random"
   if ENV['DOCS'] == 'true'
     DocYoSelf.config do |c|
@@ -80,4 +81,4 @@
 
 class ActionController::TestCase
   include Devise::TestHelpers
-end
+end