browse-everything 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5863bed03ca833eec713b397198c731d607234fa
-  data.tar.gz: e08f0deb438edda9aa2f31fc38cd7ea72c1accf3
+  metadata.gz: 7ecf1f6e239a55eaca19d11c80ba83cb833df9ac
+  data.tar.gz: 59e99e140a5520feb8345928b7080b90b4ad914b
 SHA512:
-  metadata.gz: 6779253458d0923ae17881205d5d4949a3520744cfcfd09b962c4219100068b02c67a2a99dabcc22b8a926d3b016c987f14f206634a3e74e9af0de2ea7c663a4
-  data.tar.gz: 32e870be303fc01a309cbb5d2942f76204e67663e9f3ee8f99ddfca28b9d51d770bc55166c412f41640295a0fac134f4d7e8eb8c10a8ba7dea893724b4721394
+  metadata.gz: b8b0e5d8b7f8705cf017530760bb12a73a23e4217c452c07dc33f5bf1e449085353df70bbf9567fe5d239d5f21cde4abf2a213385874ab2b43c705e5d951430e
+  data.tar.gz: dc27c56cd04044728ef80665eb8f5c9e500db68904e2b36c98248086c456649fdf8a48378a7a419a899ebc1dad8b75c7aea6ab0f01b58593c8dff0ede70b62bc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -4,11 +4,11 @@ source 'https://rubygems.org'
 gemspec
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
-if File.exists?(file)
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
+if File.exist?(file)
   begin
     eval_gemfile file
   rescue Bundler::GemfileError => e
@@ -17,12 +17,23 @@ if File.exists?(file)
   end
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'sass-rails', "< 5.0"
+
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
+
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/HISTORY.md

@@ -1,3 +1,6 @@
+### 0.10.5 (2016-09-23)
+  Fix naming conflict that broke the `context` option in 0.10.4.
+
 ### 0.10.4 (2016-08-05)
   Don't wait for auto-toggle if the explicit browseEverything() call is seen first.
 

data/Rakefile

@@ -5,7 +5,14 @@ Dir.glob('tasks/*.rake').each { |r| import r }
 
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
-
-task :default => [:ci]
 require 'jasmine'
 load 'jasmine/tasks/jasmine.rake'
+
+# Set up the test application prior to running jasmine tasks.
+task 'jasmine:require' => :setup_test_server
+task :setup_test_server do
+  require 'engine_cart'
+  EngineCart.load_application!
+end
+
+task :default => [:ci]

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

@@ -20,7 +20,7 @@ $ ->
       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)
+    $(obj).data('ev-state',ctx)
     ctx
 
   toHiddenFields = (data) ->
@@ -154,8 +154,8 @@ $ ->
       url: $('a.ev-link',node.row).attr('href')
       data:
         parent: node.row.data('tt-id')
-        accept: dialog.data('context').opts.accept
-        context: dialog.data('context').opts.context
+        accept: dialog.data('ev-state').opts.accept
+        context: dialog.data('ev-state').opts.context
     .done (html) ->
       setProgress('100')
       clearInterval progressIntervalID
@@ -182,12 +182,12 @@ $ ->
   $(window).on('resize', -> sizeColumns($('table#file-list')))
 
   $.fn.browseEverything = (options) ->
-    ctx = $(this).data('context')
+    ctx = $(this).data('ev-state')
     options = $(this).data() unless (ctx? or options?)
     if options?
       ctx = initialize(this[0], options)
       $(this).click () ->
-        dialog.data('context',ctx)
+        dialog.data('ev-state',ctx)
         dialog.load ctx.opts.route, () -> 
           setTimeout refreshFiles, 500
           ctx.callbacks.show.fire()
@@ -213,7 +213,7 @@ $ ->
     
   $(document).on 'click', 'button.ev-cancel', (event) ->
     event.preventDefault()
-    dialog.data('context').callbacks.cancel.fire()
+    dialog.data('ev-state').callbacks.cancel.fire()
     $('.ev-browser').modal('hide')
 
   $(document).on 'click', 'button.ev-submit', (event) ->
@@ -222,7 +222,7 @@ $ ->
     $('body').css('cursor','wait')
     main_form = $(this).closest('form')
     resolver_url = main_form.data('resolver')
-    ctx = dialog.data('context')
+    ctx = dialog.data('ev-state')
     $(main_form).find('input[name=context]').val(ctx.opts.context)
     $.ajax resolver_url,
       type: 'POST'
@@ -254,8 +254,8 @@ $ ->
     $.ajax 
       url: $(this).val(),
       data:
-        accept: dialog.data('context').opts.accept
-        context: dialog.data('context').opts.context
+        accept: dialog.data('ev-state').opts.accept
+        context: dialog.data('ev-state').opts.context
     .done (data) ->
       $('.ev-files').html(data)
       indicateSelected();
@@ -304,7 +304,7 @@ $ ->
 auto_toggle = ->
   triggers = $('*[data-toggle=browse-everything]')
   triggers.each () -> 
-    ctx = $(this).data('context')
+    ctx = $(this).data('ev-state')
     $(this).browseEverything($(this).data()) unless ctx?
 
 if Turbolinks? && Turbolinks.supported

data/browse-everything.gemspec

@@ -39,9 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "factory_girl_rails"
-  spec.add_development_dependency "engine_cart", '~> 0.8.0'
+  spec.add_development_dependency "engine_cart", '~> 0.10'
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "jasmine", '~> 2.3'
   spec.add_development_dependency "coveralls"
-
+  spec.add_development_dependency "poltergeist", "~> 1.10"
 end

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = "0.10.4"
+  VERSION = "0.10.5"
 end

data/spec/features/select_files_spec.rb

@@ -0,0 +1,35 @@
+require 'capybara/poltergeist'
+
+describe "Choosing files", :type => :feature do
+  before do
+    Capybara.register_driver :poltergeist do |app|
+      Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: 90)
+    end
+    Capybara.current_driver = :poltergeist
+    visit '/'
+  end
+
+  shared_examples "browseable files" do
+    it "selects files from the filesystem" do
+      click_button('Browse')
+      sleep(5)
+      click_link("README.rdoc")
+      within(".modal-footer") do
+        expect(page).to have_selector("span", text: "1 file selected")
+        click_button("Submit")
+      end
+      sleep(5)
+      expect(page).to have_selector("#status", text: "1 items selected")
+    end
+  end
+
+  context "when Turbolinks are enabled" do
+    before { click_link('Enter Test App (Turbolinks)') }
+    it_behaves_like "browseable files"
+  end
+
+  context "when Turbolinks are disabled" do
+    before { click_link('Enter Test App (No Turbolinks)') }
+    it_behaves_like "browseable files"
+  end
+end

data/spec/features/test_compiling_stylesheets_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Compiling the stylesheets", :type => :feature do
   it "should not raise errors" do
     visit '/'

data/spec/javascripts/jasmine_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'rake'
 
 # Run the jasmine tests by running the jasmine:ci rake command and parses the output for failures.

data/spec/spec_helper.rb

@@ -22,8 +22,13 @@ 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
 
+Capybara.default_driver = :rack_test      # This is a faster driver
+Capybara.javascript_driver = :poltergeist # This is slower
+Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]

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

@@ -13,7 +13,7 @@
   <p id="status">0 items selected</p>
 
   <script>
