browse-everything 0.11.1 → 0.12.0

data/app/views/browse_everything/_file.html.erb

@@ -1,34 +1,51 @@
-<% if file.container? || provider.config[:max_upload_file_size].blank? # never disable a folder or if no maximum is set
+<%# Never disable folders. Files are only disabled if their size exceeds the maximum %>
+<% if file.container? || provider.config[:max_upload_file_size].blank?
    disabled = false
  else
    max_size = provider.config[:max_upload_file_size].to_i
    disabled = file.size > max_size
  end
 %>
-<tr role="row" tabindex="-1" data-ev-location="<%= file.location %>" data-tt-id="<%=path%>" data-tt-parent-id="<%=parent%>" data-tt-branch="<%=file.container? ? 'true' : 'false'%>">
+<tr role="row" tabindex="-1"
+    data-ev-location="<%= file.location %>"
+    data-tt-id="<%=path%>"
+    data-tt-parent-id="<%=parent%>"
+    data-tt-branch="<%=file.container? ? 'true' : 'false'%>">
+
   <td role="gridcell" class="<%=file.container? ? 'ev-container' : 'ev-file'%> ev-file-name">
     <% if disabled %>
-      <span title="<%= t('browse_everything.size_disabled', max_size: number_to_human_size(max_size)) %>"class="<%=file.container? ? 'folder' : 'file'%>" aria-hidden="true">
-      <%= file.name %>
+      <span title="<%= t('browse_everything.size_disabled', max_size: number_to_human_size(max_size)) %>"
+            class="<%=file.container? ? 'folder' : 'file'%>" aria-hidden="true">
+        <%= file.name %>
       </span>
       <span class="sr-only"><%= file.container? ? ', folder' : ', file' %> </span>
     <% else %>
-      <%= link_to browse_everything_engine.contents_path(provider_name,file.id), :class=>'ev-link' do %>
+      <%= link_to browse_everything_engine.contents_path(provider_name, file.id), class: 'ev-link' do %>
         <span class="<%=file.container? ? 'folder' : 'file'%>" aria-hidden="true"/>
         <%= file.name %>
         <span class="sr-only"><%= file.container? ? ', folder' : ', file' %> </span>
       <% end %>
     <% end %>
   </td>
-  <td role="gridcell" class="ev-directory-select">
-    <%= check_box_tag(:select_all, "0", false, class: "ev-select-all") if file.container? %>
-  </td>
+
+  <% if file.container? %>
+    <td role="gridcell" class="ev-directory-select">
+      <%= check_box_tag(:select_all, "0", false, class: "ev-select-all") %>
+    </td>
+  <% else %>
+    <td role="gridcell" class="ev-file-select">
+      <%= check_box_tag(file.id.to_s.parameterize, "0", false, class: "ev-select-file") %>
+    </td>
+  <% end %>
+
   <td role="gridcell" class="ev-file-size">
     <%= number_to_human_size(file.size).sub(/Bytes/,'bytes') %>
   </td>
+
   <td role="gridcell" class="ev-file-kind">
     <%= file.type %>
   </td>
+
   <td role="gridcell" class="ev-file-date">
     <%= file.mtime.strftime('%F %R') %>
   </td>

data/browse-everything.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.42.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.8.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'pry'

data/lib/browse_everything/driver/s3.rb

@@ -3,35 +3,35 @@ require 'aws-sdk'
 module BrowseEverything
   module Driver
     class S3 < Base
-      DEFAULTS = { signed_url: true, region: 'us-east-1' }
-      
-      def initialize config, *args
+      DEFAULTS = { signed_url: true, region: 'us-east-1' }.freeze
+      CONFIG_KEYS = [:app_key, :app_secret, :bucket].freeze
+
+      def initialize(config, *args)
         config = DEFAULTS.merge(config)
         super
       end
-      
+
       def icon
         'amazon'
       end
-      
+
       def validate_config
-        unless [:app_key, :app_secret, :bucket].all? { |key| config[key].present? }
-          raise BrowseEverything::InitializationError, 'Amazon S3 driver requires :bucket, :app_key and :app_secret'
-        end
+        return if CONFIG_KEYS.all? { |key| config[key].present? }
+        raise BrowseEverything::InitializationError, "Amazon S3 driver requires #{CONFIG_KEYS.join(',')}"
       end
-      
+
       def contents(path = '')
-        path = File.join(path,'') unless path.empty?
+        path = File.join(path, '') unless path.empty?
         result = []
         listing = client.list_objects(bucket: config[:bucket], delimiter: '/', prefix: path)
         unless path.empty?
           result << BrowseEverything::FileEntry.new(
             Pathname(path).join('..'),
-            '', '..', 0, Time.now, true
+            '', '..', 0, Time.current, true
           )
         end
         listing.common_prefixes.each do |prefix|
-          result << entry_for(prefix.prefix, 0, Time.now, true)
+          result << entry_for(prefix.prefix, 0, Time.current, true)
         end
         listing.contents.reject { |entry| entry.key == path }.each do |entry|
           result << entry_for(entry.key, entry.size, entry.last_modified, false)
@@ -46,21 +46,21 @@ module BrowseEverything
       end
 
       def entry_for(name, size, date, dir)
-        BrowseEverything::FileEntry.new(name, [key,name].join(':'), File.basename(name), size, date, dir)
+        BrowseEverything::FileEntry.new(name, [key, name].join(':'), File.basename(name), size, date, dir)
       end
-      
+
       def details(path)
         entry = client.head_object(path)
         BrowseEverything::FileEntry.new(
           entry.key,
-          [key,entry.key].join(':'),
+          [key, entry.key].join(':'),
           File.basename(entry.key),
           entry.size,
           entry.last_modified,
           false
         )
       end
-      
+
       def link_for(path)
         obj = bucket.object(path)
         if config[:signed_url]
@@ -69,19 +69,18 @@ module BrowseEverything
           obj.public_url
         end
       end
-      
+
       def authorized?
         true
       end
-      
+
       def bucket
         @bucket ||= Aws::S3::Bucket.new(config[:bucket], client: client)
       end
-      
+
       def client
         @client ||= Aws::S3::Client.new(credentials: Aws::Credentials.new(config[:app_key], config[:app_secret]), region: config[:region])
       end
-
     end
   end
 end

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/spec/features/select_files_spec.rb

@@ -14,12 +14,13 @@ describe 'Choosing files', type: :feature do
       click_button('Browse')
       sleep(5)
       click_link('Gemfile.lock')
+      check('config-ru')
       within('.modal-footer') do
-        expect(page).to have_selector('span', text: '1 file selected')
+        expect(page).to have_selector('span', text: '2 files selected')
         click_button('Submit')
       end
       sleep(5)
-      expect(page).to have_selector('#status', text: '1 items selected')
+      expect(page).to have_selector('#status', text: '2 items selected')
     end
   end
 

data/spec/features/test_compiling_stylesheets_spec.rb

@@ -1,5 +1,5 @@
 describe 'Compiling the stylesheets', type: :feature do
-  it 'should not raise errors' do
+  it 'does not raise errors' do
     visit '/'
     expect(page).not_to have_content 'Sass::SyntaxError'
   end

data/spec/helper/browse_everything_controller_helper_spec.rb

@@ -6,21 +6,18 @@ describe BrowseEverythingController, type: :controller do
   before(:all)  { stub_configuration   }
   after(:all)   { unstub_configuration }
 
+  subject { helper_context.auth_link.scan(/state/) }
+
   let(:helper_context) { controller.view_context }
   let(:browser) { BrowseEverything::Browser.new(url_options) }
 
-  before do
-    allow(controller).to receive(:provider).and_return(provider)
-  end
+  before { allow(controller).to receive(:provider).and_return(provider) }
 
   context 'dropbox' do
     let(:provider) { browser.providers['dropbox'] }
 
     describe 'auth_link' do
-      subject { helper_context.auth_link }
-      it 'has a single state' do
-        expect(subject.scan(/state/).length).to eq 1
-      end
+      its(:length) { is_expected.to eq(1) }
     end
   end
 
@@ -28,10 +25,7 @@ describe BrowseEverythingController, type: :controller do
     let(:provider) { browser.providers['box'] }
 
     describe 'auth_link' do
-      subject { helper_context.auth_link }
-      it 'has a single state' do
-        expect(subject.scan(/state/).length).to eq 1
-      end
+      its(:length) { is_expected.to eq(1) }
     end
   end
 end

data/spec/unit/base_spec.rb

@@ -1,25 +1,31 @@
 include BrowserConfigHelper
 
 describe BrowseEverything::Driver::Base do
-  subject { BrowseEverything::Driver::Base.new({}) }
+  let(:driver) { described_class.new({}) }
 
   describe 'simple properties' do
-    its(:name)      { should == 'Base'         }
-    its(:key)       { should == 'base'         }
-    its(:icon)      { should be_a(String)      }
-    its(:auth_link) { should be_empty          }
-    specify         { should_not be_authorized }
+    subject { driver }
+
+    its(:name)      { is_expected.to eq('Base')         }
+    its(:key)       { is_expected.to eq('base')         }
+    its(:icon)      { is_expected.to be_a(String)      }
+    its(:auth_link) { is_expected.to be_empty          }
+    specify         { is_expected.not_to be_authorized }
   end
-  context '#connect' do
-    specify { subject.connect({}, {}).should be_blank }
+  describe '#connect' do
+    subject { driver.connect({}, {}) }
+    it { is_expected.to be_blank }
   end
-  context '#contents' do
-    specify { subject.contents('').should be_empty }
+  describe '#contents' do
+    subject { driver.contents('') }
+    it { is_expected.to be_empty }
   end
-  context '#details' do
-    specify { subject.details('/path/to/foo.txt').should be_nil }
+  describe '#details' do
+    subject { driver.details('/path/to/foo.txt') }
+    it { is_expected.to be_nil }
   end
-  context '#link_for' do
-    specify { subject.link_for('/path/to/foo.txt').should == ['/path/to/foo.txt', { file_name: 'foo.txt' }] }
+  describe '#link_for' do
+    subject { driver.link_for('/path/to/foo.txt') }
+    it { is_expected.to contain_exactly('/path/to/foo.txt', file_name: 'foo.txt') }
   end
 end

data/spec/unit/browse_everything_helper_spec.rb

@@ -11,27 +11,27 @@ describe BrowseEverythingHelper do
 
   let(:test_file) { BrowseEverything::FileEntry.new 0, '/path/to/file.mp4', 'file.mp4', 12345, Time.now, false }
 
-  it 'should match a full type' do
+  it 'matches a full type' do
     expect(test_class.new(accept: 'video/mp4').is_acceptable?(test_file)).to eq(true)
   end
 
-  it 'should match a wildcard type' do
+  it 'matches a wildcard type' do
     expect(test_class.new(accept: 'video/*').is_acceptable?(test_file)).to eq(true)
   end
 
-  it 'should not match the wrong full type' do
+  it 'does not match the wrong full type' do
     expect(test_class.new(accept: 'video/mpeg').is_acceptable?(test_file)).to eq(false)
   end
 
-  it 'should not match the wrong wildcard type' do
+  it 'does not match the wrong wildcard type' do
     expect(test_class.new(accept: 'audio/*').is_acceptable?(test_file)).to eq(false)
   end
 
-  it 'should match a type list' do
+  it 'matches a type list' do
     expect(test_class.new(accept: 'audio/*, video/mp4').is_acceptable?(test_file)).to eq(true)
   end
 
-  it 'should not match the wrong type list' do
+  it 'does not match the wrong type list' do
     expect(test_class.new(accept: 'audio/*, application/json').is_acceptable?(test_file)).to eq(false)
   end
 end

data/spec/unit/browser_spec.rb

@@ -24,51 +24,53 @@ describe BrowseEverything::Browser do
   end
 
   describe 'file config' do
-    before(:each) { allow(File).to receive(:read).and_return(file_config) }
-    subject { BrowseEverything::Browser.new(url_options) }
+    let(:browser) { described_class.new(url_options) }
 
-    it 'should have 2 providers' do
-      expect(subject.providers.keys).to eq([:file_system, :dropbox])
+    before { allow(File).to receive(:read).and_return(file_config) }
+
+    it 'has 2 providers' do
+      expect(browser.providers.keys).to eq([:file_system, :dropbox])
     end
 
-    it 'should use the file configuration' do
-      expect(subject.providers[:dropbox].config[:app_key]).to eq('FileConfigKey')
+    it 'uses the file configuration' do
+      expect(browser.providers[:dropbox].config[:app_key]).to eq('FileConfigKey')
     end
   end
 
   describe 'global config' do
-    before(:each) { BrowseEverything.configure(global_config) }
-    subject { BrowseEverything::Browser.new(url_options) }
+    let(:browser) { described_class.new(url_options) }
+
+    before { BrowseEverything.configure(global_config) }
 
-    it 'should have 2 providers' do
-      expect(subject.providers.keys).to eq([:file_system, :dropbox])
+    it 'has 2 providers' do
+      expect(browser.providers.keys).to eq([:file_system, :dropbox])
     end
 
-    it 'should use the global configuration' do
-      expect(subject.providers[:dropbox].config[:app_key]).to eq('GlobalConfigKey')
+    it 'uses the global configuration' do
+      expect(browser.providers[:dropbox].config[:app_key]).to eq('GlobalConfigKey')
     end
   end
 
   describe 'local config' do
-    subject { BrowseEverything::Browser.new(local_config) }
+    let(:browser) { described_class.new(local_config) }
 
-    it 'should have 2 providers' do
-      expect(subject.providers.keys).to eq([:file_system, :dropbox])
+    it 'has 2 providers' do
+      expect(browser.providers.keys).to eq([:file_system, :dropbox])
     end
 
-    it 'should use the local configuration' do
-      expect(subject.providers[:dropbox].config[:app_key]).to eq('LocalConfigKey')
+    it 'uses the local configuration' do
+      expect(browser.providers[:dropbox].config[:app_key]).to eq('LocalConfigKey')
     end
   end
 
   describe 'unknown provider' do
-    subject do
-      BrowseEverything::Browser.new(local_config.merge(foo: { key: 'bar', secret: 'baz' }))
+    let(:browser) do
+      described_class.new(local_config.merge(foo: { key: 'bar', secret: 'baz' }))
     end
 
-    it 'should complain but continue' do
-      allow(Rails.logger).to receive(:warn).with('Unknown provider: foo')
-      expect(subject.providers.keys).to eq([:file_system, :dropbox])
+    it 'complains but continue' do
+      expect(Rails.logger).to receive(:warn).with('Unknown provider: foo')
+      expect(browser.providers.keys).to eq([:file_system, :dropbox])
     end
   end
 end

data/spec/unit/dropbox_spec.rb

@@ -19,50 +19,48 @@ describe BrowseEverything::Driver::Dropbox, vcr: { cassette_name: 'dropbox', rec
 
   describe 'simple properties' do
     subject    { provider }
-    its(:name) { should == 'Dropbox'     }
-    its(:key)  { should == 'dropbox'     }
-    its(:icon) { should be_a(String) }
+    its(:name) { is_expected.to eq('Dropbox') }
+    its(:key)  { is_expected.to eq('dropbox') }
+    its(:icon) { is_expected.to be_a(String) }
   end
 
-  context 'authorization' do
-    subject { provider }
-
-    specify { should_not be_authorized }
+  describe '#auth_link' do
+    subject { provider.auth_link[0] }
 
-    context '#auth_link' do
-      specify { subject.auth_link[0].should start_with('https://www.dropbox.com/1/oauth2/authorize') }
-      specify { subject.auth_link[0].should include('browse%2Fconnect') }
-      specify { subject.auth_link[0].should include('state') }
-    end
+    it { is_expected.to start_with('https://www.dropbox.com/1/oauth2/authorize') }
+    it { is_expected.to include('browse%2Fconnect') }
+    it { is_expected.to include('state') }
+  end
 
-    it 'should authorize' do
-      subject.connect(auth_params, csrf_data)
-      expect(subject).to be_authorized
-    end
+  describe 'authorization' do
+    subject { provider }
+    before { provider.connect(auth_params, csrf_data) }
+    it { is_expected.to be_authorized }
   end
 
   describe '#contents' do
-    before(:each) { provider.connect(auth_params, csrf_data) }
+    before { provider.connect(auth_params, csrf_data) }
 
     context 'root directory' do
       let(:contents) { provider.contents('') }
+
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == 'Apps'    }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('Apps')   }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name) { should == 'Books'   }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('Books')  }
+        specify    { is_expected.to be_container }
       end
       context '[4]' do
         subject { contents[4] }
-        its(:name)     { should == 'iPad intro.pdf' }
-        its(:size)     { should == 208218 }
-        its(:location) { should == 'dropbox:/iPad intro.pdf' }
-        its(:type)     { should == 'application/pdf'          }
-        specify        { should_not be_container              }
+        its(:name)     { is_expected.to eq('iPad intro.pdf') }
+        its(:size)     { is_expected.to eq(208218) }
+        its(:location) { is_expected.to eq('dropbox:/iPad intro.pdf') }
+        its(:type)     { is_expected.to eq('application/pdf') }
+        specify        { is_expected.not_to be_container }
       end
     end
 
@@ -70,51 +68,57 @@ describe BrowseEverything::Driver::Dropbox, vcr: { cassette_name: 'dropbox', rec
       let(:contents) { provider.contents('/Writer') }
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == '..'      }
-        specify    { should be_container }
+
+        its(:name) { is_expected.to eq('..')     }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name)     { should == 'About Writer.txt' }
-        its(:location) { should == 'dropbox:/Writer/About Writer.txt' }
-        its(:type)     { should == 'text/plain'      }
-        specify        { should_not be_container     }
+
+        its(:name)     { is_expected.to eq('About Writer.txt') }
+        its(:location) { is_expected.to eq('dropbox:/Writer/About Writer.txt') }
+        its(:type)     { is_expected.to eq('text/plain') }
+        specify        { is_expected.not_to be_container }
       end
       context '[2]' do
         subject { contents[2] }
-        its(:name)     { should == 'Markdown Test.txt' }
-        its(:location) { should == 'dropbox:/Writer/Markdown Test.txt' }
-        its(:type)     { should == 'text/plain'      }
-        specify        { should_not be_container     }
+
+        its(:name)     { is_expected.to eq('Markdown Test.txt') }
+        its(:location) { is_expected.to eq('dropbox:/Writer/Markdown Test.txt') }
+        its(:type)     { is_expected.to eq('text/plain') }
+        specify        { is_expected.not_to be_container }
       end
       context '[3]' do
         subject { contents[3] }
-        its(:name)     { should == 'Writer FAQ.txt' }
-        its(:location) { should == 'dropbox:/Writer/Writer FAQ.txt' }
-        its(:type)     { should == 'text/plain'      }
-        specify        { should_not be_container     }
+
+        its(:name)     { is_expected.to eq('Writer FAQ.txt') }
+        its(:location) { is_expected.to eq('dropbox:/Writer/Writer FAQ.txt') }
+        its(:type)     { is_expected.to eq('text/plain') }
+        specify        { is_expected.not_to be_container }
       end
     end
 
     context '#details' do
       subject { provider.details('') }
-      its(:name) { should == 'Apps' }
+      its(:name) { is_expected.to eq('Apps') }
     end
   end
 
   describe '#link_for' do
-    before(:each) { provider.connect(auth_params, csrf_data) }
+    before { provider.connect(auth_params, csrf_data) }
 
     context '[0]' do
-      subject { provider.link_for('/Writer/Writer FAQ.txt') }
-      specify { subject[0].should == 'https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Writer%20FAQ.txt' }
-      specify { subject[1].should have_key(:expires) }
+      let(:link) { provider.link_for('/Writer/Writer FAQ.txt') }
+
+      specify { expect(link[0]).to eq('https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Writer%20FAQ.txt') }
+      specify { expect(link[1]).to have_key(:expires) }
     end
 
     context '[1]' do
-      subject { provider.link_for('/Writer/Markdown Test.txt') }
-      specify { subject[0].should == 'https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Markdown%20Test.txt' }
-      specify { subject[1].should have_key(:expires) }
+      let(:link) { provider.link_for('/Writer/Markdown Test.txt') }
+
+      specify { expect(link[0]).to eq('https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Markdown%20Test.txt') }
+      specify { expect(link[1]).to have_key(:expires) }
     end
   end
 end