blacklight-marc 5.5.0 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e8d8a88f4be661346d59f902344e109f02e672
-  data.tar.gz: 024738cc6d5c0e46cee5c91f2881afc7d3569f61
+  metadata.gz: e8e43d7c8a9b57de3e972546f7c341ca55545a30
+  data.tar.gz: fe618a0f2c13669d32457b783c47700096ca9ef0
 SHA512:
-  metadata.gz: a1ce25d123310609c7fd38aa374bc9128a5c439974f5944285120b14501f69826cd559d2537e6b6c5cd1533cdc494ee0dfdbe05a7a9a142785f1595f6233b9ce
-  data.tar.gz: ddb00a986af2a989198c6def0b246858e0b501f57416805f056315f476bbede3622a52cde86420d9466ae7619b70a3e029bd119d5a09325c2aecfe7cbac94aab
+  metadata.gz: d55e417c12342255ba4839a1baa6364324e52141039adab7860fa02638734e9711611a5f3eb63df8404c073eeb02a6f38d6ed098d213cdcaa8a6339fae366d38
+  data.tar.gz: 9050cf52fad6e56be7900fd07b53c9bdd8513ad807f2426f5e16565c81e7c578b17f61ed9795970cc0f152cf14b6a44443b0a243abcbfc3352be09533a84735f

data/Rakefile

@@ -1,10 +1,12 @@
 require "bundler/gem_tasks"
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
 
 require 'jettywrapper'
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 
+EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
+
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => [:ci]
@@ -30,7 +32,7 @@ namespace :blacklight_marc do
   end
 
   desc "Clean out the test rails app"
-  task :clean => ['engine_cart:clean', 'jetty:clean'] do
+  task :clean => ['jetty:clean'] do
   end
 
   desc "Create the test rails app"

data/blacklight-marc.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "blacklight", "~> 5.8"
+  spec.add_dependency "blacklight", "~> 5.10"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "jettywrapper"
   spec.add_development_dependency "capybara"
-  spec.add_development_dependency "engine_cart", "~> 0.4"
+  spec.add_development_dependency "engine_cart", "~> 0.6"
 
   spec.add_dependency "rails"
   # Let's allow future versions of marc, count on

data/lib/blacklight/marc/catalog.rb

@@ -1,7 +1,7 @@
 module Blacklight::Marc
   module Catalog
     def librarian_view
-      @response, @document = get_solr_response_for_doc_id params[:id]
+      @response, @document = fetch params[:id]
 
       respond_to do |format|
         format.html
@@ -11,7 +11,7 @@ module Blacklight::Marc
 
     # grabs a bunch of documents to export to endnote
     def endnote
-      @response, @documents = get_solr_response_for_document_ids(params[:id])
+      @response, @documents = fetch(Array(params[:id]))
       respond_to do |format|
         format.endnote { render :layout => false }
       end

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = "5.5.0"
+    VERSION = "5.10.0"
   end
 end

data/lib/generators/blacklight/marc/install_generator.rb

@@ -0,0 +1,57 @@
+require 'rails/generators'
+
+module Blacklight::Marc
+  class InstallGenerator < Rails::Generators::Base
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc """
+     1. Creates config/SolrMarc/... with settings for SolrMarc
+     2. Creates a CatalogController with some some demo fields for MARC-like data
+     3. Injects MARC-specific behaviors into the SolrDocument
+     4. Injects MARC-specific behaviors into the CatalogController
+    """
+    
+    # Copy all files in templates/config directory to host config
+    def create_configuration_files
+      directory("config/SolrMarc")
+    end
+
+    # add MARC-specific extensions to the solr document
+    def add_marc_extension_to_solrdocument
+
+      insert_into_file "app/models/solr_document.rb", :after => "include Blacklight::Solr::Document" do <<EOF
+    
+      # The following shows how to setup this blacklight document to display marc documents
+  extension_parameters[:marc_source_field] = :marc_display
+  extension_parameters[:marc_format_type] = :marcxml
+  use_extension( Blacklight::Solr::Document::Marc) do |document|
+    document.key?( :marc_display  )
+  end
+  
+  field_semantics.merge!(    
+                         :title => "title_display",
+                         :author => "author_display",
+                         :language => "language_facet",
+                         :format => "format"
+                         )
+
+EOF
+      end
+    end
+
+    # Add MARC behaviors to the catalog controller
+  def inject_blacklight_controller_behavior    
+#    prepend_file("app/controllers/application_controller.rb", "require 'blacklight/controller'\n\n")
+    inject_into_class "app/controllers/catalog_controller.rb", "CatalogController", :after => "include Blacklight::Catalog" do
+      "  include Blacklight::Marc::Catalog\n"
+    end
+  end
+
+
+  def inject_blacklight_marc_routes
+    route('Blacklight::Marc.add_routes(self)')
+  end
+
+  end
+end

data/lib/generators/blacklight_marc/marc_generator.rb

@@ -1,57 +1,9 @@
-require 'rails/generators'
-
 module BlacklightMarc
   class MarcGenerator < Rails::Generators::Base
 
-    source_root File.expand_path('../templates', __FILE__)
-
-    desc """
-     1. Creates config/SolrMarc/... with settings for SolrMarc
-     2. Creates a CatalogController with some some demo fields for MARC-like data
-     3. Injects MARC-specific behaviors into the SolrDocument
-     4. Injects MARC-specific behaviors into the CatalogController
-    """
-    
-    # Copy all files in templates/config directory to host config
-    def create_configuration_files
-      directory("config/SolrMarc")
-    end
-
-    # add MARC-specific extensions to the solr document
-    def add_marc_extension_to_solrdocument
-
-      insert_into_file "app/models/solr_document.rb", :after => "include Blacklight::Solr::Document" do <<EOF
-    
-      # The following shows how to setup this blacklight document to display marc documents
-  extension_parameters[:marc_source_field] = :marc_display
-  extension_parameters[:marc_format_type] = :marcxml
-  use_extension( Blacklight::Solr::Document::Marc) do |document|
-    document.key?( :marc_display  )
-  end
-  
-  field_semantics.merge!(    
-                         :title => "title_display",
-                         :author => "author_display",
-                         :language => "language_facet",
-                         :format => "format"
-                         )
-
-EOF
-      end
+    def generate_blacklight_marc_install
+      say "blacklight_marc:marc generator is deprecated; use blacklight:marc:install instead", :red
+      generate "blacklight:marc:install"
     end
-
-    # Add MARC behaviors to the catalog controller
-  def inject_blacklight_controller_behavior    
-#    prepend_file("app/controllers/application_controller.rb", "require 'blacklight/controller'\n\n")
-    inject_into_class "app/controllers/catalog_controller.rb", "CatalogController", :after => "include Blacklight::Catalog" do
-      "  include Blacklight::Marc::Catalog\n"
-    end
-  end
-
-
-  def inject_blacklight_marc_routes
-    route('Blacklight::Marc.add_routes(self)')
-  end
-
   end
-end
+end

data/lib/railties/solr_marc.rake

@@ -123,7 +123,7 @@ def compute_arguments
   # use :replicate_master_url for current env if present, otherwise :url
   # for current env. 
   # Also take jetty_path from there if present. 
-    if c = Blacklight.solr_config
+    if c = Blacklight.connection_config
       arguments[:solr_url] = c[:url]    
       if c[:jetty_path]
         arguments[:solr_path] ||= File.expand_path(File.join(c[:jetty_path], "solr"), Rails.root)

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

@@ -33,6 +33,6 @@ class TestAppGenerator < Rails::Generators::Base
   end
   
   def run_blacklight_marc_generator
-    generate 'blacklight_marc:marc'
+    generate 'blacklight:marc:install'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-marc
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.10.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -191,19 +191,20 @@ files:
 - 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/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/railties/solr_marc.rake
 - spec/controllers/catalog_controller_spec.rb
 - spec/features/librarian_view_spec.rb
@@ -238,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MARC support for Blacklight