blacklight 4.2.2 → 4.3.0

data/spec/helpers/search_history_constraints_helper_spec.rb

@@ -56,9 +56,9 @@ describe SearchHistoryConstraintsHelper do
         @params = {:q => "history", :f => {"some_facet" => ["value1", "value1"],  "other_facet" => ["other1"]}}        
       end
       it "should call lesser methods" do
-        helper.stub!(:blacklight_config).and_return(@config)
-        helper.stub!(:default_search_field).and_return(Blacklight::Configuration::SearchField.new(:key => 'default_search_field', :display_label => 'Default'))
-        helper.should_receive(:label_for_search_field).with(nil).any_number_of_times.and_return('')
+        helper.stub(:blacklight_config).and_return(@config)
+        helper.stub(:default_search_field).and_return(Blacklight::Configuration::SearchField.new(:key => 'default_search_field', :display_label => 'Default'))
+        helper.stub(:label_for_search_field).with(nil).and_return('')
         # API hooks expect this to be so
         response = helper.render_search_to_s(@params)
 
@@ -68,6 +68,17 @@ describe SearchHistoryConstraintsHelper do
       end
     end
     
+    describe "render_search_to_s_filters" do
+      it "should render a constraint for a selected facet in the config" do
+        response = helper.render_search_to_s_filters(:f => {"some_facet" => ["value1", "value2"]})
+        expect(response).to eq("<span class=\"constraint\"><span class=\"filterName\">Some:</span><span class=\"filterValues\"><span class=\"filterValue\">value1</span><span class=\"filterSeparator\"> and </span><span class=\"filterValue\">value2</span></span></span>")
+      end
+
+      it "should render a constraint for a selected facet not in the config" do
+        response = helper.render_search_to_s_filters(:f => {"undefined_facet" => ["value1", "value2"]})
+        expect(response).to eq("<span class=\"constraint\"><span class=\"filterName\">Undefined Facet:</span><span class=\"filterValues\"><span class=\"filterValue\">value1</span><span class=\"filterSeparator\"> and </span><span class=\"filterValue\">value2</span></span></span>")
+      end
+    end
 
   
   end

data/spec/lib/blacklight_solr_document_more_like_this_spec.rb

@@ -8,7 +8,7 @@ describe Blacklight::Solr::Document::MoreLikeThis do
   end
   
   it "should pluck the MoreLikeThis results from the Solr Response" do
-    mock_solr_response = mock(:more_like => [{'id' => 'abc'}])
+    mock_solr_response = double(:more_like => [{'id' => 'abc'}])
     result = @mock_class.new({:id => '123'}, mock_solr_response).more_like_this
     result.should have(1).item
     result.first.should be_a_kind_of(SolrDocument)

data/spec/lib/blacklight_solr_response_spec.rb

@@ -157,7 +157,7 @@ describe Blacklight::SolrResponse do
   it "should provide MoreLikeThis suggestions" do
     raw_response = eval(mock_response_with_more_like_this)
     r = Blacklight::SolrResponse.new(raw_response, {})
-    r.more_like(mock(:id => '79930185')).should have(2).items
+    r.more_like(double(:id => '79930185')).should have(2).items
   end
 
   def mock_query_response

data/spec/lib/search_fields_spec.rb

@@ -21,7 +21,7 @@ describe Blacklight::SearchFields do
 
   before(:each) do  
     @search_field_obj = MockConfig.new
-    @search_field_obj.stub!(:blacklight_config).and_return(@config)
+    @search_field_obj.stub(:blacklight_config).and_return(@config)
   end
 
   it "should return search field list with calculated :label when needed" do

data/spec/lib/solr_helper_spec.rb

@@ -193,7 +193,7 @@ describe 'Blacklight::SolrHelper' do
       end
 
       it "should pass date-type fields through" do
-        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(mock(:date => true, :query => nil, :tag => nil))
+        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil))
 
         facet_value_to_fq_string("facet_name", "2012-01-01").should  == "facet_name:2012-01-01"
       end
