blacklight-marc 5.0.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d908859e48042b0e0b642132ae5ddfbf981897f
-  data.tar.gz: 8120bcb5ea2d3d1735bde7396193e5dfc1aa68d4
+  metadata.gz: 0f0fb70263ceb51ccdd8cd3d861101dbc74bf1df
+  data.tar.gz: 7ef0b31a16dbcaafa8a4afa3c09c523f766e00aa
 SHA512:
-  metadata.gz: 9c4e5a0134edfbe5f648dab763a857df5e7797cf664f607379ce6e45e2170b1b7a5279a2482706f88337d4c5d3e3ea6d6fef400016e2b4a9e3cb7e9a3b6d9495
-  data.tar.gz: ced6d727659b9f0e2bad8f969d5f840a7a614f50fc8c65c660024768f4a9ae7c041fad71f625729b0b7076938881bc5469ff9f4b9b1058170a89ea2ba6eacadd
+  metadata.gz: 77bdd9fd66ca82d8f11fcde0c392105327772ba0eb44bc665aa9c868ad3df7d8e96f0a836139519055e74dfdcc42349ed573b061c3a91b357e944eb4af605389
+  data.tar.gz: 23bdcd829106648025d26239dd506ccbde04901707cf46ee354d3ea8bff32f25cee9bc3bbdb43e383fea4ad1dc4bd8779d97a12d1d5bc6f44203b9d833598ba8

data/.travis.yml

@@ -2,7 +2,7 @@ notifications:
   email: false
 
 rvm:
-  - 2.1.0
+  - 2.1.1
   - 2.0.0
   - 1.9.3
   - jruby-19mode

data/Gemfile

@@ -1,15 +1,27 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in blacklight_marc.gemspec
-gemspec
+# Please see blacklight_marc.gemspec for dependency information.
+gemspec path: File.expand_path('..', __FILE__)
+
+
+# Peg simplecov to < 0.8 until this is resolved:
+# https://github.com/colszowka/simplecov/issues/281
+gem 'simplecov', '~> 0.7.1', require: false
+gem 'coveralls', require: false
+
+gem 'engine_cart', '~> 0.3.0'
+
+# pin to known-working versions of rails and dependencies
+gem 'rails', '4.0.4'
+gem 'sass', '~> 3.2.15'
+gem 'sprockets', '~> 2.11.0'
 
 group :test do
-  gem 'devise'
-  gem "bootstrap-sass"
-  gem 'turbolinks'
   gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 end
 
-if File.exists?('spec/test_app_templates/Gemfile.extra')
-  eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
 end

data/Rakefile

@@ -1,21 +1,16 @@
 require "bundler/gem_tasks"
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
-APP_ROOT = File.expand_path("..", __FILE__)
-
-TEST_APP_TEMPLATES = 'spec/test_app_templates'
-TEST_APP = 'spec/internal'
 
 require 'jettywrapper'
 require 'rspec/core/rake_task'
+require 'engine_cart/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => [:ci]
 
-task :ci => ['blacklight_marc:generate', 'jetty:clean'] do
-  ENV['environment'] = "test"
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 60
+task :ci => ['blacklight_marc:clean', 'blacklight_marc:generate'] do
+  jetty_params = Jettywrapper.load_config('test')
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task["blacklight_marc:fixtures"].invoke
     Rake::Task['spec'].invoke
@@ -34,35 +29,11 @@ namespace :blacklight_marc do
     end
   end
 
-  desc "Create the test rails app"
-  task :generate do
-    unless File.exists?('spec/internal/Rakefile')
-      puts "Generating rails app"
-      `rails new #{TEST_APP}`
-      puts "Copying gemfile"
-      open("#{TEST_APP}/Gemfile", 'a') do |f|
-        f.write File.read(TEST_APP_TEMPLATES + "/Gemfile.extra")
-        f.write "gem 'blacklight-marc', :path => '../../'" 
-      end
-      puts "Copying generator"
-      `cp -r #{TEST_APP_TEMPLATES}/lib/generators #{TEST_APP}/lib`
-      within_test_app do
-        puts "Bundle install"
-        `bundle install`
-        puts "running test_app_generator"
-        system "rails generate test_app"
-
-        puts "running migrations"
-        puts `rake db:migrate db:test:prepare`
-      end
-    end
-    puts "Done generating test app"
+  desc "Clean out the test rails app"
+  task :clean => ['engine_cart:clean', 'jetty:clean'] do
   end
-end
-def within_test_app
-  FileUtils.cd(TEST_APP)
-  Bundler.with_clean_env do
-    yield
+
+  desc "Create the test rails app"
+  task :generate => ['engine_cart:generate'] do
   end
-  FileUtils.cd(APP_ROOT)
 end

data/app/helpers/blacklight_bookmarks_helper.rb

@@ -0,0 +1,3 @@
+module BlacklightBookmarksHelper
+
+end

data/app/helpers/blacklight_marc_helper.rb

@@ -1,11 +1,11 @@
 module BlacklightMarcHelper
-  
+
   # puts together a collection of documents into one refworks export string
   def render_refworks_texts(documents)
     val = ''
     documents.each do |doc|
-      if doc.respond_to?(:to_marc)
-        val += doc.export_as_refworks_marc_txt + "\n"
+      if doc.exports_as? :refworks_marc_txt
+        val += doc.export_as(:refworks_marc_txt) + "\n"
       end
     end
     val
@@ -15,8 +15,8 @@ module BlacklightMarcHelper
   def render_endnote_texts(documents)
     val = ''
     documents.each do |doc|
-      if doc.respond_to?(:to_marc)
-        val += doc.export_as_endnote + "\n"
+      if doc.exports_as? :endnote
+        val += doc.export_as(:endnote) + "\n"
       end
     end
     val

