blacklight 3.0.0pre4 → 3.0.0pre6

data/test_support/spec/lib/marc_export_spec.rb

@@ -169,6 +169,202 @@ def record2_xml
 </record>"
 end
 
+def year_range_xml
+  "<record>
+     <leader>01021cam a2200277 a 4500</leader>
+     <controlfield tag=\"001\">a1711966</controlfield>
+     <controlfield tag=\"003\">SIRSI</controlfield>
+     <controlfield tag=\"008\">890421s1988    enka          001 0 eng d</controlfield>
+
+     <datafield tag=\"100\" ind1=\"1\" ind2=\" \">
+       <subfield code=\"a\">Schmoe, Joe</subfield>
+     </datafield>
+
+     <datafield tag=\"245\" ind1=\"1\" ind2=\"4\">
+       <subfield code=\"a\">Main title /</subfield>
+       <subfield code=\"c\">Subtitle</subfield>
+     </datafield>
+
+     <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+       <subfield code=\"a\">London :</subfield>
+       <subfield code=\"b\">Batsford,</subfield>
+       <subfield code=\"c\">1988-2000</subfield>
+     </datafield>
+     
+  </record>"
+end
+
+def no_date_xml
+  "<record>
+     <leader>01021cam a2200277 a 4500</leader>
+     <controlfield tag=\"001\">a1711966</controlfield>
+     <controlfield tag=\"003\">SIRSI</controlfield>
+     <controlfield tag=\"008\">890421s1988    enka          001 0 eng d</controlfield>
+
+     <datafield tag=\"100\" ind1=\"1\" ind2=\" \">
+       <subfield code=\"a\">Schmoe, Joe</subfield>
+     </datafield>
+
+     <datafield tag=\"245\" ind1=\"1\" ind2=\"4\">
+       <subfield code=\"a\">Main title /</subfield>
+       <subfield code=\"c\">Subtitle</subfield>
+     </datafield>
+
+     <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+       <subfield code=\"a\">London :</subfield>
+       <subfield code=\"b\">Batsford,</subfield>
+       <subfield code=\"c\">n.d.</subfield>
+     </datafield>
+     
+  </record>"
+end
+
+def section_title_xml
+  "<record>
+     <leader>01021cam a2200277 a 4500</leader>
+     <controlfield tag=\"001\">a1711966</controlfield>
+     <controlfield tag=\"003\">SIRSI</controlfield>
+     <controlfield tag=\"008\">890421s1988    enka          001 0 eng d</controlfield>
+
+     <datafield tag=\"100\" ind1=\"1\" ind2=\" \">
+       <subfield code=\"a\">Schmoe, Joe</subfield>
+     </datafield>
+
+     <datafield tag=\"245\" ind1=\"1\" ind2=\"4\">
+       <subfield code=\"a\">Main title /</subfield>
+       <subfield code=\"b\">Subtitle</subfield>
+       <subfield code=\"n\">Number of part.</subfield>
+       <subfield code=\"p\">Name of part.</subfield>
+     </datafield>
+
+     <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+       <subfield code=\"a\">London :</subfield>
+       <subfield code=\"b\">Batsford,</subfield>
+       <subfield code=\"c\">2001</subfield>
+     </datafield>
+     
+  </record>"
+end
+
+def dissertation_note_xml
+"<record>
+  <leader>00903nam a2200253   4500</leader>
+  <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
+
+  <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Thesis on some subject.</subfield>
+  </datafield>
+
+  <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+    <subfield code=\"c\">2009</subfield>
+  </datafield>
+  
+  <datafield tag=\"502\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Phd Thesis -- Goodenough College, 2009</subfield>
+  </datafield>
+</record>"
+end
+
+def special_contributor_with_author_xml
+"<record>
+  <leader>00903nam a2200253   4500</leader>
+  <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
+  
+  <datafield tag=\"100\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Doe, John</subfield>
+  </datafield>
+  
+  <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Title of item.</subfield>
+  </datafield>
+
+  <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Publisher</subfield>
+    <subfield code=\"b\">Place</subfield>
+    <subfield code=\"c\">2009</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Joe</subfield>
+    <subfield code=\"e\">trl.</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Bill</subfield>
+    <subfield code=\"4\">edt</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Susie</subfield>
+    <subfield code=\"e\">com.</subfield>
+  </datafield>
+  
+</record>"
+end
+
+def three_authors_xml
+"<record>
+  <leader>00903nam a2200253   4500</leader>
+  <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
+  
+  <datafield tag=\"100\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Doe, John</subfield>
+  </datafield>
+  
+  <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Title of item.</subfield>
+  </datafield>
+
+  <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Publisher</subfield>
+    <subfield code=\"b\">Place</subfield>
+    <subfield code=\"c\">2009</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Joe</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Bill</subfield>
+  </datafield>
+  
+</record>"
+end
+
+def special_contributor_no_author_xml
+"<record>
+  <leader>00903nam a2200253   4500</leader>
+  <controlfield tag=\"008\">730111s1971    ohu      b    000 0 eng  </controlfield>
+  
+  <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
+    <subfield code=\"a\">Title of item.</subfield>
+  </datafield>
+
+  <datafield tag=\"260\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Publisher</subfield>
+    <subfield code=\"b\">Place</subfield>
+    <subfield code=\"c\">2009</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Joe</subfield>
+    <subfield code=\"e\">trl.</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Bill</subfield>
+    <subfield code=\"4\">edt</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\" \" ind2=\" \">
+    <subfield code=\"a\">Schmoe, Susie</subfield>
+    <subfield code=\"e\">com.</subfield>
+  </datafield>
+  
+</record>"
+end
+
 # 4+:athors
 def record3_xml
 "<record>
