blacklight 3.0pre2 → 3.0.0pre3

data/README.md

@@ -0,0 +1,24 @@
+# Blacklight
+
+Blacklight is open source discovery software. Libraries (or anyone else) can use Blacklight to enable searching and browsing of their collections online. Blacklight uses the [Apache SOLR](http://lucene.apache.org/solr) search engine to index and search full text and/or metadata, and Blacklight has a highly configurable Ruby on Rails front-end. Blacklight was originally developed at the University of Virginia Library and is made public under an Apache 2.0 license. 
+
+
+## Documentation, Information and Support
+
+* [Project Homepage](http://projectblacklight.org)
+* [Developer Documentation](https://github.com/projectblacklight/blacklight/wiki)
+* [Quickstart Guide](https://github.com/projectblacklight/blacklight/wiki/Blacklight-3.x-Quickstart)
+* [JIRA Issue Tracker](http://jira.projectblacklight.org/jira/secure/Dashboard.jspa)
+* [Support](http://projectblacklight.org/support.html)
+
+## Dependencies
+
+* ruby v1.8.7 or higher 
+* git
+* java 1.5 or higher
+* access to a command prompt on the machine to install
+
+In addition, you must have the Bundler and Rails 3.0 gems installed. Other gem dependencies are defined in the blacklight.gemspec file and will be automatically loaded by Bundler.
+
+## Configuring Apache Solr 
+You'll also want some information about how Blacklight expects [Apache SOLR](http://lucene.apache.org/solr ) to run, which you can find in [README_SOLR](https://github.com/projectblacklight/blacklight/wiki/README_SOLR)

data/VERSION

@@ -0,0 +1 @@
+3.0.0pre3

data/app/helpers/catalog_helper.rb

@@ -12,7 +12,12 @@ module CatalogHelper
     # from will_paginate?
   	def page_entries_info(collection, options = {})
       start = (collection.current_page - 1) * collection.per_page + 1
-      total_hits = @response.total
+      
+      # actual WillPaginate::Collection's have #total_entries. RSolr::Ext::Response
+      # has #total instead. We want this to work for both, to do what we want
+      # for RSolr, but not break WillPaginate's usual use. 
+      total_hits = collection.respond_to?(:total_entries) ? collection.total_entries : collection.total
+
       start_num = format_num(start)
       end_num = format_num(start + collection.size - 1)
       total_num = format_num(total_hits)

data/app/views/_user_util_links.html.erb

@@ -1,8 +1,8 @@
 <% if current_user %>
   <%= link_to "Log Out", destroy_user_session_path %> [<%= link_to current_user, edit_user_registration_path %>]
-  <% if current_user.last_search_url %>
-    | <%= link_to('View your last search', catalog_index_path(current_user.last_search_url)) %><% end %> | 
-    <%= link_to 'Your Bookmarks', bookmarks_path %> |
+    | 
+    <%= link_to 'Your Bookmarks', bookmarks_path %>
+    |
     <%= link_to "Saved Searches", saved_searches_path %>
 <% else %>
   <%= link_to 'Login', new_user_session_path %>

data/app/views/catalog/_document.html.erb

@@ -0,0 +1,21 @@
+    <% # container for a single doc -%>
+    <div class="document <%= render_document_class document %>">
+      
+      <% # header bar for doc items in index view -%>
+      <div class="documentHeader">
+        
+        <% # bookmark/folder functions for items/docs -%>
+        <%= render_index_doc_actions document %>
+        
+        <% # main title container for doc partial view -%>
+        <div class="yui-u">
+          <h3 class="index_title"><%= document_counter + 1 + @response.params[:start].to_i %>. <%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
+        </div>
+      </div>
+      
+      <% # main container for doc partial view -%>
+      <%= render_document_partial document, :index %>
+
+      <%= render_document_unapi_microformat document %>
+
+    </div>

data/app/views/catalog/_document_list.html.erb

@@ -1,30 +1,4 @@
 <% # container for all documents in index view -%>
 <div id="documents">
-  
-  <% # loop thru each doc -%>
-  <% @document_list.each_with_index do |document,counter| %>
-
-    <% # container for a single doc -%>
-    <div class="document <%= render_document_class document %>">
-      
-      <% # header bar for doc items in index view -%>
-      <div class="documentHeader">
-        
-        <% # bookmark/folder functions for items/docs -%>
-        <%= render_index_doc_actions document %>
-        
-        <% # main title container for doc partial view -%>
-        <div class="yui-u">
-          <h3 class="index_title"><%= counter + 1 + @response.params[:start].to_i %>. <%= link_to_document document, :label=>document_show_link_field, :counter => (counter + 1 + @response.params[:start].to_i) %></h3>
-        </div>
-      </div>
-      
-      <% # main container for doc partial view -%>
-      <%= render_document_partial document, :index %>
-
-      <%= render_document_unapi_microformat document %>
-
-    </div>
-    
-  <% end %>
+  <%= render :partial => 'document', :collection => @document_list, :as => :document %>
 </div>

data/app/views/catalog/index.html.erb

@@ -31,7 +31,5 @@
 
   <%= render 'results_pagination' %>
 
-  <%= render :partial=>'solr_request' %>
-
 <% end %>
 

data/app/views/catalog/show.html.erb

@@ -29,9 +29,6 @@
   </div>
 </div>
 
-<%= render :partial=>'solr_request' %>
-
-
   <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
     <!-- 
          // COinS, for Zotero among others. 

data/blacklight.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
   # Required Gems
   s.add_dependency "rails", "~> 3.0"
   s.add_dependency "nokogiri", "~>1.5.0.beta.3"   # XML Parser
-  s.add_dependency "marc"  # Marc record parser
-  s.add_dependency "rsolr",  '1.0.0' # Library for interacting with rSolr.
-  s.add_dependency "rsolr-ext", '1.0.0' # extension to the above for some rails-ish behaviors - currently imbeded in our solr document ojbect.
-  s.add_dependency "will_paginate", "3.0.pre2" # the pagination (page 1,2,3, etc..) of our search results
+  s.add_dependency "marc", "~> 0.3"  # Marc record parser
+  s.add_dependency "rsolr",  '~> 1.0' # Library for interacting with rSolr.
+  s.add_dependency "rsolr-ext", '~> 1.0' # extension to the above for some rails-ish behaviors - currently embedded in our solr document ojbect.
+  s.add_dependency "will_paginate", "~> 3.0.pre2" # the pagination (page 1,2,3, etc..) of our search results
 
 
   # TESTING GEM REQUIREMENTS

data/features/default_setup.feature

@@ -0,0 +1,51 @@
+Feature:
+  In order to develop and extend the Blacklight GEM - I need to ensure that the changes
+  I make will still allow all tests to pass in a fresh default installation. 
+
+  Scenario: The Blacklight generator installs devise when given the -d option, and the tests pass
+    When I run `rails new test_app`
+    And I cd to "test_app"
+    And a file named "Gemfile" with:
+    """
+    source "http://rubygems.org"
+    gem 'rails', '>=3.0.4'
+    gem 'sqlite3-ruby', :require => 'sqlite3'
+    gem 'blacklight', :path => '../../../'
+
+    # For testing
+    group :development, :test do 
+       gem "rspec"
+       gem "rspec-rails", "~>2.5.0"       
+       gem "cucumber-rails"
+       gem "database_cleaner"  
+       gem "capybara"
+       gem "webrat"
+       gem "aruba"
+    end
+
+    """  
+    And I run `bundle install --local`
+
+    Then the file "app/models/user.rb" should not exist
+    And I run `rails generate blacklight -d`
+
+    # Devise should now be installed.
+    Then a file named "app/models/user.rb" should exist
+    Then a directory named "app/views/devise" should exist
+    Then the file "app/models/user.rb" should contain "devise"
+    
+    # And the user model should be setup with Blacklight
+    And the file "app/models/user.rb" should contain "include Blacklight::User"
+
+    And I run `rake db:migrate`
+    
+    # And I complete the setup for testing
+    And I run `rails g cucumber:install`
+    And I run `rails generate blacklight:jetty test_jetty -e test`
+    Then a directory named "test_jetty" should exist
+    And I run `rake solr:marc:index_test_data RAILS_ENV=test`
+    And I run `rake blacklight:spec:with_solr`
+    Then the output should contain "0 failures"
+    And I remove the file "public/index.html"
+    And I run `rake blacklight:cucumber:with_solr`
+    Then the output should contain "81 passed"

data/features/generators.feature

@@ -4,7 +4,7 @@ Feature:
   I would like to use the blacklight generator.
 
   Scenario: The Blacklight generators create all the correct files and file modifications when executed with defaults
-    When I run "rails new test_app"
+    When I run `rails new test_app`
     And I cd to "test_app"
     And a file named "Gemfile" with:
     """
@@ -13,34 +13,32 @@ Feature:
     gem 'sqlite3-ruby', :require => 'sqlite3'
     gem 'blacklight', :path => '../../../'
     """  
-    And I run "bundle install --local"
+    And I run `bundle install --local`
 
     When I write to "app/models/user.rb" with:
     """
     class User < ActiveRecord::Base
     end
     """
-    And I run "rails generate blacklight"
+    And I run `rails generate blacklight`
     Then the following files should exist:
        | config/initializers/blacklight_config.rb         |
        | config/solr.yml                                  |
        | public/images/blacklight/bg.png                  |
-       | public/javascripts/blacklight.js                 |
-       | public/javascripts/jquery-1.4.2.min.js           |
-       | public/javascripts/jquery-ui-1.8.1.custom.min.js |
-       | public/stylesheets/blacklight.css                |
-       | public/stylesheets/yui.css                       | 
-    And a directory named "public/stylesheets/jquery" should exist
-    And the file "app/models/user.rb" should contain "is_blacklight_user"
+       | public/javascripts/blacklight/blacklight.js      |
+       | public/javascripts/blacklight/jquery-1.4.2.min.js |
+       | public/javascripts/blacklight/jquery-ui-1.8.1.custom.min.js |
+       | public/stylesheets/blacklight/blacklight.css     |
+       | public/stylesheets/blacklight/yui.css            | 
+    And a directory named "public/stylesheets/blacklight/jquery" should exist
+    And the file "app/models/user.rb" should contain "include Blacklight::User"
     
     # Devise should next exist in thie scenerio
     And a directory named "app/views/devise" should not exist
     And the file "app/models/user.rb" should not contain "devise"
 
-
-  @really_slow_process
-  Scenario: The Blacklight generator installs devise when given the -d option
-    When I run "rails new test_app"
+  Scenario: The Blacklight generator functions correctly when specifying an alternate user model
+    When I run `rails new test_app`
     And I cd to "test_app"
     And a file named "Gemfile" with:
     """
@@ -48,30 +46,13 @@ Feature:
     gem 'rails', '>=3.0.4'
     gem 'sqlite3-ruby', :require => 'sqlite3'
     gem 'blacklight', :path => '../../../'
-
-    # For testing
-    gem 'rspec-rails'	
-    gem 'cucumber-rails'
-    gem 'webrat'    # still needed for rspec view tests
-    gem 'capybara'  # used by latest cucumber
-
     """  
-    And I run "bundle install --local"
-
-    Then the file "app/models/user.rb" should not exist
-    And I run "rails generate blacklight -d"    
-
-    # Devise should now be installed.
-    Then a file named "app/models/user.rb" should exist
-    Then a directory named "app/views/devise" should exist
-    Then the file "app/models/user.rb" should contain "devise"
+    And I run `bundle install --local`
+    And I run `rails generate model person`
+    And I run `rails generate blacklight person`
+    And the file "app/models/person.rb" should contain "include Blacklight::User"
     
-    # And the user model should be setup with Blacklight
-    And the file "app/models/user.rb" should contain "is_blacklight_user"
+    # Devise should not exist in thie scenerio
+    And a directory named "app/views/devise" should not exist
+    And the file "app/models/person.rb" should not contain "devise"
 
-    # And I copy over the rspec and feature tests, just in case I want to test them.
-    And I run "cp -r ../../../test_app/spec ."
-    And I run "cp -r ../../../test_app/features ."
-    And I run "cp    ../../../test_app/Rakefile ."
-    And I run "cp -r ../../../test_app/jetty ."
- 

data/features/support/aruba.rb

@@ -1,9 +1,9 @@
 require 'aruba/cucumber'
 
 Before do
-    @aruba_timeout_seconds = 30
+    @aruba_timeout_seconds = 60
 end
 
 Before ('@really_slow_process') do
-    @aruba_timeout_seconds = 30
+    @aruba_timeout_seconds = 120
 end

data/lib/blacklight.rb

@@ -31,13 +31,6 @@ module Blacklight
     attr_accessor :solr, :solr_config
   end
   
-  # Just returning a string for the Blacklight version number.
-  # I've just put master here now, should it say when it's running under master?  (Master?)
-  # We need to find a better way of increasing this number automatically during releases, but this is a good way for now.
-  def self.version
-    "2.8.0"
-  end
-
   # Adding a little jruby support
   def self.jruby?
     defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby" 

data/lib/blacklight/solr_helper.rb

@@ -316,7 +316,7 @@ module Blacklight::SolrHelper
     # override any field-specific default in the solr request handler. 
     solr_params[:"f.#{facet_field}.facet.limit"] = 
       if solr_params["facet.limit"] 
-        solr_params["facet.limit"] + 1
+        solr_params["facet.limit"].to_i + 1
       elsif respond_to?(:facet_list_limit)
         facet_list_limit.to_s.to_i + 1
       else

data/lib/blacklight/user.rb

@@ -14,11 +14,6 @@ module Blacklight::User
   # that calls "is_blacklight_user"
   module InstanceMethods
 
-    # fixme:  This needs to be re-implemented
-    def last_search_url
-      return self.searches.last
-    end
-    
     def has_bookmarks?
       bookmarks.count > 0
     end

data/lib/blacklight/version.rb

@@ -1,3 +1,7 @@
 module Blacklight
-  VERSION = "3.0pre2"
+  def self.version
+    @version ||= File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
+  end
+
+  VERSION = self.version
 end

data/test_support/spec/helpers/catalog_helper_spec.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe CatalogHelper do
+  include CatalogHelper
+
+  def mock_collection args
+    current_page = args[:current_page] || 1
+    per_page = args[:per_page] || 10
+    total = args[:total]
+    arr = (1..total).to_a
+
+    page_results = WillPaginate::Collection.create(current_page, per_page, total) do |pager|
+      pager.replace(arr.slice(pager.offset, pager.per_page))
+    end
+  end
+  
+  describe "page_entries_info" do
+    before(:all) do
+    end
+
+    it "with no results" do
+      @collection = mock_collection :total => 0
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "No entry_names found"
+      html.html_safe?.should == true
+    end
+
+    it "with a single result" do
+      @collection = mock_collection :total => 1
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "Displaying <b>1</b> entry_name"
+      html.html_safe?.should == true
+    end
+
+    it "with a single page of results" do
+      @collection = mock_collection :total => 7
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "Displaying <b>all 7</b> entry_names"
+      html.html_safe?.should == true
+    end
+
+    it "on the first page of multiple pages of results" do
+      @collection = mock_collection :total => 15, :per_page => 10
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "Displaying entry_names <b>1 - 10</b> of <b>15</b>"
+      html.html_safe?.should == true
+    end
+
+    it "on the second page of multiple pages of results" do
+      @collection = mock_collection :total => 47, :per_page => 10, :current_page => 2
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "Displaying entry_names <b>11 - 20</b> of <b>47</b>"
+      html.html_safe?.should == true
+    end
+
+    it "on the last page of results" do
+      @collection = mock_collection :total => 47, :per_page => 10, :current_page => 5
+
+      html = page_entries_info(@collection, { :entry_name => 'entry_name' })
+      html.should == "Displaying entry_names <b>41 - 47</b> of <b>47</b>"
+      html.html_safe?.should == true
+    end
+
+  end
+end

data/test_support/spec/lib/blacklight_user_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Blacklight::User" do
+  class MockUser
+    include Blacklight::User::InstanceMethods
+    attr_accessor :searches
+    attr_accessor :bookmarks
+  end
+
+  class MockBookmark
+    attr_accessor :document_id
+
+    def initialize document_id
+      self.document_id = document_id
+    end
+  end
+
+  before(:each) do
+    @user = MockUser.new
+    @user.searches = []
+    @user.bookmarks = []
+  end
+
+  def mock_bookmark doc_id
+    MockBookmark.new doc_id
+  end
+
+  it "should know if it doesn't have bookmarks" do
+    @user.has_bookmarks?.should == false
+  end
+
+  it "should know if it has bookmarkss" do
+    @user.bookmarks.push(mock_bookmark(1))
+    @user.bookmarks.push(mock_bookmark(2))
+    @user.has_bookmarks?.should == true
+  end
+
+  it "should know if it has a bookmarked document" do
+    @user.bookmarks.push(mock_bookmark(1))
+    @user.should be_document_is_bookmarked(1)
+  end
+
+  it "should return a bookmark it a document is bookmarked" do
+    @user.bookmarks.push(mock_bookmark(1))
+    @user.existing_bookmark_for(1).should be_a_kind_of(MockBookmark)
+  end
+
+  it "should be able to create bookmarks in batches" do
+    @md1 = { :document_id => 1 }
+    @md2 = { :document_id => 2 }
+    @md3 = { :document_id => 3 }
+    @user.bookmarks.should_receive(:create).with(@md1)
+    @user.bookmarks.should_receive(:create).with(@md2)
+    @user.bookmarks.should_receive(:create).with(@md3)
+
+    @user.documents_to_bookmark= [@md1,@md2,@md3]
+  end
+
+  it "should not recreate bookmarks for documents already bookmarked" do
+    @md1 = { :document_id => 1 }
+    @user.bookmarks.should_not_receive(:create).with(@md1)
+
+    @user.bookmarks.push(mock_bookmark(1))
+    @user.documents_to_bookmark=[@md1]
+  end
+
+  it "should know if it doesn't have a search" do
+    @user.has_searches?.should == false
+  end
+
+  it "should know if it has a search" do
+    @user.searches.push(1)
+    @user.has_searches?.should == true
+  end
+
+end    

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight
 version: !ruby/object:Gem::Version 
-  hash: 1923831917
-  prerelease: 3
+  hash: -766259868
+  prerelease: true
   segments: 
   - 3
   - 0
-  - pre
-  - 2
-  version: 3.0pre2
+  - 0pre3
+  version: 3.0.0pre3
 platform: ruby
 authors: 
 - jrochkind
@@ -22,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:00
+date: 2011-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,12 +77,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        version: "0"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -92,14 +92,13 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -108,14 +107,13 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -124,14 +122,13 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1923831917
+        hash: 270495401
         segments: 
         - 3
         - 0
-        - pre
-        - 2
+        - pre2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id007
@@ -150,8 +147,9 @@ files:
 - .yardopts
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
+- VERSION
 - app/controllers/bookmarks_controller.rb
 - app/controllers/feedback_controller.rb
 - app/controllers/folder_controller.rb
@@ -177,6 +175,7 @@ files:
 - app/views/catalog/_constraints.html.erb
 - app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_did_you_mean.html.erb
+- app/views/catalog/_document.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facet_limit.html.erb
@@ -196,7 +195,6 @@ files:
 - app/views/catalog/_show_sidebar.html.erb
 - app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_sms_form.html.erb
-- app/views/catalog/_solr_request.html.erb
 - app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_unapi_microformat.html.erb
 - app/views/catalog/citation.html.erb
@@ -228,6 +226,7 @@ files:
 - config.ru
 - config/routes.rb
 - db/seeds.rb
+- features/default_setup.feature
 - features/generators.feature
 - features/support/aruba.rb
 - install.rb
@@ -352,6 +351,7 @@ files:
 - test_support/spec/data/sample_docs.yml
 - test_support/spec/data/test_data.utf8.mrc
 - test_support/spec/helpers/blacklight_helper_spec.rb
+- test_support/spec/helpers/catalog_helper_spec.rb
 - test_support/spec/helpers/hash_as_hidden_fields_spec.rb
 - test_support/spec/helpers/render_constraints_helper_spec.rb
 - test_support/spec/helpers/search_history_helper_spec.rb
@@ -362,6 +362,7 @@ files:
 - test_support/spec/lib/blacklight_solr_document_marc_spec.rb
 - test_support/spec/lib/blacklight_solr_document_spec.rb
 - test_support/spec/lib/blacklight_spec.rb
+- test_support/spec/lib/blacklight_user_spec.rb
 - test_support/spec/lib/configurable_spec.rb
 - test_support/spec/lib/facet_paginator_spec.rb
 - test_support/spec/lib/marc_export_spec.rb
@@ -419,10 +420,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities
 test_files: 
+- features/default_setup.feature
 - features/generators.feature
 - features/support/aruba.rb

data/README.rdoc

@@ -1,175 +0,0 @@
-Please note: The main Blacklight website is http://projectblacklight.org
-
-=Installing Blacklight
-
-== Some background information
-
-Blacklight is open source discovery software. Libraries (or anyone else) can use Blacklight to enable searching and browsing of their collections online. Blacklight uses the Apache SOLR ( http://lucene.apache.org/solr ) search engine to index and search full text and/or metadata, and Blacklight has a highly configurable Ruby on Rails front-end. Blacklight was originally developed at the University of Virginia Library and is made public under an Apache 2.0 license. 
-
-== Install & Use (With Devise)
-
-Create a new rails 3 application
-
-  $ rails new my_app
-
-Add blacklight to your gem file 
-
-  /my_app/Gemfile
-  ...
-  gem 'blackight'
-
-Install blacklight
-
-  $ rails generate blacklight --devise
-
-Run your database migrations
-
-  $ rake db:migrate
-  
-You will need a Solr setup, referred to in your config/solr.yml. You can install
-an example jetty container with Solr, that has Solr configured to work with
-Blacklight's defaults, like:
-  $ rails generate blacklight:jetty
-
-You can also install your own Solr or use an existing install. But Blacklight
-configuration needs to match your Solr setup, and there are certain things
-in a Solr setup that Blacklight requires. To generate some Solr config files
-that match what default Blacklight expects:
-  $ rails generate blacklight:solr_conf path/to/output/directory/
-  
-Start up your application
-
-  $ rails server
-
-Visit the catalog at:  http://localhost/catalog
-
-
-== Install and Use (with a custom user authentication system)
-
-Blacklight 3 requires Rails 3.0 or greater.
-
-Add the blacklight gem to your ./Gemfile
-
-  gem 'blacklight'
-
-  $ bundle install
-
-If you have a user model already, the Blacklight generator will connect to it automatically during installation.  However, you will need to make sure the following named routes are included in your /config/routes.rb file:
-
-   match 'new_user_session',          :to => 'Your User Session Controller # Log in action'
-   match 'destroy_user_session',      :to => 'Your User Session Controller # Log Out action'
-
-One blacklight view uses #to_s on your user model to get a user-displayable
-account name/identifier for the currently logged in account, you probably
-want to have such a method. 
-
-(TODO: Instructions on how to tell BL the name of your user model if it's
-not User?)
-
-And you will need to make sure the following methods are available both
-on controllers and as helpers:
-
-  current_user   - Which should return a user object that include Blacklight::User
-  user_session   - Which should return a user session
-
-Once these are in place, you can run the Blacklight Installation Generator:
-
-  rails generate blacklight
-
-Execute your migrations, and you should be good to go.
-
-  rake db:migrate
-
-Start up your application
-
-  $ rails server
-
-Visit the catalog at:  http://localhost/catalog
-
-== Using Blacklight source checkout as gem for development
-
-The ordinary install instructions install the BL gem (which is not
-full source code) in wherever your system installs gems. 
-
-Sometimes, especially for development, it's useful to check out
-a complete copy of the blacklight source code, and link your app
-to that as a 'gem' instead. 
-
-Checkout the code:
-
-  $ git clone git@github.com:projectblacklight/blacklight.git  
-
-(While the rails3 branch is still a seperate branch called 'rails3', 
-if you'd like to checkout the rails3 branch, or any other particular
-branch/tag using ordinary git commands:
-  $ cd blacklight
-  $ git checkout -t origin/rails3
-)
-  
-Now, in your local app's Gemfile, simply specify that it should find
-the Blacklight gem at this source checkout location:
-
-   gem 'blacklight', :path=>"./relative/path/to/blacklight_checkout"
-   
-You can have the blacklight source checkout anywhere you want, referred
-to by absolute or relative path. You can have it inside your local app's
-directory if you want, or you can have it outside using a relative path
-beginning with "../".  If you have it inside your app's root, you can
-even use 'git submodule' techniques to link your app to a particular
-git commit, like some of us did in Rails2 Blacklight. (But you probably
-don't want it in your local apps ./vendor/plugins, that'll likely
-confuse Rails, since it's already being referred to in your Gemfile). 
-
-== Running Blacklight's own tests
-
-Any application that refers to a Blacklight gem using a source checkout
-(see above) can run the automated tests (cucumber and rspec) that
-come with Blacklight source. 
-
-Of course, if you've customized the app quite a bit, the tests may not
-pass, as they test expected default behavior in some cases. So ordinarily
-tests are run against a pretty basic stub app. The tests also
-test authentication features, so expect the app to have auth features
-installed, for instance with a Devise install.
-
-To run the tests:
-
-* Create a stub app with BL with devise, following the ordinary instructions for
-  installing blacklight, but linking to a source checkout of Blacklight
-  following the instructions above in "Using Blacklight source checkout
-  as gem for development"
-* You also need to include some gems in your test app's Gemfile needed for
-  running our tests:
-       group :development, :test do 
-          gem "rspec"
-          gem "rspec-rails", "~>2.5.0"       
-          gem "cucumber-rails"
-          gem "database_cleaner"  
-          gem "capybara"
-          gem "webrat"
-          gem "aruba"
-       end
-* run `bundle install` in the test app, and don't forget `rake db:migrate`
-* complete the install of cucumber:  'rails g cucumber:install'
-* remove /public/index.html (blacklight tests expect / to map to catalog)
-* You need to install a jetty/solr with test data for testing. You can do that
-  like this (from your stub app home directory):
-      rails generate blacklight:jetty test_jetty -e test
-      rake solr:marc:index_test_data RAILS_ENV=test
-* Now use some rake tasks that come with Blacklight to actually run the tests. 
-  Run these from your stub app:
-  * rake blacklight:cucumber:with_solr -- run tests in BL, start and stop the test jetty/solr around tests
-  * rake blacklight:cucumber -- run tests in BL, no jetty/solr. (Tests will fail unless you start it yourself)
-  * rake blacklight:spec:with_solr
-  * rake blacklight:spec
-  * the standard rails tasks for cucumber/rspec are all included with 
-    blacklight: prefix, and should work as expected, but using
-    specs/features defined in BL plugin instead of in your local
-    app. (Not every variant has a :with_solr yet). 
-
-
-==Pre-requisites
-Whichever method you choose for installation, be sure you have all the pre-requisites in place. You can find these detailed in {PRE-REQUISITES}[https://github.com/projectblacklight/blacklight/wiki/PRE-REQUISITES]
-
-==Running solr
-You'll also want some information about how Blacklight expects Apache SOLR ( http://lucene.apache.org/solr ) to run, which you can find in {README_SOLR}[https://github.com/projectblacklight/blacklight/wiki/README_SOLR]

data/app/views/catalog/_solr_request.html.erb

@@ -1,5 +0,0 @@
-<% unless ::Rails.env=='production' %>
-  <% @footer = capture do %>
-    <div class="solrQuery"><%= URI.decode(@response.header.inspect) %></div>
-  <% end %>
-<% end %>