blacklight 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7778b16dcb6a423cfc3ae78a5c8c94ee31622039
-  data.tar.gz: 05a40b65ff9610a0f76b259c0d765897dfb44d08
+  metadata.gz: 2973df853ccd78aa817fb76e2b5f2aaec1273b55
+  data.tar.gz: 4e6e6d1ad0d678deb64588ce0a3b81628c8a10dc
 SHA512:
-  metadata.gz: 2d6a0c5e522c97076ce95ccdc52b9ec11d841e23bc7143e2678c2d9cee5bd5836d405f4a71c9ebc6317e07a2446200a5fbf5a29fa427e923130920bceb6dda05
-  data.tar.gz: e119661aa4a379fa17d92f5c57c0dce7d9f2014a9cafbd1a03ca1b1c9960a6fc515c0fcb571bd5d571c504fcaffc90209ddc6a35c66053cfdb32e26ba1300cd8
+  metadata.gz: 0978b221b5f4308e8ee8011826ab39cad5fd69fc122399ae0b0d45ab1373e9db21ed099e6c4c69b159caa988633c02babb6988cd3eb2b6a52e684bf5df5eafe5
+  data.tar.gz: d0f6f2e7324af35f7c9d967de599ab24f0a9153942e2d15209d9b1aee19bd7c02b7b4cfe82690bbda17ec0e708aa6c9ca8deb5f41df9591bbb6d907fb70aee5e

data/VERSION

@@ -1 +1 @@
-4.6.1
+4.6.2

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -126,7 +126,7 @@ module Blacklight::BlacklightHelperBehavior
   # Field keys for the index fields
   # @deprecated
   def index_field_names document=nil
-    Deprecation.warn(self, "#index_field_names helper is deprecated, and should be replaced by overriding the appropriate partial")
+    Deprecation.warn(Blacklight::BlacklightHelperBehavior, "#index_field_names helper is deprecated, and should be replaced by overriding the appropriate partial")
     index_fields(document).keys
   end
 
@@ -135,7 +135,7 @@ module Blacklight::BlacklightHelperBehavior
   # @deprecated
   def index_field_labels document=nil
     # XXX DEPRECATED
-    Deprecation.warn(self, "#index_field_labels helper is deprecated, and should be replaced by overriding the appropriate partial")
+    Deprecation.warn(Blacklight::BlacklightHelperBehavior, "#index_field_labels helper is deprecated, and should be replaced by overriding the appropriate partial")
   
     Hash[*index_fields(document).map { |key, field| [key, field.label] }.flatten]
   end
@@ -263,7 +263,7 @@ module Blacklight::BlacklightHelperBehavior
   # @deprecated
   def document_show_field_labels document=nil
     # XXX DEPRECATED
-    Deprecation.warn(self, "#document_show_field_labels helper is deprecated, and should be replaced by overriding the appropriate partial")
+    Deprecation.warn(Blacklight::BlacklightHelperBehavior, "#document_show_field_labels helper is deprecated, and should be replaced by overriding the appropriate partial")
     
     Hash[*document_show_fields(document).map { |key, field| [key, field.label] }.flatten]
   end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -8,7 +8,7 @@ module Blacklight::CatalogHelperBehavior
   # it translates to a Kaminari-paginatable
   # object, with the keys Kaminari views expect.
   def paginate_params(response)
-    Deprecation.warn self, "#paginate_params is deprecated; the original response object is Kaminari-compatible"
+    Deprecation.warn Blacklight::CatalogHelperBehavior, "#paginate_params is deprecated; the original response object is Kaminari-compatible"
 
     response
   end
@@ -26,7 +26,7 @@ module Blacklight::CatalogHelperBehavior
   # shortcut for built-in Rails helper, "number_with_delimiter"
   #
   def format_num(num)
-    Deprecation.warn self, "#format_num is deprecated; use e.g. #number_with_delimiter directly"
+    Deprecation.warn Blacklight::CatalogHelperBehavior, "#format_num is deprecated; use e.g. #number_with_delimiter directly"
     number_with_delimiter(num)
   end
 
@@ -178,7 +178,7 @@ module Blacklight::CatalogHelperBehavior
   end
 
   def response_has_no_search_results?
-    Deprecation.warn(self, "#response_has_no_search_results? is deprecated; use Response#empty? to check instead")
+    Deprecation.warn(Blacklight::CatalogHelperBehavior, "#response_has_no_search_results? is deprecated; use Response#empty? to check instead")
     @response.empty?
   end
 end

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -35,7 +35,7 @@ module Blacklight::FacetsHelperBehavior
   #
   def render_facet_limit(display_facet, options = {})
     if display_facet.is_a? String or display_facet.is_a? Symbol
-      Deprecation.warn(self, "Blacklight::FacetsHelper#render_facet_limit: use #render_facet_partials to render facets by field name")
+      Deprecation.warn(Blacklight::FacetsHelperBehavior, "Blacklight::FacetsHelper#render_facet_limit: use #render_facet_partials to render facets by field name")
       return render_facet_partials([display_facet])
     end
     return if not should_render_facet?(display_facet)

data/spec/helpers/blacklight_helper_spec.rb

@@ -90,6 +90,30 @@ describe BlacklightHelper do
   def current_search_session
 
   end
+  
+  describe "deprecated methods" do
+    describe "#index_field_names" do
+      it "should warn" do
+        expect(Blacklight::BlacklightHelperBehavior.deprecation_behavior.first).to receive(:call)
+        helper.stub(:index_fields => {})
+        helper.index_field_names
+      end
+    end
+    describe "#index_field_labels" do
+      it "should warn" do
+        expect(Blacklight::BlacklightHelperBehavior.deprecation_behavior.first).to receive(:call)
+        helper.stub(:index_fields => {})
+        helper.index_field_labels
+      end
+    end
+    describe "#document_show_field_labels" do
+      it "should warn" do
+        expect(Blacklight::BlacklightHelperBehavior.deprecation_behavior.first).to receive(:call)
+        helper.stub(:document_show_fields => {})
+        helper.document_show_field_labels
+      end
+    end
+  end
 
   describe "#application_name", :test => true do
     it "should use the Rails application config application_name if available" do

data/spec/helpers/catalog_helper_spec.rb

@@ -21,7 +21,33 @@ describe CatalogHelper do
   def render_grouped_response?
     false
   end
-  
+
+  describe "deprecated methods" do
+    describe "response_has_no_search_results?" do
+      it "should be deprecated" do
+        expect(Blacklight::CatalogHelperBehavior.deprecation_behavior.first).to receive(:call)
+        assign(:response, double(:empty? => false))
+        expect(helper.response_has_no_search_results?).to be_false
+      end
+    end
+    
+    describe "paginate_params" do
+      let(:response) { double }
+      it "should be deprecated" do
+        expect(Blacklight::CatalogHelperBehavior.deprecation_behavior.first).to receive(:call)
+        assign(:response, response)
+        expect(helper.paginate_params(response)).to eq response
+      end
+    end
+
+    describe "format_num" do
+      it "should be deprecated" do
+        expect(Blacklight::CatalogHelperBehavior.deprecation_behavior.first).to receive(:call)
+        expect(format_num(10000)).to eq '10,000'
+      end
+    end
+
+  end
   
   describe "page_entries_info" do
     before(:all) do

data/spec/helpers/facets_helper_spec.rb

@@ -229,6 +229,13 @@ describe FacetsHelper do
       helper.should_receive(:render).with(hash_including(:partial => 'custom_facet_partial'))
       helper.render_facet_limit(@mock_facet)
     end 
+
+    it "should be deprecated when a string is passed" do
+      expect(@response).to receive(:facet_by_field_name)
+      expect(Blacklight::FacetsHelperBehavior.deprecation_behavior.first).to receive(:call)
+      helper.render_facet_limit('basic_field')
+    end
+
   end
 
   describe "add_facet_params" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails