blacklight 3.0.0pre6 → 3.0.0pre7

data/test_support/spec/data/sample_docs.yml

@@ -27,7 +27,7 @@ document_list_mash:
     published_display: 
     - Yerushalayim
     subtitle_vern_display: "\xE2\x80\x8F\xD7\xA1\xD7\xA4\xD7\x95\xD7\xA8\xD7\x99\xD7\x9D \xD7\x9E\xD7\xA4\xD7\x9C\xD7\x99\xD7\x90\xD7\x99\xD7\x9D \xD7\x94\xD7\x9E\xD7\x91\xD7\x95\xD7\xA1\xD7\xA1\xD7\x99\xD7\x9D \xD7\xA2\xD7\x9C \xD7\xA2\xD7\x95\xD7\x91\xD7\x93\xD7\x95\xD7\xAA \xD7\x94\xD7\x99\xD7\xA1\xD7\x98\xD7\x95\xD7\xA8\xD7\x99\xD7\x95\xD7\xAA /\xE2\x80\x8F"
-    marc_display: "01657cam a2200337 a 4500001001300000003000400013005001700017008004100034010001700075035002600092040002800118042001400146043002100160050002000181066001100201100004900212245015200261246010000413246005600513260007400569300005100643504003500694650004700729650004300776650003900819880005300858880014800911880010201059880005901161880009901220   87931798 DLC20090121115059.0060428m19869999ir ah    b    000 0 per d  a   87931798   a(CStRLIN)DCLN06-B3656  aNjPcNjPdUkLSOAdDLC-R  alccopycat  aa------af------00aBP44b.M88 1986  c(3c(41 6880-01aMuvaḥḥid Abṭaḥī, Ḥujjat.106880-02aĀshnāʼī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh /cbih qalam-i Ḥujjat Muvaḥḥid Abṭaḥī.3 6880-03aĀshnāyī bā ḥawzahʹhā-yi ʻilmīyah-ʼi Shīʻah dar ṭūl-i tārīkh306880-04aḤawzahʹhā-yi ʻilmīyah-ʼi Shīʻah  6880-05aIṣfahān :bḤawzah-i ʻIlmīyah,c1365-   [1986-      ]  av. <1> :bill. (some col.), facsims. ;c25 cm.  aBibliography: v. 1, p.451-455. 0aReligious institutionszIslamic countries. 0aShiitesxEducationzIslamic countries. 0aIslamic universities and colleges.1 6100-01/(3/r‏a‏موحد ابطحى، خجة.106245-02/(3/r‏a‏اشنائى با حوزه‌هاى علميۀ شيعه در طول تاريخ /‏c‏بقلم حجة موحد ابطحى.3 6246-03/(3/r‏a‏اشنايى با حوزه‌هاى علميۀ شيعه در طول تاريخ306246-04/(3/r‏a‏حوزه هاى علميۀ شيعه  6260-05/(3/r‏a‏اصفهان :‏b‏حوزۀ علميه،‏c‏‪1365- [1986-    ]‬."
+    marc_display:  "01041cam  2200265 a 4500001002000000003000400020005001700024008004100041010002400082020002500106020004400131040001800175050002400193082001800217100003200235245008700267246003600354250001200390260003700402300002900439500004200468520022000510650003300730650001200763^###89048230#/AC/r91^DLC^19911106082810.9^891101s1990####maua###j######000#0#eng##^##$a###89048230#/AC/r91^##$a0316107514\" :$c$12.95^##$a0316107506 (pbk.)\" :$c$5.95 ($6.95 Can.)^##$aDLC$cDLC$dDLC^00$aGV943.25$b.B74 1990^00$a796.334/2$220^10$aBrenner, Richard J.,$d1941-^10$aMake the team.$pSoccer :$ba heads up guide to super soccer! /$cRichard J. Brenner.^30$aHeads up guide to super soccer.^##$a1st ed.^##$aBoston :$bLittle, Brown,$cc1990.^##$a127 p. :$bill. ;$c19 cm.^##$a\"A Sports illustrated for kids book.\"^##$aInstructions for improving soccer skills. Discusses dribbling, heading, playmaking, defense, conditioning, mental attitude, how to handle problems with coaches, parents, and other players, and the history of soccer.^#0$aSoccer$vJuvenile literature.^#1$aSoccer.^\\"
   - !map:Mash 
     score: 1.0
     format: Book

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # -*- coding: UTF-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'marc'

data/test_support/spec/helpers/catalog_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe CatalogHelper do
   include CatalogHelper

data/test_support/spec/helpers/hash_as_hidden_fields_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HashAsHiddenFields do

data/test_support/spec/helpers/render_constraints_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 # This is NOT currently spec'ing render_constraints_* methods, becuase

data/test_support/spec/helpers/search_history_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SearchHistoryHelper do

data/test_support/spec/helpers/solr_helper_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'marc'
 
@@ -290,6 +291,33 @@ describe 'Blacklight::SolrHelper' do
       end
     end
 
+    describe "sorting" do
+      it "should send the default sort parameter to solr" do
+        test_sort_field = ['test', 'solr_test_field asc'] 
+        Blacklight.config[:sort_fields].unshift(test_sort_field)
+
+        produced_params = @solr_helper.solr_search_params
+        produced_params[:sort].should == 'solr_test_field asc'
+
+        Blacklight.config[:sort_fields].delete(test_sort_field)
+      end
+
+      it "should not send a sort parameter to solr if the sort value is blank" do
+        test_sort_field = ['test', nil] 
+        Blacklight.config[:sort_fields].unshift(test_sort_field)
+
+        produced_params = @solr_helper.solr_search_params
+        produced_params.should_not have_key(:sort)
+
+        Blacklight.config[:sort_fields].delete(test_sort_field)
+      end
+
+      it "should pass through user sort parameters" do
+        produced_params = @solr_helper.solr_search_params :sort => 'solr_test_field desc'
+        produced_params[:sort].should == 'solr_test_field desc'
+      end
+    end
+
     describe "for :solr_local_parameters config" do
       before do
         # Hack to test with our own custom config specified here
@@ -748,18 +776,18 @@ describe 'Blacklight::SolrHelper' do
 =end
 
     it 'should have a doc id field' do
-      @doc.id.should_not == nil
+      @doc[:id].should_not == nil
     end
 
     it 'should have non-nil values for required fields set in initializer' do
-      @doc.get(Blacklight.config[:show][:html_title]).should_not == nil
-      @doc.get(Blacklight.config[:show][:heading]).should_not == nil
-      @doc.get(Blacklight.config[:show][:display_type]).should_not == nil
+      @doc[Blacklight.config[:show][:html_title]].should_not == nil
+      @doc[Blacklight.config[:show][:heading]].should_not == nil
+      @doc[Blacklight.config[:show][:display_type]].should_not == nil
     end
 
     it "should limit search result by facets when supplied" do
       doc2 = @solr_helper.get_single_doc_via_search(@doc_row , :q => @all_docs_query, :f => @multi_facets)
-      doc2.id.should_not == nil
+      doc2[:id].should_not == nil
     end
 
   end

data/test_support/spec/lib/blacklight_email_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Blacklight::Solr::Document::Email" do

data/test_support/spec/lib/blacklight_sms_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Blacklight::Solr::Document::Email" do

data/test_support/spec/lib/blacklight_solr_document_dublin_core_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Blacklight::Solr::Document::DublinCore" do

data/test_support/spec/lib/blacklight_solr_document_marc_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 

data/test_support/spec/lib/blacklight_solr_document_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'rubygems'
 

data/test_support/spec/lib/blacklight_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Blacklight do

data/test_support/spec/lib/blacklight_user_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Blacklight::User" do

data/test_support/spec/lib/configurable_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Blacklight::Configurable do

data/test_support/spec/lib/facet_paginator_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Spec tests for Paginator class found in lib/blacklight/solr/facet_paginator.rb
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

data/test_support/spec/lib/marc_export_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'rubygems'

data/test_support/spec/lib/search_fields_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Blacklight::SearchFields do

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require "rake"

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 require "rake"

data/test_support/spec/models/bookmark_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module BookmarkSpecHelper

data/test_support/spec/models/record_mailer_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# -*- encoding : utf-8 -*-
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 

data/test_support/spec/models/search_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Search do

data/test_support/spec/models/solr_docment_spec.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# -*- encoding : utf-8 -*-
 
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'rubygems'

data/test_support/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
 # and actual spec/ stuff is in another (the blacklight gem checkout).  

data/test_support/spec/support/action_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Added based on http://www.arctickiwi.com/blog/upgrading-to-rspec-2-with-ruby-on-rails-3
 # God bless you Jonathon Horsman 
 module ActionController

data/test_support/spec/support/assert_difference.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Added based on http://www.arctickiwi.com/blog/upgrading-to-rspec-2-with-ruby-on-rails-3
 # God bless you Jonathon Horsman 
 def assert_difference(executable, how_many = 1, &block)

data/test_support/spec/support/include_text.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Added from http://www.arctickiwi.com/blog/upgrading-to-rspec-2-with-ruby-on-rails-3
 module RSpec::Rails
   module Matchers

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "catalog/_constraints_element.html.erb" do

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "/catalog/_document_list.html.erb" do  

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "/catalog/_facets.html.erb" do

data/test_support/spec/views/catalog/_index_partials/_default.erb_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 # spec for default partial to display solr document fields 

data/test_support/spec/views/catalog/_show_partials/_default.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 # spec for default partial to display solr document fields 

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

@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe "Atom feed view" do  
+describe "catalog/index.atom.builder" do  
   
 
   before(:all) do
@@ -38,10 +39,7 @@ describe "Atom feed view" do
     params.merge!( @params )
     @response = @rsolr_response
  
-    #    render "catalog/index.atom.builder"
-    # Default behavior in rails 3 is to assume you are rendering a partial,
-    # so you need to be a little more explicit with reder calls outside current scope.
-    render :file => "catalog/index.atom.builder", :content_type => "application/atom+xml", :object => @response 
+    render 
 
     # We need to use rexml to test certain things that have_tag wont' test    
     # note that response is depricated rails 3, use "redered" instead. 

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

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "/catalog/show.html.erb" do

data/test_support/spec/views/catalog/unapi.xml.builder_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "unAPI formats list" do  

data/uninstall.rb

@@ -1 +1,2 @@
+# -*- encoding : utf-8 -*-
 # Uninstall hook code here

metadata

@@ -1,15 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blacklight
 version: !ruby/object:Gem::Version 
-  hash: 1923832005
-  prerelease: 5
+  prerelease: true
   segments: 
   - 3
   - 0
-  - 0
-  - pre
-  - 6
-  version: 3.0.0pre6
+  - 0pre7
+  version: 3.0.0pre7
 platform: ruby
 authors: 
 - Jonathan Rochkind
@@ -24,115 +21,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -04:00
+date: 2011-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: unicode
-  prerelease: false
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 3
         - 0
-        version: "0"
+        version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
+  name: nokogiri
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
-        - 3
+        - 1
+        - 5
         - 0
-        version: "3.0"
+        - beta
+        - 3
+        version: 1.5.0.beta.3
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
+  name: unicode
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196437
         segments: 
-        - 1
-        - 5
         - 0
-        - beta
-        - 3
-        version: 1.5.0.beta.3
+        version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: marc
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 4
         - 3
         version: 0.4.3
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rsolr
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rsolr-ext
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: kaminari
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   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."
 email: 
@@ -236,9 +226,6 @@ files:
 - config/locales/kaminari.yml
 - config/routes.rb
 - db/seeds.rb
-- features/default_setup.feature
-- features/generators.feature
-- features/support/aruba.rb
 - install.rb
 - install/solr.yml
 - lib/.DS_Store
@@ -328,6 +315,7 @@ files:
 - lib/railties/solr_marc.rake
 - tasks/blacklight_tasks.rake
 - test_support/.rspec
+- test_support/bin/test.sh
 - test_support/data/test_data.utf8.mrc
 - test_support/features/bookmarks.feature
 - test_support/features/did_you_mean.feature
@@ -414,7 +402,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1025619995026452913
       segments: 
       - 0
       version: "0"
@@ -423,7 +411,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3
@@ -432,11 +419,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: blacklight
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A next-geration Library Catalag for Universities
-test_files: 
-- features/default_setup.feature
-- features/generators.feature
-- features/support/aruba.rb
+test_files: []
+