browse-everything 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWQ5N2ZhNTczZmU4ZTkyZjU4ZmI0ZDU3Y2EzMzU4N2E2MzFhZjg0OA==
+  data.tar.gz: !binary |-
+    OGMzZDRlZmM1YTA3NTJiOWJiZTQ4YzM4MjhiOTY3ZTJjMmFjYTgxMg==
+SHA512:
+  metadata.gz: !binary |-
+    ZmExOTFlNDI0NWJjN2VjNzc2ODYxZWM1ZDlhNWQ3NjE1ZWU4YTA3OTMyMDMw
+    N2UyZDMxZjdkZjBmY2ZhMjJlZTg3MjU5MzMwYWJlOWRjOTQ0MzIxZDE0OGIz
+    MmFiYzk0ZWE5NzZiZjY3ODZjNmYzOTFmOTE0NTg1NDQ3NjJjYzg=
+  data.tar.gz: !binary |-
+    Nzk2ZGY1NjBkMWYxZDNmNTA3NzI1OGJmMDY3MWFlMmEyYmRhZjY3YWFhZDM5
+    YzM1MjY3YjAxNjM3ZjY5YTFjOGU4M2UzOWM5MjI0YmQ5NDllOTA2YmIwMGY5
+    N2VlMGUwNjhiNWM4NThkOWFmMWMyMWI1YWNhMGMzMzc3NTllNzE=

data/HISTORY.md

@@ -1,3 +1,7 @@
+### 0.4.2 (2014-04-25)
+- Fixed TurboLinks-related initialization bugs
+- Added TurboLinks testing options to internal test app
+
 ### 0.4.1 (2014-04-03)
 - Bug fixes
 - TurboLinks compatibility

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

@@ -1,23 +1,25 @@
-ready = ->
-  context = {}
-  active = null
+$(document).on 'page:change', ->
+  triggers = $('*[data-toggle=browse-everything]')
+  triggers.each () -> $(this).browseEverything($(this).data())
+
+$ ->
   dialog = $('div#browse-everything')
 
   initialize = (obj,options) ->
     if $('div#browse-everything').length == 0
       dialog = $('<div id="browse-everything" class="ev-browser modal fade"></div>').hide().appendTo('body')
     dialog.modal({ backdrop: 'static', show: false });
-    context[obj] = 
+    ctx =
       opts: $.extend(true, {}, options)
       callbacks:
         done: $.Callbacks()
         cancel: $.Callbacks()
         fail: $.Callbacks()
-    ctx = context[obj]
     ctx.callback_proxy = 
       done:   (func) -> ctx.callbacks.done.add(func)   ; return this
       cancel: (func) -> ctx.callbacks.cancel.add(func) ; return this
       fail:   (func) -> ctx.callbacks.fail.add(func)   ; return this
+    $(obj).data('context',ctx)
     ctx
 
   toHiddenFields = (data) ->
@@ -29,19 +31,17 @@ ready = ->
     $(elements.toArray().join("\n"))
 
   $.fn.browseEverything = (options) ->
+    ctx = $(this).data('context')
     if options?
-      initialize(this[0], options)
+      ctx = initialize(this[0], options)
       $(this).click () ->
-        active = context[this]
-        dialog.load active.opts.route, () -> dialog.modal('show')
-    context[this[0]].callback_proxy
-
-  triggers = $('*[data-toggle=browse-everything]')
-  triggers.each () -> $(this).browseEverything($(this).data())
+        dialog.data('context',ctx)
+        dialog.load ctx.opts.route, () -> dialog.modal('show')
+    ctx.callback_proxy
 
   $(document).on 'click', 'button.ev-cancel', (event) ->
     event.preventDefault()
-    active.callbacks.cancel.fire()
+    dialog.data('context').callbacks.cancel.fire()
     $('.ev-browser').modal('hide')
 
   $(document).on 'click', 'button.ev-submit', (event) ->
