blacklight 5.0.0.pre3 → 5.0.0.pre4

data/spec/lib/blacklight/configuration_spec.rb

@@ -40,9 +40,8 @@ describe "Blacklight::Configuration" do
     end
 
     it "should introspect SolrDocument for sensible defaults  for show + index" do
-      expect(@config.show.html_title).to eq'id'
-      expect(@config.show.heading).to eq 'id'
-      expect(@config.index.show_link).to eq'id'
+      expect(@config.view_config(:show).title_field).to eq 'id'
+      expect(@config.index.title_field).to eq 'id'
     end
 
     it "should have ordered hashes for field configuration" do

data/spec/lib/blacklight/solr_helper_spec.rb

@@ -26,10 +26,6 @@ describe 'Blacklight::SolrHelper' do
     @config = config
   end
 
-  def blacklight_solr
-    Blacklight.solr
-  end
-
   include Blacklight::SolrHelper
 
   before(:each) do
@@ -562,7 +558,7 @@ describe 'Blacklight::SolrHelper' do
 
       it "should use the configured request handler " do
         blacklight_config.stub(:default_solr_params).and_return({:qt => 'custom_request_handler'})
-        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
+        blacklight_solr.should_receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
           expect(params[:params][:'facet.field']).to eq ["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"]
           expect(params[:params][:"facet.query"]).to eq ["pub_date:[#{5.years.ago.year} TO *]", "pub_date:[#{10.years.ago.year} TO *]", "pub_date:[#{25.years.ago.year} TO *]"]
@@ -636,8 +632,8 @@ describe 'Blacklight::SolrHelper' do
         (solr_response, document_list) = get_search_results(:q => @all_docs_query)
         result_docs = document_list
         document = result_docs.first
-        expect(document.get(blacklight_config.index.show_link)).not_to be_nil
-        expect(document.get(blacklight_config.index.record_display_type)).not_to be_nil
+        expect(document.get(blacklight_config.index.title_field)).not_to be_nil
+        expect(document.get(blacklight_config.index.display_type_field)).not_to be_nil
       end
     end
 
@@ -856,7 +852,7 @@ describe 'Blacklight::SolrHelper' do
 
     it "should use a provided document request handler " do
       blacklight_config.stub(:document_solr_request_handler => 'document')
-      Blacklight.solr.should_receive(:get).with('select', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
+      blacklight_solr.should_receive(:get).with('select', kind_of(Hash)).and_return({'response'=>{'docs'=>[]}})
       expect { get_solr_response_for_doc_id(@doc_id)}.to raise_error Blacklight::Exceptions::InvalidSolrID
     end
 
@@ -870,9 +866,8 @@ describe 'Blacklight::SolrHelper' do
       expect(@document.id).to eq @doc_id
     end
     it 'should have non-nil values for required fields set in initializer' do
-      expect(@document.get(blacklight_config[:show][:html_title])).not_to be_nil
-      expect(@document.get(blacklight_config[:show][:heading])).not_to be_nil
-      expect(@document.get(blacklight_config[:show][:display_type])).not_to be_nil
+      expect(@document.get(blacklight_config.view_config(:show).title_field)).not_to be_nil
+      expect(@document.get(blacklight_config.view_config(:show).display_type_field)).not_to be_nil
     end
   end
 
@@ -944,9 +939,8 @@ describe 'Blacklight::SolrHelper' do
     end
 
     it 'should have non-nil values for required fields set in initializer' do
-      expect(@doc[blacklight_config.show.html_title]).not_to be_nil
-      expect(@doc[blacklight_config.show.heading]).not_to be_nil
-      expect(@doc[blacklight_config.show.display_type]).not_to be_nil
+      expect(@doc[blacklight_config.view_config(:show).title_field]).not_to be_nil
+      expect(@doc[blacklight_config.view_config(:show).display_type_field]).not_to be_nil
     end
 
     it "should limit search result by facets when supplied" do
@@ -1086,7 +1080,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
 
@@ -1152,7 +1146,7 @@ describe 'Blacklight::SolrHelper' do
 
       it "defaults to get" do
         expect(blacklight_config.http_method).to eq :get
-        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
+        blacklight_solr.should_receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
           expect(params[:method]).to eq :get
           expect(params[:params]).to include(:q)
@@ -1166,7 +1160,7 @@ describe 'Blacklight::SolrHelper' do
 
       it "keep value set to post" do
         expect(blacklight_config.http_method).to eq :post
-        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
+        blacklight_solr.should_receive(:send_and_receive) do |path, params|
           expect(path).to eq 'select'
           expect(params[:method]).to eq :post
           expect(params[:data]).to include(:q)

data/spec/lib/blacklight/user_spec.rb

@@ -8,50 +8,9 @@ describe "Blacklight::User" do
     Bookmark.new :document_id => document_id
   end
 
-  it "should know if it doesn't have bookmarks" do
-    expect(subject).to_not have_bookmarks
-  end
-
-  it "should know if it has bookmarkss" do
-    subject.bookmarks << mock_bookmark(1)
-    subject.bookmarks << mock_bookmark(2)
-
-    expect(subject).to have_bookmarks
-  end
-
   it "should know if it has a bookmarked document" do
     subject.bookmarks << mock_bookmark(1)
     expect(subject.document_is_bookmarked?(1)).to be_true
   end
 
-  it "should be able to create bookmarks in batches" do
-    @md1 = { :document_id => 1 }
-    @md2 = { :document_id => 2 }
-    @md3 = { :document_id => 3 }
-
-    subject.documents_to_bookmark= [@md1,@md2,@md3]
-    expect(subject.bookmarks).to have(3).bookmarks
-    expect(subject.bookmarked_document_ids).to include("1","2","3")
-
-  end
-
-  it "should not recreate bookmarks for documents already bookmarked" do
-    subject.bookmarks << mock_bookmark(1)
-
-    @md1 = { :document_id => 1 }
-    subject.bookmarks.should_not_receive(:create).with(@md1)
-
-    subject.bookmarks.push(mock_bookmark(1))
-    subject.documents_to_bookmark=[@md1]
-  end
-
-  it "should know if it doesn't have a search" do
-    expect(subject.has_searches?).to be_false
-  end
-
-  it "should know if it has a search" do
-    subject.searches << Search.new
-    expect(subject.has_searches?).to be_true
-  end
-
 end    

data/spec/lib/blacklight_spec.rb

@@ -2,20 +2,6 @@ require 'spec_helper'
 
 describe Blacklight do
   
-  context "locate_path" do
-    
-    it "should find app/controllers/application_controller.rb" do
-      result = Blacklight.locate_path 'app', 'controllers', 'application_controller.rb'
-      expect(result).not_to be_nil
-    end
-    
-    it "should not find blah.rb" do
-      result = Blacklight.locate_path 'blah.rb'
-      expect(result).to be_nil
-    end
-    
-  end
-  
   context 'root' do
 
     let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
@@ -23,14 +9,6 @@ describe Blacklight do
     it 'should return the full path to the BL plugin' do
       expect(Blacklight.root).to eq blroot
     end
-    
-    it 'should return the full path to the model directory' do
-      expect(Blacklight.models_dir).to eq blroot + "/app/models"
-    end
-
-    it 'should return the full path to the controllers directory' do
-      expect(Blacklight.controllers_dir).to eq blroot + "/app/controllers"
-    end
 
   end
   

data/spec/lib/utils_spec.rb

@@ -33,12 +33,10 @@ describe 'Blacklight::Utils' do
     describe "internal hash table" do
       before do
         @h = Blacklight::OpenStructWithHashAccess.new
-
         @h[:a] = 1
         @h[:b] = 2
-
-
       end
+
       it "should expose the internal hash table" do
         expect(@h.to_h).to be_a_kind_of(Hash)
         expect(@h.to_h[:a]).to eq 1
@@ -48,10 +46,43 @@ describe 'Blacklight::Utils' do
         expect(@h.keys).to include(:a, :b)
       end
 
-      it "should expose merge" do
+    end
+
+    describe "#merge" do
+
+      before do
+        @h = Blacklight::OpenStructWithHashAccess.new
+        @h[:a] = 1
+        @h[:b] = 2
+      end
+      
+      it "should merge the object with a hash" do
         expect(@h.merge(:a => 'a')[:a]).to eq 'a'
       end
 
+      it "should merge the object with another struct" do
+        expect(@h.merge(Blacklight::OpenStructWithHashAccess.new(:a => 'a'))[:a]).to eq 'a'
+      end
+    end
+
+
+    describe "#merge!" do
+      
+      before do
+        @h = Blacklight::OpenStructWithHashAccess.new
+        @h[:a] = 1
+        @h[:b] = 2
+      end
+      
+      it "should merge the object with a hash" do
+        @h.merge!(:a => 'a')
+        expect(@h[:a]).to eq 'a'
+      end
+
+      it "should merge the object with another struct" do
+        @h.merge!(Blacklight::OpenStructWithHashAccess.new(:a => 'a'))
+        expect(@h[:a]).to eq 'a'
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,12 +5,13 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
-ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-if ENV['COVERAGE'] and ruby_engine != "jruby"
+if ENV["COVERAGE"] or ENV["CI"]
   require 'simplecov'
+  require 'coveralls'
 
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start do
-    root File.expand_path(File.dirname(__FILE__) + "../../..")
+    add_filter "/spec/"
   end
 end
 

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

@@ -22,13 +22,13 @@ class TestAppGenerator < Rails::Generators::Base
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
-    gem 'blacklight_marc', :github => 'projectblacklight/blacklight_marc'
+    gem 'blacklight_marc', ">= 0.0.9", :github => 'projectblacklight/blacklight_marc'
 
     Bundler.with_clean_env do
       run "bundle install"
     end
 
-    generate 'blacklight', '--devise --marc'
+    generate 'blacklight:install', '--devise --marc'
   end
 
   def run_test_support_generator

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

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe "catalog/constraints" do
   let :blacklight_config do
-    Blacklight::Configuration.new :document_index_view_types => ['list', 'xyz']
+    Blacklight::Configuration.new do |config|
+      config.view.xyz
+    end
   end
 
   it "should render nothing if no constraints are set" do
@@ -21,7 +23,7 @@ describe "catalog/constraints" do
   end
 
   it "should render a start over link with the current view type" do
-    view.should_receive(:search_action_url).with(view: 'xyz').and_return('http://xyz?view=xyz')
+    view.should_receive(:search_action_url).with(view: :xyz).and_return('http://xyz?view=xyz')
     view.stub(query_has_constraints?: true)
     params[:view] = 'xyz'
     view.stub(:blacklight_config).and_return(blacklight_config)

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

@@ -9,7 +9,7 @@ describe "/catalog/_index_default.erb" do
 
   before(:each) do
     @config = Blacklight::Configuration.new do |config|
-      config.show.display_type = 'asdf'
+      config.show.display_type_field = 'asdf'
       config.add_index_field 'one_field', :label => 'One:'
       config.add_index_field 'empty_field', :label => 'Three:'
       config.add_index_field 'four_field', :label => 'Four:'

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

@@ -11,10 +11,6 @@ describe "catalog/_paginate_compact.html.erb" do
       @config = config
     end
 
-    def blacklight_solr
-      Blacklight.solr
-    end
-
     def facet_limit_for *args
       0
     end
@@ -42,4 +38,4 @@ describe "catalog/_paginate_compact.html.erb" do
     expect(rendered).to have_selector ".page_entries"
     expect(rendered).to have_selector "a[@rel=next]"
   end
-end
+end

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

@@ -11,7 +11,7 @@ describe "/catalog/_show_default.html.erb" do
 
   before(:each) do
      @config = Blacklight::Configuration.new do |config|
-      config.show.display_type = 'asdf'
+      config.show.display_type_field = 'asdf'
       config.add_show_field 'one_field', :label => 'One:'
       config.add_show_field 'empty_field', :label => 'Three:'
       config.add_show_field 'four_field', :label => 'Four:'

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

@@ -11,13 +11,17 @@ describe "catalog/_view_type_group" do
   end
 
   it "should not display the group when there's only one option" do
-    blacklight_config.stub document_index_view_types: ['a']
     render partial: 'catalog/view_type_group'
     expect(rendered).to be_empty
   end
 
   it "should display the group" do
-    blacklight_config.stub document_index_view_types: ['a', 'b', 'c']
+    blacklight_config.configure do |config|
+      config.view.delete(:list)
+      config.view.a 
+      config.view.b
+      config.view.c
+    end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
     expect(rendered).to have_selector('.view-type-a', :text => 'A')
@@ -27,7 +31,11 @@ describe "catalog/_view_type_group" do
 
 
   it "should set the current view to 'active'" do
-    blacklight_config.stub document_index_view_types: ['a', 'b']
+    blacklight_config.configure do |config|
+      config.view.delete(:list)
+      config.view.a 
+      config.view.b
+    end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.active', :text => 'A')
     expect(rendered).to_not have_selector('.active', :text => 'B')

data/tasks/blacklight.rake

@@ -10,16 +10,12 @@ end
 
 desc "Run test suite"
 task :ci => 'blacklight:clean' do
-  ENV['environment'] = "test"
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 60
+  jetty_params = Jettywrapper.load_config('test')
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task["blacklight:fixtures"].invoke
     Rake::Task['blacklight:coverage'].invoke
   end
   raise "test failures: #{error}" if error
-  # Only create documentation if the tests have passed
-  #Rake::Task["active_fedora:doc"].invoke
 end
 
 namespace :blacklight do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre3
+  version: 5.0.0.pre4
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: blacklight_marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
@@ -250,7 +249,9 @@ files:
 - app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb
 - app/helpers/blacklight/render_constraints_helper_behavior.rb
 - app/helpers/blacklight/search_history_constraints_helper_behavior.rb
+- app/helpers/blacklight/url_helper_behavior.rb
 - app/helpers/blacklight_helper.rb
+- app/helpers/blacklight_url_helper.rb
 - app/helpers/catalog_helper.rb
 - app/helpers/facets_helper.rb
 - app/helpers/hash_as_hidden_fields_helper.rb
@@ -305,7 +306,6 @@ files:
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
 - app/views/catalog/email_sent.html.erb
-- app/views/catalog/endnote.endnote.erb
 - app/views/catalog/facet.html.erb
 - app/views/catalog/index.atom.builder
 - app/views/catalog/index.html.erb
@@ -313,7 +313,6 @@ files:
 - app/views/catalog/opensearch.json.erb
 - app/views/catalog/opensearch.xml.builder
 - app/views/catalog/send_email_record.erb
-- app/views/catalog/show.endnote.erb
 - app/views/catalog/show.html.erb
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.html.erb
@@ -339,6 +338,8 @@ files:
 - config/jetty.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.fr.yml
+- db/migrate/20140202020201_create_searches.rb
+- db/migrate/20140202020202_create_bookmarks.rb
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - lib/blacklight.rb
@@ -352,6 +353,7 @@ files:
 - lib/blacklight/configuration/search_field.rb
 - lib/blacklight/configuration/solr_field.rb
 - lib/blacklight/configuration/sort_field.rb
+- lib/blacklight/configuration/view_config.rb
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
@@ -382,7 +384,7 @@ files:
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets_generator.rb
-- lib/generators/blacklight/blacklight_generator.rb
+- lib/generators/blacklight/install_generator.rb
 - lib/generators/blacklight/jetty_generator.rb
 - lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
@@ -390,15 +392,9 @@ files:
 - lib/generators/blacklight/templates/catalog_controller.rb
 - lib/generators/blacklight/templates/config/jetty.yml
 - lib/generators/blacklight/templates/config/solr.yml
-- lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb
-- lib/generators/blacklight/templates/migrations/create_bookmarks.rb
-- lib/generators/blacklight/templates/migrations/create_searches.rb
-- lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb
 - lib/generators/blacklight/templates/solr_document.rb
 - lib/generators/blacklight/test_support_generator.rb
-- lib/railties/all_tests.rake
 - lib/railties/blacklight.rake
-- lib/railties/blacklight_rspec.rake
 - solr/sample_solr_documents.yml
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
@@ -424,6 +420,7 @@ files:
 - spec/helpers/hash_as_hidden_fields_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
+- spec/helpers/url_helper_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
@@ -526,6 +523,7 @@ test_files:
 - spec/helpers/hash_as_hidden_fields_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
+- spec/helpers/url_helper_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb