blacklight 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e42546dfea7f15e6d7fb7840dc8c565dc1a2f4d
-  data.tar.gz: 4f80a2c7b454658bd1be662f9509224db5eeee47
+  metadata.gz: abad33ed78f1831cc8ae408d0d19071b667f74be
+  data.tar.gz: bd713d5fb66e2d1aa49b4fbcac88ff0724b0aedf
 SHA512:
-  metadata.gz: c8fbed4b5264a3d96387cb0fafe1e39f7e18ad2c1b2847ab357f9c749ff6e63028876db67ed7906ae21f765bfbac900a9dfd891faa2df981a861c63fabb14790
-  data.tar.gz: 99196a24351223263018890b8acd9d0d9c5a0adcc2d0793fe44f6f9310d4d803fead0e0930d3fc16e2ddc05d6a1459fb1c6578685d14a23f965f85f3cc2dc3c5
+  metadata.gz: c9478b659e45b4df5320395ddc301190390a7adb6d031a819761af390f07d5d59853f184381ff96fae5193c867e84b1a6bb19d86e56e9b2619c42639136697a2
+  data.tar.gz: 37f40ed46cca97a3f5fb1ddb49776e6ff4a41ca2318575d6cfb1f942c8a1e32ef7e2f29f73eac320f3b8d67ccc814aba6dc293e5482bf5062c82710cdd34cad1

data/VERSION

@@ -1 +1 @@
-5.12.0
+5.12.1

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -48,9 +48,12 @@ module Blacklight::CatalogHelperBehavior
   #
   # @param [Integer] document index
   # @return [Integer]
-  def document_counter_with_offset idx 
+  def document_counter_with_offset idx, offset = nil
+    offset ||= @response.start if @response
+    offset ||= 0
+
     unless render_grouped_response? 
-      idx + 1 + @response.params[:start].to_i
+      idx + 1 + offset
     end
   end
 

data/blacklight.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails",     ">= 3.2.6", "< 5"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
-  s.add_dependency "kaminari", "~> 0.15"  # the pagination (page 1,2,3, etc..) of our search results
+  s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "rsolr",     "~> 1.0.11"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"

data/lib/blacklight/document.rb

@@ -13,6 +13,7 @@
 # transformation formats.
 #
 module Blacklight::Document
+  autoload :ActiveModelShim, 'blacklight/document/active_model_shim'
   autoload :SchemaOrg, 'blacklight/document/schema_org'
   autoload :DublinCore, 'blacklight/document/dublin_core'
   autoload :Email, 'blacklight/document/email'
@@ -42,14 +43,6 @@ module Blacklight::Document
     apply_extensions
   end
 
-  def to_model
-    self
-  end
-
-  def persisted?
-    true
-  end
-
   # the wrapper method to the @_source object.
   # If a method is missing, it gets sent to @_source
   # with all of the original params and block
@@ -65,14 +58,6 @@ module Blacklight::Document
     _source_responds_to?(*args) || super
   end
 
-  def [] *args
-    _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.
@@ -138,30 +123,10 @@ module Blacklight::Document
     Array(self[key]).first
   end
 
-  def id
-    self[self.class.unique_key]
-  end
-
-  def to_param
-    id.to_s
-  end
-
-  def as_json(options = nil)
-    _source.as_json(options)
-  end
-
   def to_partial_path
     'catalog/document'
   end
 
-  def destroyed?
-    false
-  end
-  
-  def new_record?
-    false
-  end
-  
   def has_highlight_field? k
     false
   end
@@ -186,13 +151,6 @@ module Blacklight::Document
       @unique_key ||= 'id' 
     end
 
-    def primary_key
-      unique_key
-    end
-    
-    def base_class
-      self
-    end  
   end
   
   private

data/lib/blacklight/document/active_model_shim.rb

@@ -0,0 +1,62 @@
+require 'active_model/conversion'
+
+module Blacklight::Document
+  module ActiveModelShim
+    extend ActiveSupport::Concern
+
+    include ::ActiveModel::Conversion
+
+    module ClassMethods
+      def primary_key
+        unique_key
+      end
+
+      def base_class
+        self
+      end
+    end
+    
+    ##
+    # Unique ID for the document
+    def id
+      self[self.class.unique_key]
+    end
+
+    ##
+    # accessors for reading attribute
+    def [] *args
+      _source.send :[], *args
+    end
+    
+    def _read_attribute(attr)
+      self[attr]
+    end
+
+    def as_json(options = nil)
+      _source.as_json(options)
+    end
+    
+    ##
+    # ActiveRecord::Persistence method stubs to get non-AR objects to
+    # play nice with e.g. Blacklight's bookmarks
+    def persisted?
+      true
+    end
+
+    def destroyed?
+      false
+    end
+    
+    def new_record?
+      false
+    end
+
+    ##
+    # #to_partial_path is also defined in Blacklight::Document, but
+    # ActiveModel::Conversion (included above) will overwrite that..
+    def to_partial_path
+      'catalog/document'
+    end
+
+  end
+end

data/lib/blacklight/solr/document.rb

@@ -26,6 +26,7 @@ module Blacklight::Solr::Document
 
   extend ActiveSupport::Concern
   include Blacklight::Document
+  include Blacklight::Document::ActiveModelShim
   include Blacklight::Solr::Document::MoreLikeThis
 
   def has_highlight_field? k

data/lib/blacklight/solr_response.rb

@@ -34,6 +34,10 @@ class Blacklight::SolrResponse < HashWithIndifferentAccess
     header['params'] || request_params
   end
 
+  def start
+    params[:start].to_i
+  end
+
   def rows
     params[:rows].to_i
   end

data/spec/helpers/blacklight_helper_spec.rb

@@ -462,7 +462,7 @@ describe BlacklightHelper do
 
     before do
       allow(helper).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
-      assign(:response, double("SolrResponse", grouped?: false, params: {}))
+      assign(:response, double("SolrResponse", grouped?: false, start: 0))
       allow(helper).to receive(:link_to_document).and_return('<a/>')
       allow(helper).to receive(:render_index_doc_actions).and_return('<div/>')
     end

data/spec/helpers/catalog_helper_spec.rb

@@ -247,19 +247,19 @@ describe CatalogHelper do
 
   describe "document_counter_with_offset" do
     it "should render the document index with the appropriate offset" do
-      assign(:response, double(:params => { :start => 0 }, :grouped? => false))
+      assign(:response, double(start: 0, grouped?: false))
       expect(helper.document_counter_with_offset(0)).to be(1)
       expect(helper.document_counter_with_offset(1)).to be(2)
     end
 
     it "should render the document index with the appropriate offset" do
-      assign(:response, double(:params => { :start => 10 }, :grouped? => false))
+      assign(:response, double(start: 10, grouped?: false))
       expect(helper.document_counter_with_offset(0)).to be(11)
       expect(helper.document_counter_with_offset(1)).to be(12)
     end
 
     it "should not provide a counter for grouped responses" do
-      assign(:response, double(:params => { :start => 10 }, :grouped? => true))
+      assign(:response, double(start: 10, grouped?: true))
       expect(helper.document_counter_with_offset(0)).to be_nil
     end
   end

data/spec/views/catalog/_index_header_default.html.erb_spec.rb

@@ -10,7 +10,7 @@ describe "catalog/_index_header_default" do
   end
 
   before do
-    assign :response, double(params: {})
+    assign :response, double(start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:current_search_session).and_return nil

data/spec/views/catalog/_thumbnail_default.erb_spec.rb

@@ -17,7 +17,7 @@ describe "catalog/_thumbnail_default" do
   end
 
   before do
-    assign :response, double(:params => {})
+    assign :response, double(start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:current_search_session).and_return nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,14 +57,14 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
 - !ruby/object:Gem::Dependency
@@ -424,6 +424,7 @@ files:
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/controller.rb
 - lib/blacklight/document.rb
+- lib/blacklight/document/active_model_shim.rb
 - lib/blacklight/document/dublin_core.rb
 - lib/blacklight/document/email.rb
 - lib/blacklight/document/export.rb