blacklight 3.8.2 → 4.0.0.pre6

data/lib/generators/blacklight/jetty_generator.rb

@@ -64,41 +64,7 @@ Requires system('unzip... ') to work, probably won't work on Windows.
         remove_dir(tmp_save_dir)
       end                  
     end
-    
-    # the only thing that's REALLY BL-specific is these conf files
-    # installed by another generator. We write em on top of the solr we
-    # just installed. We "force" it because we're usually writing on top of files
-    # we just installed anyway. The user should have said 'no' to overwriting
-    # their dir if they already had one!  
-    #
-    # If we later install Solr from somewhere other than BL jetty repo, we'd
-    # still want to write these on top, just like this. 
-    def install_conf_files
-      generate("blacklight:solr_conf", "#{File.join(save_location, 'solr', 'conf')} --force")
-    end
-    
-    # adds a jetty_path key to solr.yml for the current environment, so
-    # rake tasks for automatically starting jetty/solr (as well as
-    # for indexing with solrmarc) can find it. 
-    def add_jetty_path_to_solr_yml        
-      # inject_into_file no-ops silently if the :after isn't found, we
-      # want to be noisy. 
-      config_file = "config/solr.yml"
-      config_file_full_path = File.expand_path(config_file, destination_root)
-      after_hook = /#{Regexp.escape(options[:environment])}\:[^\n]*\n/
-            
-      if !(File.exists?(config_file_full_path) && File.binread( config_file_full_path ) =~ after_hook)
-        say_status("skipped", "Could not find '#{options[:environment]}' block in #{config_file} to add jetty_path to.", :red)
-      elsif File.binread( config_file_full_path  ) =~ /#{Regexp.escape(options[:environment])}\:[^\n]*\n.*(?!\n\n).*jetty_path\:/
-        say_status("skipped", "#{config_file} '#{options[:environment]}' block already has jetty_path, not overwriting.", :red)        
-      else
-        inject_into_file config_file, :verbose => false, :after => after_hook do
-          "  jetty_path: '#{save_location}'\n"
-        end
-        say_status("insert", "#{config_file}: jetty_path key for '#{options[:environment]}' block")
-      end                    
-    end
-    
+   
     
   end
 end

data/lib/generators/blacklight/templates/blacklight.css.scss

@@ -0,0 +1,4 @@
+@import 'bootstrap';
+@import 'bootstrap-responsive';
+
+@import 'blacklight/blacklight';

data/lib/generators/blacklight/templates/config/SolrMarc/config-test.properties

@@ -11,9 +11,9 @@
 # Solr that you want to use, or to a directory of jar files extracted from a
 # Solr war files.  If this is not provided, SolrMarc can only work by
 # communicating with a running Solr server.
-solrmarc.solr.war.path=../jetty/webapps/solr.war
+#solrmarc.solr.war.path=../jetty/webapps/solr.war
 # Path to your solr instance
-solr.path = ../jetty/solr
+#solr.path = ../jetty/solr
 
 # Relative paths for solr.indexer can be relative to the location of
 # this config.properties file. 

data/lib/generators/blacklight/templates/config/jetty.yml

@@ -0,0 +1,6 @@
+default:
+  jetty_port: 8983
+test:
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
+  jetty_home: <%= ENV['TEST_JETTY_PATH'] || File.join(Rails.root, 'test_jetty') %>
+  startup_wait: 15

data/lib/generators/blacklight/test_support_generator.rb

@@ -0,0 +1,35 @@
+# -*- encoding : utf-8 -*-
+# Copy Blacklight test support material in place
+
+
+# Need the requires here so we can call the generator from environment.rb
+# as suggested above. 
+require 'rails/generators'
+require 'rails/generators/base'
+module Blacklight
+  class TestSupport < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+  desc """ 
+Installs a jetty container with a solr installed in it. A solr setup known 
+good with default blacklight setup, including solr conf files for out
+of the box blacklight. 
+
+Also adds jetty_path key to solr.yml for selected environment, to refer
+to this install. 
+
+Requires system('unzip... ') to work, probably won't work on Windows.
+
+"""
+    def alternate_controller
+      copy_file "alternate_controller.rb", "app/controllers/alternate_controller.rb"
+
+      route("resources :alternate do
+                member do
+                  get :facet
+                end
+              end")
+
+
+    end
+  end
+end

data/lib/railties/all_tests.rake

@@ -9,21 +9,12 @@ namespace :blacklight do
 
     desc "Run Blacklight cucumber and rspec, with test solr"
     task :hudson do
-      solr_config = Blacklight.solr_yml["test"]
-      if solr_config
-        jetty_path = solr_config["jetty_path"] 
-        uri = URI(solr_config["url"])
-        jetty_port = uri.port if ['127.0.0.1', 'localhost'].include? uri.host
-      end   
-      raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path 
+      Rails.env = 'test' unless ENV['RAILS_ENV']
 
-      error = Jettywrapper.wrap(
-        :jetty_port => jetty_port,
-        :jetty_home => File.expand_path(jetty_path, Rails.root), 
-        :sleep_after_start => 2) do          
+      error = Jettywrapper.wrap(Jettywrapper.load_config) do
           Rake::Task["blacklight:spec"].invoke 
           Rake::Task["blacklight:cucumber"].invoke 
-      end             
+      end
 
       raise "test failures: #{error}" if error
     end
@@ -31,19 +22,10 @@ namespace :blacklight do
     namespace :all_tests do
       task :rcov do
       desc "Run Blacklight rspec and cucumber tests with rcov"
-      solr_config = Blacklight.solr_yml["test"]
-      if solr_config
-        jetty_path = solr_config["jetty_path"] 
-        uri = URI(solr_config["url"])
-        jetty_port = uri.port if ['127.0.0.1', 'localhost'].include? uri.host
-      end   
-      raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path 
 
       rm "blacklight-coverage.data" if File.exist?("blacklight-coverage.data")
-      error = Jettywrapper.wrap(
-        :jetty_port => jetty_port,
-        :jetty_home => File.expand_path(jetty_path, Rails.root), 
-        :sleep_after_start => 2) do          
+      Rails.env = 'test' unless ENV['RAILS_ENV']
+      error = Jettywrapper.wrap(Jettywrapper.load_config) do          
           Rake::Task["blacklight:spec:rcov"].invoke 
           Rake::Task["blacklight:cucumber:rcov"].invoke 
       end             

data/lib/railties/blacklight_cucumber.rake

@@ -90,18 +90,9 @@ begin
       desc "blacklight:cucumber with jetty/solr launch"
       task :with_solr do      
         require 'jettywrapper'
-        solr_config = Blacklight.solr_yml["test"]
-        if solr_config
-          jetty_path = solr_config["jetty_path"] 
-          uri = URI(solr_config["url"])
-          jetty_port = uri.port if ['127.0.0.1', 'localhost'].include? uri.host
-        end   
-        raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path 
 
-        error = Jettywrapper.wrap(
-          :jetty_port => jetty_port,
-          :jetty_home => File.expand_path(jetty_path, Rails.root), 
-          :sleep_after_start => 2) do        
+        Rails.env = 'test' unless ENV['RAILS_ENV']
+        error = Jettywrapper.wrap(Jettywrapper.load_config) do        
             Rake::Task["blacklight:cucumber"].invoke 
         end     
 

data/lib/railties/blacklight_rspec.rake

@@ -86,18 +86,8 @@ begin
         # Need to look  up where the test jetty is located
         # from solr.yml, we don't hardcode it anymore. 
 
-        solr_config = Blacklight.solr_yml["test"]
-        if solr_config
-          jetty_path = solr_config["jetty_path"] 
-          uri = URI(solr_config["url"])
-          jetty_port = uri.port if ['127.0.0.1', 'localhost'].include? uri.host
-        end   
-        raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path 
-
-        error = Jettywrapper.wrap(
-          :jetty_port => jetty_port,
-          :jetty_home => File.expand_path(jetty_path, Rails.root), 
-          :sleep_after_start => 2) do              
+        Rails.env = 'test' unless ENV['RAILS_ENV']
+        error = Jettywrapper.wrap(Jettywrapper.load_config) do              
             Rake::Task["blacklight:spec"].invoke 
         end             
         raise "test failures: #{error}" if error

data/test_support/bin/run-tests.sh

@@ -51,6 +51,6 @@ check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these t
 fi
 
 cd tmp/test_app
-bundle exec rake blacklight:hudson
+bundle exec rake blacklight:hudson RAILS_ENV=test
 check_errs $? "Tests failed." 
 benchmark

data/test_support/bin/setup-test-app.sh

@@ -0,0 +1,123 @@
+#!/bin/bash
+# test.sh
+# Create a default rails appliaction, install blacklight, and run all the tests.
+
+#If null or empty, use default value
+RAILS_VERSION=${RAILS_VERSION:-"~> 3.2"}
+JETTY_URL=${JETTY_URL:-"https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0"}
+
+before="$(date +%s)"
+benchmark() 
+{
+    after="$(date +%s)"
+    elapsed_seconds="$(expr $after - $before)"
+    echo "Total Time: ${elapsed_seconds} sec"
+    # as a bonus, make our script exit with the right error code.
+}
+
+check_errs()
+{
+  # Function. Parameter 1 is the return code
+  # Para. 2 is text to display on failure.
+  if [ "${1}" -ne "0" ]; then
+    echo "ERROR # ${1} : ${2}"
+     benchmark
+     exit 1
+  fi
+}
+
+# Make sure we are in the blacklight directory
+if [ ! -f "blacklight.gemspec" ]
+then
+  echo "You must execute test.sh from the root of your blacklight checkout."
+  exit 1
+fi
+
+# Clear out the tmp/ directory.
+rm -rf tmp/test_app
+mkdir -p tmp/test_app
+cd tmp
+
+
+if [[  $# -gt 0 ]]
+then
+# Make certain rvm will work correctly.
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+  # First try to load from a user install
+  source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+  # Then try to load from a root install
+  source "/usr/local/rvm/scripts/rvm"
+else
+  echo "WARNING: An RVM installation was not found.\n"
+  exit 1
+fi
+
+rvm use "$@" --create
+check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests." 
+fi
+
+if ! gem query -n rails -v "$RAILS_VERSION" --installed > /dev/null; then
+  gem install --no-rdoc --no-ri 'rails' -v "$RAILS_VERSION"
+fi
+
+if ! gem query -n bundler -v ">=1.0" --installed > /dev/null; then
+  gem install --no-rdoc --no-ri 'bundler'
+fi
+
+rails "_${RAILS_VERSION}_" new test_app
+
+cd test_app
+rm public/index.html
+
+echo "
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
+platforms :ruby do
+ gem 'sqlite3'
+ gem 'execjs'
+ gem 'therubyracer'
+end
+
+gem 'blacklight', :path => '../../'
+gem 'jquery-rails'
+
+group :assets do
+  gem 'compass-rails', '~> 1.0.0'
+  gem 'compass-susy-plugin', '~> 0.9.0'
+end
+
+
+# For testing
+group :development, :test do 
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'generator_spec'
+  gem 'cucumber-rails'
+  gem 'database_cleaner'
+  gem 'capybara'
+gem 'rcov', :platform => :mri_18
+gem 'simplecov', :platform => :mri_19
+gem 'simplecov-rcov', :platform => :mri_19
+end
+
+gem 'jettywrapper', '>= 1.2.0'
+" >> Gemfile
+
+bundle install
+check_errs $? "Bundle install failed." 
+
+rails generate blacklight -d
+check_errs $?  "Blacklight generator failed" 
+
+bundle exec rake db:migrate
+check_errs $? "Rake Migration failed" 
+
+benchmark

data/test_support/bin/test.sh

@@ -4,10 +4,10 @@
 
 #If null or empty, use default value
 RAILS_VERSION=${RAILS_VERSION:-"~> 3.2"}
-JETTY_URL=${JETTY_URL:-"https://github.com/projectblacklight/blacklight-jetty/zipball/v3.5.0"}
+JETTY_URL=${JETTY_URL:-"https://github.com/projectblacklight/blacklight-jetty/zipball/v4.0.0"}
 
 before="$(date +%s)"
-benchmark() 
+benchmark()
 {
     after="$(date +%s)"
     elapsed_seconds="$(expr $after - $before)"
@@ -55,7 +55,7 @@ else
 fi
 
 rvm use "$@" --create
-check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests." 
+check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests."
 fi
 
 if ! gem query -n rails -v "$RAILS_VERSION" --installed > /dev/null; then
@@ -66,7 +66,7 @@ if ! gem query -n bundler -v ">=1.0" --installed > /dev/null; then
   gem install --no-rdoc --no-ri 'bundler'
 fi
 
-rails "_${RAILS_VERSION}_" new test_app
+rails new test_app
 
 cd test_app
 rm public/index.html
@@ -96,13 +96,17 @@ end
 
 
 # For testing
-group :development, :test do 
+group :development, :test do
   gem 'rspec'
   gem 'rspec-rails'
   gem 'generator_spec'
   gem 'cucumber-rails'
   gem 'database_cleaner'
-  gem 'capybara'
+  if defined? :JRUBY_VERSION
+    gem 'capybara', '~> 1.0'
+  else
+    gem 'capybara'
+  end
 gem 'rcov', :platform => :mri_18
 gem 'simplecov', :platform => :mri_19
 gem 'simplecov-rcov', :platform => :mri_19
@@ -114,24 +118,17 @@ gem 'jettywrapper', '>= 1.2.0'
 export BUNDLE_GEMFILE=`pwd`/Gemfile
 
 bundle install
-check_errs $? "Bundle install failed." 
+check_errs $? "Bundle install failed."
 
 rails generate blacklight -d
-check_errs $?  "Blacklight generator failed" 
+check_errs $?  "Blacklight generator failed"
 
-bundle exec rake db:migrate
-check_errs $? "Rake Migration failed" 
+bundle exec rake db:migrate RAILS_ENV=test
+check_errs $? "Rake Migration failed"
 
-rails g cucumber:install &> /dev/null 
+rails g cucumber:install &> /dev/null
 
-cp ../../test_support/alternate_controller.rb app/controllers/
-# add routing for the alternate_controller:
-# resources :alternate do
-#   member do
-#     get :facet
-#   end
-# end
-ruby -pi.bak -e 'gsub(/devise_for :users/, "devise_for :users\n  resources :alternate do\n    member do\n      get :facet\n    end\n  end")' config/routes.rb
+rails g blacklight:test_support
 
 jetty_zip=$( JETTY_URL=$JETTY_URL ruby -e 'puts "/tmp/blacklight_jetty_#{ENV["JETTY_URL"].split("/").last}"')
 if [ ! -f $jetty_zip ]
@@ -143,9 +140,12 @@ fi
 rails g blacklight:jetty test_jetty -e test -d $jetty_zip
 check_errs $? "Jetty setup failed."
 
+rake jetty:start RAILS_ENV=test
 bundle exec rake solr:marc:index_test_data RAILS_ENV=test
+rake jetty:stop RAILS_ENV=test
+sleep 2
 
-bundle exec rake blacklight:hudson
-check_errs $? "Tests failed." 
+bundle exec rake blacklight:hudson RAILS_ENV=test
+check_errs $? "Tests failed."
 
 benchmark

data/test_support/features/bookmarks.feature

@@ -7,8 +7,8 @@ Feature: Bookmarks
   Scenario: Bookmarks Menu Link
     Given I am logged in as "user1"
     When I am on the home page
-    Then I should see "Your Bookmarks"
-    When I follow "Your Bookmarks"
+    Then I should see "Bookmarks"
+    When I follow "Bookmarks"
     Then I should be on the bookmarks page
     And I should see a stylesheet
   
@@ -59,4 +59,10 @@ Feature: Bookmarks
       And I am logged in as "user1"
       When I go to the bookmarks page
       Then I should see a "Remove bookmark" button
-      
+
+    Scenario: Citing items in bookmarks
+      Given I am on the document page for id 2007020969
+      And I press "Bookmark"
+      When I go to the bookmarks page
+      And I follow "Cite"
+      Then I should see "Strong Medicine speaks"