blacklight 3.4.1 → 3.4.2

data/VERSION

@@ -1 +1 @@
-3.4.1
+3.4.2

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -118,7 +118,7 @@ module Blacklight::BlacklightHelperBehavior
 
   def render_index_field_value args
     value = args[:value]
-    value ||= send(blacklight_config.index_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.index_fields[args[:field]][:helper_method]
+    value ||= send(blacklight_config.index_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.index_fields[args[:field]] and blacklight_config.index_fields[args[:field]][:helper_method]
     value ||= args[:document].get(args[:field], :sep => nil) if args[:document] and args[:field]
     render_field_value value
   end
@@ -174,7 +174,7 @@ module Blacklight::BlacklightHelperBehavior
 
   def render_document_show_field_value args
     value = args[:value]
-    value ||= send(blacklight_config.show_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.show_fields[args[:field]][:helper_method]
+    value ||= send(blacklight_config.show_fields[args[:field]][:helper_method], args) if args[:field] and blacklight_config.show_fields[args[:field]] and blacklight_config.show_fields[args[:field]][:helper_method]
     value ||= args[:document].get(args[:field], :sep => nil) if args[:document] and args[:field]
     render_field_value value
   end

data/lib/blacklight/solr/document.rb

@@ -100,7 +100,7 @@ module Blacklight::Solr::Document
     end
 
     def to_param
-      URI.escape(CGI.escape(id), '.')
+      id
     end
   end
 

data/lib/generators/blacklight/blacklight_generator.rb

@@ -142,8 +142,11 @@ EOF
   end
 
   def inject_blacklight_routes
-    route('root :to => "catalog#index"')
+    # These will end up in routes.rb file in reverse order
+    # we add em, since each is added at the top of file. 
+    # we want "root" to be FIRST for optimal url generation. 
     route('Blacklight.add_routes(self)')
+    route('root :to => "catalog#index"')
   end
 
   def add_sass_configuration

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -52,9 +52,29 @@ describe CatalogController do
       { :get => catalog_url(SolrDocument.new(:id => 'asdf')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
     end
 
-    it "should escape solr document ids" do
-      catalog_path(SolrDocument.new(:id => 'http://example.com')).should == "/catalog/http%3A%2F%2Fexample%2Ecom"
-      { :get => catalog_url(SolrDocument.new(:id => 'http://example.com'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+    context "should escape solr document ids" do
+
+      it "should pass-through url-valid ids" do
+        { :get => catalog_url(SolrDocument.new(:id => 'qwerty'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
+      end
+
+      it "should route url-like ids" do
+        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        { :get => catalog_url(SolrDocument.new(:id => 'http://example.com'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+      end
+
+      it "should route ids with whitespace" do
+        { :get => catalog_url(SolrDocument.new(:id => 'mm 123')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
+      end
+
+      it "should route ids with a literal '+'" do
+        { :get => catalog_url(SolrDocument.new(:id => 'this+that')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
+      end
+
+      it "should route ids with a literal '/" do
+        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
+        { :get => catalog_url(SolrDocument.new(:id => 'and/or')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
+      end
     end
 
   end

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -392,6 +392,13 @@ describe BlacklightHelper do
       value = helper.render_index_field_value :document => doc, :field => 'qwer'
       value.should == 'document qwer value'
     end
+
+    it "should work with index fields that aren't explicitly defined" do
+      doc = mock()
+      doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      value = helper.render_index_field_value :document => doc, :field => 'mnbv'
+      value.should == 'document mnbv value'
+    end
   end
   
 
@@ -426,6 +433,13 @@ describe BlacklightHelper do
       value = helper.render_document_show_field_value :document => doc, :field => 'qwer'
       value.should == 'document qwer value'
     end
+
+    it "should work with show fields that aren't explicitly defined" do
+      doc = mock()
+      doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
+      value = helper.render_document_show_field_value :document => doc, :field => 'mnbv'
+      value.should == 'document mnbv value'
+    end
   end
   
 end

data/test_support/spec/helpers/render_constraints_helper_spec.rb

@@ -9,7 +9,7 @@ describe RenderConstraintsHelper do
 
   describe '#render_constraints_query' do
     it "should have a link relative to the current url" do
-      helper.render_constraints_query(:q=>'foobar', :f=>{:type=>'journal'}).should have_selector "a[href='/catalog?f%5Btype%5D=journal']"
+      helper.render_constraints_query(:q=>'foobar', :f=>{:type=>'journal'}).should have_selector "a[href='/?f%5Btype%5D=journal']"
     end
   end
 
@@ -24,7 +24,7 @@ describe RenderConstraintsHelper do
       result = helper.render_filter_element('type', ['journal'], {:q=>'biz'})
       result.size.should == 1
       # I'm not certain how the ampersand gets in there. It's not important.
-      result.first.should have_selector "a[href='/catalog?&q=biz']"
+      result.first.should have_selector "a[href='/?&q=biz']"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -505,7 +505,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750863571297793864
+      hash: -528944564261981247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -514,10 +514,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -750863571297793864
+      hash: -528944564261981247
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)