geoblacklight 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a76208f38c8360b0a7ac9d53f6bea129aa127c7f
-  data.tar.gz: cab96dd5acfb95ebb2313061eedb342be66fc086
+  metadata.gz: 59d0205c4e07a131e2b5428ed95c147063845cd9
+  data.tar.gz: 5b25ed07db81ba2ba79f0a9ba910708883d98c21
 SHA512:
-  metadata.gz: 52d058b189f45f3009b8071bf2ea5db8811b1d2965d6995432ebe25897fabe86c79c68068245158388fbd4efc9a6b5658ab8d68fcd3bd1e7a72318b1800e5d88
-  data.tar.gz: 1deb25f8b97b1954559efa2105d364dd69be7ad8ad69d9c736ddbb0cc9fef2c16c0a882fef063a3b7b8ff507d740f42e75126b0a2ee3c163a10fb72a07ab7dcc
+  metadata.gz: 6293951f6b7f5adc3f98d97517f79fd89c8f0be0178276820db43c0f74552253f4ee4df0c49418739bbb0659cda9702bd01e0d937a04534feabe37b501e0a6a6
+  data.tar.gz: 1c399c1039db4db32a724e1d76730e7b9932ca279a5220d0af7f3e85b638c9a1313e62e393a9d7b15bdd4eb222fcee48ddaf610ae5b3112a9cacf144bd9e47ba

data/app/controllers/download_controller.rb

@@ -1,5 +1,5 @@
 class DownloadController < ApplicationController
-  include Blacklight::SolrHelper
+  include Blacklight::SearchHelper
 
   rescue_from Geoblacklight::Exceptions::ExternalDownloadFailed do |exception|
     Geoblacklight.logger.error exception.message + ' ' + exception.url
@@ -18,7 +18,7 @@ class DownloadController < ApplicationController
   end
 
   def show
-    @response, @document = get_solr_response_for_doc_id params[:id]
+    @response, @document = fetch params[:id]
     restricted_should_authenticate
     response = check_type
     validate response
@@ -30,13 +30,13 @@ class DownloadController < ApplicationController
 
   def file
     # Grab the solr document to check if it should be public or not
-    @response, @document = get_solr_response_for_doc_id(file_name_to_id(params[:id]))
+    @response, @document = fetch(file_name_to_id(params[:id]))
     restricted_should_authenticate
     send_file "tmp/cache/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
   end
 
   def hgl
-    @response, @document = get_solr_response_for_doc_id params[:id]
+    @response, @document = fetch params[:id]
     if params[:email]
       response = Geoblacklight::HglDownload.new(@document, params[:email]).get
       if response.nil?

data/geoblacklight.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 5.9'
+  spec.add_dependency 'blacklight', '~> 5.12.0'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'blacklight_range_limit', '~> 5.0.3'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -21,6 +21,8 @@ class CatalogController < ApplicationController
      :q => '{!raw f=layer_slug_s v=$id}'
     }
 
+    config.search_builder_class = Geoblacklight::SearchBuilder
+
     # solr field configuration for search results/index views
     # config.index.show_link = 'title_display'
     # config.index.record_display_type = 'format'

data/lib/generators/geoblacklight/templates/settings.yml

@@ -1,3 +1,6 @@
+# Download path can be configured using this setting
+#DOWNLOAD_PATH: "./tmp/cache/downloads"
+
 #Main Solr geometry field used for spatial search and bounding box. Should be type 'rpt'
 GEOMETRY_FIELD: 'solr_geom'
 

data/lib/geoblacklight.rb

@@ -21,6 +21,7 @@ module Geoblacklight
   require 'geoblacklight/reference'
   require 'geoblacklight/references'
   require 'geoblacklight/routes'
+  require 'geoblacklight/search_builder'
   
   def self.inject!
     CatalogController.send(:include, Geoblacklight::ControllerOverride)

data/lib/geoblacklight/controller_override.rb

@@ -1,26 +1,12 @@
 module Geoblacklight
   module ControllerOverride
     extend ActiveSupport::Concern
-    included do
-      solr_search_params_logic << :add_spatial_params
-    end
-
-    def add_spatial_params(solr_params, req_params)
-      if req_params[:bbox]
-        solr_params[:bq] ||= []
-        solr_params[:bq] = ["#{Settings.GEOMETRY_FIELD}:\"IsWithin(#{req_params[:bbox]})\"^10"]
-        solr_params[:fq] ||= []
-        solr_params[:fq] << "#{Settings.GEOMETRY_FIELD}:\"Intersects(#{req_params[:bbox]})\""
-      end
-      solr_params
-    end
-
     def web_services
-      @response, @document = get_solr_response_for_doc_id params[:id]
+      @response, @document = fetch params[:id]
     end
 
     def metadata