@@ -203,7 +203,7 @@ describe 'Blacklight::SolrHelper' do
       end
 
       it "should add tag local parameters" do
-        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(mock(:query => nil, :tag => 'asdf', :date => nil))
+        blacklight_config.facet_fields.stub(:[]).with('facet_name').and_return(double(:query => nil, :tag => 'asdf', :date => nil))
 
         facet_value_to_fq_string("facet_name", true).should  == "{!tag=asdf}facet_name:true"
         facet_value_to_fq_string("facet_name", "my value").should  == "{!raw f=facet_name tag=asdf}my value"
@@ -1014,7 +1014,7 @@ describe 'Blacklight::SolrHelper' do
 
     describe "#get_solr_response_for_field_values" do
       before do
-        @mock_response = mock()
+        @mock_response = double()
         @mock_response.stub(:docs => [])
       end
       it "should contruct a solr query based on the field and value pair" do
@@ -1041,7 +1041,7 @@ describe 'Blacklight::SolrHelper' do
 #  more like this
 #  nearby on shelf
   it "should raise a Blacklight exception if RSolr can't connect to the Solr instance" do
-    Blacklight.solr.stub!(:get).and_raise(Errno::ECONNREFUSED)
+    Blacklight.solr.stub(:get).and_raise(Errno::ECONNREFUSED)
     expect { find(:a => 123) }.to raise_exception(/Unable to connect to Solr instance/)
   end
 end

data/spec/models/solr_docment_spec.rb

@@ -81,7 +81,7 @@ end
       end
       
       it "should not try to create marc for objects w/out stored marc (marcxml test only at this time)" do
-        # TODO: Create another mock object that does not have marc-xml in it and make
+        # TODO: Create another double object that does not have marc-xml in it and make
         # sure everything fails gracefully
         @hash_without_marcxml = get_hash_without_marcxml['response']['docs'][0]
         @solrdoc_without_marc = SolrDocument.new(@hash_without_marcxml)

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 platforms :jruby do
-  gem 'jruby-openssl'
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
   gem 'mediashelf-loggable', '>= 0.4.8'
@@ -8,22 +7,16 @@ end
 
 platforms :ruby do
  gem 'sqlite3'
- gem 'execjs'
- gem 'therubyracer', '~> 0.10.2'
 end
 
-gem 'blacklight', :path => '../../'
 gem 'jquery-rails'
 
-# For testing
-group :development, :test do
-  gem 'rspec-rails', '~> 2.13.1'
-end
-
 group :test do
+  gem 'rspec-rails', '~> 2.13'
   gem 'generator_spec'
-  gem 'cucumber-rails', :require => false
-  gem 'database_cleaner', '>= 1.0.0.RC1'
+  gem 'cucumber'
+  gem 'cucumber-rails', :git => 'https://github.com/cucumber/cucumber-rails.git', :branch => 'master_rails4_test',  :require => false
+  gem 'database_cleaner', '>= 1.0.1'
   if defined? :JRUBY_VERSION
     gem 'capybara', '~> 1.0'
   else

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,8 +11,8 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
-  def copy_rspec_rake_task
-    copy_file "lib/tasks/rspec.rake"
+  def copy_blacklight_test_app_rake_task
+    copy_file "lib/tasks/blacklight_test_app.rake"
   end
 
   def remove_index 

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -0,0 +1,22 @@
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+
+desc "run the blacklight gem spec"
+gem_home = File.expand_path('../../../../..', __FILE__)
+
+namespace :blacklight_test_app do
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = gem_home + '/spec/**/*_spec.rb'
+    t.rspec_opts = "--colour"
+    t.ruby_opts = "-I#{gem_home}/spec"
+  end
+
+  Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
+    t.cucumber_opts = gem_home + "/features/**/*.feature"
+  end
+
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+end

data/spec/views/catalog/_facets.html.erb_spec.rb

@@ -13,13 +13,13 @@ describe "catalog/_facets" do
 
   it "should have a header" do
 