-    $(document).on('page:change', function() {
+    $(document).on('turbolinks:load', function() {
       $('#browse-btn').browseEverything()
         .done(function(data) { $('#status').html(data.length.toString() + " items selected") })
         .cancel(function()   { window.alert('Canceled!') });

data/spec/unit/base_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 include BrowserConfigHelper
 
 describe BrowseEverything::Driver::Base do
@@ -25,4 +23,3 @@ describe BrowseEverything::Driver::Base do
     specify { subject.link_for('/path/to/foo.txt').should == ['/path/to/foo.txt', { file_name: 'foo.txt' }] }
   end
 end
-

data/spec/unit/browse_everything_helper_spec.rb

@@ -1,7 +1,4 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 describe BrowseEverythingHelper do
-
   let(:test_class) {
     Class.new do
       include BrowseEverythingHelper
@@ -13,15 +10,15 @@ 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
     expect(test_class.new(accept: 'video/mp4').is_acceptable?(test_file)).to eq(true)
   end
-  
+
   it "should match 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
     expect(test_class.new(accept: 'video/mpeg').is_acceptable?(test_file)).to eq(false)
   end

data/spec/unit/browser_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 include BrowserConfigHelper
 
 describe BrowseEverything::Browser do

data/spec/unit/dropbox_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 include BrowserConfigHelper
 
 describe BrowseEverything::Driver::Dropbox, vcr: { cassette_name: 'dropbox', record: :none } do

data/spec/unit/file_entry_spec.rb

@@ -1,10 +1,7 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 describe BrowseEverything::FileEntry do
-
   let(:mtime) { Time.now }
   describe "regular file" do
-    subject { 
+    subject {
       BrowseEverything::FileEntry.new(
         'file_id_01234', 'my_provider:/location/pa/th/file.m4v',
         'file.m4v', '1.2 GB', mtime, false
@@ -12,7 +9,7 @@ describe BrowseEverything::FileEntry do
     }
 
     it "should be a BrowseEverything::FileEntry" do
-      expect(subject).to be_a BrowseEverything::FileEntry                     
+      expect(subject).to be_a BrowseEverything::FileEntry
     end
 
     it "#id" do
@@ -40,14 +37,14 @@ describe BrowseEverything::FileEntry do
     end
 
     it "#container?" do
-      expect(subject.container?).to be false                                  
+      expect(subject.container?).to be false
     end
-    
+
     it "#relative_parent_path?" do
-      expect(subject.relative_parent_path?).to be false                                  
+      expect(subject.relative_parent_path?).to be false
     end
   end
-  
+
   describe "directory" do
     subject {
       BrowseEverything::FileEntry.new(
@@ -61,14 +58,14 @@ describe BrowseEverything::FileEntry do
     end
 
     it "#container?" do
-      expect(subject.container?).to be true                                  
+      expect(subject.container?).to be true
     end
 
     it "#relative_parent_path?" do
-      expect(subject.relative_parent_path?).to be false                                  
+      expect(subject.relative_parent_path?).to be false
     end
   end
-  
+
   describe "parent path" do
     subject {
       BrowseEverything::FileEntry.new(
@@ -82,11 +79,11 @@ describe BrowseEverything::FileEntry do
     end
 
     it "#container?" do
-      expect(subject.container?).to be true                                  
+      expect(subject.container?).to be true
     end
 
     it "#relative_parent_path?" do
-      expect(subject.relative_parent_path?).to be true                                  
+      expect(subject.relative_parent_path?).to be true
     end
   end
 end

data/spec/unit/file_system_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 include BrowserConfigHelper
 
 describe BrowseEverything::Driver::FileSystem do

data/spec/unit/retriever_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
 describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record: :none,  } do
   subject { BrowseEverything::Retriever.new }
   let(:datafile) { File.expand_path('../../fixtures/file_system/file_1.pdf',__FILE__) }
@@ -10,12 +8,12 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
 
   context 'http://' do
     let(:spec) {
-      { 
+      {
         "0" => {
-          "url"=>"https://retrieve.cloud.example.com/some/dir/file.pdf", 
-          "auth_header"=>{"Authorization"=>"Bearer ya29.kQCEAHj1bwFXr2AuGQJmSGRWQXpacmmYZs4kzCiXns3d6H1ZpIDWmdM8"}, 
-          "expires"=>(Time.now + 3600).xmlschema, 
-          "file_name"=>"file.pdf", 
+          "url"=>"https://retrieve.cloud.example.com/some/dir/file.pdf",
+          "auth_header"=>{"Authorization"=>"Bearer ya29.kQCEAHj1bwFXr2AuGQJmSGRWQXpacmmYZs4kzCiXns3d6H1ZpIDWmdM8"},
+          "expires"=>(Time.now + 3600).xmlschema,
+          "file_name"=>"file.pdf",
           "file_size"=>size.to_s
         }
       }
@@ -32,25 +30,25 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
         expect { |block| subject.retrieve(spec['0'], &block) }.to yield_with_args(data, data.length, data.length)
       end
     end
-    
+
     context "#download" do
       it "content" do
         file = subject.download(spec['0'])
         expect(File.open(file,'rb',&:read)).to eq(data)
       end
-      
+
       it "callbacks" do
         expect { |block| subject.download(spec['0'], &block) }.to yield_with_args(String, data.length, data.length)
       end
     end
   end
-  
+
   context 'file://' do
     let(:spec) {
-      { 
+      {
         "0" => {
-          "url"=>"file://#{datafile}", 
-          "file_name"=>"file.pdf", 
+          "url"=>"file://#{datafile}",
+          "file_name"=>"file.pdf",
           "file_size"=>size.to_s
         },
 	"1" => {
@@ -84,13 +82,13 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
         file = subject.download(spec['0'])
         expect(File.open(file,'rb',&:read)).to eq(data)
       end
-      
+
       it "callbacks" do
         expect { |block| subject.download(spec['0'], &block) }.to yield_with_args(String, data.length, data.length)
       end
     end
   end
-  
+
   context ''
-  
+
 end

data/spec/unit/sky_drive_spec.rb

@@ -1,7 +1,3 @@
-require File.expand_path('../../spec_helper',__FILE__)
-
-
-
 describe BrowseEverything::Driver::SkyDrive do
   include BrowseEverything::Engine.routes.url_helpers
 
@@ -28,7 +24,6 @@ describe BrowseEverything::Driver::SkyDrive do
                   :headers  => {
                       "content-type"          =>  "application/json"})
 
-
     driver = BrowseEverything::Driver::SkyDrive.new(provider_yml)
     driver.connect({code:"code"},{})
     driver.authorized?.should == true
@@ -49,10 +44,8 @@ describe BrowseEverything::Driver::SkyDrive do
                   :headers  => {
                       "content-type"          =>  "application/json"})
 
-
     driver = BrowseEverything::Driver::SkyDrive.new(provider_yml)
     driver.connect({code:"code"},{})
     driver.authorized?.should == false
   end
-
-end
+end

data/spec/views/browse_everything/_file.html.erb_spec.rb

@@ -1,7 +1,4 @@
-require File.expand_path('../../../spec_helper',__FILE__)
-
 describe 'browse_everything/_file.html.erb', type: :view do
-
   let(:file)  {
                 BrowseEverything::FileEntry.new(
                      'file_id_01234', 'my_provider:/location/pa/th/file.m4v',
@@ -17,7 +14,6 @@ describe 'browse_everything/_file.html.erb', type: :view do
   let(:provider) { double("provider") }
   let(:page) { Capybara::Node::Simple.new(rendered) }
 
-
   before do
     allow(view).to receive(:browse_everything_engine).and_return(BrowseEverything::Engine.routes.url_helpers)
     allow(view).to receive(:provider).and_return(provider)
@@ -73,5 +69,4 @@ describe 'browse_everything/_file.html.erb', type: :view do
       end
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Carolyn Cole
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -315,14 +315,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +365,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
 description: AJAX/Rails engine file browser for cloud storage services
 email:
 - cam156@psu.edu
@@ -378,6 +392,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -425,6 +440,7 @@ files:
 - lib/generators/browse_everything/install_generator.rb
 - lib/generators/browse_everything/templates/browse_everything.scss
 - lib/generators/browse_everything/templates/browse_everything_providers.yml.example
+- spec/features/select_files_spec.rb
 - spec/features/test_compiling_stylesheets_spec.rb
 - spec/fixtures/file_system/dir_1/dir_3/file_3.m4v
 - spec/fixtures/file_system/dir_1/file_2.txt
@@ -478,11 +494,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
 test_files:
+- spec/features/select_files_spec.rb
 - spec/features/test_compiling_stylesheets_spec.rb
 - spec/fixtures/file_system/dir_1/dir_3/file_3.m4v
 - spec/fixtures/file_system/dir_1/file_2.txt