blacklight 5.11.1 → 5.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d4dba8182fcbbaa71a0f1e263c992b5ead7a54
-  data.tar.gz: a2ad75e6e2097d1881685a1f3e35414c885a70c0
+  metadata.gz: fbed788b9563305a5fdc48a4d8c24b8a96387e6b
+  data.tar.gz: 0bd82d604396b69091d6f50fba853f2af67f06aa
 SHA512:
-  metadata.gz: 2ec8a493c2c4e80ce27b9c901f6fb9de931d058d6a81f6dbc57ee2b54d4f1a321a13626d9df1342e430903cdf655ee1a380f38506f3e31b0af5708b23a5d2d96
-  data.tar.gz: 02343ff43095be1ffe760572b3cb1737dd14a38ab08178f5c3b9997fd46695895c627321dce537cc027f1c1059805ad37b5b268595077866cbad1b771f7212bf
+  metadata.gz: ef476787e4c81ac178e2ed8f2c86bcac92709d023e1a241d0581b30e39196b0d687df4979aa749077c61c9a65d97f0b2fb391e9feb8dee087a9a6fd4ef9af6e2
+  data.tar.gz: c5e5be39ab6a4e978d550ae344a6aa543d633f65f1ca74f04310c91984b321db9f4e7a9a433ce7e8bb7325919b80106d2d6c99474212d00411ecd2670492f4ea

data/.travis.yml

@@ -15,6 +15,8 @@ matrix:
       env: "RAILS_VERSION=4.1.9"
     - rvm: 2.1.5
       env: "RAILS_VERSION=4.2.0"
+    - rvm: 2.1.5
+      env: "RAILS_VERSION=4.2.1"
     - rvm: jruby
       env: "RAILS_VERSION=4.2.0 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
     - rvm: 1.9.3

data/VERSION

@@ -1 +1 @@
-5.11.1
+5.11.2

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -87,13 +87,11 @@ module Blacklight::ConfigurationHelperBehavior
   # Look up the label for the facet field
   def facet_field_label field
     field_config = blacklight_config.facet_fields[field]
+    defaults = [:"blacklight.search.fields.facet.#{field}", :"blacklight.search.fields.#{field}"]
+    defaults << field_config.label if field_config
+    defaults << field.to_s.humanize
 
-    field_label(
-      :"blacklight.search.fields.facet.#{field}",
-      :"blacklight.search.fields.#{field}",
-      (field_config.label if field_config),
-      field.to_s.humanize
-    )
+    field_label *defaults
   end
 
   def view_label view

data/lib/blacklight/document.rb

@@ -59,6 +59,10 @@ module Blacklight::Document
     @_source.send :[], *args
   end
 
+  def _read_attribute(attr)
+    self[attr]
+  end
+
   # Helper method to check if value/multi-values exist for a given key.
   # The value can be a string, or a RegExp
   # Multiple "values" can be given; only one needs to match.
@@ -153,4 +157,4 @@ module Blacklight::Document
       self
     end  
   end
-end
+end

data/lib/blacklight/solr/search_builder.rb

@@ -232,6 +232,9 @@ module Blacklight::Solr
     def facet_value_to_fq_string(facet_field, value) 
       facet_config = blacklight_config.facet_fields[facet_field]
 
+      solr_field = facet_config.field if facet_config and not facet_config.query
+      solr_field ||= facet_field
+
       local_params = []
       local_params << "tag=#{facet_config.tag}" if facet_config and facet_config.tag
 
@@ -243,17 +246,17 @@ module Blacklight::Solr
           facet_config.query[value][:fq]
         when (facet_config and facet_config.date)
           # in solr 3.2+, this could be replaced by a !term query
-          "#{prefix}#{facet_field}:#{RSolr.solr_escape(value)}"
+          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value)}"
         when (value.is_a?(DateTime) or value.is_a?(Date) or value.is_a?(Time))
-          "#{prefix}#{facet_field}:#{RSolr.solr_escape(value.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ"))}"
+          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ"))}"
         when (value.is_a?(TrueClass) or value.is_a?(FalseClass) or value == 'true' or value == 'false'),
              (value.is_a?(Integer) or (value.to_i.to_s == value if value.respond_to? :to_i)),
              (value.is_a?(Float) or (value.to_f.to_s == value if value.respond_to? :to_f))
-          "#{prefix}#{facet_field}:#{RSolr.solr_escape(value.to_s)}"
+          "#{prefix}#{solr_field}:#{RSolr.solr_escape(value.to_s)}"
         when value.is_a?(Range)
-          "#{prefix}#{facet_field}:[#{value.first} TO #{value.last}]"
+          "#{prefix}#{solr_field}:[#{value.first} TO #{value.last}]"
         else
-          "{!raw f=#{facet_field}#{(" " + local_params.join(" ")) unless local_params.empty?}}#{value}"
+          "{!raw f=#{solr_field}#{(" " + local_params.join(" ")) unless local_params.empty?}}#{value}"
       end
     end
     

data/spec/lib/blacklight/solr/search_builder_spec.rb

@@ -355,6 +355,10 @@ describe Blacklight::Solr::SearchBuilder do
 
   
   describe "#facet_value_to_fq_string" do
+    it "should use the configured field name" do
+      blacklight_config.add_facet_field :facet_key, field: "facet_name"
+      expect(subject.send(:facet_value_to_fq_string, "facet_key", "my value")).to eq "{!raw f=facet_name}my value"
+    end
 
     it "should use the raw handler for strings" do
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "my value")).to eq "{!raw f=facet_name}my value"
@@ -389,19 +393,19 @@ describe Blacklight::Solr::SearchBuilder do
     end
 
     it "should pass date-type fields through" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil))
+      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil, :field => 'facet_name'))
 
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "2012-01-01")).to eq "facet_name:2012\\-01\\-01"
     end
 
     it "should escape datetime-type fields" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil))
+      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => true, :query => nil, :tag => nil, :field => 'facet_name'))
 
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "2003-04-09T00:00:00Z")).to eq "facet_name:2003\\-04\\-09T00\\:00\\:00Z"
     end
     
     it "should format Date objects correctly" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => nil, :query => nil, :tag => nil))
+      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:date => nil, :query => nil, :tag => nil, :field => 'facet_name'))
       d = DateTime.parse("2003-04-09T00:00:00")
       expect(subject.send(:facet_value_to_fq_string, "facet_name", d)).to eq "facet_name:2003\\-04\\-09T00\\:00\\:00Z"      
     end
@@ -411,7 +415,7 @@ describe Blacklight::Solr::SearchBuilder do
     end
 
     it "should add tag local parameters" do
-      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:query => nil, :tag => 'asdf', :date => nil))
+      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(:query => nil, :tag => 'asdf', :date => nil, :field => 'facet_name'))
 
       expect(subject.send(:facet_value_to_fq_string, "facet_name", true)).to eq "{!tag=asdf}facet_name:true"
       expect(subject.send(:facet_value_to_fq_string, "facet_name", "my value")).to eq "{!raw f=facet_name tag=asdf}my value"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.11.1
+  version: 5.11.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails