browse-everything 0.1.1 → 0.2.0

data/HISTORY.md

@@ -1,2 +1,5 @@
+### 0.2.0 (2013-12-03)
+- Bootstrap 2/3 cross-compatibility
+
 ### 0.1.0 (2013-09-24)
 - Initial release

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/browse-everything.png)](http://badge.fury.io/rb/browse-everything)
 [![Build Status](https://travis-ci.org/projecthydra/browse-everything.png?branch=master)](https://travis-ci.org/projecthydra/browse-everything)
 
 # BrowseEverything

data/app/assets/javascripts/browse_everything/behavior.js.coffee

@@ -5,7 +5,7 @@ $(document).ready ->
 
   initialize = (obj,options) ->
     if dialog.length == 0
-      dialog = $('<div id="browse-everything" class="ev-browser modal hide fade"></div>').appendTo('body')
+      dialog = $('<div id="browse-everything" class="ev-browser modal fade"></div>').hide().appendTo('body')
     dialog.modal({ backdrop: 'static', show: false });
     context[obj] = 
       opts: $.extend(true, {}, options)

data/app/assets/stylesheets/bootstrap-responsive.css.scss

@@ -0,0 +1,4 @@
+/*
+ * Empty placeholder for Bootstrap 3
+ *
+ */

data/app/assets/stylesheets/browse_everything.css.scss

@@ -27,56 +27,67 @@
   }
 }
 
-.ev-body {
-  padding: 0;
-}
+#browse-everything {
+  overflow-y: hidden;
+  position: fixed !important;
+  margin: 0 0 0 -37.5%;
+  left: 50%;
+  width: 75%;
 
-.ev-providers {
-  padding: 4px;
-  background-color: lightgray;
-}
+  .modal-body {
+    overflow: hidden;
+  }
 
-.ev-providers, .ev-files {
-  li { @include ev-link; }
-  .ev-selected {
-    @include border-highlight(black);
+  .modal-footer {
+    margin: 0px;
   }
-}
 
-.modal-body {
-  overflow: hidden;
-}
+  .row {
+    margin: inherit;
+  }
+  
+  .ev-files {
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
 
-.ev-files {
-  position: relative;
-  overflow-x: hidden;
-  overflow-y: auto;
+    li { 
+      overflow: hidden;
+      text-overflow: ellipsis;
+      .ev-file-name {
+  //      padding: 0px 6px;
+        white-space: nowrap;
+      }
+      border-top: none;
+    }
 
-  li { 
-    overflow: hidden;
-    text-overflow: ellipsis;
-    .ev-file-name {
-//      padding: 0px 6px;
-      white-space: nowrap;
+    &.detail {
+    }
+
+    &.list ul {
+      @include content-columns(3);
     }
-    border-top: none;
   }
 
-  &.detail {
+  .ev-container li {
+    cursor: pointer;
   }
 
-  &.list ul {
-    @include content-columns(3);
+  .ev-body {
+    padding: 0;
   }
-}
 
-.ev-container li {
-  cursor: pointer;
-}
+  .ev-providers {
+    padding: 4px;
+    background-color: lightgray;
+  }
+
+  .ev-providers, .ev-files {
+    height: 50vh;
+    li { @include ev-link; }
+    .ev-selected {
+      @include border-highlight(black);
+    }
+  }
 
-#browse-everything {
-  margin: 0 0 0 -37.5%;
-  left: 50%;
-  width: 75%;
-  height: 75%;
 }

data/app/helpers/bootstrap_version_helper.rb

@@ -0,0 +1,19 @@
+module BootstrapVersionHelper
+
+  def bootstrap_three?
+    Bundler.environment.specs['bootstrap-sass'].first.version >= Gem::Version.new('3')
+  end
+
+  def bs2(if2)
+    bs2or3(if2,'')
+  end
+
+  def bs3(if3)
+    bs2or3('',if3)
+  end
+
+  def bs2or3(if2,if3)
+    bootstrap_three? ? if3 : if2
+  end
+
+end

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

@@ -1,8 +1,8 @@
-  <ul class="unstyled">
+  <ul class="<%=bs3('list-')%>unstyled">
     <% browser.providers.each_pair do |key, provider| %>
       <li>
         <span class="ev-container">
-          <i class="icon-<%=provider.icon%>"></i>
+          <i class="<%=bs2or3('icon','glyphicon glyphicon')%>-<%=provider.icon%>"></i>
           <%= link_to(provider.name, browse_everything_engine.contents_path(key)) %>
         </span>
       </li>

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

@@ -1,28 +1,20 @@
-<div class="modal-header"></div>
-<div class="modal-body ev-body">
-  <div class="ev-browser row-fluid">
-    <div class="span2 ev-providers nav nav-list">
-      <%= render :partial => 'providers' %>
-    </div>
-    <div class="span10 ev-files list">
-      <%= render :partial => 'files' %>
+<% if bootstrap_three? %><div class="modal-content"><% end %>
+  <div class="modal-header"></div>
+  <div class="modal-body ev-body">
+    <div class="ev-browser row<%=bs2('-fluid')%>">
+      <div class="<%=bs2or3('span','col-xs-')%>2 ev-providers nav nav-list">
+        <%= render :partial => 'providers' %>
+      </div>
+      <div class="<%=bs2or3('span','col-xs-')%>10 ev-files list">
+        <%= render :partial => 'files' %>
+      </div>
     </div>
   </div>
-</div>
-<div class="modal-footer">
-  <span class="pull-left ev-status">0 files selected</span>
-  <%= form_tag browse_everything_file_handler_path, :method => "POST", :class => "ev-submit-form form-horizontal", :data => { :resolver => browse_everything_engine.resolver_path } do %>
-    <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>
-<script>
-  $(window).resize(function() {
-    var be = $('#browse-everything').outerHeight();
-    var he = $('#browse-everything .modal-header').outerHeight();
-    var fo = $('#browse-everything .modal-footer').outerHeight();
-    $('#browse-everything .modal-body').css('max-height','none').height(be-(he+fo));
-    $('#browse-everything .ev-providers').height(be-(he+fo));
-  })
-  $(window).trigger('resize');
-</script>
+  <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 %>
+      <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><% end %>

data/browse-everything.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bootstrap-sass"
   spec.add_dependency "font-awesome-rails"
   spec.add_dependency "google_drive"
-  spec.add_dependency "dropbox-sdk"
+  spec.add_dependency "dropbox-sdk", ">= 1.6.2"
   spec.add_dependency "skydrive"
   spec.add_dependency "ruby-box"
   spec.add_dependency "google-api-client"

data/lib/browse_everything/driver/file_system.rb

@@ -18,7 +18,7 @@ module BrowseEverything
         result = []
         if File.directory?(real_path)
           if relative_path.present?
-            result << details('..')
+            result << details(File.expand_path('..',real_path),'..')
           end
           result += Dir[File.join(real_path,'*')].collect { |f| details(f) }
         elsif File.exists?(real_path)
@@ -33,13 +33,13 @@ module BrowseEverything
         end
       end
 
-      def details(path)
+      def details(path,display=nil)
         if File.exists?(path)
           info = File::Stat.new(path)
           BrowseEverything::FileEntry.new(
             Pathname.new(File.expand_path(path)).relative_path_from(Pathname.new(config[:home])),
             [self.key,path].join(':'),
-            File.basename(path),
+            display || File.basename(path),
             info.size,
             info.mtime,
             info.directory?

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/fixtures/vcr_cassettes/dropbox.yml

@@ -152,7 +152,7 @@ http_interactions:
   recorded_at: Fri, 20 Sep 2013 15:38:55 GMT
 - request:
     method: get
-    uri: https://api.dropbox.com/1/media/auto/Writer/Writer%20FAQ.txt
+    uri: https://api.dropbox.com/1/media/auto/Writer/Writer%20FAQ.txt?
     body:
       encoding: UTF-8
       string: ''
@@ -191,7 +191,7 @@ http_interactions:
   recorded_at: Fri, 20 Sep 2013 15:39:01 GMT
 - request:
     method: get
-    uri: https://api.dropbox.com/1/media/auto/Writer/Markdown%20Test.txt
+    uri: https://api.dropbox.com/1/media/auto/Writer/Markdown%20Test.txt?
     body:
       encoding: UTF-8
       string: ''

data/spec/support/app/views/file_handler/index.html.erb

@@ -1,9 +1,9 @@
-<div class="hero-unit">
+<div class="<%=bs2or3('hero-unit','jumbotron')%>">
   <h1>Welcome!</h1>
 
   <p>Please click the button below to start pickin' files!</p>
 
-  <%= form_tag(browse_everything_file_handler_path, id: 'main_form', method: 'post') do %>
+  <%= form_tag('/file', id: 'main_form', method: 'post') do %>
     <%= button_tag("Browse", type: 'button', class: 'btn btn-large btn-success', id: "browse-btn",
       'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
       'data-target' => '#main_form' ) %>

data/spec/support/lib/generators/test_app_generator.rb

@@ -28,7 +28,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   mount BrowseEverything::Engine => '/browse'
   root :to => "file_handler#index"
-  post '/file', :to => "file_handler#update", :as => "browse_everything_file_handler"
+  post '/file', :to => "file_handler#update"
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: skydrive
   requirement: !ruby/object:Gem::Requirement
@@ -325,8 +325,10 @@ files:
 - app/.DS_Store
 - app/assets/javascripts/browse_everything.js
 - app/assets/javascripts/browse_everything/behavior.js.coffee
+- app/assets/stylesheets/bootstrap-responsive.css.scss
 - app/assets/stylesheets/browse_everything.css.scss
 - app/controllers/browse_everything_controller.rb
+- app/helpers/bootstrap_version_helper.rb
 - app/helpers/browse_everything_helper.rb
 - app/views/.DS_Store
 - app/views/browse_everything/_auth.html.erb
@@ -385,12 +387,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1393661968678573604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1393661968678573604
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -416,4 +424,3 @@ test_files:
 - spec/unit/file_entry_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/sky_drive_spec.rb
-has_rdoc: