blacklight 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ee8019553f491ded8b0186b6d9d30358c2ca25
-  data.tar.gz: d4935e93a6fa56fb5ae42f32f0140e61bb1b0032
+  metadata.gz: 4351fa82e876ef0b03e9d75450ea07744d8567e8
+  data.tar.gz: b7d75684699b261d2677a4ef063e27b95959c5fd
 SHA512:
-  metadata.gz: 9e75097a23a6c9e685bf6c7924ae387ee47e14ef1723f43660d5597591dae6d0b6a3c50120fddb18dfe9373609215966623c33eae70ff7bf89d8db8c7a36b284
-  data.tar.gz: 011cc55da8d2cc401dbb59450545b3b120e75e2919d960abe8c24c3c25d42c645f14c29d4efa77000101539b506c89af8e2feb9e493b7e1aaf27d59537fd3f50
+  metadata.gz: a31bb3788b2927af494e778c79c3367453d0f2a88f0d890abdf21743a3095281ac0f98218c189010f50bc7c1aff28b49e3211c5973a79a357fc2f825edd75b6a
+  data.tar.gz: 31b186d154589f37db2cea16ea55d8f894e9182bf94d901b470399b29a639fe2086ec0198751fc9bcdaf965b2a47e48b9aa038a4f0d62da309bf9d09449475c3

data/.travis.yml

@@ -10,13 +10,14 @@ gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile
 
-# script:
-#   - test_support/bin/test.sh
-
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - blacklight-commits@googlegroups.com
 
-# before_install:
-#   - gem install bundler
+env: JRUBY_OPTS="--server -Xcompile.invokedynamic=true -J-Xms512m -J-Xmx1024m"        
+# jruby 1.9 + rails 4.0.0.beta1 don't work well together
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails4.gemfile

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.2.1

data/app/models/bookmark.rb

@@ -3,7 +3,7 @@ class Bookmark < ActiveRecord::Base
   
   belongs_to :user
   validates_presence_of :user_id, :scope=>:document_id
-  attr_accessible :id, :document_id, :title
+  attr_accessible :id, :document_id, :title if Rails::VERSION::MAJOR < 4
 
 
   def document

data/app/models/search.rb

@@ -4,7 +4,7 @@ class Search < ActiveRecord::Base
   belongs_to :user
   
   serialize :query_params
-  attr_accessible :query_params
+  attr_accessible :query_params if Rails::VERSION::MAJOR < 4
   
   # A Search instance is considered a saved search if it has a user_id.
   def saved?

data/app/views/bookmarks/_tools.html.erb

@@ -3,7 +3,7 @@
         <%= link_to t('blacklight.tools.cite'), citation_catalog_path(:sort=>params[:sort], :per_page=>params[:per_page], :id => @bookmarks.collect{|doc| doc.document_id}), {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink btn'} %>
       </li>
       <li class="refworks">
-        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@bookmarks} %>
+        <%= render :partial => 'catalog/refworks_form', :locals => {:documents=>@document_list} %>
       </li>
 
       <li class="endnote">

data/blacklight.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "sass-rails"
-  s.add_dependency "bootstrap-sass", "~> 2.2.0"
+  s.add_dependency "bootstrap-sass", ">= 2.2.0", "< 2.4"
   s.add_development_dependency "jettywrapper", ">= 1.4.1"
   s.add_development_dependency "rspec-rails"
 end

data/gemfiles/rails4.gemfile

@@ -6,5 +6,5 @@ gemspec :path=>"../"
 gem 'simplecov', :platform => :mri
 gem 'simplecov-rcov', :platform => :mri
 
-gem 'rails', '4.0.0.beta1'
-gem 'sass-rails', '4.0.0.beta1'
+gem 'rails', '4.0.0.rc1'
+gem 'sass-rails', '4.0.0.rc1'

data/lib/blacklight/routes.rb

@@ -49,7 +49,7 @@ module Blacklight
           get "saved_searches",       :to => "saved_searches#index",   :as => "saved_searches"
           put "saved_searches/save/:id",    :to => "saved_searches#save",    :as => "save_search"
           delete "saved_searches/forget/:id",  :to => "saved_searches#forget",  :as => "forget_search"
-          post "saved_searches/forget/:id",  :to => "saved_searches#forget",  :as => "forget_search"
+          post "saved_searches/forget/:id",  :to => "saved_searches#forget"
         end
       end
     
@@ -59,6 +59,7 @@ module Blacklight
           get 'catalog/opensearch', :as => "opensearch_catalog"
           get 'catalog/citation', :as => "citation_catalog"
           get 'catalog/email', :as => "email_catalog"
+          post 'catalog/email'
           get 'catalog/sms', :as => "sms_catalog"
           get 'catalog/endnote', :as => "endnote_catalog"
           get 'catalog/send_email_record', :as => "send_email_record_catalog"

data/lib/blacklight/solr_helper.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-require File.join(File.dirname(__FILE__), 'mash') unless defined?(Mash)
 # SolrHelper is a controller layer mixin. It is in the controller scope: request params, session etc.
 # 
 # NOTE: Be careful when creating variables here as they may be overriding something that already exists.

data/lib/generators/blacklight/blacklight_generator.rb

@@ -78,9 +78,6 @@ EOF
       end
       
       gem "devise-guests", "~> 0.3"
-      if Rails::VERSION::MAJOR == 4
-        gem 'protected_attributes' # Required for devise
-      end
 
       Bundler.with_clean_env do
        run "bundle install"

data/spec/helpers/facets_helper_spec.rb

@@ -370,7 +370,7 @@ describe FacetsHelper do
  
       helper.should_receive(:facet_display_value).and_return('Z')
       helper.should_receive(:add_facet_params_and_redirect).and_return('link')
-      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10)).should == "<a href=\"link\" class=\"facet_select\">Z</a> <span class=\"count\">10</span>"
+      helper.render_facet_value('simple_field', mock(:value => 'A', :hits => 10)).should == (helper.link_to("Z", "link", :class => "facet_select") + " " + (helper.content_tag :span, 10, :class => 'count')).html_safe
     end
 
 

data/spec/lib/solr_helper_spec.rb

@@ -550,10 +550,12 @@ describe 'Blacklight::SolrHelper' do
       end
 
       it "should use the configured request handler " do
-        blacklight_config.stub(:solr_request_handler => 'custom_request_handler')
+        blacklight_config.stub(:default_solr_params).and_return({:qt => 'custom_request_handler'})
         Blacklight.solr.should_receive(:send_and_receive) do |path, params|
           path.should == 'select'
-          params[:params].should include(:start => 0, :rows => 10, :qt=>"custom_request_handler", :q=>"", "spellcheck.q"=>"", :"facet.field"=>["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"], :"facet.query"=>["pub_date:[2007 TO *]", "pub_date:[2002 TO *]", "pub_date:[1987 TO *]"], :"f.subject_topic_facet.facet.limit"=>21, :sort=>"score desc, pub_date_sort desc, title_sort asc")
+          params[:params][:'facet.field'].should == ["format", "{!ex=pub_date_single}pub_date", "subject_topic_facet", "language_facet", "lc_1letter_facet", "subject_geo_facet", "subject_era_facet"]
+          params[:params][:"facet.query"].should == ["pub_date:[#{5.years.ago.year} TO *]", "pub_date:[#{10.years.ago.year} TO *]", "pub_date:[#{25.years.ago.year} TO *]"]
+          params[:params].should include(:rows => 10, :qt=>"custom_request_handler", :q=>"", "spellcheck.q"=>"", :"f.subject_topic_facet.facet.limit"=>21, :sort=>"score desc, pub_date_sort desc, title_sort asc")
         end.and_return({'response'=>{'docs'=>[]}})
         get_search_results(:q => @all_docs_query)
       end

data/spec/models/bookmark_spec.rb

@@ -1,24 +1,15 @@
 # -*- encoding : utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-module BookmarkSpecHelper
-  def valid_bookmark_attributes
-    {
-      :id => 1,
-      :user_id => 1,
-      :document_id => 'u001'
-    }
-  end
-end
-
 describe Bookmark do
-  include BookmarkSpecHelper
   before(:each) do
     @bookmark = Bookmark.new
   end
   
   it "should be valid" do
-    @bookmark.assign_attributes valid_bookmark_attributes, :without_protection => true
+    @bookmark.id = 1
+    @bookmark.user_id = 1
+    @bookmark.document_id = 'u001'
     @bookmark.should be_valid
   end
    
@@ -31,7 +22,9 @@ describe Bookmark do
   end
 
   it "should be valid after saving" do
-    @bookmark.assign_attributes valid_bookmark_attributes, :without_protection => true
+    @bookmark.id = 1
+    @bookmark.user_id = 1
+    @bookmark.document_id = 'u001'
     @bookmark.save
     @bookmark.should be_valid
   end

data/spec/models/search_spec.rb

@@ -21,7 +21,7 @@ describe Search do
   describe "saved?" do
     it "should be true when user_id is not NULL and greater than 0" do
       @search = Search.new
-      @search.assign_attributes({:user_id => 1}, :without_protection => true)
+      @search.user_id = 1
       @search.save
 
       @search.saved?.should be_true
@@ -46,16 +46,23 @@ describe Search do
       Search.destroy_all
       days_old = 7
       unsaved_search_today = Search.new
-      unsaved_search_today.assign_attributes({:user_id => nil, :created_at => Date.today}, :without_protection => true)
+      unsaved_search_today.user_id = nil
+      unsaved_search_today.created_at = Date.today
       unsaved_search_today.save
+
       unsaved_search_past = Search.new
-      unsaved_search_past.assign_attributes({:user_id => nil, :created_at => Date.today - (days_old + 1).days}, :without_protection => true)
+      unsaved_search_past.user_id = nil
+      unsaved_search_past.created_at = Date.today - (days_old + 1).days
       unsaved_search_past.save
+
       saved_search_today = Search.new
-      saved_search_today.assign_attributes({:user_id => 1, :created_at => Date.today}, :without_protection => true)
+      saved_search_today.user_id = 1
+      saved_search_today.created_at = Date.today
       saved_search_today.save
+
       saved_search_past = Search.new
-      saved_search_past.assign_attributes({:user_id => 1, :created_at => (Date.today - (days_old + 1).days)}, :without_protection => true)
+      saved_search_past.user_id = 1
+      saved_search_past.created_at = Date.today - (days_old + 1).days
       saved_search_past.save
 
       lambda do

data/spec/routing/catalog_routing_spec.rb

@@ -3,9 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "Routing" do
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
-    it "should map {:controller => 'catalog', :action => 'email'} to /catalog/email" do
+    it "should have a path for showing the email form" do
       { :get => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
-
+    end
+    it "should have a path for sending the email" do
+      { :post => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
     end
     it "should map {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
       { :get => "/catalog/sms" }.should route_to(:controller => 'catalog', :action => 'sms')
@@ -18,21 +20,6 @@ describe "Routing" do
     end
   end
 
-  # parameters generated from routes
-  describe "Parameters Generated from Routes:" do
-    it "should map /catalog/email to {:controller => 'catalog', :action => 'email'}" do
-      { :get => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
-    end
-    it "should map /catalog/sms to {:controller => 'catalog', :action => 'sms'}" do
-      { :get => "/catalog/sms" }.should route_to(:controller => 'catalog', :action => 'sms')
-    end
-    it "should map /catalog/666 to {:controller => 'catalog', :action => 'show', :id => 666}" do
-      { :get => "/catalog/666" }.should route_to(:controller => 'catalog', :action => 'show', :id => "666")
-    end
-    it "should map /catalog/111/librarian_view to {:controller => 'catalog', :action => 'librarian_view', :id => 111}" do
-      { :get => "/catalog/111/librarian_view" }.should route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
-    end
-  end
 
   describe "catalog_path for SolrDocument", :test => true do
     it "should route correctly" do

data/spec/test_app_templates/Gemfile.extra

@@ -17,7 +17,7 @@ gem 'jquery-rails'
 
 # For testing
 group :development, :test do
-  gem 'rspec-rails', '~> 2.12.0'
+  gem 'rspec-rails', '~> 2.13.1'
 end
 
 group :test do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -15,30 +15,8 @@ authors:
 - Naomi Dushay
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVjaHJp
-  czEVMBMGCgmSJomT8ixkARkWBWNiZWVyMRQwEgYKCZImiZPyLGQBGRYEaW5mbzAe
-  Fw0xMzAzMDcwNDI1MzRaFw0xNDAzMDcwNDI1MzRaMD0xDjAMBgNVBAMMBWNocmlz
-  MRUwEwYKCZImiZPyLGQBGRYFY2JlZXIxFDASBgoJkiaJk/IsZAEZFgRpbmZvMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UC2Jw9BQ7bNTyVHaxGKbCqV
-  H+BggkU9CWOBB8YA7j2ebcAjRlj6AemKWHB0fPEi9qmGaE1bMbus8IJbFcjkZNqG
-  6yHVdOq9tacSH4iiEdH3QioWSte0zY7vwD9u92QLaNzUAm9yjIYF6ZDNM/dl25Hb
-  UYDURJXfLOKe3AivodRujsHRxDLFpS6FjdmwB9m8N2JBs/uOrUULB48aaa36pWWE
-  w4rhqT9kOpZl8BRdE/pTrePlQGDZ8Oe74gVWJth4lavtMaPP+UqHigmlnFvWO9+D
-  a+9q1qwvQ3ySYRJIACIsYaY6rlhZ6i+PGKhbCnG6at6bC9TVu2JfKbC/LBP9mwID
-  AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU61dLp5FY
-  qfqrGhr0V8WPGwAIEKQwGwYDVR0RBBQwEoEQY2hyaXNAY2JlZXIuaW5mbzAbBgNV
-  HRIEFDASgRBjaHJpc0BjYmVlci5pbmZvMA0GCSqGSIb3DQEBBQUAA4IBAQBuQW5N
-  6NaEla5fJftOPCecLSB5z8oS+fAO8LbfcUqHSo+y/1ZkN8kF8Y1SaoqPpqxuOZ4g
-  zX+X6k0gJHLKHTNufTaLhORd66Tp1raoW2qqKEcoshOcoQyw/mh9KYLVaQEX8US8
-  0yZ9dRMWFtRjwvkvueNMzLZidH+GsaDq/bxR9/9PAv+4RxQRYw+nrAglf2DxINSI
-  o8CdBnIKvzS1JRgM172NHIwScyJdDFWxfBh1CTG9VRXTwQfyQmM0h1GThWYcdNw7
-  W4KPvarE4dgxT4TXIIKkh/K/Z9yaYt73biInVukEI9H2HHWkuAyblxg1jcR/zy+w
-  K27NJ2vhSpx2PPhb
-  -----END CERTIFICATE-----
-date: 2013-03-29 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,16 +112,22 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -499,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)

metadata.gz.sig

@@ -1,3 +0,0 @@
-f���U��R�m��
-A�X�g�
-�;�>���ʕ�w��qL�d�W�s��(���_N�r$b+���8A!S)�_���t:8%����Bf�~�=�0�*3�p"��=�C�E��X*�^��dN�e'�Y^-en~?�A\6D�G+�"��<s�1{��S�Pv�ʽ_~g<�������?��B�QWƉ��J��=h�}���b��3Ols��3y>�߶�A�+=�vލ�Z�U+4���=)u��Ӵ����Z��