hydra-core 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 062149584b5be89ae0716bd3a3520345bf121dae
-  data.tar.gz: 99a9a1b9dbc2fcf2f17e069e8b20a23ba0df602c
+  metadata.gz: 22598b19fbed7793eb7c9dc1d01cc5d404256a81
+  data.tar.gz: b8f7f73db73a3fecb112d40d182be170af2087c1
 SHA512:
-  metadata.gz: d3a3407920ae6cfa55e08e8ab49b7accaa5462dddf1c4651734636102b42861855d759d26e08e3de67fe3592bac6e66b8a860e59394c0e4ee2f48a7d1c889052
-  data.tar.gz: f8f7a35179930da51336ff795248dfdd1fc14d475cf3b87e40b5430f8643e1c6daa28fdbc1ad35ebd3e0e54cad5340d4fcf40e73d3e36241b55a4236a656adba
+  metadata.gz: 3f70d2bcdcc5a4e2eced2b62d04dfc444e97d47eb6c6c6ed53b2a35bafbeb05326ba4fda646ff3abbe1765ff85f9372ffc6bc0593d43db705805f1ab92e00a01
+  data.tar.gz: 603d485d5cef74358169f483cf016c8bb6ed56cb04ec0b79f0cea4ea08da8d2d1071855459eb5c4e9a94af9f688db94a4560c9149d47e974104c83201c8cea53

data/app/helpers/hydra/facets_helper_behavior.rb

@@ -14,11 +14,11 @@ module Hydra
         render_array_facet_value(facet_solr_field, item, options)
       end
 
-      (link_to_unless(options[:suppress_link], item.value, add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), add_facet_params_and_redirect(facet_solr_field, item.value), :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
     end
 
     def render_array_facet_value(facet_solr_field, item, options)
-      (link_to_unless(options[:suppress_link], item[0], add_facet_params_and_redirect(facet_solr_field, item[0]), :class=>"facet_select") + " (" + format_num(item[1]) + ")").html_safe 
+      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item[0]), add_facet_params_and_redirect(facet_solr_field, item[0]), :class=>"facet_select") + " (" + format_num(item[1]) + ")").html_safe 
     end
   end
 end

data/hydra-core.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.name          = "hydra-core"
   gem.require_paths = ["lib"]
   gem.version       = version
+  gem.license       = "APACHE2"
 
   gem.required_ruby_version = '>= 1.9.3'
 

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "6.3.1"
+  VERSION = "6.3.2"
 end
 

data/spec/controllers/downloads_controller_spec.rb

@@ -15,7 +15,7 @@ describe DownloadsController do
 
   describe "with a file" do
     before do
-      @user = User.create!(email: 'email@example.com', password: 'password')
+      @user = User.new.tap {|u| u.email = 'email@example.com'; u.password = 'password'; u.save}
       @obj = ActiveFedora::Base.new
       @obj = ModsAsset.new
       @obj.label = "world.png"
@@ -132,7 +132,7 @@ describe DownloadsController do
     describe "when not logged in as reader" do
       describe "show" do
         before do
-          sign_in User.create!(email: 'email2@example.com', password: 'password')
+          sign_in User.new.tap {|u| u.email = 'email2@example.com'; u.password = 'password'; u.save}
         end
         it "should deny access" do
           lambda { get "show", :id =>@obj.pid }.should raise_error Hydra::AccessDenied

data/spec/helpers/facets_helper_spec.rb

@@ -10,12 +10,17 @@ describe FacetsHelper do
   
   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)
-
+      item = double("item", :value=>'two', :hits=>9)
       ret_val = helper.render_selected_facet_value("one", item)
       ret_val.should == "<span class=\"selected\">two <span class=\"count\">9</span></span>"
       ret_val.should be_html_safe
     end
+    it "should use facet_display_value" do
+      item = double("item", :value=>'two', :hits=>9)
+      helper.stub(:facet_display_value).and_return('four')
+      ret_val = helper.render_selected_facet_value("one", item)
+      ret_val.should == "<span class=\"selected\">four <span class=\"count\">9</span></span>"
+    end
   end
 end
 

data/spec/models/user_spec.rb

@@ -4,7 +4,7 @@ describe User do
 
   describe "user_key" do
     before do
-      @user = User.new(:email=>"foo@example.com")
+      @user = User.new.tap {|u| u.email = "foo@example.com"}
       @user.stub(:username =>'foo')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 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-07-04 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.3.2
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,8 @@ files:
 - tasks/hydra_jetty.rake
 - tasks/rspec.rake
 homepage: http://projecthydra.org
-licenses: []
+licenses:
+- APACHE2
 metadata: {}
 post_install_message: 
 rdoc_options: []