geoblacklight 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa36bd32f32a6b289d92cab3606e6ba22437a021
-  data.tar.gz: f09f5393f099ccb09019cfd66643ded169a26c58
+  metadata.gz: 6c66665cbabfb3ba8ad4f22cb69c5a34901502e1
+  data.tar.gz: f7cd3b0972dc89757282a8332e1f168bba7d0035
 SHA512:
-  metadata.gz: 2cda324d88b1b06c40607b5d0d23a3133fdeb40fed7ad24939b0f9aec4bf3197b9150c5792f1cadf5f502923c064dfb7dc63c25dffd8d8a16ffba9c49fd5c67e
-  data.tar.gz: 80fa4d0944f7218f785b2bb9b6756d2fbfe1edc1f21b5d59a241173d9315f1db1ce27dd7b5eaec5b2f42d1460ae02534be95b39706f2f32a92bac9f280ead698
+  metadata.gz: 2ba6e4f97b0b646b8a37a7e58c8fa1e986930512b27f746742131a5d47190dfcf6bb1302c1f91eff47648969d767dabaaf733c0f47ed83748f3a2fcfe2f0aab4
+  data.tar.gz: 43e761955b978e8acd896b36714eb2b48ea300db2427a75f4ee1ef10d49e4d8a49379d7d7f41df5ec9a021f511e9cb23ad8fb39695654fb2f74c90403bf7ee7f

data/app/controllers/download_controller.rb

@@ -3,6 +3,7 @@ class DownloadController < ApplicationController
 
   def show
     @response, @document = get_solr_response_for_doc_id
+    restricted_should_authenticate
     response = check_type
     validate response
     respond_to do |format|
@@ -12,9 +13,14 @@ class DownloadController < ApplicationController
   end
 
   def file
-    send_file "tmp/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
+    # 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]))
+    restricted_should_authenticate
+    send_file "tmp/cache/downloads/#{params[:id]}.#{params[:format]}", type: 'application/zip', x_sendfile: true
   end
 
+  private
+
   def check_type
     case params[:type]
     when 'shapefile'
@@ -32,4 +38,15 @@ class DownloadController < ApplicationController
       flash[:success] = view_context.link_to(t('geoblacklight.download.success', title: response), download_file_path(response))
     end
   end
+
+  # Checks whether a document is public, if not require user to authenticate
+  def restricted_should_authenticate
+    unless @document.public?
+      authenticate_user!
+    end
+  end
+  
+  def file_name_to_id(file_name)
+    file_name.split('-')[0..-2].join('-')
+  end
 end

data/app/helpers/geoblacklight_helper.rb

@@ -16,6 +16,14 @@ module GeoblacklightHelper
     content_tag(:i, '', :class => 'fa fa-download fa-fw') + ' ' + t('Metadata')
   end
 
+  def document_available?
+    @document.public? || (@document.same_institution? && current_user)
+  end
+
+  def document_downloadable?
+    document_available? && @document.downloadable?
+  end
+
   def abstract_truncator(abstract)
     if (abstract)
       if (abstract.length > 150)
@@ -48,10 +56,10 @@ module GeoblacklightHelper
   end
 
   def layer_access_image(access)
-    case access
-    when 'Restricted'
+    case access.downcase
+    when 'restricted'
       content_tag(:i, '', class: 'fa fa-lock fa-lg text-muted  tooltip-icon', 'data-toggle' => 'tooltip', title: 'Restricted', style: 'width: 17px;')
-    when 'Public'
+    when 'public'
       content_tag(:i, '', class: 'fa fa-unlock fa-lg text-muted tooltip-icon',  'data-toggle' => 'tooltip', title: 'Public')
     else
       ""

data/app/views/catalog/_show_default.html.erb

@@ -4,7 +4,7 @@
 
 <div class='row'>
   <div class="col-md-8">
-    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document[:solr_wms_url], available: document.available? } do %>
+    <%= content_tag :div, id: 'map', data: { map: 'item', 'catalog-path'=> catalog_index_path , 'map-bbox' => document[:solr_bbox], 'layer-id' => document[:layer_id_s], 'wms-url' => document[:solr_wms_url], available: document_available? } do %>
       <div id='control'>
         <div id='handle'></div>
         <div id='bottom'></div>

data/app/views/catalog/_show_sidebar.html.erb

@@ -18,7 +18,7 @@
         <i class="fa fa-bookmark fa-fw"></i>&nbsp;Cite This
       </a>    
     </ul>
-    <% if document.downloadable? %>
+    <% if document_downloadable? %>
       <div class='btn-group'>
         <%= button_tag(type: 'button', class: 'btn btn-default dropdown-toggle', data: { toggle: 'dropdown' }) do %>
           Download <span class='caret'></span>
@@ -31,6 +31,8 @@
           <% end %>
         </ul>
       </div>
+    <% elsif document.restricted? && document.same_institution? %>
+      <%= link_to t('geoblacklight.tools.login_to_view'), new_user_session_path(referrer: request.original_url) %>
     <% end %>
   </div>
 </div>

data/config/locales/geoblacklight.en.yml

@@ -2,4 +2,6 @@ en:
   geoblacklight:
     download:
       success: 'Your file %{title} is ready for download'
-      error: 'Sorry, the requested file could not be downloaded'
+      error: 'Sorry, the requested file could not be downloaded'
+    tools:
+      login_to_view: 'Login to view and download'

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.7.1'
+  spec.add_dependency 'blacklight', '~> 5.7.2'
   spec.add_dependency 'leaflet-rails', '~> 0.7.3'
   spec.add_dependency 'blacklight_range_limit', '~> 5.0.1'
   spec.add_dependency 'font-awesome-rails', '~> 4.1.0.0'
@@ -33,4 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'engine_cart', '~> 0.4.0'
   spec.add_development_dependency 'capybara', '~> 2.3.0'
   spec.add_development_dependency 'poltergeist', '~> 1.5.0'
+  spec.add_development_dependency 'factory_girl_rails'
+  spec.add_development_dependency 'database_cleaner'
 end

data/lib/generators/geoblacklight/install_generator.rb

@@ -45,9 +45,7 @@ module Geoblacklight
     end
 
     def create_downloads_directory
-      if !Dir.exists?('tmp/downloads')
-        Dir.mkdir('tmp/downloads')
-      end
+      FileUtils.mkdir_p("tmp/cache/downloads") unless File.directory?("tmp/cache/downloads")
     end
 
     # Necessary for bootstrap-sass 3.2

data/lib/geoblacklight/download.rb

@@ -13,7 +13,7 @@ class Download
   end
 
   def file_path
-    "#{Rails.root}/tmp/downloads/#{file_name}"
+    "#{Rails.root}/tmp/cache/downloads/#{file_name}"
   end
 
   def download_exists?

data/lib/geoblacklight/solr_document.rb

@@ -8,7 +8,11 @@ module Geoblacklight
     end
 
     def public?
-      get(:dc_rights_s) == 'Public'
+      get(:dc_rights_s).downcase == 'public'
+    end
+
+    def restricted?
+      get(:dc_rights_s).downcase == 'restricted'
     end
 
     def downloadable?
@@ -20,7 +24,7 @@ module Geoblacklight
     end
 
     def same_institution?
-      get(:dct_provenance_s) == Settings.Institution
+      get(:dct_provenance_s).downcase == Settings.INSTITUTION.downcase
     end
 
     def itemtype

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/tasks/geoblacklight.rake

@@ -22,7 +22,7 @@ namespace :geoblacklight do
   namespace :downloads do
     desc 'Delete all cached downloads'
     task delete: :environment do
-      FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/downloads/*")
+      FileUtils.rm_rf Dir.glob("#{Rails.root}/tmp/cache/downloads/*")
     end
   end
 end

data/spec/controllers/download_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Geoblacklight::DownloadController, type: :controller do
+  describe '#file' do
+    describe 'restricted file' do
+      it 'should redirect to login for authentication' do
+        get :file, id: 'stanford-jf841ys4828-shapefile', format: 'zip'
+        expect(response.status).to eq 401
+      end
+    end
+    describe 'public file' do
+      it 'should initiate download' do
+        expect(controller).to receive(:render)
+        expect(controller).to receive(:send_file)
+        get :file, id: 'mit-us-ma-e25zcta5dct-2000-shapefile', format: 'zip'
+        expect(response.status).to eq 200
+      end
+    end
+  end
+  describe '#show' do
+    describe 'restricted file' do
+      it 'should redirect to login for authentication' do
+        get 'show', id: 'stanford-jf841ys4828', format: 'json'
+        expect(response.status).to eq 401
+      end
+    end
+    describe 'public file' do
+      it 'should initiate download creation' do
+        get 'show', id: 'mit-us-ma-e25zcta5dct-2000'
+        expect(response.status).to eq 200
+      end
+    end
+  end
+end

data/spec/factories/user.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:email) { |n| "user#{n}@example.com" }
+    password 'password'
+    password_confirmation 'password'
+  end
+end

data/spec/features/download_layer_spec.rb

@@ -1,18 +1,29 @@
 require 'spec_helper'
 
-feature 'Download layer', js: true do
-  scenario 'clicking shapefile download button should trigger download' do
+feature 'Download layer' do
+  scenario 'clicking shapefile download button should trigger download', js: true do
     expect_any_instance_of(ShapefileDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-shapefile.zip')
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('button', text: 'Download').click
     find('a', text: 'Shapefile').click
     expect(page).to have_css('a', text: 'Your file mit-us-ma-e25zcta5dct-2000-shapefile.zip is ready for download')
   end
-  scenario 'clicking kmz download button should trigger download' do
+  scenario 'clicking kmz download button should trigger download', js: true do
     expect_any_instance_of(KmzDownload).to receive(:get).and_return('mit-us-ma-e25zcta5dct-2000-kmz.kmz')
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('button', text: 'Download').click
     find('a', text: 'KMZ').click
     expect(page).to have_css('a', text: 'Your file mit-us-ma-e25zcta5dct-2000-kmz.kmz is ready for download')
   end
+  scenario 'restricted layer should not have download available to non logged in user' do
+    visit catalog_path('stanford-jf841ys4828')
+    expect(page).to have_css 'a', text: 'Login to view and download'
+    expect(page).to_not have_css 'button', text: 'Download'
+  end
+  scenario 'restricted layer should have download available to logged in user' do
+    sign_in
+    visit catalog_path('stanford-jf841ys4828')
+    expect(page).to_not have_css 'a', text: 'Login to view and download'
+    expect(page).to have_css 'button', text: 'Download'
+  end
 end

data/spec/features/layer_inspection_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 feature 'Layer inspection', js: true do
   scenario 'clicking map should trigger inspection' do
+    table_values = { values: [['Attribute']] }
+    expect_any_instance_of(WmsLayer).to receive(:get_feature_info).and_return(table_values)
     visit catalog_path('mit-us-ma-e25zcta5dct-2000')
     find('#map').click
     expect(page).to have_css('th', text: 'Attribute')

data/spec/lib/geoblacklight/download_spec.rb

@@ -20,7 +20,7 @@ describe 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/downloads/#{download.file_name}"
+      expect(download.file_path).to eq "#{Rails.root}/tmp/cache/downloads/#{download.file_name}"
     end
   end
   describe '#download_exists?' do

data/spec/lib/geoblacklight/solr_document.rb

@@ -21,13 +21,13 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#public?' do
     describe 'a public document' do
-      let(:document_attributes) { { dc_rights_s: 'Public' } }
+      let(:document_attributes) { { dc_rights_s: 'PUBLIC' } }
       it 'should be public' do
         expect(document.public?).to be_truthy
       end
     end
     describe 'a restricted resource' do
-      let(:document_attributes) { { dc_rights_s: 'Restricted' } }
+      let(:document_attributes) { { dc_rights_s: 'RESTRICTED' } }
       it 'should not be public' do
         expect(document.public?).to be_falsey
       end
@@ -35,11 +35,15 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#same_institution?' do
     describe 'within the same institution' do
-      let(:document_attributes) { { dct_provenance_s: 'Stanford' } }
+      let(:document_attributes) { { dct_provenance_s: 'STANFORD' } }
       it 'should be true' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_truthy
       end
+      it 'should match case inconsistencies' do
+        allow(Settings).to receive('Institution').and_return('StAnFord')
+        expect(document.same_institution).to be_truthy
+      end
     end
     describe 'within a different institution' do
       let(:document_attributes) { { dct_provenance_s: 'MIT' } }

data/spec/spec_helper.rb

@@ -1,10 +1,14 @@
 ENV["RAILS_ENV"] ||= 'test'
 
+require 'factory_girl'
+require 'database_cleaner'
 require 'engine_cart'
 require 'coveralls'
 Coveralls.wear!('rails')
 EngineCart.load_application!
 
+require 'rspec/rails'
+require 'capybara/rspec'
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
@@ -27,8 +31,26 @@ end
 
 require 'geoblacklight'
 
-require 'rspec/rails'
-require 'capybara/rspec'
+Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
+
+FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryGirl.find_definitions
 
 RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+
+  config.before :each do
+    if Capybara.current_driver == :rack_test
+      DatabaseCleaner.strategy = :transaction
+    else
+      DatabaseCleaner.strategy = :truncation
+    end
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+
+  config.include Devise::TestHelpers, type: :controller
 end

data/spec/support/features/session_helpers.rb

@@ -0,0 +1,20 @@
+module Features
+  module SessionHelpers
+    def sign_up_with(email, password)
+      visit new_user_registration_path
+      fill_in 'Email', with: email
+      fill_in 'Password', with: password
+      click_button 'Sign up'
+    end
+
+    def sign_in
+      user = FactoryGirl.create(:user)
+      user.save
+      visit new_user_session_path
+      fill_in 'user_email', with: user.email
+      fill_in 'user_password', with: user.password
+      click_button 'Log in'
+      expect(page).to have_content 'Signed in successfully.'
+    end
+  end
+end

data/spec/support/features.rb

@@ -0,0 +1,5 @@
+require File.expand_path("../features/session_helpers.rb", __FILE__)
+
+RSpec.configure do |config|
+  config.include Features::SessionHelpers, type: :feature
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Darren Hardy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.1
+        version: 5.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.7.1
+        version: 5.7.2
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: GeoBlacklight started at Stanford and its goal is to provide a world-class
   discovery platform for geospatial (GIS) holdings. It is an open collaborative project
   aiming to build off of the successes of the Blacklight Solr-powered discovery interface
@@ -281,6 +309,8 @@ files:
 - lib/geoblacklight/wms_layer.rb
 - lib/geoblacklight/wms_layer/feature_info_response.rb
 - lib/tasks/geoblacklight.rake
+- spec/controllers/download_controller_spec.rb
+- spec/factories/user.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
@@ -296,6 +326,8 @@ files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/spec_helper.rb
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb
@@ -326,6 +358,8 @@ signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
+- spec/controllers/download_controller_spec.rb
+- spec/factories/user.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
@@ -341,6 +375,8 @@ test_files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/spec_helper.rb
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_document_split.html.erb_spec.rb
 - spec/views/catalog/_index_split.html.erb_spec.rb