blacklight-marc 5.10.0 → 6.0.0

data/spec/routing/routes_spec.rb

@@ -4,11 +4,11 @@ describe "Routing" do
   describe "Paths Generated by Custom Routes:" do
     it "should map {:controller => 'catalog', :id => '111', :action => 'librarian_view'} to /catalog/111/librarian_view" do
       expect({ :get => "/catalog/111/librarian_view" }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
-      expect({ :get => librarian_view_catalog_path('111') }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
+      expect({ :get => librarian_view_solr_document_path('111') }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
     end
     it "should map {:controller => 'catalog', :action => 'endnote'} to /catalog/endnote" do
       expect({ :get => "/catalog/endnote" }).to route_to(:controller => 'catalog', :action => 'endnote')
-      expect({ :get => endnote_catalog_path }).to route_to(:controller => 'catalog', :action => 'endnote')
+      expect({ :get => endnote_solr_document_path }).to route_to(:controller => 'catalog', :action => 'endnote')
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,7 +12,8 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/ and ruby_engine != "jruby"
   end
 end
 
-require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
+require 'engine_cart'
+EngineCart.load_application!
 
 require 'rspec/rails'
 require 'rspec/active_model/mocks'
@@ -36,4 +37,10 @@ RSpec.configure do |config|
   #       # Equivalent to being in spec/controllers
   #     end
   config.infer_spec_type_from_file_location!
+
+  config.include(ControllerLevelHelpers, type: :helper)
+  config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
+
+  config.include(ControllerLevelHelpers, type: :view)
+  config.before(:each, type: :view) { initialize_controller_helpers(view) }
 end

data/spec/support/controller_level_helpers.rb

@@ -0,0 +1,21 @@
+module ControllerLevelHelpers
+  module ControllerViewHelpers
+    include Blacklight::Facet
+
+    def blacklight_config
+      controller.blacklight_config
+    end
+
+    def search_state
+      @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+    end
+
+    def blacklight_configuration_context
+      @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+    end
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerViewHelpers
+  end
+end

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

@@ -1,8 +1,6 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
-
   def fix_travis_rails_4 
     if ENV['TRAVIS']
       insert_into_file 'app/assets/stylesheets/application.css', :before =>'/*' do      
@@ -18,7 +16,7 @@ class TestAppGenerator < Rails::Generators::Base
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow) 
     gem 'blacklight'
-
+    gem "traject", '~>2.0'
     Bundler.with_clean_env do
       run "bundle install"
     end

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

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe 'bookmarks/_endnote.html.erb' do
+  before do
+    allow(controller).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+  end
+
   it "should have a link" do
     assign(:document_list, [mock_model(Bookmark, document_id: 7, exports_as?: true), mock_model(Bookmark, document_id: 8, exports_as?: true)])
     render

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

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe 'bookmarks/_refworks.html.erb' do
+  before do
+    allow(controller).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+  end
+
   it "should have a link" do
     allow(view).to receive_messages(encrypt_user_id: 1)
     allow(view).to receive_messages(current_or_guest_user: mock_model(User))

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

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'catalog/_document_action' do
+  let(:document_action_config) { Blacklight::Configuration::ToolConfig.new(tool_config) }
+  let(:document) { SolrDocument.new(id: '123') }
+
+  before do
+    allow(view).to receive_messages(controller_name: 'catalog')
+    render 'catalog/document_action', document_action_config: document_action_config, document: document
+  end
+
+  context "for refworks" do
+    let(:tool_config) { { if: :render_refworks_action?, partial: "document_action",
+      name: :refworks, key: :refworks, modal: false } }
+
+    it "should not be modal" do
+      expect(rendered).to have_link('Export to Refworks')
+      expect(rendered).not_to have_selector('a[data-ajax-modal]')
+    end
+  end
+end

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'rexml/document'
+
+describe "catalog/index" do  
+
+  before(:all) do
+    @config = Blacklight::Configuration.new.configure do |config|
+      config.default_solr_params = {
+        :fl => '*',
+        :rows => 10
+      }
+    end
+    
+    @params = { 'content_format' => 'marc', :f => { :format => ['Book'] }, :page => 2 }
+
+    # run a solr query to get our data
+    c = CatalogController.new
+    c.blacklight_config = @config
+    @response, @document_list = c.search_results(@params)
+
+    # munge the solr response to match test expectations
+    @document_list[1] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "author_display" })
+    @document_list[5] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "marc_display" })
+  end
+  before(:each) do
+    # Not sure what Assigns was doing here ... dhf
+    #    assigns[:response] = @rsolr_response
+    #    assigns[:document_list] = @document_list
+    # not sure why we can't use assigns for 'params', instead this weird way,
+    # but okay. 
+
+    params.merge!( @params )
+    allow(view).to receive(:blacklight_config).and_return(@config)
+    allow(view).to receive(:search_field_options_for_select).and_return([])
+
+    render :template => 'catalog/index', :formats => [:atom] 
+
+    # We need to use rexml to test certain things that have_tag wont' test    
+    # note that response is depricated rails 3, use "redered" instead. 
+    @response_xml = REXML::Document.new(rendered)   
+  end
+
+  describe "when content_format is specified" do
+    describe "for an entry with content available" do
+      before do
+        @entry = @response_xml.elements.to_a("/feed/entry")[0]
+      end
+      it "should include a link rel tag" do
+        expect(@entry.to_s).to have_selector("link[rel=alternate][type='application/marc']")
+      end
+      it "should have content embedded" do
+        expect(@entry.to_s).to have_selector("content")
+      end
+    end
+  end
+end
+
+

data/test_support/config/translation_maps/test_dewey.properties

@@ -0,0 +1,99 @@
+000 = 000s - Computer Science, Information & General Works
+010 = 010s - Bibliography
+020 = 020s - Library & Information Sciences
+030 = 030s - General Encyclopedic Works
+050 = 050s - General Serials & their Indexes
+060 = 060s - General Organization & Museology
+070 = 070s - News Media, Journalism, Publishing
+080 = 080s - General Collections
+090 = 090s - Manuscripts & Rare Books
+100 = 100s - Philosophy & Psychology
+110 = 110s - Metaphysics
+120 = 120s - Epistemology, Causation, Humankind
+130 = 130s - Paranormal Phenomena
+140 = 140s - Specific Philosophical Schools
+150 = 150s - Psychology
+160 = 160s - Logic
+170 = 170s - Ethics (Moral Philosophy)
+180 = 180s - Ancient, Medieval, Oriental Philosophy
+190 = 190s - Modern Western Philosophy
+200 = 200s - Religion
+210 = 210s - Natural Theology
+220 = 220s - Bible
+230 = 230s - Christian Theology
+240 = 240s - Christian Moral & Devotional Theology
+250 = 250s - Christian Orders & Local Church
+260 = 260s - Christian Social Theology
+270 = 270s - Christian Church History
+280 = 280s - Christian Denominations & Sects
+290 = 290s - Other & Comparative Religions
+300 = 300s - Social Sciences
+310 = 310s - General Statistics
+320 = 320s - Political Science
+330 = 330s - Economics
+340 = 340s - Law
+350 = 350s - Public Administration
+360 = 360s - Social Services; Association
+370 = 370s - Education
+380 = 380s - Commerce, Communications, Transport
+390 = 390s - Customs, Etiquette, Folklore
+400 = 400s - Language
+410 = 410s - Linguistics
+420 = 420s - English & Old English
+430 = 430s - Germanic Languages German
+440 = 440s - Romance Languages French
+450 = 450s - Italian, Romanian, Rhaeto-Romantic
+460 = 460s - Spanish & Portugese Languages
+470 = 470s - Italic Latin
+480 = 480s - Hellenic Languages Classical Greek
+490 = 490s - Other Languages
+500 = 500s - Science
+510 = 510s - Mathematics
+520 = 520s - Astronomy & Allied Sciences
+530 = 530s - Physics
+540 = 540s - Chemistry & Allied Sciences
+550 = 550s - Earth Sciences
+560 = 560s - Paleontology Paleozoology
+570 = 570s - Life Sciences
+580 = 580s - Botanical Sciences
+590 = 590s - Zoological Sciences
+600 = 600s - Technology
+610 = 610s - Medical Sciences Medicine
+620 = 620s - Engineering & Allied Operations
+630 = 630s - Agriculture
+640 = 640s - Home economics & Family Living
+650 = 650s - Management & Auxiliary Services
+660 = 660s - Chemical Engineering
+670 = 670s - Manufacturing
+680 = 680s - Manufacture for Specific Uses
+690 = 690s - Buildings
+700 = 700s - Arts & Recreation
+710 = 710s - Civic & Landscape Art
+720 = 720s - Architecture
+730 = 730s - Plastic Arts Sculpture
+740 = 740s - Drawing & Decorative Arts
+750 = 750s - Painting & Paintings
+760 = 760s - Graphic Arts Printmaking & Prints
+770 = 770s - Photography & Photographs
+780 = 780s - Music
+790 = 790s - Recreational & Performing Arts
+800 = 800s - Literature
+810 = 810s - American Literature in English
+820 = 820s - English & Old English Literatures
+830 = 830s - Literatures of Germanic Languages
+840 = 840s - Literatures of Romance Languages
+850 = 850s - Italian, Romanian, Rhaeto-Romanic
+860 = 860s - Spanish & Portuguese Literatures
+870 = 870s - Italic Literatures Latin
+880 = 880s - Hellenic Literatures Classical Greek
+890 = 890s - Literatures of Other Languages
+900 = 900s - History & Geography
+910 = 910s - Geography & Travel
+920 = 920s - Biography, Genealogy, Insignia
+930 = 930s - History of Ancient World
+940 = 940s - General History of Europe
+950 = 950s - General History of Asia Far East
+960 = 960s - General History of Africa
+970 = 970s - General History of North America
+980 = 980s - General History of South America
+990 = 990s - General History of Other Areas

data/test_support/config/translation_maps/test_formats.properties

@@ -0,0 +1,22 @@
+# format mapping
+#    leader 06-07
+aa = Book
+ab = Serial
+am = Book
+as = Serial
+ta = Book
+tm = Book
+sd = Sound Disc
+#    leader 06
+c = Musical Score
+d = Musical Score
+e = Map or Globe
+f = Map or Globe
+i = Non-musical Recording
+j = Musical Recording
+k = Image
+m = Computer File
+#    007[0]  when it doesn't clash with above
+h = Microform
+q = Musical Score
+v = Video

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.pre3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 6.0.0.pre3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +120,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: library_stdnums
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -156,6 +176,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: traject
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: marc-fastxmlwriter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MARC support for Blacklight
 email:
 - justin@curationexperts.com
@@ -169,57 +217,71 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/stylesheets/blacklight_marc.scss
 - app/helpers/blacklight_bookmarks_helper.rb
 - app/helpers/blacklight_marc_helper.rb
+- app/models/concerns/blacklight/solr/document/marc.rb
+- app/models/concerns/blacklight/solr/document/marc_export.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/_refworks_form.html.erb
 - app/views/catalog/endnote.endnote.erb
 - app/views/catalog/librarian_view.html.erb
+- app/views/catalog/show.refworks.erb
 - blacklight-marc.gemspec
 - config/jetty.yml
-- config/locales/blacklight.en.yml
-- config/locales/blacklight.fr.yml
+- config/locales/blacklight_marc.de.yml
+- config/locales/blacklight_marc.en.yml
+- config/locales/blacklight_marc.es.yml
+- config/locales/blacklight_marc.fr.yml
+- config/locales/blacklight_marc.it.yml
+- config/locales/blacklight_marc.pt-BR.yml
 - config/routes.rb
-- lib/SolrMarc.jar
 - lib/blacklight/marc.rb
 - lib/blacklight/marc/catalog.rb
 - lib/blacklight/marc/engine.rb
-- lib/blacklight/marc/railtie.rb
+- lib/blacklight/marc/indexer.rb
+- lib/blacklight/marc/indexer/dewey.rb
+- lib/blacklight/marc/indexer/formats.rb
 - lib/blacklight/marc/routes.rb
 - lib/blacklight/marc/version.rb
-- lib/blacklight/solr/document/marc.rb
-- lib/blacklight/solr/document/marc_export.rb
 - lib/generators/blacklight/marc/install_generator.rb
-- lib/generators/blacklight/marc/templates/config/SolrMarc/config-test.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/config.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/index.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/index_scripts/dewey.bsh
-- lib/generators/blacklight/marc/templates/config/SolrMarc/index_scripts/format.bsh
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/README_MAPS
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/callnumber_map.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/composition_era_map.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/country_map.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/format_map.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/instrument_map.properties
-- lib/generators/blacklight/marc/templates/config/SolrMarc/translation_maps/language_map.properties
-- lib/generators/blacklight_marc/marc_generator.rb
+- lib/generators/blacklight/marc/templates/app/models/marc_indexer.rb
+- lib/generators/blacklight/marc/templates/config/translation_maps/README_MAPS
+- lib/generators/blacklight/marc/templates/config/translation_maps/callnumber_map.properties
+- lib/generators/blacklight/marc/templates/config/translation_maps/composition_era_map.properties
+- lib/generators/blacklight/marc/templates/config/translation_maps/country_map.properties
+- lib/generators/blacklight/marc/templates/config/translation_maps/format_map.properties
+- lib/generators/blacklight/marc/templates/config/translation_maps/instrument_map.properties
+- lib/generators/blacklight/marc/templates/config/translation_maps/language_map.properties
 - lib/railties/solr_marc.rake
 - spec/controllers/catalog_controller_spec.rb
+- spec/features/bookmarks_spec.rb
 - spec/features/librarian_view_spec.rb
+- spec/features/record_view_spec.rb
+- spec/features/search_formats_spec.rb
 - spec/helpers/blacklight_marc_helper_spec.rb
 - spec/integration/solr_document_spec.rb
 - spec/lib/blacklight_solr_document_marc_spec.rb
+- spec/lib/indexer/dewey_spec.rb
+- spec/lib/indexer/formats_spec.rb
 - spec/lib/marc_export_spec.rb
 - spec/lib/tasks/solr_marc_task_spec.rb
+- spec/lib/traject_indexer_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/support/controller_level_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb
+- spec/views/catalog/_document_action.html.erb_spec.rb
+- spec/views/catalog/index.atom.builder_spec.rb
+- test_support/config/translation_maps/test_dewey.properties
+- test_support/config/translation_maps/test_formats.properties
 - test_support/data/test_data.utf8.mrc
-homepage: https://github.com/projectblacklight/blacklight_marc
+homepage: https://github.com/projectblacklight/blacklight-marc
 licenses:
 - Apache 2.0
 metadata: {}
@@ -239,20 +301,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: MARC support for Blacklight
 test_files:
 - spec/controllers/catalog_controller_spec.rb
+- spec/features/bookmarks_spec.rb
 - spec/features/librarian_view_spec.rb
+- spec/features/record_view_spec.rb
+- spec/features/search_formats_spec.rb
 - spec/helpers/blacklight_marc_helper_spec.rb
 - spec/integration/solr_document_spec.rb
 - spec/lib/blacklight_solr_document_marc_spec.rb
+- spec/lib/indexer/dewey_spec.rb
+- spec/lib/indexer/formats_spec.rb
 - spec/lib/marc_export_spec.rb
 - spec/lib/tasks/solr_marc_task_spec.rb
+- spec/lib/traject_indexer_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/support/controller_level_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/bookmarks/_endnote.html.erb_spec.rb
 - spec/views/bookmarks/_refworks.html.erb_spec.rb
+- spec/views/catalog/_document_action.html.erb_spec.rb
+- spec/views/catalog/index.atom.builder_spec.rb