@@ -50,17 +50,18 @@ ready = ->
     $('body').css('cursor','wait')
     main_form = $(this).closest('form')
     resolver_url = main_form.data('resolver')
+    ctx = dialog.data('context')
     $.ajax resolver_url,
       type: 'POST'
       dataType: 'json'
       data: main_form.serialize()
     .done (data) ->
-      if active.opts.target?
+      if ctx.opts.target?
         fields = toHiddenFields({selected_files: data})
-        $(active.opts.target).append($(fields))
-      active.callbacks.done.fire(data)
+        $(ctx.opts.target).append($(fields))
+      ctx.callbacks.done.fire(data)
     .fail (xhr,status,error) ->
-      active.callbacks.fail.fire(status, error, xhr.responseText)
+      ctx.callbacks.fail.fire(status, error, xhr.responseText)
     .always ->
       $('body').css('cursor','default')
       $('.ev-browser').modal('hide')
@@ -107,6 +108,3 @@ ready = ->
       else
         window.setTimeout check_func, 1000
     check_func()
-
-$(document).ready(ready)
-$(document).on('page:load', ready)

data/browse-everything.gemspec

@@ -6,8 +6,8 @@ require 'browse_everything/version'
 Gem::Specification.new do |spec|
   spec.name          = "browse-everything"
   spec.version       = BrowseEverything::VERSION
-  spec.authors       = ["Carolyn Cole", "Jessie Keck", "Michael B. Klein", "Thomas Scherz", "Xiaoming Wang"]
-  spec.email         = ["cam156@psu.edu", "jkeck@stanford.edu", "mbklein@gmail.com", "scherztc@ucmail.uc.edu", "xw5d@virginia.edu"]
+  spec.authors       = ["Carolyn Cole", "Jessie Keck", "Michael B. Klein", "Thomas Scherz", "Xiaoming Wang", "Jeremy Friesen"]
+  spec.email         = ["cam156@psu.edu", "jkeck@stanford.edu", "mbklein@gmail.com", "scherztc@ucmail.uc.edu", "xw5d@virginia.edu", "jeremy.n.friesen@gmail.com"]
   spec.description   = %q{AJAX/Rails engine file browser for cloud storage services}
   spec.summary       = %q{AJAX/Rails engine file browser for cloud storage services}
   spec.homepage      = "https://github.com/projecthydra/browse-everything"
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ">= 3.1"
-  spec.add_dependency "sass-rails"
-  spec.add_dependency "bootstrap-sass"
-  spec.add_dependency "font-awesome-rails"
   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 "font-awesome-rails"
   spec.add_dependency "google-api-client"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-rails"

data/lib/browse-everything.rb

@@ -1 +1,3 @@
+require 'bootstrap-sass'
+require 'font-awesome-rails'
 require 'browse_everything'

data/lib/browse_everything/engine.rb

@@ -1,6 +1,4 @@
 module BrowseEverything
   class Engine < ::Rails::Engine
-    require 'bootstrap-sass'
-    require 'font-awesome-rails'
   end
 end

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/support/app/controllers/file_handler_controller.rb

@@ -1,7 +1,10 @@
 class FileHandlerController < ApplicationController
   def index
   end
-  
+
+  def main
+  end
+    
   def update
     render :json => params[:selected_files].to_json
   end

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

@@ -1,22 +1,6 @@
-<div class="<%=bs2or3('hero-unit','jumbotron')%>">
-  <h1>Welcome!</h1>
-
-  <p>Please click the button below to start pickin' files!</p>
-
-  <%= 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' ) %>
-    <%= button_tag("Submit", type: 'submit', class: 'btn btn-large btn-primary', id: "submit-btn") %>
-  <% end %>
-
-  <p id="status">0 items selected</p>
-
-  <script>
-    $(document).ready(function() {
-      $('#browse-btn').browseEverything()
-        .done(function(data) { $('#status').html(data.length.toString() + " items selected") })
-        .cancel(function()   { window.alert('Canceled!') });
-    });
-  </script>
+<div class="panel panel-default">
+  <div class="panel-body">
+    <a href="main" class="btn btn-large btn-primary" role="button">Enter Test App (Turbolinks)</a>
+    <a href="main" class="btn btn-large btn-primary" role="button" data-no-turbolink>Enter Test App (No Turbolinks)</a>
+  </div>
 </div>

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

@@ -0,0 +1,22 @@
+<div class="<%=bs2or3('hero-unit','jumbotron')%>">
+  <h1>Welcome!</h1>
+
+  <p>Please click the button below to start pickin' files!</p>
+
+  <%= 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' ) %>
+    <%= button_tag("Submit", type: 'submit', class: 'btn btn-large btn-primary', id: "submit-btn") %>
+  <% end %>
+
+  <p id="status">0 items selected</p>
+
+  <script>
+    $(document).on('page:change', function() {
+      $('#browse-btn').browseEverything()
+        .done(function(data) { $('#status').html(data.length.toString() + " items selected") })
+        .cancel(function()   { window.alert('Canceled!') });
+    });
+  </script>
+</div>

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

@@ -32,6 +32,7 @@ class TestAppGenerator < Rails::Generators::Base
       %{
 
   root :to => "file_handler#index"
+  get '/main', :to => "file_handler#main"
   post '/file', :to => "file_handler#update"
       }
     end
@@ -39,6 +40,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def create_test_route
     copy_file "app/controllers/file_handler_controller.rb", "app/controllers/file_handler_controller.rb"
+    copy_file "app/views/file_handler/main.html.erb", "app/views/file_handler/main.html.erb"
     copy_file "app/views/file_handler/index.html.erb", "app/views/file_handler/index.html.erb"
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Carolyn Cole
@@ -10,15 +9,15 @@ authors:
 - Michael B. Klein
 - Thomas Scherz
 - Xiaoming Wang
+- Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -26,15 +25,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: google_drive
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,31 +39,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: dropbox-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: skydrive
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -74,15 +67,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: google_drive
+  name: ruby-box
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,31 +81,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dropbox-sdk
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: skydrive
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -122,15 +109,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-box
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -138,7 +123,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,7 +130,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -154,7 +137,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -162,7 +144,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -170,7 +151,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -178,7 +158,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -186,7 +165,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,7 +172,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,7 +179,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -210,7 +186,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -218,7 +193,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -226,7 +200,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -234,7 +207,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -242,7 +214,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -250,7 +221,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -258,7 +228,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -266,7 +235,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -274,7 +242,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -282,7 +249,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -290,7 +256,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -298,7 +263,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -306,7 +270,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -314,7 +277,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -326,6 +288,7 @@ email:
 - mbklein@gmail.com
 - scherztc@ucmail.uc.edu
 - xw5d@virginia.edu
+- jeremy.n.friesen@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -382,6 +345,7 @@ files:
 - spec/spec_helper.rb.orig
 - spec/support/app/controllers/file_handler_controller.rb
 - spec/support/app/views/file_handler/index.html.erb
+- spec/support/app/views/file_handler/main.html.erb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/unit/base_spec.rb
 - spec/unit/browser_spec.rb
@@ -394,33 +358,26 @@ files:
 homepage: https://github.com/projecthydra/browse-everything
 licenses:
 - Apache 2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3163804288131024990
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3163804288131024990
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
 test_files:
 - spec/fixtures/file_system/dir_1/dir_3/file_3.m4v
@@ -433,6 +390,7 @@ test_files:
 - spec/spec_helper.rb.orig
 - spec/support/app/controllers/file_handler_controller.rb
 - spec/support/app/views/file_handler/index.html.erb
+- spec/support/app/views/file_handler/main.html.erb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/unit/base_spec.rb
 - spec/unit/browser_spec.rb
@@ -440,3 +398,4 @@ test_files:
 - spec/unit/file_entry_spec.rb
 - spec/unit/file_system_spec.rb
 - spec/unit/sky_drive_spec.rb
+has_rdoc: