blacklight 5.5.2 → 5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6f521c7766d2dd6e7b718a222296f2d0dad680a
-  data.tar.gz: 324a81ef36346eca1526cbe54ccbfc604703a7aa
+  metadata.gz: 1bf604eb0b46a56985d84d8cb961500977284bad
+  data.tar.gz: 4e12870a95adf4febbc6b1169a5f82554db0ea06
 SHA512:
-  metadata.gz: 9d826574a0c0c6562857e3e846f323bd9e9bcc27d29b4f7efdb394c8c7a9c8372a43be6ea7972cdce406fc57d3f373616be37c54f1aa35edcbaad45c5703e690
-  data.tar.gz: 5aa333a5d25378061b79c61d0c94e07a912b197a6234e6ef9153749b7b8a04ff8eb65fd21d9e68b928ffb510885bcdcebad0bcbc157fb4605e7e5cf0209f2669
+  metadata.gz: c7f4c3e67986cd420977845279c4f20014595a1d8e26c13b83e57108b54d744022bae8699352ef2cecd159c49a483a8b52397f382213c3066ce746645f0c2683
+  data.tar.gz: db60e6e0fcedc28a3053039076652eb78e3b076881a8fc818f68e48b4d86482829f54bf934d7dda7a62829529abef89c77d856a9effef12b4d3c7ff365e5ba42

data/VERSION

@@ -1 +1 @@
-5.5.2
+5.5.3

data/app/assets/stylesheets/blacklight/_facets.css.scss

@@ -52,6 +52,22 @@
     }
   }
 
+  @mixin hyphens-auto {
+    // breaks long words apart so they don't cause the containing div to
+    // be too big
+    // from http://kenneth.io/blog/2012/03/04/word-wrapping-hypernation-using-css/
+    -ms-word-break: break-all;
+    word-break: break-all;
+
+    // Non standard for webkit
+    word-break: break-word;
+
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    -ms-hyphens: auto;
+    hyphens: auto;
+  }
+
   .facet-label {
     display: table-cell;
     padding-right: 1em;
@@ -59,6 +75,8 @@
     text-indent: -15px;
     padding-left: 15px;
     padding-bottom: $padding-base-vertical;
+
+    @include hyphens-auto;
   }
 
   .facet-count {
@@ -139,4 +157,4 @@ ul.facet_extended_list, .facet_extended_list ul
     padding-bottom: $padding-base-vertical;
     padding-left: $padding-large-horizontal;
   }
-}
+}

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -412,7 +412,7 @@ module Blacklight::BlacklightHelperBehavior
     document_index_path_templates.each do |str|
       partial = str % { index_view_type: view }
       logger.debug "Looking for document index partial #{partial}"
-      template = lookup_context.find_all(partial, lookup_context.prefixes, true, locals.keys + [:documents], {}).first
+      template = lookup_context.find_all(partial, lookup_context.prefixes + [""], true, locals.keys + [:documents], {}).first
       return template.render(self, locals.merge(documents: documents)) if template
     end
 
@@ -501,7 +501,7 @@ module Blacklight::BlacklightHelperBehavior
     document_partial_path_templates.each do |str|
       partial = str % { action_name: base_name, format: format, index_view_type: document_index_view_type }
       logger.debug "Looking for document partial #{partial}"
-      template = lookup_context.find_all(partial, lookup_context.prefixes, true, locals.keys + [:document], {}).first
+      template = lookup_context.find_all(partial, lookup_context.prefixes + [""], true, locals.keys + [:document], {}).first
       return template.render(self, locals.merge(document: doc)) if template
     end
 

data/app/views/layouts/blacklight.html.erb

@@ -16,10 +16,10 @@
     <title><%= render_page_title %></title>
     <%= opensearch_description_tag application_name, opensearch_catalog_path(:format => 'xml', :only_path => false) %>
     <%= favicon_link_tag asset_path('favicon.ico') %>
-    <%= stylesheet_link_tag    "application" %>
+    <%= stylesheet_link_tag "application", media: "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
-    <%= content_for(:head) %> 
+    <%= content_for(:head) %>
 
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

data/lib/blacklight/catalog.rb

@@ -138,7 +138,7 @@ module Blacklight::Catalog
       @response, @documents = get_solr_response_for_document_ids(params[:id])
       
       if request.post? and validate_sms_params
-        to = "#{params[:to].gsub(/[^\d]/, '')}@#{sms_mappings[params[:carrier]]}"
+        to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
 
         sms = RecordMailer.sms_record(@documents, { :to => to }, url_options)
         sms.deliver

data/lib/blacklight/routes.rb

@@ -102,6 +102,7 @@ module Blacklight
           get "#{primary_resource}/email", :as => "email_#{primary_resource}"
           post "#{primary_resource}/email"
           get "#{primary_resource}/sms", :as => "sms_#{primary_resource}"
+          post "#{primary_resource}/sms"
         end
       end
 

data/lib/blacklight/solr/facet_paginator.rb

@@ -37,7 +37,7 @@ module Blacklight::Solr
     def initialize(all_facet_values, arguments)
       # to_s.to_i will conveniently default to 0 if nil
       @offset = arguments[:offset].to_s.to_i 
-      @limit =  arguments[:limit].to_s.to_i
+      @limit = arguments[:limit]
       # count is solr's default
       @sort = arguments[:sort] || "count" 
 
@@ -82,7 +82,7 @@ module Blacklight::Solr
     deprecation_deprecate :has_next?
 
     def last_page?
-      total_count <= limit
+      limit.nil? || total_count <= limit
     end
 
     def first_page?
@@ -112,10 +112,10 @@ module Blacklight::Solr
     end
 
     private
-      # setting limit to 0 implies no limit
+      # setting limit to nil implies no limit
       # @return an array of facets on the page
       def items_for_limit(values)
-        limit == 0 ? values : values.take(limit)
+        limit.nil? ? values : values.take(limit)
       end
   end
 end

data/lib/blacklight/solr_helper.rb

@@ -327,8 +327,8 @@ module Blacklight::SolrHelper
     a << response.documents.map {|doc| doc[solr_params[:fl]].to_s }
   end
   
-  
-  
+  DEFAULT_FACET_LIMIT = 10
+
   # Look up facet limit for given facet_field. Will look at config, and
   # if config is 'true' will look up from Solr @response if available. If
   # no limit is avaialble, returns nil. Used from #solr_search_params
@@ -349,8 +349,8 @@ module Blacklight::SolrHelper
       else
         limit.to_i - 1 # we added 1 to find out if we needed to paginate
       end
-    elsif (facet.limit and facet.limit != true)
-      facet.limit
+    elsif facet.limit
+      facet.limit == true ? DEFAULT_FACET_LIMIT : facet.limit
     end
   end
 

data/spec/controllers/catalog_controller_spec.rb

@@ -404,7 +404,7 @@ describe CatalogController do
       SolrDocument.use_extension( Blacklight::Solr::Document::Sms )
     end
     describe "email" do
-      it "should give error if no TO paramater" do
+      it "should give error if no TO parameter" do
         post :email, :id => doc_id
         expect(request.flash[:error]).to eq "You must enter a recipient in order to send this message"
       end
@@ -412,7 +412,7 @@ describe CatalogController do
         post :email, :id => doc_id, :to => 'test_bad_email'
         expect(request.flash[:error]).to eq "You must enter a valid email address"
       end
-      it "should not give error if no Message paramater is set" do
+      it "should not give error if no Message parameter is set" do
         post :email, :id => doc_id, :to => 'test_email@projectblacklight.org'
         expect(request.flash[:error]).to be_nil
       end
@@ -425,7 +425,6 @@ describe CatalogController do
         expect(request.flash[:error]).to be_nil
         expect(request).to redirect_to(catalog_path(doc_id))
       end
-
       it "should render email_sent for XHR requests" do
         xhr :post, :email, :id => doc_id, :to => 'test_email@projectblacklight.org'
         expect(request).to render_template 'email_sent'
@@ -454,6 +453,12 @@ describe CatalogController do
         expect(request.flash[:error]).to be_nil
         expect(request).to redirect_to(catalog_path(doc_id))
       end
+      it "should send to the appropriate carrier email address" do
+        mock_mailer = double
+        allow(mock_mailer).to receive(:deliver)
+        expect(RecordMailer).to receive(:sms_record).with(anything, { to: '5555555555@txt.att.net' }, hash_including(:host => 'test.host')).and_return mock_mailer
+        post :sms, :id => doc_id, :to => '5555555555', :carrier => 'txt.att.net'
+      end
       it "should redirect back to the record upon success" do
         post :sms, :id => doc_id, :to => '5555555555', :carrier => 'txt.att.net'
         expect(request.flash[:error]).to eq nil

data/spec/lib/blacklight/facet_paginator_spec.rb

@@ -75,12 +75,13 @@ describe 'Blacklight::Solr::FacetPaginator' do
     it "should return all the items" do
       expect(subject.items).to eq seven_facet_values
     end
+    it { should be_last_page }
   end
 
   describe "#as_json" do
     subject { Blacklight::Solr::FacetPaginator.new([f1], offset: 0, limit: nil).as_json }
     it "should be well structured" do
-      expect(subject).to eq("items" => [{"hits"=>"792", "value"=>"Book"}], "limit" => 0,
+      expect(subject).to eq("items" => [{"hits"=>"792", "value"=>"Book"}], "limit" => nil,
        "offset" => 0, "sort" => "count")
     end
   end

data/spec/lib/blacklight/solr_helper_spec.rb

@@ -1224,9 +1224,8 @@ describe Blacklight::SolrHelper do
       expect(subject.facet_limit_for("subject_topic_facet")).to be_nil
       
       expect(subject.solr_search_params).not_to have_key(:"f.subject_topic_facet.facet.limit")
-      
     end
-    
+
     describe "for 'true' configured values" do
       let(:blacklight_config) do
         config = Blacklight::Configuration.new
@@ -1249,6 +1248,9 @@ describe Blacklight::SolrHelper do
         subject.instance_variable_set(:@response, @response)
         expect(subject.facet_limit_for("language_facet")).to eq 15
       end
+      it "should default to 10" do
+        expect(subject.facet_limit_for("language_facet")).to eq 10
+      end
     end
   end
 

data/spec/routing/catalog_routing_spec.rb

@@ -9,9 +9,12 @@ describe "Routing" do
     it "should have a path for sending the email" do
       expect(:post => "/catalog/email").to route_to(:controller => 'catalog', :action => 'email')
     end
-    it "should map {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
+    it "should map GET {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
       expect(:get => "/catalog/sms").to route_to(:controller => 'catalog', :action => 'sms')
     end
+    it "should map POST {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
+      expect(:post => "/catalog/sms").to route_to(:controller => 'catalog', :action => 'sms')
+    end
     it "should map { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
       expect(:get => "/catalog/666").to route_to(:controller => 'catalog', :action => 'show', :id => "666")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.5.2
+  version: 5.5.3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -555,7 +555,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)