-      @response, @document = get_solr_response_for_doc_id params[:id]
+      @response, @document = fetch params[:id]
     end
   end
-end
+end

data/lib/geoblacklight/download.rb

@@ -14,7 +14,7 @@ module Geoblacklight
     end
 
     def file_path
-      "#{Rails.root}/tmp/cache/downloads/#{file_name}"
+      Settings.DOWNLOAD_PATH || "#{Rails.root}/tmp/cache/downloads"
     end
 
     def download_exists?
@@ -35,18 +35,18 @@ module Geoblacklight
     # @return [String] filename of the completed download
     def create_download_file
       download = initiate_download
-      File.open("#{file_path}.tmp", 'wb')  do |file|
+      File.open("#{file_path}/#{file_name}.tmp", 'wb')  do |file|
         if download.headers['content-type'] == @options[:content_type]
           file.write download.body
         else
           fail Geoblacklight::Exceptions::WrongDownloadFormat
         end
       end
-      File.rename("#{file_path}.tmp", file_path)
+      File.rename("#{file_path}/#{file_name}.tmp", "#{file_path}/#{file_name}")
       file_name
     rescue Geoblacklight::Exceptions::WrongDownloadFormat => error
       Geoblacklight.logger.error "#{error} expected #{@options[:content_type]} received #{download.headers['content-type']}"
-      File.delete("#{file_path}.tmp")
+      File.delete("#{file_path}/#{file_name}.tmp")
       raise Geoblacklight::Exceptions::ExternalDownloadFailed, message: 'Wrong download type'
     end
 

data/lib/geoblacklight/search_builder.rb

@@ -0,0 +1,18 @@
+module Geoblacklight
+  class SearchBuilder  < Blacklight::Solr::SearchBuilder
+    def initialize(processor_chain, scope)
+      super(processor_chain, scope)
+      processor_chain << :add_spatial_params
+    end
+
+    def add_spatial_params(solr_params)
+      if blacklight_params[:bbox]
+        solr_params[:bq] ||= []
+        solr_params[:bq] = ["#{Settings.GEOMETRY_FIELD}:\"IsWithin(#{blacklight_params[:bbox]})\"^10"]
+        solr_params[:fq] ||= []
+        solr_params[:fq] << "#{Settings.GEOMETRY_FIELD}:\"Intersects(#{blacklight_params[:bbox]})\""
+      end
+      solr_params
+    end
+  end
+end

data/lib/geoblacklight/solr_document.rb

@@ -12,11 +12,11 @@ module Geoblacklight
     end
 
     def public?
-      get(:dc_rights_s).downcase == 'public'
+      fetch(:dc_rights_s).downcase == 'public'
     end
 
     def restricted?
-      get(:dc_rights_s).downcase == 'restricted'
+      fetch(:dc_rights_s).downcase == 'restricted'
     end
 
     def downloadable?
@@ -40,7 +40,7 @@ module Geoblacklight
     end
 
     def same_institution?
-      get(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
+      fetch(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
     end
 
     def item_viewer
@@ -52,7 +52,7 @@ module Geoblacklight
     end
 
     def bounding_box_as_wsen
-      s = get(Settings.GEOMETRY_FIELD.to_sym)
+      s = fetch(Settings.GEOMETRY_FIELD.to_sym)
       if s =~ /^\s*ENVELOPE\(\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*,\s*([-\.\d]+)\s*\)\s*$/
         w, s, e, n = $1, $4, $2, $3
         return "#{w} #{s} #{e} #{n}"

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/tasks/geoblacklight.rake

@@ -6,16 +6,16 @@ namespace :geoblacklight do
     desc "Put sample data into solr"
     task :seed => :environment do
       docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
-      Blacklight.solr.add docs
-      Blacklight.solr.commit
+      Blacklight.default_index.connection.add docs
+      Blacklight.default_index.connection.commit
     end
 
     desc "Ingests a GeoHydra transformed.json"
     task :ingest_all => :environment do
       docs = JSON::parse(File.read("#{Rails.root}/tmp/transformed.json"))
       docs.each do |doc|
-        Blacklight.solr.add doc
-        Blacklight.solr.commit
+        Blacklight.default_index.connection.add doc
+        Blacklight.default_index.connection.commit
       end
     end
   end

data/spec/lib/geoblacklight/controller_override_spec.rb

@@ -1,28 +1 @@
-require 'spec_helper'
-
-describe Geoblacklight::ControllerOverride do
-  class GeoblacklightControllerTestClass
-  end
-  
-  before(:each) do
-    @fake_controller = GeoblacklightControllerTestClass.new
-    @fake_controller.extend(Geoblacklight::ControllerOverride)
-  end
-  
-  let(:solr_params) { OpenStruct.new }
-  let(:req_params) { OpenStruct.new }
-  
-  describe 'add_spatial_params' do
-    it 'should return the solr_params when no bbox is given' do
-      expect(@fake_controller.add_spatial_params(solr_params, req_params)).to eq solr_params
-    end
-    it 'should return a spatial search if bbox is given' do
-      req_params.bbox = '123'
-      expect(has_spatial_query(solr_params, req_params)).to be_truthy
-    end
-  end
-end
-
-def has_spatial_query(solr_params, req_params)
-  /Intersects/ =~ @fake_controller.add_spatial_params(solr_params, req_params).fq.first
-end
+require 'spec_helper'

data/spec/lib/geoblacklight/download_spec.rb

@@ -20,7 +20,11 @@ describe Geoblacklight::Download do
   end
   describe '#file_path' do
     it 'should return the path with name and extension' do
-      expect(download.file_path).to eq "#{Rails.root}/tmp/cache/downloads/#{download.file_name}"
+      expect(download.file_path).to eq "#{Rails.root}/tmp/cache/downloads"
+    end
+    it 'should be configurable' do
+      expect(Settings).to receive(:DOWNLOAD_PATH).and_return('configured/path')
+      expect(download.file_path).to eq 'configured/path'
     end
   end
   describe '#download_exists?' do
@@ -41,7 +45,7 @@ describe Geoblacklight::Download do
     it 'should call create_download_file if it does not exist' do
       expect(download).to receive(:download_exists?).and_return(false)
       expect(download).to receive(:initiate_download).and_return(object: 'file')
-      expect(File).to receive(:open).with("#{download.file_path}.tmp", 'wb').and_return('')
+      expect(File).to receive(:open).with("#{download.file_path}/#{download.file_name}.tmp", 'wb').and_return('')
       expect(File).to receive(:rename)
       expect(download.get).to eq 'test-shapefile.zip'
     end
@@ -50,13 +54,13 @@ describe Geoblacklight::Download do
     it 'should create the file in fs and delete it if the content headers are not correct' do
       bad_file = OpenStruct.new(headers: { 'content-type' => 'bad/file' })
       expect(download).to receive(:initiate_download).and_return(bad_file)
-      expect(File).to receive(:delete).with("#{download.file_path}.tmp").and_return(nil)
+      expect(File).to receive(:delete).with("#{download.file_path}/#{download.file_name}.tmp").and_return(nil)
       expect { download.create_download_file }.to raise_error(Geoblacklight::Exceptions::ExternalDownloadFailed, 'Wrong download type')
     end
     it 'should create the file, write it, and then rename from tmp if everything is ok' do
       shapefile = OpenStruct.new(headers: {'content-type' => 'application/zip'})
       expect(download).to receive(:initiate_download).and_return(shapefile)
-      expect(File).to receive(:open).with("#{download.file_path}.tmp", 'wb').and_return('')
+      expect(File).to receive(:open).with("#{download.file_path}/#{download.file_name}.tmp", 'wb').and_return('')
       expect(File).to receive(:rename)
       expect(download.create_download_file).to eq download.file_name
     end

data/spec/lib/geoblacklight/search_builder_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Geoblacklight::SearchBuilder do
+  let(:method_chain) { CatalogController.search_params_logic }
+  let(:user_params) { Hash.new }
+  let(:solr_params) { Hash.new }
+  let(:context) { CatalogController.new }
+
+  let(:search_builder) { described_class.new(method_chain, context) }
+
+  subject { search_builder.with(user_params) }
+
+  describe '#add_spatial_params' do
+    it 'should return the solr_params when no bbox is given' do
+      expect(subject.add_spatial_params(solr_params)).to eq solr_params
+    end
+
+    it 'should return a spatial search if bbox is given' do
+      params = { :bbox => '123' }
+      subject.with(params)
+      expect(subject.add_spatial_params(solr_params)[:fq].to_s).to include("Intersects")
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: 5.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: 5.12.0
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -350,6 +350,7 @@ files:
 - lib/geoblacklight/reference.rb
 - lib/geoblacklight/references.rb
 - lib/geoblacklight/routes.rb
+- lib/geoblacklight/search_builder.rb
 - lib/geoblacklight/solr_document.rb
 - lib/geoblacklight/version.rb
 - lib/geoblacklight/view_helper_override.rb
@@ -392,6 +393,7 @@ files:
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
+- spec/lib/geoblacklight/search_builder_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
@@ -426,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -466,6 +468,7 @@ test_files:
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata_spec.rb
 - spec/lib/geoblacklight/references_spec.rb
+- spec/lib/geoblacklight/search_builder_spec.rb
 - spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb