blacklight 5.0.0.pre3 → 5.0.0.pre4

data/app/views/catalog/endnote.endnote.erb

@@ -1 +0,0 @@
-<%= render_endnote_texts(@documents) %>

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

@@ -1 +0,0 @@
-<%= render_endnote_text(@document) %>

data/lib/generators/blacklight/blacklight_generator.rb

@@ -1,97 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-
-class BlacklightGenerator < Rails::Generators::Base
-
-  source_root File.expand_path('../templates', __FILE__)
-  
-  argument     :model_name, :type => :string , :default => "user"
-  class_option :devise    , :type => :boolean, :default => false, :aliases => "-d", :desc => "Use Devise as authentication logic."
-  class_option :marc      , :type => :boolean, :default => false, :aliases => "-m", :desc => "Generate MARC-based demo ."
-
-  desc """
-This generator makes the following changes to your application:
- 1. Generates blacklight:models
- 2. Creates a number of public assets, including images, stylesheets, and javascript
- 3. Injects behavior into your user application_controller.rb
- 4. Adds example configurations for dealing with MARC-like data
- 5. Adds Blacklight routes to your ./config/routes.rb
-
-
-Thank you for Installing Blacklight.
-       """ 
-
-  def bundle_install
-    Bundler.with_clean_env do
-      run "bundle install"
-    end
-  end
-
-  # Copy all files in templates/public/ directory to public/
-  # Call external generator in AssetsGenerator, so we can
-  # leave that callable seperately too. 
-  def copy_public_assets 
-    generate "blacklight:assets"
-  end
-
-  def generate_blacklight_models
-
-    generator_args = []
-    if options[:devise]
-      generator_args << "--devise #{options[:devise]}"
-    end
-    
-    generate 'blacklight:models', generator_args.join(" ")
-  end
-
-  # Add Blacklight to the application controller
-  def inject_blacklight_controller_behavior    
-#    prepend_file("app/controllers/application_controller.rb", "require 'blacklight/controller'\n\n")
-    inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-      "  # Adds a few additional behaviors into the application controller \n " +        
-        "  include Blacklight::Controller\n" + 
-        "  # Please be sure to impelement current_user and user_session. Blacklight depends on \n" +
-        "  # these methods in order to perform user specific actions. \n\n" +
-        "  layout 'blacklight'\n\n"
-    end
-  end
-  
-  # Generate blacklight catalog controller
-  def create_blacklight_catalog
-    copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
-  end 
-
-  def generate_blacklight_marc_demo
-    if options[:marc]
-      gem "blacklight_marc"
-
-      Bundler.with_clean_env do
-        run "bundle install"
-      end
-
-      generate 'blacklight_marc:marc'
-    end
-  end
-
-  def inject_blacklight_routes
-    # These will end up in routes.rb file in reverse order
-    # we add em, since each is added at the top of file. 
-    # we want "root" to be FIRST for optimal url generation. 
-    route('blacklight_for :catalog')
-    route('root :to => "catalog#index"')
-  end
-
-  def add_sass_configuration
-
-    insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
-    
-    # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
-    config.assets.compress = !Rails.env.development?
-
-EOF
-      end
-
-  end
-
-end  
-

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

@@ -1,16 +0,0 @@
-# -*- encoding : utf-8 -*-
-class AddUserTypesToBookmarksSearches < ActiveRecord::Migration
-  def self.up
-    add_column :searches, :user_type, :string
-    add_column :bookmarks, :user_type, :string
-    Search.reset_column_information
-    Bookmark.reset_column_information
-    Search.update_all("user_type = '<%=model_name%>'")
-    Bookmark.update_all("user_type = '<%=model_name%>'")
-  end
-
-  def self.down
-    remove_column :searches, :user_type
-    remove_column :bookmarks, :user_type
-  end
-end

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

@@ -1,12 +0,0 @@
-# -*- encoding : utf-8 -*-
-class RemoveEditableFieldsFromBookmarks < ActiveRecord::Migration
-  def self.up
-    remove_column :bookmarks, :notes
-    remove_column :bookmarks, :url
-  end
-
-  def self.down
-    add_column :bookmarks, :notes, :text
-    add_column :bookmarks, :url, :string
-  end
-end

data/lib/railties/all_tests.rake

@@ -1,39 +0,0 @@
-namespace :blacklight do
-  begin
-    require 'rspec/core'
-    require 'rspec/core/rake_task'
-
-    desc "Run Blacklight rspec, with test solr"
-    task :all_tests => :hudson
-
-    desc "Run Blacklight rspec, with test solr"
-    task :hudson 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
-    end
-    
-    namespace :all_tests do
-      task :rcov do
-      desc "Run Blacklight rspec tests with rcov"
-
-      rm "blacklight-coverage.data" if File.exist?("blacklight-coverage.data")
-      Rails.env = 'test' unless ENV['RAILS_ENV']
-      error = Jettywrapper.wrap(Jettywrapper.load_config) do          
-          Rake::Task["blacklight:spec:rcov"].invoke 
-      end             
-      raise "test failures: #{error}" if error
-    end
-  end
-    
-  rescue LoadError
-    desc "Not available! (rspec not avail)"
-    task :all_tests do
-      abort 'Not available. Rspec needs to be installed to run blacklight:all_tests'
-    end
-  end
-end

data/lib/railties/blacklight_rspec.rake

@@ -1,128 +0,0 @@
-# Blacklight customization of the Rake tasks that come with rspec-2, to run
-# specs located in alternate location (inside BL plugin), and to provide
-# rake tasks for jetty/solr wrapping. 
-#
-# Same tasks as in ordinary rspec, but prefixed with blacklight:. 
-#
-# rspec2 keeps it's rake tasks inside it's own code, it doesn't generate them. 
-# We had to copy them from there and modify, may have to be done again
-# if rspec2 changes a lot, but this code looks relatively cleanish. 
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-  if default = Rake.application.instance_variable_get('@tasks')['default']
-    default.prerequisites.delete('test')
-  end
-  
-  spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "db:test:prepare" : :noop
-  task :noop do; end
-  #task :default => :spec
-  
-  blacklight_spec = File.expand_path("./test_support/spec", Blacklight.root)
-  
-  # Set env variable to tell our spec/spec_helper.rb where we really are,
-  # so it doesn't have to guess with relative path, which will be wrong
-  # since we allow spec_dir to be in a remote location. spec_helper.rb
-  # needs it before Rails.root is defined there, even though we can
-  # oddly get it here, i dunno. 
-  ENV['RAILS_ROOT'] = Rails.root.to_s
-  
-  namespace :blacklight do
-    
-    desc "Run all specs in spec directory (excluding plugin specs)"
-    RSpec::Core::RakeTask.new(:spec => spec_prereq) do |t|
-      # the user might not have run rspec generator because they don't
-      # actually need it, but without an ./.rspec they won't get color,
-      # let's insist. 
-      t.rspec_opts = "--colour"
-      
-      # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
-      t.pattern = "#{blacklight_spec}"      
-    end
-    
-    # Don't understand what this does or how to make it use our remote stats_directory
-    #task :stats => "spec:statsetup"
-    
-    namespace :spec do
-      [:requests, :models, :controllers, :views, :helpers, :mailers, :lib, :routing].each do |sub|
-        desc "Run the code examples in spec/#{sub}"
-        RSpec::Core::RakeTask.new(sub => spec_prereq) do |t|
-          # the user might not have run rspec generator because they don't
-          # actually need it, but without an ./.rspec they won't get color,
-          # let's insist. 
-          t.rspec_opts = "--colour"
-          
-          # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
-          t.pattern = "#{blacklight_spec}/#{sub}" 
-
-          ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-          if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/ and ruby_engine != "jruby"
-            t.rcov = true
-            t.rcov_opts = %w{--rails -I../../app -I../../lib --exclude osx\/objc,gems\/,spec\/,features\/ --aggregate blacklight-coverage.data}
-            t.rcov_opts << %[-o "../../coverage/rcov"]
-          end
-        end
-      end
-    
-      desc "Run all specs with rcov"
-      RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
-        t.rcov = true
-        # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
-        t.pattern = File.join(blacklight_spec, "/**/*_spec.rb")
-        t.rspec_opts = "--colour"
-        t.rcov_opts = '-o "../../coverage/rcov" --exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-'
-      end
-      
-      # Blacklight. Solr wrapper. for now just for blacklight:spec, plan to
-      # provide it for all variants eventually.
-      # if you would like to see solr startup messages on STDERR
-      # when starting solr test server during functional tests use:
-      # 
-      #    rake SOLR_CONSOLE=true      
-      desc "blacklight:solr with jetty/solr launch"
-      task :with_solr do    
-        require 'jettywrapper'
-        # wrap tests with a test-specific Solr server
-        # Need to look  up where the test jetty is located
-        # from solr.yml, we don't hardcode it anymore. 
-
-        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
-      end
-      
-    
-      # Don't understand what this does or how to make it use our remote stats_directory.
-      # task :statsetup do
-        # require 'rails/code_statistics'
-        # ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-        # ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-        # ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-        # ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-        # ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-        # ::STATS_DIRECTORIES << %w(Mailer\ specs spec/mailers) if File.exist?('spec/mailers')
-        # ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-        # ::STATS_DIRECTORIES << %w(Request\ specs spec/requests) if File.exist?('spec/requests')
-        # ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-        # ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-        # ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-        # ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-        # ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-        # ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailers')
-        # ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-        # ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
-      # end
-    end
-  end  
-rescue LoadError
-  # This rescue pattern stolen from cucumber; rspec didn't need it before since
-  # tasks only lived in rspec gem itself, but for Blacklight since we're copying
-  # these tasks into BL, we use the rescue so you can still run BL (without
-  # these tasks) even if you don't have rspec installed. 
-  desc 'rspec rake tasks not available (rspec not installed)'
-  task :spec do
-    abort 'Rspec rake tasks  not available. Be sure to install rspec gems. '
-  end
-end