data/app/views/bookmarks/_endnote.html.erb

@@ -1,3 +1,5 @@
-      <li class="endnote">
-        <%= link_to t('blacklight.tools.endnote'), endnote_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect {|doc| doc.document_id}, :format => 'endnote'), {:class => 'btn btn-default'}%>
-      </li>
+<% if @document_list.any? {|d| d.exports_as? :endnote } %>
+  <li class="endnote">
+    <%= link_to t('blacklight.tools.endnote'), bookmarks_path(:endnote, params_for_search), :class => "btn btn-default", :id => "endnoteLink" %>
+  </li>
+<% end %>

data/app/views/bookmarks/_marc_tools.html.erb

@@ -0,0 +1,2 @@
+<%= render 'endnote' %>
+<%= render 'refworks' %>

data/app/views/bookmarks/_refworks.html.erb

@@ -1,3 +1,5 @@
-      <li class="refworks">
-        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@document_list} %>
-      </li>
+<% if @document_list.any? {|d| d.exports_as? :refworks_marc_txt } %>
+  <li class="refworks">
+    <%= link_to t('blacklight.tools.refworks'), refworks_export_url(url: bookmarks_export_url(:refworks_marc_txt, params_for_search)), :class => "btn btn-default", :id => "refworksLink" %>
+  </li>
+<% end %>

data/blacklight-marc.gemspec

@@ -17,13 +17,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "blacklight", "~> 5.0"
+  spec.add_dependency "blacklight", ">= 5.4.0.rc1", "< 6.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "jettywrapper"
+  spec.add_development_dependency "capybara"
   spec.add_dependency "rails"
   # Let's allow future versions of marc, count on
   # them to be backwards compat until 1.1

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = "5.0.0"
+    VERSION = "5.4.0"
   end
 end

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

@@ -11,20 +11,19 @@ class TestAppGenerator < Rails::Generators::Base
     end
   end
 
-  def copy_blacklight_test_app_rake_task
-    copy_file "lib/tasks/blacklight_test_app.rake"
-  end
-
   def remove_index 
     remove_file "public/index.html"
-    remove_file 'app/assets/images/rails.png'
   end
-
+  
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
+    gem 'blacklight', "5.4.0"
 
-    generate 'blacklight:install'
-    generate 'blacklight_marc:marc'
+    Bundler.with_clean_env do
+      run "bundle install"
+    end
+
+    generate 'blacklight:install', '--devise --jettywrapper'
   end
 
   def run_test_support_generator
@@ -32,4 +31,8 @@ class TestAppGenerator < Rails::Generators::Base
 
     generate 'blacklight:test_support'
   end
+  
+  def run_blacklight_marc_generator
+    generate 'blacklight_marc:marc'
+  end
 end

data/spec/views/bookmarks/_endnote.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'bookmarks/_endnote.html.erb' do
   it "should have a link" do
-    assign(:bookmarks, [mock_model(Bookmark, document_id: 7), mock_model(Bookmark, document_id: 8)])
+    assign(:document_list, [mock_model(Bookmark, document_id: 7, exports_as?: true), mock_model(Bookmark, document_id: 8, exports_as?: true)])
     render
     expect(rendered).to have_link "Export to EndNote"
   end

data/spec/views/bookmarks/_refworks.html.erb_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe 'bookmarks/_refworks.html.erb' do
   it "should have a link" do
-    assign(:document_list, [mock_model(Bookmark, document_id: 7), mock_model(Bookmark, document_id: 8)])
+    view.stub(encrypt_user_id: 1)
+    view.stub(current_or_guest_user: mock_model(User))
+    assign(:document_list, [mock_model(Bookmark, document_id: 7, exports_as?: true), mock_model(Bookmark, document_id: 8, exports_as?: true)])
     render
-    expect(rendered).to have_button "Export to Refworks"
+    expect(rendered).to have_link "Export to Refworks"
   end
 end
-

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.4.0.rc1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.4.0.rc1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -141,8 +161,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/helpers/blacklight_bookmarks_helper.rb
 - app/helpers/blacklight_marc_helper.rb
 - app/views/bookmarks/_endnote.html.erb
+- app/views/bookmarks/_marc_tools.html.erb
 - app/views/bookmarks/_refworks.html.erb
 - app/views/catalog/_marc_view.html.erb
 - app/views/catalog/endnote.endnote.erb
@@ -184,9 +206,7 @@ files:
 - spec/lib/tasks/solr_marc_task_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb
 - test_support/data/test_data.utf8.mrc
@@ -210,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MARC support for Blacklight
@@ -224,8 +244,6 @@ test_files:
 - spec/lib/tasks/solr_marc_task_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb

data/spec/test_app_templates/Gemfile.extra

@@ -1,21 +0,0 @@
-platforms :jruby do
-  gem 'jdbc-sqlite3'
-  gem 'mediashelf-loggable', '>= 0.4.8'
-  gem 'therubyrhino'
-end
-
-platforms :ruby do
- gem 'sqlite3'
-end
-
-gem 'jquery-rails'
-
-group :test do
-  gem 'rspec-rails', '~> 2.13'
-  gem 'generator_spec'
-  gem 'capybara'
-  gem 'simplecov', :platform => :mri_19
-end
-
-gem 'blacklight' #, github: 'projectblacklight/blacklight'
-gem 'jettywrapper', '>= 1.2.0'

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -1,14 +0,0 @@
-require 'rspec/core/rake_task'
-
-desc "run the blacklight gem spec"
-gem_home = File.expand_path('../../../../..', __FILE__)
-
-namespace :blacklight_test_app do
-
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = gem_home + '/spec/**/*_spec.rb'
-    t.rspec_opts = "--colour"
-    t.ruby_opts = "-I#{gem_home}/spec"
-  end
-
-end