-      @mock_field_1 = mock(:field => 'facet_field_1',
+      @mock_field_1 = double(:field => 'facet_field_1',
                        :label => 'label')
-      @mock_display_facet_1 = mock(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
+      @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
       view.stub(:facet_field_names => [:facet_field_1],
                 :facet_limit_for => 10 )
 
-      @response = mock()
+      @response = double()
       @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
 
     view.stub(:render_facet_partials => '')
@@ -29,13 +29,13 @@ describe "catalog/_facets" do
 
   describe "facet display" do
     before do
-      @mock_field_1 = mock(:field => 'facet_field_1',
+      @mock_field_1 = double(:field => 'facet_field_1',
                        :label => 'label')
-      @mock_display_facet_1 = mock(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
+      @mock_display_facet_1 = double(:name => 'facet_field_1', :items => [Blacklight::SolrResponse::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
       view.stub(:facet_field_names => [:facet_field_1],
                 :facet_limit_for => 10 )
 
-      @response = mock()
+      @response = double()
       @response.stub(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
 
     end 

data/spec/views/catalog/_index_default.erb_spec.rb

@@ -21,27 +21,25 @@ describe "/catalog/_index_default.erb" do
     @fname_3 = "empty_field"
     @fname_4 = "four_field"
     
-    @document = mock("solr_doc")
-    @document.should_receive(:get).with(@fname_1, hash_including(:sep => nil)).any_number_of_times.and_return("val_1")
-    @document.should_receive(:get).with(@fname_2, hash_including(:sep => nil)).any_number_of_times.and_return("val_2")
-    @document.should_receive(:get).with(@fname_3, hash_including(:sep => nil)).any_number_of_times.and_return(nil)
-    @document.should_receive(:get).with(@fname_4, hash_including(:sep => nil)).any_number_of_times.and_return("val_4")
+    @document = double("solr_doc")
+    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    @document.should_receive(:'has?').with(@fname_1).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(@fname_2).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(@fname_3).any_number_of_times.and_return(false)
-    @document.should_receive(:'has?').with(@fname_4).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(anything()).any_number_of_times.and_return(true)
+    @document.stub(:has?).with(@fname_1).and_return(true)
+    @document.stub(:has?).with(@fname_2).and_return(true)
+    @document.stub(:has?).with(@fname_3).and_return(false)
+    @document.stub(:has?).with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    @document.should_receive(:get).with(anything(), hash_including(:sep => nil)).any_number_of_times.and_return("bleah")
-    @document.should_receive(:[]).any_number_of_times
+    @document.stub(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Three:"
     @flabel_4 = "Four:"
 
-    view.stub!(:blacklight_config).and_return(@config)
+    view.stub(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :index
   end

data/spec/views/catalog/_show_default.erb_spec.rb

@@ -23,27 +23,25 @@ describe "/catalog/_show_default.html.erb" do
     @fname_3 = "empty_field"
     @fname_4 = "four_field"
     
-    @document = mock("solr_doc")
-    @document.should_receive(:get).with(@fname_1, hash_including(:sep => nil)).any_number_of_times.and_return("val_1")
-    @document.should_receive(:get).with(@fname_2, hash_including(:sep => nil)).any_number_of_times.and_return("val_2")
-    @document.should_receive(:get).with(@fname_3, hash_including(:sep => nil)).any_number_of_times.and_return(nil)
-    @document.should_receive(:get).with(@fname_4, hash_including(:sep => nil)).any_number_of_times.and_return("val_4")
+    @document = double("solr_doc")
+    @document.stub(:get).with(@fname_1, hash_including(:sep => nil)).and_return("val_1")
+    @document.stub(:get).with(@fname_2, hash_including(:sep => nil)).and_return("val_2")
+    @document.stub(:get).with(@fname_3, hash_including(:sep => nil)).and_return(nil)
+    @document.stub(:get).with(@fname_4, hash_including(:sep => nil)).and_return("val_4")
     
-    @document.should_receive(:'has?').with(@fname_1).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(@fname_2).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(@fname_3).any_number_of_times.and_return(false)
-    @document.should_receive(:'has?').with(@fname_4).any_number_of_times.and_return(true)
-    @document.should_receive(:'has?').with(anything()).any_number_of_times.and_return(true)
+    @document.stub(:'has?').with(@fname_1).and_return(true)
+    @document.stub(:'has?').with(@fname_2).and_return(true)
+    @document.stub(:'has?').with(@fname_3).and_return(false)
+    @document.stub(:'has?').with(@fname_4).and_return(true)
     
     # cover any remaining fields in initalizer
-    @document.should_receive(:get).with(any_args()).any_number_of_times.and_return("bleah")
-    @document.should_receive(:[]).any_number_of_times
+    @document.stub(:[])
     
     @flabel_1 = "One:"
     @flabel_3 = "Two:"
     @flabel_4 = "Four:"
 
-    view.stub!(:blacklight_config).and_return(@config)
+    view.stub(:blacklight_config).and_return(@config)
     assigns[:document] = @document
     @rendered = view.render_document_partial @document, :show
   end

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -30,8 +30,8 @@ describe "catalog/index" do
     # but okay. 
 
     params.merge!( @params )
-    view.stub!(:blacklight_config).and_return(@config)
-    view.stub!(:search_field_options_for_select).and_return([])
+    view.stub(:blacklight_config).and_return(@config)
+    view.stub(:search_field_options_for_select).and_return([])
 
     render :template => 'catalog/index', :formats => [:atom] 
 

data/tasks/blacklight.rake

@@ -40,9 +40,9 @@ namespace :blacklight do
 
   desc "Run specs"
   task :spec => [:generate] do |t|
-    focused_spec = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
+    spec_options = ENV['SPEC'] ? " SPEC=#{File.join(GEM_ROOT, ENV['SPEC'])}" : ''
     within_test_app do
-      system "rake myspec#{focused_spec}"
+      system "rake blacklight_test_app:spec#{spec_options}"
       abort "Error running spec" unless $?.success?
     end
   end
@@ -50,7 +50,7 @@ namespace :blacklight do
   desc "Run cucumber features"
   task :cucumber => [:generate] do |t|
     within_test_app do
-      system "rake blacklight:cucumber"
+      system "CUCUMBER_OPTS='../../features' rake blacklight_test_app:cucumber"
       abort "Error running cucumber" unless $?.success?
     end
   end
@@ -68,7 +68,10 @@ namespace :blacklight do
       puts "Generating rails app"
       `rails new #{TEST_APP}`
       puts "Copying gemfile"
-      `cat #{TEST_APP_TEMPLATES}/Gemfile.extra >> #{TEST_APP}/Gemfile`
+      open("#{TEST_APP}/Gemfile", 'a') do |f|
+        f.write File.read(TEST_APP_TEMPLATES + "/Gemfile.extra")
+        f.write "gem 'blacklight', :path => '../../'" 
+      end
       puts "Copying generator"
       `cp -r #{TEST_APP_TEMPLATES}/lib/generators #{TEST_APP}/lib`
       within_test_app do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
@@ -416,6 +416,7 @@ files:
 - lib/railties/blacklight_cucumber.rake
 - lib/railties/blacklight_rspec.rake
 - lib/railties/solr_marc.rake
+- lib/solrmarc.log.1
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
@@ -460,7 +461,7 @@ files:
 - spec/support/include_text.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/rspec.rake
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
@@ -565,7 +566,7 @@ test_files:
 - spec/support/include_text.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/rspec.rake
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb

data/spec/test_app_templates/lib/tasks/rspec.rake

@@ -1,8 +0,0 @@
-require 'rspec/core/rake_task'
-desc "run the blacklight gem spec"
-gem_home = File.expand_path('../../../../..', __FILE__)
-RSpec::Core::RakeTask.new(:myspec) do |t|
-  t.pattern = gem_home + '/spec/**/*_spec.rb'
-  t.rspec_opts = "--colour"
-  t.ruby_opts = "-I#{gem_home}/spec"
-end