hydra-core 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7bbd65400b9e3173824a1cb57422323c4f04a0
-  data.tar.gz: 989d029fd3bf0481304766bf8ccc6dbd32a3384f
+  metadata.gz: d0bab92197a631330fa21a7a548ce74eac3b6c1b
+  data.tar.gz: e93594e35f3912e8bb315c896a2d1b9bfeeca262
 SHA512:
-  metadata.gz: 4ce648f2cbd0c653c658d1dad402c372ce149d9e66f00c011baf328dee6f4cbfd3e1c566662fd040c758dfb9b70516205683c89e4701eb558cbfdb6cecfc9200
-  data.tar.gz: 22c9cfe1972f18b3c581ea8f058075d4f06c6532e77bb3e8377e85fc2d6d26f9b57d6e5752352920ec325b3eeef128350a73cd3039dc165d64fa7734a436b06a
+  metadata.gz: 6acbd061cda6f61cac8be5a275936e92e169d4f07e3491a475116cf5dd829b08be8b7150f1e37316c4a523910637734f26632755935b9ef0290ef5d55b3ad807
+  data.tar.gz: 009fdf265cf9e97ea3bc8e7ef900bc1c705eea7f2cb0826cdf31769c76200e98e4f3a378783f660d2af95a0f0f274ddb5ab7e1ffdce721f6b64e9020934d30fa

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -3,12 +3,20 @@ module Hydra
     include Blacklight::BlacklightHelperBehavior
     
     # Given a Fedora uri, generate a reasonable partial name
+    # Rails thinks that periods indicate a filename, so escape them with slashes.
+    # @param [Hash] document the solr document (hash of fields & values)
+    # @return [String] the name for the display partial
+    # @example
+    #   document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"])
+    #    => "generic_content"
+    #   document_partial_name('has_model_s' => ["info:fedora/hull-cModel:text.pdf"])
+    #    => "text_pdf"
     def document_partial_name(document)
       display_type = document[blacklight_config.show.display_type]
 
       return 'default' unless display_type 
 
-      display_type.first.gsub(/^[^\/]+\/[^:]+:/,"").underscore
+      Array(display_type).first.gsub(/^[^\/]+\/[^:]+:/,"").gsub(/\./, '_').underscore
     end    
 
   #   COPIED from vendor/plugins/blacklight/app/helpers/application_helper.rb

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

@@ -21,7 +21,7 @@ class CatalogController < ApplicationController
 
     # solr field configuration for search results/index views
     config.index.show_link = 'title_tesim'
-    config.index.record_tsim_type = 'has_model_ssim'
+    config.index.record_display_type = 'has_model_ssim'
 
     # solr field configuration for document/show views
     config.show.html_title = 'title_tesim'

data/lib/hydra/controller/download_behavior.rb

@@ -22,7 +22,7 @@ module Hydra
       protected
 
       def load_asset
-        @asset = ActiveFedora::Base.find(params[:id], :cast=>true)
+        @asset = ActiveFedora::Base.load_instance_from_solr(params[:id])
       end
 
       def load_datastream
@@ -53,6 +53,7 @@ module Hydra
       def datastream_to_show
         ds = asset.datastreams[params[:datastream_id]] if params.has_key?(:datastream_id)
         ds = default_content_ds if ds.nil?
+        raise "Unable to find a datastream for #{asset}" if ds.nil?
         ds
       end
       
@@ -107,7 +108,7 @@ module Hydra
       
       def default_content_ds
         ActiveFedora::ContentModel.known_models_for(asset).each do |model_class|
-          return model_class.default_content_ds if model_class.respond_to?(:default_content_ds)
+          return asset.datastreams[model_class.default_content_ds] if model_class.respond_to?(:default_content_ds)
         end
         if asset.datastreams.keys.include?(DownloadsController.default_content_dsid)
           return asset.datastreams[DownloadsController.default_content_dsid]

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.1.0"
+  VERSION = "6.1.1"
 end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -19,6 +19,7 @@ describe DownloadsController do
       @obj = ActiveFedora::Base.new
       @obj = ModsAsset.new
       @obj.label = "world.png"
+      @obj.add_file_datastream('fizz', :dsid=>'buzz', :mimeType => 'image/png')
       @obj.add_file_datastream('foobarfoobarfoobar', :dsid=>'content', :mimeType => 'image/png')
       @obj.add_file_datastream("It's a stream", :dsid=>'descMetadata', :mimeType => 'text/plain')
       @obj.read_users = [@user.user_key]
@@ -33,7 +34,15 @@ describe DownloadsController do
         User.any_instance.stub(:groups).and_return([])
       end
       describe "show" do
-        it "should default to returning configured default download" do
+        it "should default to returning default download configured by object" do
+          ModsAsset.stub(:default_content_ds).and_return('buzz')
+          get "show", :id => @obj.pid
+          response.should be_success
+          response.headers['Content-Type'].should == "image/png"
+          response.headers["Content-Disposition"].should == "inline; filename=\"world.png\""
+          response.body.should == 'fizz'
+        end
+        it "should default to returning default download configured by controller" do
           DownloadsController.default_content_dsid.should == "content"
           get "show", :id => @obj.pid
           response.should be_success

data/spec/helpers/blacklight_helper_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe BlacklightHelper do
   describe "document_partial_name" do
-    it "Should lop off everything before the first colin after the slash" do
+    it "should lop off everything before the first colin after the slash" do
       @config = Blacklight::Configuration.new.configure do |config|
         config.show.display_type = 'has_model_s'
       end
@@ -10,6 +10,21 @@ describe BlacklightHelper do
       helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"]).should == "presentation"
       helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"]).should == "generic_content" 
     end
+    it "should support single valued fields" do
+      @config = Blacklight::Configuration.new.configure do |config|
+        config.show.display_type = 'active_fedora_model_ssi'
+      end
+      helper.stub(:blacklight_config).and_return(@config)
+      helper.document_partial_name('active_fedora_model_ssi' => "Chicken").should == "chicken" 
+    end
+
+    it "should handle periods" do
+      @config = Blacklight::Configuration.new.configure do |config|
+        config.show.display_type = 'has_model_s'
+      end
+      helper.stub(:blacklight_config).and_return(@config)
+      helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:text.PDF"]).should == "text_pdf"
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.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: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.1
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement