browse-everything 0.16.1 → 1.0.0.rc1

data/spec/lib/browse_everything/driver/google_drive_spec.rb

@@ -2,7 +2,7 @@
 
 include BrowserConfigHelper
 
-describe BrowseEverything::Driver::GoogleDrive, vcr: { cassette_name: 'google_drive', record: :none } do
+describe BrowseEverything::Driver::GoogleDrive do
   let(:browser) { BrowseEverything::Browser.new(url_options) }
   let(:provider) { browser.providers['google_drive'] }
   let(:provider_yml) do
@@ -11,9 +11,27 @@ describe BrowseEverything::Driver::GoogleDrive, vcr: { cassette_name: 'google_dr
       url_options: { port: '3000', protocol: 'http://', host: 'example.com' }
     }
   end
+  let(:oauth_response_body) do
+    '{
+     "access_token": "access-token",
+     "token_type": "Bearer",
+     "expires_in": 3600,
+     "refresh_token": "refresh-token"
+    }'
+  end
 
   before do
     stub_configuration
+
+    stub_request(
+      :post, 'https://oauth2.googleapis.com/token'
+    ).to_return(
+      body: oauth_response_body,
+      status: 200,
+      headers: {
+        'Content-Type' => 'application/json; charset=UTF-8'
+      }
+    )
   end
 
   after do
@@ -30,11 +48,11 @@ describe BrowseEverything::Driver::GoogleDrive, vcr: { cassette_name: 'google_dr
 
   describe '#validate_config' do
     it 'raises and error with an incomplete configuration' do
-      expect { BrowseEverything::Driver::GoogleDrive.new({}) }.to raise_error(BrowseEverything::InitializationError)
+      expect { described_class.new({}) }.to raise_error(BrowseEverything::InitializationError)
     end
 
     it 'raises and error with a configuration without a client secret' do
-      expect { BrowseEverything::Driver::GoogleDrive.new(client_id: 'test-client-id') }.to raise_error(BrowseEverything::InitializationError)
+      expect { described_class.new(client_id: 'test-client-id') }.to raise_error(BrowseEverything::InitializationError)
     end
   end
 
@@ -69,7 +87,7 @@ describe BrowseEverything::Driver::GoogleDrive, vcr: { cassette_name: 'google_dr
     let(:driver) { described_class.new(provider_yml) }
 
     before do
-      driver.connect({ code: 'code' }, {})
+      driver.connect({ code: 'code' }, {}, nil)
     end
 
     describe '#authorized?' do
@@ -139,6 +157,25 @@ describe BrowseEverything::Driver::GoogleDrive, vcr: { cassette_name: 'google_dr
 
     describe '#link_for' do
       subject(:link) { driver.link_for('asset-id2') }
+      let(:file_response_body) do
+        '{
+         "id": "asset-id2",
+         "name": "asset-name2.pdf",
+         "webContentLink": "https://drive.google.com/uc?id=id&export=download"
+        }'
+      end
+
+      before do
+        stub_request(
+          :get, "https://www.googleapis.com/drive/v3/files/asset-id2?fields=id,%20name,%20size"
+        ).to_return(
+          body: file_response_body,
+          status: 200,
+          headers: {
+            'Content-Type' => 'application/json'
+          }
+        )
+      end
 
       it 'generates the link for a Google Drive asset' do
         expect(link).to be_an Array

data/spec/lib/browse_everything/driver/s3_spec.rb

@@ -22,30 +22,46 @@ describe BrowseEverything::Driver::S3 do
   end
 
   describe 'configuration' do
-    it '#validate_config' do
+    it 'rejects an empty config.' do
       expect { described_class.new({}) }.to raise_error(BrowseEverything::InitializationError)
     end
 
-    it 'rejects app_key if app_secret is missing' do
+    it 'rejects a missing region' do
       expect { described_class.new(bucket: 'bucket', app_key: 'APP_KEY') }.to raise_error(BrowseEverything::InitializationError)
     end
 
+    it 'rejects app_key if app_secret is missing' do
+      expect { described_class.new(bucket: 'bucket', region: 'us-east-1', app_key: 'APP_KEY') }.to raise_error(BrowseEverything::InitializationError)
+    end
+
     it 'rejects app_secret if app_key is missing' do
-      expect { described_class.new(bucket: 'bucket', app_secret: 'APP_SECRET') }.to raise_error(BrowseEverything::InitializationError)
+      expect { described_class.new(bucket: 'bucket', region: 'us-east-1', app_secret: 'APP_SECRET') }.to raise_error(BrowseEverything::InitializationError)
     end
 
     it 'accepts app_key and app_secret together' do
-      expect { described_class.new(bucket: 'bucket', app_key: 'APP_KEY', app_secret: 'APP_SECRET') }.not_to raise_error
+      expect { described_class.new(bucket: 'bucket', region: 'us-east-1', app_key: 'APP_KEY', app_secret: 'APP_SECRET') }.not_to raise_error
     end
 
     it 'rejects an invalid response type' do
-      expect { described_class.new(bucket: 'bucket', response_type: :foo) }.to raise_error(BrowseEverything::InitializationError)
+      expect { described_class.new(bucket: 'bucket', region: 'us-east-1', response_type: :foo) }.to raise_error(BrowseEverything::InitializationError)
     end
 
-    it 'deprecates :signed_url' do
-      driver = described_class.new(bucket: 'bucket', signed_url: false)
-      expect(driver.config).not_to have_key(:signed_url)
-      expect(driver.config[:response_type]).to eq(:public_url)
+    context 'deprecating :signed_url' do
+      it 'sets the value of :signed_url to :response_type' do
+        driver = described_class.new(bucket: 'bucket', region: 'us-east-1', signed_url: false)
+        expect(driver.config).not_to have_key(:signed_url)
+        expect(driver.config[:response_type]).to eq(:public_url)
+
+        signed_driver = described_class.new(bucket: 'bucket', region: 'us-east-1', signed_url: true)
+        expect(signed_driver.config).not_to have_key(:signed_url)
+        expect(signed_driver.config[:response_type]).to eq(:signed_url)
+      end
+
+      it 'sets the default value of :response_type to :signed_url' do
+        driver = described_class.new(bucket: 'bucket', region: 'us-east-1')
+        expect(driver.config).not_to have_key(:signed_url)
+        expect(driver.config[:response_type]).to eq(:signed_url)
+      end
     end
   end
 
@@ -95,15 +111,8 @@ describe BrowseEverything::Driver::S3 do
 
       let(:contents) { provider.contents('foo/') }
 
-      context 'with a single directory' do
-        subject { contents[0] }
-
-        its(:name) { is_expected.to eq('..') }
-        specify    { is_expected.to be_container }
-      end
-
       context 'with a JPEG asset' do
-        subject { contents[1] }
+        subject { contents[0] }
 
         its(:name)     { is_expected.to eq('baz.jpg') }
         its(:location) { is_expected.to eq('s3:foo/baz.jpg')  }
@@ -113,7 +122,7 @@ describe BrowseEverything::Driver::S3 do
       end
 
       context 'with a PNG asset' do
-        subject { contents[2] }
+        subject { contents[1] }
 
         its(:name)     { is_expected.to eq('quux.png') }
         its(:location) { is_expected.to eq('s3:foo/quux.png') }

data/spec/lib/browse_everything/retriever_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record: :none } do
+describe BrowseEverything::Retriever do
   let(:retriever) { described_class.new }
   let(:datafile) { File.expand_path('../../fixtures/file_system/file_1.pdf', __dir__) }
   let(:datafile_with_spaces) { File.expand_path('../../fixtures/file_system/file 1.pdf', __dir__) }
@@ -12,7 +12,7 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     subject(:computed_file_size) { retriever.file_size(options) }
 
     let(:url) { URI.parse("file://#{datafile}") }
-    let(:headers) { [] }
+    let(:headers) { {} }
     let(:file_size) { 0 }
     let(:options) do
       {
@@ -31,6 +31,25 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     context 'when retrieving a resource from a cloud storage provider' do
       let(:url) { URI.parse('https://drive.google.com/uc?id=id&export=download') }
 
+      before do
+        stub_request(
+          :head, "https://drive.google.com/uc?export=download&id=id"
+        ).and_return(
+          headers: {
+            'Content-Length' => '1234'
+          }
+        )
+
+        stub_request(
+          :get, "https://drive.google.com/uc?export=download&id=id"
+        ).and_return(
+          headers: {
+            'Content-Length' => '1234'
+          },
+          body: 'content'
+        )
+      end
+
       it 'calculates or retrieves the size of a file' do
         retriever.retrieve(options) do |_chunk, _retrieved, total|
           expect(total).to eq 1234
@@ -80,6 +99,17 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     end
 
     context 'when retrieving data using chunked-encoded streams' do
+      before do
+        stub_request(
+          :get, "https://retrieve.cloud.example.com/some/dir/file.pdf"
+        ).and_return(
+          headers: {
+            'Content-Type' => 'text/plain'
+          },
+          body: data
+        )
+      end
+
       it 'content' do
         content = +''
         retriever.retrieve(spec['0']) { |chunk, _retrieved, _total| content << chunk }
@@ -92,6 +122,17 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     end
 
     context 'when downloading content' do
+      before do
+        stub_request(
+          :get, "https://retrieve.cloud.example.com/some/dir/file.pdf"
+        ).and_return(
+          headers: {
+            'Content-Type' => 'text/plain'
+          },
+          body: data
+        )
+      end
+
       it 'content' do
         file = retriever.download(spec['0'])
         expect(File.open(file, 'rb', &:read)).to eq(data)
@@ -115,6 +156,13 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
         }
       end
       let(:download_options) { spec['0'] }
+      before do
+        stub_request(
+          :get, "https://retrieve.cloud.example.com/some/dir/file_error.pdf"
+        ).and_return(
+          status: 403
+        )
+      end
 
       it 'raises an exception' do
         expect { retriever.download(download_options) }.to raise_error(BrowseEverything::DownloadError, /BrowseEverything::Retriever: Failed to download/)
@@ -184,6 +232,14 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
 
     context 'when can retrieve' do
       let(:url) { 'https://retrieve.cloud.example.com/some/dir/can_retrieve.pdf' }
+      before do
+        stub_request(
+          :get, "https://retrieve.cloud.example.com/some/dir/can_retrieve.pdf"
+        ).to_return(
+          status: 206,
+          body: '%'
+        )
+      end
 
       it 'says it can' do
         expect(described_class).to be_can_retrieve(url)
@@ -192,6 +248,13 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
 
     context 'when cannot retrieve' do
       let(:url) { 'https://retrieve.cloud.example.com/some/dir/cannot_retrieve.pdf' }
+      before do
+        stub_request(
+          :get, "https://retrieve.cloud.example.com/some/dir/cannot_retrieve.pdf"
+        ).to_return(
+          status: 403
+        )
+      end
 
       it 'says it cannot' do
         expect(described_class).not_to be_can_retrieve(url)

data/spec/spec_helper.rb

@@ -36,19 +36,13 @@ require 'capybara/rspec'
 require 'rspec'
 require 'rspec/rails'
 require 'rspec/its'
-require 'vcr'
-require 'webmock/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[Pathname.new(File.expand_path('support/**/*.rb', __dir__))].each { |f| require f }
 
-VCR.configure do |c|
-  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  c.hook_into :webmock
-  c.configure_rspec_metadata!
-  c.ignore_localhost = true
-end
+require 'webmock/rspec'
+WebMock.disable_net_connect!(allow_localhost: true)
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
@@ -85,7 +79,8 @@ module BrowserConfigHelper
                                's3' => {
                                  app_key: 'S3AppKey',
                                  app_secret: 'S3AppSecret',
-                                 bucket: 's3.bucket'
+                                 bucket: 's3.bucket',
+                                 region: 's3.region'
                                })
   end
 

data/spec/support/capybara.rb

@@ -2,16 +2,20 @@
 
 require 'selenium-webdriver'
 
-Capybara.javascript_driver = :headless_chrome
-
-Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w[headless disable-gpu no-sandbox] }
-  )
-
-  Capybara::Selenium::Driver.new(app,
-                                 browser: :chrome,
-                                 desired_capabilities: capabilities)
+# Temporary pin until chromedriver-helper patched to deal with change in chromedriver versioning
+# See https://github.com/flavorjones/chromedriver-helper/pull/63
+# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
+#       container build environments to mitigate Meltdown/Spectre
+#       vulnerabilities, at which point Hyrax could no longer use the
+#       Capybara-provided :selenium_chrome_headless driver (which does not
+#       include the `--no-sandbox` argument).
+Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new
+  browser_options.args << '--headless'
+  browser_options.args << '--disable-gpu'
+  browser_options.args << '--no-sandbox'
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 
 Capybara.default_max_wait_time = 5
+Capybara.javascript_driver = :selenium_chrome_headless_sandboxless

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Carolyn Cole
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -91,14 +91,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
@@ -119,14 +119,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -257,16 +257,16 @@ dependencies:
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -323,6 +323,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -449,20 +463,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -495,12 +495,14 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- SUPPORT.md
 - app/assets/javascripts/browse_everything.js
 - app/assets/javascripts/browse_everything/behavior.js.coffee
 - app/assets/stylesheets/browse_everything.scss
@@ -552,10 +554,6 @@ files:
 - spec/fixtures/file_system/dir_2/file_4.docx
 - spec/fixtures/file_system/file 1.pdf
 - spec/fixtures/file_system/file_1.pdf
-- spec/fixtures/vcr_cassettes/box.yml
-- spec/fixtures/vcr_cassettes/dropbox.yml
-- spec/fixtures/vcr_cassettes/google_drive.yml
-- spec/fixtures/vcr_cassettes/retriever.yml
 - spec/helper/browse_everything_controller_helper_spec.rb
 - spec/javascripts/behavior_spec.js
 - spec/javascripts/helpers/jasmine-jquery.js
@@ -606,12 +604,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
@@ -625,10 +623,6 @@ test_files:
 - spec/fixtures/file_system/dir_2/file_4.docx
 - spec/fixtures/file_system/file 1.pdf
 - spec/fixtures/file_system/file_1.pdf
-- spec/fixtures/vcr_cassettes/box.yml
-- spec/fixtures/vcr_cassettes/dropbox.yml
-- spec/fixtures/vcr_cassettes/google_drive.yml
-- spec/fixtures/vcr_cassettes/retriever.yml
 - spec/helper/browse_everything_controller_helper_spec.rb
 - spec/javascripts/behavior_spec.js
 - spec/javascripts/helpers/jasmine-jquery.js