hydra-head 3.1.0 → 3.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.1.0.pre2)
+    hydra-head (3.1.0)
       RedCloth (= 4.2.3)
       active-fedora (~> 3.1.1)
       blacklight (= 3.0.0)
@@ -9,7 +9,7 @@ PATH
       builder
       columnize
       crack
-      curb
+      curb (= 0.7.15)
       database_cleaner
       diff-lcs
       facets (= 2.8.4)
@@ -120,7 +120,7 @@ GEM
       capybara (>= 1.1.1)
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
-    curb (0.7.16)
+    curb (0.7.15)
     daemons (1.1.4)
     database_cleaner (0.6.7)
     diff-lcs (1.1.3)

data/HISTORY.textile

@@ -1,3 +1,9 @@
+h3. 3.1.1
+* Fixed bug where selected facet was not html_safe
+* Fixed document_list, called when sorting by object_type_facet
+* Don't issue two notice messags when saving document.
+
+
 h3. 3.1.0
 * Updated to ActiveFedora 3.1.1
 * Update rake tasks to leverage jettywrapper

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -72,9 +72,7 @@ module Hydra
     
     # Removing the [remove] link from the default selected facet display
     def render_selected_facet_value(facet_solr_field, item)
-      '<span class="selected">' +
-      render_facet_value(facet_solr_field, item, :suppress_link => true) +
-      '</span>'
+      content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected")
     end
 
     

data/app/views/catalog/_document_list.html.erb

@@ -2,10 +2,10 @@
 <div id="documents">
   <% facet_name = grouping_facet %>
   <%- if facet_name -%>
-    <%- @response.docs.group_by {|d| d.get(facet_name)}.each do |grouping| -%>
+    <%- @response.docs.group_by {|d| d[facet_name]}.each do |grouping| -%>
       <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => grouping[1], :facet_name => facet_name, :facet_value => grouping[0].to_s} %>
     <%- end -%>
   <%- else -%>
     <%= render :partial => 'catalog/_index_partials/default_group', :locals => {:docs => @response.docs, :facet_name => nil, :facet_value => nil} %>
   <%- end -%>
-</div>
+</div>

data/hydra-head.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'builder'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'
-  s.add_dependency 'curb'
+  s.add_dependency 'curb', '0.7.15' ##Locked here because centos 5.2 (Hudson) doesn't support curl 7.16
   s.add_dependency 'database_cleaner'
   s.add_dependency 'diff-lcs'
   s.add_dependency 'facets', '2.8.4'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end
 

data/lib/hydra/submission_workflow.rb

@@ -48,7 +48,6 @@ module Hydra::SubmissionWorkflow
       return_params[:new_asset] = true
     end
     if params[:wf_step] == last_step_in_workflow or params.has_key?(:finish)
-      flash[:notice] << "<br/>Your object has been saved and you have been redirected to the display view."
       return_params[:viewing_context] = "browse"
       return_params[:action] = "show" 
       return_params[:wf_step] = nil
@@ -134,4 +133,4 @@ module Hydra::SubmissionWorkflow
     Hydra.config[:submission_workflow]
   end
 
-end
+end

data/test_support/features/mods_asset_edit.feature

@@ -50,7 +50,7 @@ Feature: Edit a ModsAsset object
     When I am on the edit additional_info page for hydrangea:fixture_mods_article1
     When I press "Save and Finish"
     Then I should see "Switch to edit view"
-    And I should see "Your object has been saved"
+    And I should see "Your changes have been saved"
 
   Scenario: html5 valid
     Given I am logged in as "archivist1@example.com"

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -18,6 +18,15 @@ describe BlacklightHelper do
         helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"]).should == "generic_contents" 
       end
     end
+    describe "render_selected_facet_value" do
+      it "should be html_safe and not have the remove link" do
+        item = stub("item", :value=>'two', :hits=>9)
+
+        ret_val = helper.render_selected_facet_value("one", item)
+        ret_val.should == "<span class=\"selected\">two (9)</span>"
+        ret_val.should be_html_safe
+      end
+    end
     describe "render_head_content" do
       before (:each) do
         helper.expects(:content_for).with(:head).returns("My added content")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -114,12 +114,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 15
+        version: 0.7.15
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -1152,7 +1154,6 @@ files:
 - vendor/cache/crack-0.3.1.gem
 - vendor/cache/cucumber-1.1.0.gem
 - vendor/cache/cucumber-rails-1.1.1.gem
-- vendor/cache/curb-0.7.16.gem
 - vendor/cache/daemons-1.1.4.gem
 - vendor/cache/database_cleaner-0.6.7.gem
 - vendor/cache/diff-lcs-1.1.3.gem