blacklight 3.0.0pre6 → 3.0.0pre7

data/lib/blacklight/user.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Blacklight::User
 
   # This gives us an is_blacklight_user method that can be included in

data/lib/blacklight/version.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Blacklight
   unless Blacklight.const_defined? :VERSION
     def self.version

data/lib/colorize.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # == colorize
 #     http://colorize.rubyforge.org
 #     http://fazibear.prv.pl

data/lib/generators/blacklight/assets_generator.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Copy Blacklight assets to public folder in current app. 
 # If you want to do this on application startup, you can
 # add this next line to your one of your environment files --

data/lib/generators/blacklight/blacklight_generator.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'rails/generators'
 require 'rails/generators/migration'     
 
@@ -25,6 +26,7 @@ This generator makes the following changes to your application:
 12. Adds Blacklight routes to your ./config/routes.rb
 Thank you for Installing Blacklight.
        """ 
+
   # Implement the required interface for Rails::Generators::Migration.
   # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
   def self.next_migration_number(path)
@@ -36,6 +38,14 @@ Thank you for Installing Blacklight.
     @prev_migration_nr.to_s
   end
 
+  def check_arguments
+    if File.exists?("app/models/#{model_name}.rb") and options[:devise]
+      puts "Because you have selected \"#{model_name}\", which is an existing class, you will need to install devise manually and then run this generator without the Devise option.  You can find additional information here: https://github.com/plataformatec/devise.  \n Please be sure to include a to_s method in #{model_name} that returns the users name or email, as this will be used by Blacklight to provide a link to user specific information."
+      exit
+    end
+  end
+
+
   # Content types used by Marc Document extension, possibly among others.
   # Registering a unique content type with 'register' (rather than
   # register_alias) will allow content-negotiation for the format. 

data/lib/generators/blacklight/jetty_generator.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+require 'openssl'
 
 module Blacklight
   class Jetty < Rails::Generators::Base
@@ -8,6 +10,7 @@ module Blacklight
     class_option :environment, :aliases => "-e", :type=>"string", :desc => "environment to use jetty with. Will insert into solr.yml, and also offer to index test data in test environment.", :default => Rails.env
     # change this to a different download if you want to peg to a different
     # tagged version of our known-good jetty/solr.
+    OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # (Required by jruby)
     class_option :download_url, :aliases => "-u", :type=>"string", :default =>"https://github.com/projectblacklight/blacklight-jetty/zipball/v1.4.1-1" , :desc=>"location of zip file including a jetty with solr setup for blacklight."
     class_option :downloaded_package, :aliases => "-d", :type=>"string", :desc => "manual download of BL-jetty zip file"
      

data/lib/generators/blacklight/solr_conf_generator.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module Blacklight
   class SolrConf < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require 'blacklight/catalog'
 
 class CatalogController < ApplicationController  

data/lib/generators/blacklight/templates/config/blacklight_config.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # You can configure Blacklight from here. 
 #   
 #   Blacklight.configure(:environment) do |config| end

data/lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb

@@ -1,7 +1,14 @@
+# -*- encoding : utf-8 -*-
 class AddUserTypesToBookmarksSearches < ActiveRecord::Migration
   def self.up
     add_column :searches, :user_type, :string
     add_column :bookmarks, :user_type, :string
+    execute <<-SQL
+       UPDATE searches set user_type="<%=model_name%>"
+    SQL
+    execute <<-SQL
+       UPDATE bookmarks set user_type="<%=model_name%>"
+    SQL
   end
 
   def self.down

data/lib/generators/blacklight/templates/migrations/create_bookmarks.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class CreateBookmarks < ActiveRecord::Migration
   def self.up
     create_table :bookmarks do |t|
@@ -14,4 +15,4 @@ class CreateBookmarks < ActiveRecord::Migration
     drop_table :bookmarks
   end
   
-end
+end

data/lib/generators/blacklight/templates/migrations/create_searches.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class CreateSearches < ActiveRecord::Migration
   def self.up
     create_table :searches do |t|

data/lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class RemoveEditableFieldsFromBookmarks < ActiveRecord::Migration
   def self.up
     remove_column :bookmarks, :notes

data/lib/generators/blacklight/templates/public/javascripts/blacklight/blacklight.js

@@ -259,6 +259,7 @@ $(document).ready(function() {
                             
             $.ajax({
                 url: form.attr("action"),
+                dataType: 'json',
                 type: form.attr("method").toUpperCase(),
                 data: form.serialize(),
                 error: function() {

data/lib/generators/blacklight/templates/public/stylesheets/blacklight/blacklight.css

@@ -165,7 +165,7 @@ ul.facet_extended_list li {list-style:none; margin: 0.5em 0;}
 #results_text {display: none;}
 
 
-.page_links a, .page_links span {
+span.page a, span.page.current {
   margin-right:0.2em;
   padding:0.2em 0.5em;
   text-decoration: none;

data/lib/generators/blacklight/templates/solr_document.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 class SolrDocument 
 
   include Blacklight::Solr::Document

data/lib/railties/blacklight_cucumber.rake

@@ -25,7 +25,7 @@ begin
       Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
         # Blacklight customization, call features from external location, pass
         # in feature location wtih cucumber_opts, yeah it's weird but that's how.
-        t.cucumber_opts = blacklight_features
+        t.cucumber_opts = blacklight_features + " --format progress"
         
         t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
         t.fork = true # You may get faster startup if you set this to false
@@ -53,6 +53,7 @@ begin
         t.profile = 'rerun'
       end
 
+      if (RUBY_VERSION.to_f < 1.9)  then      
       Cucumber::Rake::Task.new({:rcov => 'db:test:prepare'}, 'Run features with rcov') do |t|
         # Blacklight customization, call features from external location, pass
         # in feature location wtih cucumber_opts, yeah it's weird but that's how.
@@ -65,7 +66,7 @@ begin
         t.rcov_opts = %w{--rails --exclude osx\/objc,gems\/,spec\/,features\/ --aggregate blacklight-coverage.data}
         t.rcov_opts << %[-o "blacklight-coverage"]
       end
-  
+      end	
   
       desc 'Run all features'
       task :all => [:ok, :wip]

data/lib/railties/jetty_solr_server.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at

data/test_support/bin/test.sh

@@ -0,0 +1,121 @@
+#!/bin/bash
+# test.sh
+# Create a default rails appliaction, install blacklight, and run all the tests.
+
+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}"
+
+    # Attempt to shut down jetty, if set.
+    if [ $jetty_pid ] 
+    then
+	kill $jetty_pid
+    fi
+     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
+
+# Make certain rvn 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
+  printf "ERROR: 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." 
+gem install --no-rdoc --no-ri 'rails'
+gem install --no-rdoc --no-ri 'bundler'
+gem install --no-rdoc --no-ri 'devise'
+rails new test_app
+cd test_app
+echo "
+source 'http://rubygems.org'
+
+gem 'rails', '>=3.0.4'
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+end
+platforms :ruby do
+ gem 'sqlite3-ruby', :require => 'sqlite3'
+end
+gem 'blacklight', :path => '../../'
+
+# For testing
+group :development, :test do 
+       gem 'rspec'
+       gem 'rspec-rails', '~>2.5.0'       
+       gem 'generator_spec'
+       gem 'cucumber-rails'
+       gem 'database_cleaner'  
+       gem 'capybara'
+       gem 'webrat'
+       gem 'aruba'
+end
+" > Gemfile
+
+bundle install --local &> /dev/null 
+# If a local install fails, try a full install.
+if [ "$?" -ne "0" ]
+then
+  bundle install
+fi
+check_errs $? "Bundle install failed." 
+rails generate blacklight -d
+check_errs $?  "Blacklight generator failed" 
+rake db:migrate
+check_errs $? "Rake Migration failed" 
+rails g cucumber:install &> /dev/null 
+jetty_zip="/tmp/bl_jetty.zip"
+if [ ! -f $jetty_zip ]
+then
+  curl -L https://github.com/projectblacklight/blacklight-jetty/zipball/v1.4.1-1 > $jetty_zip
+  check_errs $? "Jetty file does not exist, and cannot be downloaded."
+fi
+rails g blacklight:jetty test_jetty -e test -d $jetty_zip
+  check_errs $? "Jetty setup failed."
+rm public/index.html
+rake solr:marc:index_test_data RAILS_ENV=test
+cd test_jetty
+java -Djetty.port=8888 -Dsolr.solr.home=./solr -jar start.jar &> /dev/null &
+jetty_pid=$!
+cd ..
+bundle exec rake blacklight:spec
+check_errs $? "Rpec Tests failed." 
+bundle exec rake blacklight:cucumber
+check_errs $? "Cucumber Tests failed." 
+benchmark

data/test_support/features/search_results.feature

@@ -11,7 +11,7 @@ Feature: Search Results
       Then I should get at least 30 results
       And I should get exactly 30 results
       And I should get at most 30 results
-      And I should get id "00282214" in the results
+      And I should get id "2007020969" in the results
       And I should have more results than a search for "korea"
 
     Scenario: "inmul" query

data/test_support/features/step_definitions/bookmarks_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Given /^"([^\"]*)" has bookmarked an item with title "([^\"]*)"$/ do |user, title|
   user = User.find_by_email("#{user}@#{user}.com")
   user.bookmarks <<  Bookmark.create(:title => title, :document_id => "123456")

data/test_support/features/step_definitions/error_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # checkout http://blog.codefront.net/2007/03/31/testing-rescue_action_in_public-with-rspec/
 Then /^I should see a flash error "([^\"]*)"$/ do |message|
   pageshould have_selector("div.notice", :content => message)

data/test_support/features/step_definitions/folder_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Then /^I should see an add to folder form$/ do
   page.should have_selector("form.addFolder")
 end

data/test_support/features/step_definitions/general_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 When /^I follow "([^\"]*)" in "([^\"]*)"$/ do |link, scope|
   within(scope) do
     click_link(link)

data/test_support/features/step_definitions/record_view_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Then /^I (should|should not) see an? "([^\"]*)" element containing "([^\"]*)"$/ do |bool,elem,content|
   if bool == "should"
     page.should have_xpath("//#{elem}[text()='#{content}']")

data/test_support/features/step_definitions/saved_searches_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Given /^I am logged in as "([^\"]*)"$/ do |login|
   email = "#{login}@#{login}.com"
   user = User.create(:login => login, :email => email, :password => "password", :password_confirmation => "password")

data/test_support/features/step_definitions/search_facets_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # deprecated
 Then /^I should see the applied filter "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
   page.should have_selector(".facet_limit") do |node|

data/test_support/features/step_definitions/search_history_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 Given /^no previous searches$/ do
   # nothing to do
 end

data/test_support/features/step_definitions/search_result_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #include Blacklight::SolrHelper
 
 When /^I fill in the search box with "(.*?)"$/ do |query|

data/test_support/features/step_definitions/search_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # User added
 Then /^I should see a search field$/ do
   page.should have_selector("input#q")

data/test_support/features/step_definitions/user_steps.rb

@@ -1,4 +1,5 @@
+# -*- encoding : utf-8 -*-
 Given /^user with login "([^\"]*)" and email "([^\"]*)" and password "([^\"]*)"$/ do |login, email, password|
   user = User.create(:login => login, :email => email, :password => password, :password_confirmation => password)
   User.find(user.id).should_not be_nil
-end
+end

data/test_support/features/step_definitions/web_steps.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # TL;DR: YOU SHOULD DELETE THIS FILE
 #
 # This file iwas generated by Cucumber-Rails and is only here to get you a head start

data/test_support/features/support/env.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # TL;DR: YOU SHOULD DELETE THIS FILE
 #
 # This file iwas generated by Cucumber-Rails and is only here to get you a head start
@@ -47,3 +48,7 @@ ActionController::Base.allow_rescue = false
 # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
 DatabaseCleaner.strategy = :transaction
 
+# Stop endless errors like
+# ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16: 
+# warning: regexp match /.../n against to UTF-8 string
+$VERBOSE = nil

data/test_support/features/support/paths.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module NavigationHelpers
   # Maps a name to a path. Used by the
   #

data/test_support/features/support/selectors.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 module HtmlSelectorsHelpers
   # Maps a name to a selector. Used primarily by the
   #

data/test_support/spec/controllers/application_controller_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ApplicationController do
 

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'rubygems'
 require 'marc'

data/test_support/spec/controllers/folder_controller_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe FolderController do
   before(:each) do

data/test_support/spec/controllers/search_history_controller_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SearchHistoryController do