Merge branch 'master' into github

.rubocop_todo.yml

@@ -24,7 +24,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 10
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 26
+  Max: 28
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
@@ -64,12 +64,10 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Exclude:
     - 'lib/browse_everything/driver/google_drive.rb'
-    - 'lib/browse_everything/driver/sky_drive.rb'
     - 'lib/browse_everything/retriever.rb'
     - 'spec/unit/browse_everything_helper_spec.rb'
     - 'spec/unit/file_entry_spec.rb'
     - 'spec/unit/retriever_spec.rb'
-    - 'spec/unit/sky_drive_spec.rb'
     - 'spec/views/browse_everything/_file.html.erb_spec.rb'
 
 # Offense count: 3
@@ -96,7 +94,6 @@ Style/FileName:
 Style/GuardClause:
   Exclude:
     - 'lib/browse_everything/driver/google_drive.rb'
-    - 'lib/browse_everything/driver/sky_drive.rb'
 
 # Offense count: 1
 Style/MultilineBlockChain:
@@ -109,22 +106,6 @@ Style/MultilineBlockLayout:
   Exclude:
     - 'spec/unit/dropbox_spec.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineHashBraceLayout:
-  Exclude:
-    - 'spec/unit/sky_drive_spec.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Style/MultilineMethodCallIndentation:
-  Exclude:
-    - 'spec/unit/sky_drive_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_

README.md

@@ -6,7 +6,7 @@
 
 This Gem allows your rails application to access user files from cloud storage.
 Currently there are drivers implemented for [Dropbox](http://www.dropbox.com),
-[Skydrive](https://skydrive.live.com/), [Google Drive](http://drive.google.com),
+[Google Drive](http://drive.google.com),
 [Box](http://www.box.com), [Amazon S3](https://aws.amazon.com/s3/),
 and a server-side directory share.
 
@@ -57,7 +57,7 @@ In `app/assets/javascripts/application.js` include jquery and the BrowseEverythi
 
 ### Adding Providers
 In order to connect to a provider like [Dropbox](http://www.dropbox.com),
-[Skydrive](https://skydrive.live.com/), [Google Drive](http://drive.google.com), or
+[Google Drive](http://drive.google.com), or
 [Box](http://www.box.com), you must provide API keys in _config/browse_everything_providers.yml_.  For info on how to edit this file, see [Configuring browse-everything](https://github.com/projecthydra/browse-everything/wiki/Configuring-browse-everything)
 
 ### Views

app/helpers/font_awesome_version_helper.rb

@@ -0,0 +1,17 @@
+module FontAwesomeVersionHelper
+  def font_awesome_four?
+    Bundler.environment.specs['font-awesome-rails'].first.version >= Gem::Version.new('4')
+  end
+
+  def fa3(if3)
+    fa3or4(if3, '')
+  end
+
+  def fa4(if4)
+    fa3or4('', if4)
+  end
+
+  def fa3or4(if3, if4)
+    font_awesome_four? ? if4 : if3
+  end
+end

app/views/browse_everything/_files.html.erb

@@ -9,7 +9,7 @@
       </tr>
     </thead>
     <% provider.contents(browse_path).each_with_index do |file, index| %>
-      <% next if file.relative_parent_path? %>
+      <% next if file.relative_parent_path? or file.size.nil? %>
       <%= render :partial => 'file', :locals => { :file => file, :index => index,
         :path => browse_everything_engine.contents_path(provider_name, file.id), :parent => params[:parent] } %>
     <% end %>

app/views/browse_everything/index.html.erb

@@ -1,26 +1,28 @@
-<% if bootstrap_three? %><div class="modal-dialog"><div class="modal-content"><% end %>
-  <div class="modal-header">
-    <h4 class="sr-only" id="beModalLabel">Select a provider in the list to browse your files.</h4>
-    <div class="ev-providers">
-      <%= render :partial => 'providers' %>
-    </div>
-  </div>
-  <div class="modal-body ev-body" tabindex="-1">
-    <div class="loading-progress" aria-live="assertive">
-      <span class="loading-text">Loading...</span>
+<div class="modal-dialog">
+  <div class="modal-content">
+    <div class="modal-header">
+      <h4 class="sr-only" id="beModalLabel">Select a provider in the list to browse your files.</h4>
+      <div class="ev-providers">
+        <%= render :partial => 'providers' %>
+      </div>
     </div>
-    <div class="ev-browser row<%=bs2('-fluid')%>" aria-live="polite">
-      <div class="<%=fa3or4('fa3','fa4')%> <%=bs2or3('bs2 span','bs3 col-xs-')%>12 ev-files list">
-        <%= render :partial => 'files' if provider.present? %>
+    <div class="modal-body ev-body" tabindex="-1">
+      <div class="loading-progress" aria-live="assertive">
+        <span class="loading-text">Loading...</span>
+      </div>
+      <div class="ev-browser row" aria-live="polite">
+        <div class="<%=fa3or4('fa3','fa4')%> col-xs-12 ev-files list">
+          <%= render :partial => 'files' if provider.present? %>
+        </div>
       </div>
     </div>
+    <div class="modal-footer">
+      <span class="pull-left ev-status">0 files selected</span>
+      <%= form_tag '#', :class => "ev-submit-form form-horizontal", :data => { :resolver => browse_everything_engine.resolver_path } do %>
+        <input type="hidden" name="context" value=""/>
+        <button class="ev-cancel btn btn-danger"><%= t('browse_everything.modal_form.cancel')%></button>
+        <button class="ev-submit btn btn-primary" data-loading-text="Loading..."><%= t('browse_everything.modal_form.submit')%></button>
+      <% end %>
+    </div>
   </div>
-  <div class="modal-footer">
-    <span class="pull-left ev-status">0 files selected</span>
-    <%= form_tag '#', :class => "ev-submit-form form-horizontal", :data => { :resolver => browse_everything_engine.resolver_path } do %>
-      <input type="hidden" name="context" value=""/>
-      <button class="ev-cancel btn btn-danger"><%= t('browse_everything.modal_form.cancel')%></button>
-      <button class="ev-submit btn btn-primary" data-loading-text="Loading..."><%= t('browse_everything.modal_form.submit')%></button>
-    <% end %>
-  </div>
-<% if bootstrap_three? %></div></div><% end %>
+</div>

browse-everything.gemspec

@@ -22,15 +22,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'addressable', '~> 2.5'
   spec.add_dependency 'google_drive'
   spec.add_dependency 'dropbox-sdk', '>= 1.6.2'
-  spec.add_dependency 'skydrive'
   spec.add_dependency 'ruby-box'
   spec.add_dependency 'sass-rails'
-  spec.add_dependency 'bootstrap-sass'
+  spec.add_dependency 'bootstrap-sass', '~> 3.2'
   spec.add_dependency 'font-awesome-rails'
   spec.add_dependency 'google-api-client', '~> 0.9'
   spec.add_dependency 'signet'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'aws-sdk-s3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-its'

lib/browse_everything.rb

@@ -12,7 +12,6 @@ module Driver
     autoload :Base,        'browse_everything/driver/base'
     autoload :FileSystem,  'browse_everything/driver/file_system'
     autoload :Dropbox,     'browse_everything/driver/dropbox'
-    autoload :SkyDrive,    'browse_everything/driver/sky_drive'
     autoload :Box,         'browse_everything/driver/box'
     autoload :GoogleDrive, 'browse_everything/driver/google_drive'
     autoload :S3,          'browse_everything/driver/s3'

lib/browse_everything/driver/s3.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 
 module BrowseEverything
   module Driver