blacklight 5.1.1 → 5.2.0

data/spec/lib/blacklight/solr_response/facets_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Blacklight::SolrResponse::Facets do
+  describe Blacklight::SolrResponse::Facets::FacetField do
+
+    describe "A field with default options" do
+      subject { Blacklight::SolrResponse::Facets::FacetField.new "my_field", [] }
+
+      its(:name) { should eq "my_field" }
+      its(:limit) { should eq nil }
+      its(:sort) { should eq 'index' }
+      its(:offset) { should eq 0 }
+    end
+
+    describe "A field with additional options" do
+      subject { Blacklight::SolrResponse::Facets::FacetField.new "my_field", [], limit: 15, sort: 'alpha', offset: 23 }
+
+      its(:name) { should eq "my_field" }
+      its(:limit) { should eq 15 }
+      its(:sort) { should eq 'alpha' }
+      its(:offset) { should eq 23 }
+    end
+  end
+
+  describe "#facet_by_field_name" do
+    let(:facet_field) { ['my_field', []] }
+    let(:response_header) { { params: request_params }}
+    let(:request_params) { Hash.new }
+    subject { Blacklight::SolrResponse.new({responseHeader: response_header, facet_counts: { facet_fields: [facet_field] }}.with_indifferent_access, request_params)  }
+
+    describe "#limit" do
+      it "should extract a field-specific limit value" do
+        request_params['f.my_field.facet.limit'] = "10"
+        request_params['facet.limit'] = "15"
+        expect(subject.facet_by_field_name('my_field').limit).to eq 10
+      end
+
+      it "should extract a global limit value" do
+        request_params['facet.limit'] = "15"
+        expect(subject.facet_by_field_name('my_field').limit).to eq 15
+      end
+
+      it "should be nil if no value is found" do
+        expect(subject.facet_by_field_name('my_field').limit).to be_nil
+      end
+    end
+
+    describe "#offset" do
+      it "should extract a field-specific offset value" do
+        request_params['f.my_field.facet.offset'] = "10"
+        request_params['facet.offset'] = "15"
+        expect(subject.facet_by_field_name('my_field').offset).to eq 10
+      end
+
+      it "should extract a global offset value" do
+        request_params['facet.offset'] = "15"
+        expect(subject.facet_by_field_name('my_field').offset).to eq 15
+      end
+
+      it "should be nil if no value is found" do
+        expect(subject.facet_by_field_name('my_field').offset).to eq 0
+      end
+    end
+
+    describe "#sort" do
+      it "should extract a field-specific sort value" do
+        request_params['f.my_field.facet.sort'] = "alpha"
+        request_params['facet.sort'] = "index"
+        expect(subject.facet_by_field_name('my_field').sort).to eq 'alpha'
+      end
+
+      it "should extract a global sort value" do
+        request_params['facet.sort'] = "alpha"
+        expect(subject.facet_by_field_name('my_field').sort).to eq 'alpha'
+      end
+
+      it "should default to index if no value is found" do
+        expect(subject.facet_by_field_name('my_field').sort).to eq 'index'
+      end
+    end
+  end
+end

data/spec/lib/blacklight/solr_response_spec.rb

@@ -48,12 +48,14 @@ describe Blacklight::SolrResponse do
 
     r.facets.each do |facet|
       expect(facet).to respond_to :name
+      expect(facet).to respond_to :sort
+      expect(facet).to respond_to :offset
+      expect(facet).to respond_to :limit
       facet.items.each do |item|
         expect(item).to respond_to :value
         expect(item).to respond_to :hits
       end
     end
-
   end
 
   it "should provide kaminari pagination helpers" do

data/spec/lib/document_presenter_spec.rb

@@ -0,0 +1,216 @@
+require 'spec_helper'
+
+describe Blacklight::DocumentPresenter do
+  include Capybara::RSpecMatchers
+  let(:request_context) { double(:add_facet_params => '') }
+  let(:document) { double }
+  let(:config) { Blacklight::Configuration.new }
+
+  subject { Blacklight::DocumentPresenter.new(document, request_context, config) }
+
+  describe "render_index_field_value" do
+    let(:config) do 
+      Blacklight::Configuration.new.configure do |config|
+        config.add_index_field 'qwer'
+        config.add_index_field 'asdf', :helper_method => :render_asdf_index_field
+        config.add_index_field 'link_to_search_true', :link_to_search => true
+        config.add_index_field 'link_to_search_named', :link_to_search => :some_field
+        config.add_index_field 'highlight', :highlight => true
+        config.add_index_field 'solr_doc_accessor', :accessor => true
+        config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
+        config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
+      end
+    end
+    it "should check for an explicit value" do
+      document.should_not_receive(:get).with('asdf', :sep => nil)
+      value = subject.render_index_field_value 'asdf', :value => 'asdf'
+      expect(value).to eq 'asdf'
+    end
+
+    it "should check for a helper method to call" do
+      document.should_receive(:get).with('asdf', :sep => nil)
+      request_context.stub(:render_asdf_index_field).and_return('custom asdf value')
+      value = subject.render_index_field_value 'asdf'
+      expect(value).to eq 'custom asdf value'
+    end
+
+    it "should check for a link_to_search" do
+      document.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      request_context.should_receive(:add_facet_params).and_return(:f => { :link_to_search_true => ['x'] })
+      request_context.should_receive(:search_action_path).with(:f => { :link_to_search_true => ['x'] }).and_return('/foo')
+      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.render_index_field_value 'link_to_search_true'
+      expect(value).to eq 'bar'
+    end
+
+    it "should check for a link_to_search with a field name" do
+      document.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      request_context.should_receive(:add_facet_params).and_return(:f => { :some_field => ['x'] })
+      request_context.should_receive(:search_action_path).with(:f => { :some_field => ['x'] }).and_return('/foo')
+      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.render_index_field_value 'link_to_search_named'
+      expect(value).to eq 'bar'
+    end
+
+    it "should gracefully handle when no highlight field is available" do
+      document.should_not_receive(:get)
+      document.should_receive(:has_highlight_field?).and_return(false)
+      value = subject.render_index_field_value 'highlight'
+      expect(value).to be_blank
+    end
+
+    it "should check for a highlighted field" do
+      document.should_not_receive(:get)
+      document.should_receive(:has_highlight_field?).and_return(true)
+      document.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = subject.render_index_field_value 'highlight'
+      expect(value).to eq '<em>highlight</em>'
+    end
+
+    it "should check the document field value" do
+      document.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      value = subject.render_index_field_value 'qwer'
+      expect(value).to eq 'document qwer value'
+    end
+
+    it "should work with index fields that aren't explicitly defined" do
+      document.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      value = subject.render_index_field_value 'mnbv'
+      expect(value).to eq 'document mnbv value'
+    end
+
+    it "should call an accessor on the solr document" do
+      document.stub(:solr_doc_accessor => "123")
+      value = subject.render_index_field_value 'solr_doc_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit accessor on the solr document" do
+      document.stub(:solr_doc_accessor => "123")
+      value = subject.render_index_field_value 'explicit_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an implicit accessor on the solr document" do
+      expect(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = subject.render_index_field_value 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
+    end
+  end
+  
+  describe "render_document_show_field_value" do
+    let(:config) do 
+      Blacklight::Configuration.new.configure do |config|
+        config.add_show_field 'qwer'
+        config.add_show_field 'asdf', :helper_method => :render_asdf_document_show_field
+        config.add_show_field 'link_to_search_true', :link_to_search => true
+        config.add_show_field 'link_to_search_named', :link_to_search => :some_field
+        config.add_show_field 'highlight', :highlight => true
+        config.add_show_field 'solr_doc_accessor', :accessor => true
+        config.add_show_field 'explicit_accessor', :accessor => :solr_doc_accessor
+        config.add_show_field 'explicit_array_accessor', :accessor => [:solr_doc_accessor, :some_method]
+        config.add_show_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
+      end
+    end
+
+    it "should check for an explicit value" do
+      document.should_not_receive(:get).with('asdf', :sep => nil)
+      request_context.should_not_receive(:render_asdf_document_show_field)
+      value = subject.render_document_show_field_value 'asdf', :value => 'val1'
+      expect(value).to eq 'val1'
+    end
+
+    it "should check for a helper method to call" do
+      document.should_receive(:get).with('asdf', :sep => nil)
+      request_context.stub(:render_asdf_document_show_field).and_return('custom asdf value')
+      value = subject.render_document_show_field_value 'asdf'
+      expect(value).to eq 'custom asdf value'
+    end
+
+    it "should check for a link_to_search" do
+      document.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
+      request_context.should_receive(:search_action_path).with('').and_return('/foo')
+      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.render_document_show_field_value 'link_to_search_true'
+      expect(value).to eq 'bar'
+    end
+
+    it "should check for a link_to_search with a field name" do
+      document.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
+      request_context.should_receive(:search_action_path).with('').and_return('/foo')
+      request_context.should_receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.render_document_show_field_value 'link_to_search_named'
+      expect(value).to eq 'bar'
+    end
+
+    it "should gracefully handle when no highlight field is available" do
+      document.should_not_receive(:get)
+      document.should_receive(:has_highlight_field?).and_return(false)
+      value = subject.render_document_show_field_value 'highlight'
+      expect(value).to be_blank
+    end
+
+    it "should check for a highlighted field" do
+      document.should_not_receive(:get)
+      document.should_receive(:has_highlight_field?).and_return(true)
+      document.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = subject.render_document_show_field_value 'highlight'
+      expect(value).to eq '<em>highlight</em>'
+    end
+
+
+    it "should check the document field value" do
+      document.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      value = subject.render_document_show_field_value 'qwer'
+      expect(value).to eq 'document qwer value'
+    end
+
+    it "should work with show fields that aren't explicitly defined" do
+      document.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      value = subject.render_document_show_field_value 'mnbv'
+      expect(value).to eq 'document mnbv value'
+    end
+
+    it "should call an accessor on the solr document" do
+      document.stub(:solr_doc_accessor => "123")
+      value = subject.render_document_show_field_value 'solr_doc_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit accessor on the solr document" do
+      document.stub(:solr_doc_accessor => "123")
+      value = subject.render_document_show_field_value 'explicit_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit array-style accessor on the solr document" do
+      document.stub(:solr_doc_accessor => double(:some_method => "123"))
+      value = subject.render_document_show_field_value 'explicit_array_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an accessor on the solr document with the field as an argument" do
+      expect(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = subject.render_document_show_field_value 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
+    end
+  end
+  describe "render_field_value" do
+    it "should join and html-safe values" do
+      expect(subject.render_field_value(['a', 'b'])).to eq "a, b"
+    end
+
+    it "should join values using the field_value_separator" do
+      subject.stub(:field_value_separator).and_return(" -- ")
+      expect(subject.render_field_value(['a', 'b'])).to eq "a -- b"
+    end
+
+    it "should use the separator from the Blacklight field configuration by default" do
+      expect(subject.render_field_value(['c', 'd'], double(:separator => '; ', :itemprop => nil))).to eq "c; d"
+    end
+
+    it "should include schema.org itemprop attributes" do
+      expect(subject.render_field_value('a', double(:separator => nil, :itemprop => 'some-prop'))).to have_selector("span[@itemprop='some-prop']", :text => "a") 
+    end
+  end
+end

data/spec/lib/utils_spec.rb

@@ -84,5 +84,13 @@ describe 'Blacklight::Utils' do
         expect(@h[:a]).to eq 'a'
       end
     end
+
+    describe "#to_json" do
+      subject { Blacklight::OpenStructWithHashAccess.new a: 1, b: 2}
+
+      it "should serialize as json" do
+        expect(subject.to_json).to eq ({a: 1, b:2}).to_json
+      end
+    end
   end
 end

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

@@ -23,7 +23,7 @@ class TestAppGenerator < Rails::Generators::Base
       run "bundle install"
     end
 
-    generate 'blacklight:install', '--devise --marc'
+    generate 'blacklight:install', '--devise --marc --jettywrapper'
   end
 
   def run_test_support_generator

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

@@ -1,30 +1,38 @@
 require 'spec_helper'
 
 describe "catalog/index.html.erb" do
-  it "should render the sidebar and content panes" do
-    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
-    render
-    expect(rendered).to match /id="sidebar"/
-    expect(rendered).to match /id="content"/
-  end
 
-  it "should render the search_sidebar partial " do
-    stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
+  describe "with no search parameters" do
+    before do
+      view.stub(:has_search_parameters?).and_return(false)
+      view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+    end
+    it "should render the sidebar and content panes" do
+      render
+      expect(rendered).to match /id="sidebar"/
+      expect(rendered).to match /id="content"/
+    end
 
-    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
-    render
-    expect(rendered).to match /sidebar_content/
+    it "should render the search_sidebar partial " do
+      stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
+      render
+      expect(rendered).to match /sidebar_content/
+    end
   end
 
-  it "should render the search_header partial " do
-    stub_template "catalog/_results_pagination.html.erb" => ""
-    stub_template "catalog/_search_header.html.erb" => "header_content"
+  describe "with search parameters" do
+    before do
+      view.stub(:has_search_parameters?).and_return(true)
+      stub_template "catalog/_results_pagination.html.erb" => ""
+      stub_template "catalog/_search_header.html.erb" => "header_content"
 
-    view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
-    view.stub(:has_search_parameters?).and_return(true)
-    view.stub(:render_opensearch_response_metadata).and_return("")
-    assign(:response, double(:empty? => true))
-    render
-    expect(rendered).to match /header_content/
+      view.stub(:blacklight_config).and_return(Blacklight::Configuration.new)
+      view.stub(:render_opensearch_response_metadata).and_return("")
+      assign(:response, double(:empty? => true))
+    end
+    it "should render the search_header partial " do
+      render
+      expect(rendered).to match /header_content/
+    end
   end
-end
+end

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

@@ -13,13 +13,21 @@ describe "catalog/show.html.erb" do
   before :each do
     view.stub(:has_user_authentication_provider? => false)
     view.stub(:render_document_sidebar_partial => "Sidebar")
+    assign :document, document
+    view.stub(:blacklight_config).and_return(blacklight_config)
+  end
+
+  it "should set the @page_title" do
+    view.stub(:document_show_html_title).and_return("Heading")
+    render
+    page_title = view.instance_variable_get(:@page_title)
+    expect(page_title).to eq "Heading - Blacklight"
+    expect(page_title).to be_html_safe
   end
 
   it "should include schema.org itemscope/type properties" do
     view.stub(:document_show_html_title).and_return("Heading")
     document.stub(:itemtype => 'some-item-type-uri')
-    assign :document, document
-    view.stub(:blacklight_config).and_return(blacklight_config)
     render
 
     expect(rendered).to have_selector('div#document[@itemscope]')
@@ -28,11 +36,9 @@ describe "catalog/show.html.erb" do
 
   it "should render the show_header and show partials by default" do
     view.stub(:render_grouped_response?).and_return(false)
-    view.stub(:blacklight_config).and_return(blacklight_config)
     stub_template "catalog/_show_header_default.html.erb" => "document_header"
     stub_template "catalog/_show_default.html.erb" => "show_default"
     
-    assign :document, document
     render
 
     expect(rendered).to match /document_header/
@@ -42,15 +48,13 @@ describe "catalog/show.html.erb" do
 
   it "should use the show.partials parameter to determine the partials to render" do
     view.stub(:render_grouped_response?).and_return(false)
-    view.stub(:blacklight_config).and_return(blacklight_config)
     blacklight_config.show.partials = ['a', 'b', 'c']
     stub_template "catalog/_a_default.html.erb" => "a_partial"
     stub_template "catalog/_b_default.html.erb" => "b_partial"
     stub_template "catalog/_c_default.html.erb" => "c_partial"
-    assign :document, document
     render
     expect(rendered).to match /a_partial/
     expect(rendered).to match /b_partial/
     expect(rendered).to match /c_partial/
   end
-end
+end

data/template.demo.rb

@@ -0,0 +1,20 @@
+gem "blacklight"
+
+run "bundle install"
+
+# run the blacklight install generator
+generate 'blacklight:install', '--devise --marc --jettywrapper'
+
+# run the database migrations
+rake "db:migrate"
+
+# index some data
+rake "jetty:clean"
+
+require 'rails'
+require 'jettywrapper'
+
+jetty_params = Jettywrapper.load_config('development')
+Jettywrapper.wrap(jetty_params) do
+  rake "blacklight:solr:seed"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: blacklight-marc
   requirement: !ruby/object:Gem::Requirement
@@ -353,10 +353,12 @@ files:
 - blacklight.gemspec
 - config/jetty.yml
 - config/locales/blacklight.en.yml
+- config/locales/blacklight.es.yml
 - config/locales/blacklight.fr.yml
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
 - gemfiles/rails3.gemfile
+- gemfiles/rails4.1.gemfile
 - gemfiles/rails4.gemfile
 - lib/blacklight.rb
 - lib/blacklight/base.rb
@@ -371,10 +373,12 @@ files:
 - lib/blacklight/configuration/sort_field.rb
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/controller.rb
+- lib/blacklight/document_presenter.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
 - lib/blacklight/facet.rb
 - lib/blacklight/rails/routes.rb
+- lib/blacklight/request_builders.rb
 - lib/blacklight/routes.rb
 - lib/blacklight/search_fields.rb
 - lib/blacklight/solr.rb
@@ -401,7 +405,6 @@ files:
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets_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
 - lib/generators/blacklight/templates/blacklight.css.scss
@@ -451,11 +454,13 @@ files:
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/solr_response/facets_spec.rb
 - spec/lib/blacklight/solr_response/group_response_spec.rb
 - spec/lib/blacklight/solr_response/group_spec.rb
 - spec/lib/blacklight/solr_response_spec.rb
 - spec/lib/blacklight/user_spec.rb
 - spec/lib/blacklight_spec.rb
+- spec/lib/document_presenter_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/lib/utils_spec.rb
 - spec/models/bookmark_spec.rb
@@ -491,6 +496,7 @@ files:
 - spec/views/catalog/opensearch.xml.builder_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
 - tasks/blacklight.rake
+- template.demo.rb
 homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
@@ -555,11 +561,13 @@ test_files:
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/solr_response/facets_spec.rb
 - spec/lib/blacklight/solr_response/group_response_spec.rb
 - spec/lib/blacklight/solr_response/group_spec.rb
 - spec/lib/blacklight/solr_response_spec.rb
 - spec/lib/blacklight/user_spec.rb
 - spec/lib/blacklight_spec.rb
+- spec/lib/document_presenter_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/lib/utils_spec.rb
 - spec/models/bookmark_spec.rb

data/lib/generators/blacklight/jetty_generator.rb

@@ -1,70 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'openssl'
-
-module Blacklight
-  class Jetty < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-    
-    
-    argument :save_location, :type=>"string", :desc => "where to install the jetty", :default => "./jetty"
-    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/v4.0.0" , :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"
-     
-    
-    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 download_jetty         
-      tmp_save_dir = File.join(Rails.root, "tmp", "jetty_generator")      
-      empty_directory(tmp_save_dir)
-      
-      begin
-        unless options[:downloaded_package]
-          begin        
-            say_status("fetching", options[:download_url])
-            zip_file = File.join(tmp_save_dir, "bl_jetty.zip")                
-            get(options[:download_url], zip_file)
-          rescue Exception => e
-            say_status("error", "Could not download #{options[:download_url]} : #{e}", :red)
-            raise Thor::Error.new("Try downloading manually and then using '-d' option?")
-          end
-        else
-          zip_file = options[:downloaded_package]
-        end
-        
-        
-        say_status("unzipping", zip_file)
-        "unzip -d #{tmp_save_dir} -qo #{zip_file}".tap do |command|          
-          system(command) or raise Thor::Error.new("Error executing: #{command}")       
-        end        
-        # It unzips into a top_level directory we've got to find by name
-        # in the tmp dir, sadly. 
-        expanded_dir = Dir[File.join(tmp_save_dir, "projectblacklight-blacklight-jetty-*")].first        
-
-        if File.exists?( save_location ) && ! options[:force]
-          raise Thor::Error.new("cancelled by user") unless [nil, "", "Y", "y"].include? ask("Copy over existing #{save_location}? [Yn]")
-        end
-        
-        directory(expanded_dir, save_location, :verbose => false)
-        say_status("installed", save_location )
-      ensure
-        remove_dir(tmp_save_dir)
-      end                  
-    end
-   
-    
-  end
-end