@@ -228,6 +424,26 @@ def record3_xml
     <subfield code=\"m\">horn, piano,</subfield>
     <subfield code=\"r\">F major.</subfield>
   </datafield>
+  
+  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
+    <subfield code=\"a\">Doe, John</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
+    <subfield code=\"a\">Doe, Jane</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
+    <subfield code=\"a\">Smith, John</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
+    <subfield code=\"a\">Smith, Jane</subfield>
+  </datafield>
+  
+  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
+    <subfield code=\"a\">Smith, James</subfield>
+  </datafield>
 </record>"
 end
 
@@ -312,15 +528,64 @@ describe Blacklight::Solr::Document::MarcExport do
 
     @typical_record                     = dclass.new( standard_citation )
     @music_record                       = dclass.new( music_record )
+    @dissertation_record                = dclass.new( dissertation_note_xml )
     @record_without_245b                = dclass.new( record1_xml )
+    @three_authors_record               = dclass.new( three_authors_xml )
     @record_without_authors             = dclass.new( record2_xml )
-    @record_with_4plus_authors          = dclass.new( record3_xml )
+    @record_with_10plus_authors         = dclass.new( record3_xml )
+    @year_range_record                  = dclass.new( year_range_xml )
+    @no_date_record                     = dclass.new( no_date_xml )
+    @section_title_record               = dclass.new( section_title_xml )
+    @special_contributor_record         = dclass.new( special_contributor_with_author_xml )
     @record_without_citable_data        = dclass.new( no_good_data_xml )
     @record_with_bad_author             = dclass.new( bad_author_xml )
-    @record_utf8_decomposed = dclass.new( utf8_decomposed_record_xml )
+    @special_contributor_no_auth_record = dclass.new( special_contributor_no_author_xml )
+    @record_utf8_decomposed             = dclass.new( utf8_decomposed_record_xml )
 
   end
   
+  describe "export_as_chicago_citation_txt" do
+    it "should handle a typical record correclty" do
+      @typical_record.export_as_chicago_citation_txt.should == "Ferree, David C., and I. J Warrington. <i>Apples: Botany, Production, and Uses.</i> Oxon, U.K.: CABI Pub., 2003."
+    end
+    it "should format a record w/o authors correctly" do
+      @record_without_authors.export_as_chicago_citation_txt.should == "<i>Final Report to the Honorable John J. Gilligan, Governor.</i> [Columbus: Printed by the State of Ohio, Dept. of Urban Affairs, 1971."
+    end
+    it "should format a citation without a 245b field correctly" do
+      @record_without_245b.export_as_chicago_citation_txt.should == "Janetzky, Kurt., and Bernhard Brüchle. <i>The Horn.</i> London: Batsford, 1988."
+    end
+    it "should format a citation with 4+ authors correctly" do
+      chicago_text = @record_with_10plus_authors.export_as_chicago_citation_txt
+      chicago_text.should == "Greer, Lowell., Steven Lubin, Stephanie Chase, Johannes Brahms, Ludwig van Beethoven, Nikolaus von Krufft, John Doe,  et al. <i>Music for Horn.</i> [United States]: Harmonia Mundi USA, 2001."
+      chicago_text.should match(/John Doe,  et al\./)
+      chicago_text.should_not match(/Jane Doe/)
+    end
+    it "should handle dissertation data correctly" do
+      @dissertation_record.export_as_chicago_citation_txt.should == "<i>Thesis On Some Subject.</i> Phd Thesis -- Goodenough College, 2009."
+    end
+    it "should handle 3 authors correctly" do
+      @three_authors_record.export_as_chicago_citation_txt.should match(/^Doe, John, Joe Schmoe, and Bill Schmoe\./)
+    end
+    it "should handle editors, translators, and compilers correctly" do
+      @special_contributor_record.export_as_chicago_citation_txt.should == "Doe, John <i>Title of Item.</i> Translated by Joe Schmoe. Edited by Bill Schmoe. Compiled by Susie Schmoe.  Publisher: Place, 2009."
+    end
+    it "should handle editors, translators, and compilers correctly when there is no author present" do
+      @special_contributor_no_auth_record.export_as_chicago_citation_txt.should == "Schmoe, Joe trans., Bill Schmoe ed., and Susie Schmoe comp. <i>Title of Item.</i> Publisher: Place, 2009."
+    end
+    it "should handle year ranges properly" do
+      @year_range_record.export_as_chicago_citation_txt.should_not match(/2000/)
+    end
+    it "should handle n.d. in the 260$c properly" do
+      @no_date_record.export_as_chicago_citation_txt.should match(/n\.d\.$/)
+    end
+    it "should handle section title appropriately" do
+      @section_title_record.export_as_chicago_citation_txt.should == "Schmoe, Joe <i>Main Title: Subtitle\.<\/i> Number of Part, <i>Name of Part\.<\/i> London: Batsford, 2001."
+    end
+    it "should not fail if there is no citation data" do
+      @record_without_citable_data.export_as_chicago_citation_txt.should == ""
+    end
+  end
+  
   describe "export_as_apa_citation_txt" do
     it "should format a standard citation correctly" do
       @typical_record.export_as_apa_citation_txt.should == "Ferree, D. C, &amp; Warrington, I. J. (2003). <i>Apples : botany, production, and uses.</i> Oxon, U.K.: CABI Pub."
@@ -358,7 +623,7 @@ describe Blacklight::Solr::Document::MarcExport do
     end
     
     it "should format a citation with 4+ authors correctly" do
-      @record_with_4plus_authors.export_as_mla_citation_txt.should == "Greer, Lowell, et al. <i>Music for Horn.</i> [United States]: Harmonia Mundi USA, 2001."
+      @record_with_10plus_authors.export_as_mla_citation_txt.should == "Greer, Lowell, et al. <i>Music for Horn.</i> [United States]: Harmonia Mundi USA, 2001."
     end
     
     it "should not fail if there is no citation data" do
@@ -430,15 +695,50 @@ describe Blacklight::Solr::Document::MarcExport do
         endnote_entries[$1] << $2
       end
 
-      endnote_entries["0"].should == Set.new("Format") # I have no idea WHY this is correct, it is definitely not legal, but taking from earlier test for render_endnote in applicationhelper, the previous version of this.  jrochkind.
-      endnote_entries["D"].should == Set.new("p2001. ")
-      endnote_entries["C"].should == Set.new("[United States] : ")
+      endnote_entries["0"].should == Set.new(["Format"]) # I have no idea WHY this is correct, it is definitely not legal, but taking from earlier test for render_endnote in applicationhelper, the previous version of this.  jrochkind.
+      endnote_entries["D"].should == Set.new(["p2001. "])
+      endnote_entries["C"].should == Set.new(["[United States] : "])
       endnote_entries["E"].should == Set.new(["Greer, Lowell. ", "Lubin, Steven. ", "Chase, Stephanie, ", "Brahms, Johannes, ", "Beethoven, Ludwig van, ", "Krufft, Nikolaus von, "])
-      endnote_entries["I"].should == Set.new("Harmonia Mundi USA, ")
-      endnote_entries["T"].should == Set.new("Music for horn ")
+      endnote_entries["I"].should == Set.new(["Harmonia Mundi USA, "])
+      endnote_entries["T"].should == Set.new(["Music for horn "])
 
       #nothing extra
       Set.new(endnote_entries.keys).should == Set.new(["0", "C", "D", "E", "I", "T"])      
     end
   end
+
+  describe "Citation title transformation" do
+    before(:each) do 
+      class CitationTitleTest
+        include Blacklight::Solr::Document::MarcExport
+        def transform_title(text)
+          citation_title(text)
+        end
+      end
+      @citation_title = CitationTitleTest.new
+    end
+    it "should tranform a normal title properlly" do
+      @citation_title.transform_title("This is just a test").should == "This Is Just a Test"
+    end
+    it "should not attempt to capatilize words in all-caps (e.g. acronyms)" do
+      @citation_title.transform_title("IBM PC applications").should == "IBM PC Applications"
+    end
+    it "should capitalize a preposition if it is the first word in a title" do
+      @citation_title.transform_title("of mice and men").should == "Of Mice and Men"
+    end
+    it "should handle hyphenated words properly" do
+      @citation_title.transform_title("Testing hyphenated-words and how they get capitalized").should == "Testing Hyphenated-Words and How They Get Capitalized"
+    end
+    it "should handle normal prepositions properly" do
+      @citation_title.transform_title("A little learning is a dangerous thing").should == "A Little Learning Is a Dangerous Thing"
+      @citation_title.transform_title("Four theories concerning the Gospel according to Matthew").should == "Four Theories Concerning the Gospel According to Matthew"
+      @citation_title.transform_title("Tired but happy").should == "Tired but Happy"
+      @citation_title.transform_title("Mnemonics that work are better than rules that do not").should == "Mnemonics That Work Are Better Than Rules That Do Not"
+      @citation_title.transform_title("This is just a test").should == "This Is Just a Test"
+      @citation_title.transform_title("the mind of the Renaissance").should == "The Mind of the Renaissance"
+      @citation_title.transform_title("Are you considering psychoanalysis?").should == "Are You Considering Psychoanalysis?"
+      @citation_title.transform_title("Not without laughter").should == "Not without Laughter"
+    end
+  end
+
 end

data/test_support/spec/lib/tasks/solr_marc_task_spec.rb

@@ -16,7 +16,7 @@ describe "solr:marc:*" do
       $stdout = STDOUT
     end
     
-    before do
+    before(:all) do
       @rake = Rake::Application.new      
       Rake.application = @rake
       Rake.application.rake_require "../lib/railties/solr_marc"

data/test_support/spec/views/catalog/index.atom.builder_spec.rb

@@ -20,7 +20,7 @@ describe "Atom feed view" do
   
     # Load sample responses from Solr to a sample request, to test against
     @data = YAML.load(File.open(File.dirname(__FILE__) + 
-                               "/../../data/sample_docs.yml"))
+                               "/../../data/sample_docs.yml", "r:UTF-8"))
     @rsolr_response = RSolr::Ext::Response::Base.new(@data["solr_response"], nil, @data["params"])
     @params = @data["params"]
     @document_list = @data["document_list_mash"].collect do |d|   

data/test_support/spec/views/catalog/show.html.erb_spec.rb

@@ -13,16 +13,16 @@ describe "/catalog/show.html.erb" do
     
     
 # TODO:  should probably not have id field name hardcoded
-    @div_doc_id = 'div[id=doc_' + @document[:id] + ']'
+    @div_doc_id = 'div[id=doc_' + @document.id + ']'
 
     assigns[:response] = @solr_resp
     assigns[:document_list] = @document_list
     assigns[:document] = @document
     
     @previousDocument = mock("prev_doc")
-    @previousDocument.should_receive(:[]).with(:id).and_return("abc")
+    @previousDocument.should_receive(:id).and_return("abc")
     @nextDocument = mock("next_doc")
-    @nextDocument.should_receive(:[]).with(:id).and_return("xyz")
+    @nextDocument.should_receive(:id).and_return("xyz")
     assigns[:previous_document] = @previousDocument
     assigns[:next_document] = @nextDocument
 

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight
 version: !ruby/object:Gem::Version 
-  hash: 1923832001
+  hash: 1923832005
   prerelease: 5
   segments: 
   - 3
   - 0
   - 0
   - pre
-  - 4
-  version: 3.0.0pre4
+  - 6
+  version: 3.0.0pre6
 platform: ruby
 authors: 
-- jrochkind
+- Jonathan Rochkind
 - Matt Mitchell
 - Chris Beer
 - Jessie Keck
 - Jason Ronallo
 - Vernon Chapman
-- Marck A. Matienzo
+- Mark A. Matienzo
+- Dan Funk
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -04:00
+date: 2011-06-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,11 +82,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 0
+        - 4
         - 3
-        version: "0.3"
+        version: 0.4.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -119,20 +121,17 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: kaminari
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1923831917
+        hash: 3
         segments: 
-        - 3
         - 0
-        - pre
-        - 2
-        version: 3.0.pre2
+        version: "0"
   type: :runtime
   version_requirements: *id007
 description: "Blacklight is a free and open source ruby-on-rails based discovery interface (a.k.a. \xE2\x80\x9Cnext-generation catalog\xE2\x80\x9D) especially optimized for heterogeneous collections. You can use it as a library catalog, as a front end for a digital repository, or as a single-search interface to aggregate digital content that would otherwise be siloed."
@@ -220,13 +219,21 @@ files:
 - app/views/feedback/show.html.erb
 - app/views/folder/_tools.html.erb
 - app/views/folder/index.html.erb
+- app/views/kaminari/blacklight/_first_page.html.erb
+- app/views/kaminari/blacklight/_gap.html.erb
+- app/views/kaminari/blacklight/_last_page.html.erb
+- app/views/kaminari/blacklight/_next_page.html.erb
+- app/views/kaminari/blacklight/_page.html.erb
+- app/views/kaminari/blacklight/_paginator.html.erb
+- app/views/kaminari/blacklight/_prev_page.html.erb
 - app/views/layouts/blacklight.html.erb
-- app/views/record_mailer/email_record.erb
-- app/views/record_mailer/sms_record.erb
+- app/views/record_mailer/email_record.text.erb
+- app/views/record_mailer/sms_record.text.erb
 - app/views/saved_searches/index.html.erb
 - app/views/search_history/index.html.erb
 - blacklight.gemspec
 - config.ru
+- config/locales/kaminari.yml
 - config/routes.rb
 - db/seeds.rb
 - features/default_setup.feature
@@ -242,6 +249,7 @@ files:
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
+- lib/blacklight/routes.rb
 - lib/blacklight/search_fields.rb
 - lib/blacklight/solr.rb
 - lib/blacklight/solr/document.rb
@@ -424,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities