hydra-core 9.8.0 → 9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1218b0be13908d308c1bf36d42054ad627ecb973
-  data.tar.gz: 4c07a1f43cf53d0fbdbb32a950af1173de36af9a
+  metadata.gz: 0e6bce4c322a2015039716338e6ce76ee2dd280e
+  data.tar.gz: da5239427f902aaa159fd3405c7bc864cf425cc4
 SHA512:
-  metadata.gz: 3c7a3966e1c8ff2ff266069fbaf797379adf6e723a571cfd099a0f8d0b45fba2e864b40ac76f12d1870cb5e45ae5abb2885809191df8bcd783bdd921839af305
-  data.tar.gz: a35f12fd32f795bf9eb264607fdea5a697ff4702512619d6dd43032ad3b5a3b03279f2dbf111b2be79db6d8a47664d44d206739bc211008cd8c458e1cb093013
+  metadata.gz: 2232d4cee1da5b52e3c99b332743820212c7ddcbe74a78cb051982243c87e6e69dd6fb41134e1d53ca2f68a8d38cf94e55b156d379b7adc95412aedf9925cb8c
+  data.tar.gz: b155e70aaba5ec97d09a221fbacbdc1c3dbd13f0117117966681e10301e02494492ce888238b75ded5e3df10de35467ddea660e56d6120ccc0e8dcfa9d83fbea

data/app/models/hydra/content_negotiation/fedora_uri_replacer.rb

@@ -16,7 +16,7 @@ module Hydra::ContentNegotiation
 
     def replace_uri(uri)
       id = ActiveFedora::Base.uri_to_id(uri)
-      RDF::URI(Hydra.config.id_to_resource_uri.call(id))
+      RDF::URI(Hydra.config.id_to_resource_uri.call(id, graph))
     end
 
     def replaced_objects

data/lib/generators/hydra/head_generator.rb

@@ -21,9 +21,15 @@ module Hydra
     #
     # Config Files & Initializers
     #
-    def inject_fcrepo_wrapper
+      #
+    def add_gems
       gem_group :development, :test do
         gem "fcrepo_wrapper"
+        gem "rspec-rails" unless options[:'skip-rspec']
+      end
+
+      Bundler.with_clean_env do
+        run "bundle install"
       end
     end
 
@@ -35,14 +41,6 @@ module Hydra
         "      g.test_framework :rspec, :spec => true\n" <<
         "    end\n\n"
       )
-
-      gem_group :development, :test do
-        gem "rspec-rails"
-      end
-
-      Bundler.with_clean_env do
-        run "bundle install"
-      end
     end
 
     def overwrite_catalog_controller

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -60,32 +60,32 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field solr_name('title', :stored_searchable, type: :string), label: 'Title:'
-    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title:'
-    config.add_index_field solr_name('author', :stored_searchable, type: :string), label: 'Author:'
-    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author:'
-    config.add_index_field solr_name('format', :symbol), label: 'Format:'
-    config.add_index_field solr_name('language', :stored_searchable, type: :string), label: 'Language:'
-    config.add_index_field solr_name('published', :stored_searchable, type: :string), label: 'Published:'
-    config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published:'
-    config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number:'
+    config.add_index_field solr_name('title', :stored_searchable, type: :string), label: 'Title'
+    config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title'
+    config.add_index_field solr_name('author', :stored_searchable, type: :string), label: 'Author'
+    config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author'
+    config.add_index_field solr_name('format', :symbol), label: 'Format'
+    config.add_index_field solr_name('language', :stored_searchable, type: :string), label: 'Language'
+    config.add_index_field solr_name('published', :stored_searchable, type: :string), label: 'Published'
+    config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published'
+    config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number'
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field solr_name('title', :stored_searchable, type: :string), label: 'Title:'
-    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title:'
-    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), label: 'Subtitle:'
-    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), label: 'Subtitle:'
-    config.add_show_field solr_name('author', :stored_searchable, type: :string), label: 'Author:'
-    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author:'
-    config.add_show_field solr_name('format', :symbol), label: 'Format:'
-    config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), label: 'URL:'
-    config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), label: 'More Information:'
-    config.add_show_field solr_name('language', :stored_searchable, type: :string), label: 'Language:'
-    config.add_show_field solr_name('published', :stored_searchable, type: :string), label: 'Published:'
-    config.add_show_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published:'
-    config.add_show_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number:'
-    config.add_show_field solr_name('isbn', :stored_searchable, type: :string), label: 'ISBN:'
+    config.add_show_field solr_name('title', :stored_searchable, type: :string), label: 'Title'
+    config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title'
+    config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), label: 'Subtitle'
+    config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), label: 'Subtitle'
+    config.add_show_field solr_name('author', :stored_searchable, type: :string), label: 'Author'
+    config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author'
+    config.add_show_field solr_name('format', :symbol), label: 'Format'
+    config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), label: 'URL'
+    config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), label: 'More Information'
+    config.add_show_field solr_name('language', :stored_searchable, type: :string), label: 'Language'
+    config.add_show_field solr_name('published', :stored_searchable, type: :string), label: 'Published'
+    config.add_show_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published'
+    config.add_show_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number'
+    config.add_show_field solr_name('isbn', :stored_searchable, type: :string), label: 'ISBN'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.8.0"
+  VERSION = "9.8.1"
 end

data/lib/tasks/hydra.rake

@@ -6,7 +6,15 @@ namespace :hydra do
     with_server('development',
                 fcrepo_port: ENV.fetch('FCREPO_PORT', '8984'),
                 solr_port: ENV.fetch('SOLR_PORT', '8983')) do
-      `rails server`
+      IO.popen('rails server') do |io|
+        begin
+          io.each do |line|
+            puts line
+          end
+        rescue Interrupt
+          puts "Stopping server"
+        end
+      end
     end
   end
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -91,7 +91,7 @@ describe CatalogController do
         end
         context "with a configured subject converter" do
           before do
-            Hydra.config.id_to_resource_uri = lambda { |id| "http://hydra.box/catalog/#{id}" }
+            Hydra.config.id_to_resource_uri = lambda { |id, _| "http://hydra.box/catalog/#{id}" }
             get 'show', :id => asset.id, :format => :nt
           end
           it "should convert it" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.8.0
+  version: 9.8.1
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.8.0
+        version: 9.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.8.0
+        version: 9.8.1
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)