RubyGems - browse-everything - Versions diffs - 0.15.0 → 0.15.1 - Mend

browse-everything 0.15.0 → 0.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/.rubocop.yml +11 -1
data/browse-everything.gemspec +1 -1
data/lib/browse_everything/driver/dropbox.rb +73 -38
data/lib/browse_everything/retriever.rb +1 -1
data/lib/browse_everything/version.rb +1 -1
data/spec/fixtures/vcr_cassettes/dropbox.yml +233 -343
data/spec/spec_helper.rb +2 -2
data/spec/unit/browser_spec.rb +10 -10
data/spec/unit/dropbox_spec.rb +60 -91
metadata +6 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730808dd49026de8e75b8344369e54ccd437b397
-  data.tar.gz: fd60f9a6709d2dae71fedb6b6f1d5a62a0174219
+  metadata.gz: 217e127add171d887e8e372ba7505f20bfd3c862
+  data.tar.gz: f6de9170c170e8df631283bf3817259285798508
 SHA512:
-  metadata.gz: 1d5c2642e90c7dbd4babdaff36ea7408418813e00467c2a321abae41fb963bbec09aede9dfb111d7b082f7ed5781f63a81bf3f78b3088f2303ce1fe18c828347
-  data.tar.gz: 976c6e152a9712df3bf074a6a84df9a1d7321fe111386ed6f7c6235f8a5bde2056606b1e66ce8a5a6337dd59b16e1bc8e03301858c5124906f4388396947c919
+  metadata.gz: d9cfc43d9f3a117f5e2da42ffd6af90e92897c193c07559da01f7a3789c85212298d74da49fbeeb3fd5c461962cf8f246548d03b60f9a64f31ffffcf76ce1bc6
+  data.tar.gz: ad1002469c1cddbd63c268f83ef083bcf56d0a1b8c5a6a6177626fe02e83f534eaafbf870223da4b7a8f28e649ec0b072ef34202fccc3856f6f3cad192dde3d1

data/.rubocop.yml CHANGED Viewed

@@ -13,7 +13,7 @@ Rails:
 Metrics/ClassLength:
   Max: 130
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 400
@@ -27,6 +27,16 @@ RSpec/FilePath:
 RSpec/LeadingSubject:
   Enabled: false
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/unit/dropbox_spec.rb'
+    - 'spec/features/select_files_spec.rb'
+    - 'spec/javascripts/jasmine_spec.rb'
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/unit/dropbox_spec.rb'
 Style/NumericLiterals:
   MinDigits: 7

data/browse-everything.gemspec CHANGED Viewed

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 3.1'
   spec.add_dependency 'addressable', '~> 2.5'
   spec.add_dependency 'google_drive'
-  spec.add_dependency 'dropbox-sdk', '>= 1.6.2'
+  spec.add_dependency 'dropbox_api', '>= 0.1.10'
   spec.add_dependency 'ruby-box'
   spec.add_dependency 'sass-rails'
   spec.add_dependency 'bootstrap-sass', '~> 3.2'

data/lib/browse_everything/driver/dropbox.rb CHANGED Viewed

@@ -1,63 +1,99 @@
-require 'dropbox_sdk'
+require 'dropbox_api'
 module BrowseEverything
   module Driver
     class Dropbox < Base
-      CONFIG_KEYS = [:app_key, :app_secret].freeze
+      class FileEntryFactory
+        def self.build(metadata:, key:)
+          factory_klass = klass_for metadata
+          factory_klass.build(metadata: metadata, key: key)
+        end
+        class << self
+          private def klass_for(metadata)
+            case metadata
+            when DropboxApi::Metadata::File
+              FileFactory
+            else
+              ResourceFactory
+            end
+          end
+        end
+      end
+      class ResourceFactory
+        def self.build(metadata:, key:)
+          path = metadata.path_display
+          BrowseEverything::FileEntry.new(
+            path,
+            [key, path].join(':'),
+            File.basename(path),
+            nil,
+            nil,
+            true
+          )
+        end
+      end
+      class FileFactory
+        def self.build(metadata:, key:)
+          path = metadata.path_display
+          BrowseEverything::FileEntry.new(
+            path,
+            [key, path].join(':'),
+            File.basename(path),
+            metadata.size,
+            metadata.client_modified,
+            false
+          )
+        end
+      end
       def icon
         'dropbox'
       end
       def validate_config
-        return if CONFIG_KEYS.all? { |key| config[key].present? }
-        raise BrowseEverything::InitializationError, "Dropbox driver requires #{CONFIG_KEYS.inspect}"
+        raise BrowseEverything::InitializationError, 'Dropbox driver requires a :client_id argument' unless config[:client_id]
+        raise BrowseEverything::InitializationError, 'Dropbox driver requires a :client_secret argument' unless config[:client_secret]
       end
-      # @return [Array<BrowseEverything::FileEntry>]
       def contents(path = '')
-        path.sub!(%r{ /^[\/.]+/}, '')
-        result = add_directory_entry(path)
-        result += client.metadata(path)['contents'].collect { |info| make_file_entry(info) }
-        result
+        result = client.list_folder(path)
+        result.entries.map { |entry| FileEntryFactory.build(metadata: entry, key: key) }
       end
-      def add_directory_entry(path)
-        return [] if path.empty?
-        [BrowseEverything::FileEntry.new(
-          Pathname(path).join('..'),
-          '', '..', 0, Time.zone.now, true
-        )]
+      def details(path)
+        metadata = client.get_metadata(path)
+        FileEntryFactory.build(metadata: metadata, key: key)
       end
-      def make_file_entry(info)
-        path = info['path']
-        BrowseEverything::FileEntry.new(
-          path,
-          [key, path].join(':'),
-          File.basename(path),
-          info['bytes'],
-          Time.zone.parse(info['modified']),
-          info['is_dir']
-        )
+      def download(path)
+        temp_file = Tempfile.open(File.basename(path), encoding: 'ascii-8bit')
+        client.download(path) do |chunk|
+          temp_file.write chunk
+        end
+        temp_file.close
+        temp_file
       end
-      def link_for(path)
-        [client.media(path)['url'], { expires: 4.hours.from_now, file_name: File.basename(path), file_size: client.metadata(path)['bytes'].to_i }]
+      def uri_for(path)
+        temp_file = download(path)
+        uri = ::Addressable::URI.new(scheme: 'file', path: temp_file.path)
+        uri.to_s
       end
-      def details(path)
-        contents(path).first
+      def link_for(path)
+        [uri_for(path), {}]
       end
       def auth_link
-        [auth_flow.start('dropbox'), @csrf]
+        authenticator.authorize_url
       end
-      def connect(params, data)
-        @csrf = data
-        @token, _user, _state = auth_flow.finish(params)
-        @token
+      def connect(params, _data)
+        auth_bearer = authenticator.get_token(params[:code])
+        self.token = auth_bearer.token
       end
       def authorized?
@@ -66,13 +102,12 @@ module BrowseEverything
       private
-        def auth_flow
-          @csrf ||= {}
-          DropboxOAuth2Flow.new(config[:app_key], config[:app_secret], callback.to_s, @csrf, 'token')
+        def authenticator
+          @authenticator ||= DropboxApi::Authenticator.new(config[:client_id], config[:client_secret])
         end
         def client
-          DropboxClient.new(token)
+          DropboxApi::Client.new(token)
         end
     end
   end

data/lib/browse_everything/retriever.rb CHANGED Viewed

@@ -84,7 +84,7 @@ module BrowseEverything
           File.size(url.path)
         when /https?/
           response = HTTParty.head(parsed_spec[:url].to_s, headers: parsed_spec[:headers])
-          response.content_length
+          (response.content_length || parsed_spec[:file_size]).to_i
         else
           raise URI::BadURIError, "Unknown URI scheme: #{url.scheme}"
         end

data/lib/browse_everything/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = '0.15.0'.freeze
+  VERSION = '0.15.1'.freeze
 end

data/spec/fixtures/vcr_cassettes/dropbox.yml CHANGED Viewed

@@ -2,391 +2,281 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api.dropbox.com/1/oauth2/token
+    uri: https://api.dropboxapi.com/oauth2/token
     body:
       encoding: UTF-8
-      string: grant_type=authorization_code&code=FakeDropboxAuthorizationCodeABCDEFG&redirect_uri=http%3A%2F%2Fbrowse.example.edu%2Fbrowse%2Fconnect
+      string: client_id=id&client_secret=secret&code=code&grant_type=authorization_code
     headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Content-Type: application/x-www-form-urlencoded
-      Connection: close
-      Host: api.dropbox.com
-      Content-Length: '140'
+      User-Agent:
+      - Faraday v0.12.2
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
   response:
     status:
-      code: '200'
+      code: 200
       message: OK
     headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:38:46 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      x-server-response-time: '92'
-      x-dropbox-request-id: adb756ec7f02c3a142c9d43c479c2033
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 9a70a92424860e2700a2f741b4d0dc6f
+      Server:
+      - nginx
+      Date:
+      - Wed, 01 Nov 2017 15:23:50 GMT
+      Content-Type:
+      - text/javascript
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      X-Content-Type-Options:
+      - nosniff
+      X-Dropbox-Request-Id:
+      - f2f4174c641db0b51f5d82987fefca9b
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Server-Response-Time:
+      - '380'
     body:
-      encoding: UTF-8
-      string: ! '{"access_token": "FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321",
-        "token_type": "bearer", "uid": "1234567"}'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:38:46 GMT
-- request:
-    method: get
-    uri: https://api.dropbox.com/1/metadata/auto/?file_limit=25000&include_deleted=false&include_media_info=false&list=true
-    body:
-      encoding: UTF-8
-      string: ''
-    headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
-  response:
-    status:
-      code: '200'
-      message: OK
-    headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:38:48 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=MjMzNzg4MzEzNTQ2Mzk1MzQ0NjcxNzY2ODI2MDkzODUzNzI5NTYw; expires=Wed,
-        19 Sep 2018 15:38:48
-        GMT; Path=/; httponly'
-      x-server-response-time: '50'
-      x-dropbox-request-id: da19c8c6ca44a67e6c2db3f0254058d1
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 057f2caf7291c8f9684a0626480afb30
-    body:
-      encoding: UTF-8
-      string: ! '{ "hash": "60657d5728ee9c36971c0c8269a1c5e8", "thumb_exists": false, "bytes":
-        0, "path": "/", "is_dir": true, "size": "0 bytes", "root": "dropbox", "contents":
-        [ { "revision": 8743, "rev": "222700cbb190", "thumb_exists": false, "bytes": 0,
-        "modified": "Sun, 09 Dec 2012 20:30:45 +0000", "path": "/Apps", "is_dir": true,
-        "icon": "folder", "root": "dropbox", "size": "0 bytes" }, { "revision": 6944, "rev":
-        "1b2000cbb190", "thumb_exists": false, "bytes": 0, "modified": "Sun, 25 Mar 2012
-        00:36:39 +0000", "path": "/Books", "is_dir": true, "icon": "folder", "root": "dropbox",
-        "size": "0 bytes" }, { "revision": 14, "rev": "e00cbb190", "thumb_exists": false,
-        "bytes": 0, "modified": "Mon, 28 Jun 2010 16:53:48 +0000", "path": "/Documents",
-        "is_dir": true, "icon": "folder", "root": "dropbox", "size": "0 bytes" }, { "revision":
-        9, "rev": "900cbb190", "thumb_exists": false, "bytes": 127748, "modified": "Mon,
-        28 Jun 2010 16:49:18 +0000", "client_mtime": "Mon, 28 Jun 2010 16:49:19 +0000",
-        "path": "/Getting Started.pdf", "is_dir": false, "icon": "page_white_acrobat", "root":
-        "dropbox", "mime_type": "application/pdf", "size": "124.8 KB" }, { "revision": 1975,
-        "rev": "7b700cbb190", "thumb_exists": false, "bytes": 208218, "modified": "Mon,
-        28 Jun 2010 17:28:47 +0000", "client_mtime": "Mon, 28 Jun 2010 17:28:47 +0000",
-        "path": "/iPad intro.pdf", "is_dir": false, "icon": "page_white_acrobat", "root":
-        "dropbox", "mime_type": "application/pdf", "size": "203.3 KB" }, { "revision": 1973,
-        "rev": "7b500cbb190", "thumb_exists": false, "bytes": 315187, "modified": "Mon,
-        28 Jun 2010 17:27:11 +0000", "client_mtime": "Mon, 28 Jun 2010 17:27:11 +0000",
-        "path": "/iPhone intro.pdf", "is_dir": false, "icon": "page_white_acrobat", "root":
-        "dropbox", "mime_type": "application/pdf", "size": "307.8 KB" }, { "revision": 2636,
-        "rev": "a4c00cbb190", "thumb_exists": false, "bytes": 0, "modified": "Thu, 23 Sep
-        2010 06:30:15 +0000", "path": "/Writer", "is_dir": true, "icon": "folder", "root":
-        "dropbox", "size": "0 bytes" } ], "icon": "folder" }'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:38:48 GMT
-- request:
-    method: get
-    uri: https://api.dropbox.com/1/metadata/auto/Writer?file_limit=25000&include_deleted=false&include_media_info=false&list=true
-    body:
-      encoding: UTF-8
-      string: ''
-    headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
-  response:
-    status:
-      code: '200'
-      message: OK
-    headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:38:55 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=Njg4MTEzOTAzNjIxMzA3Mzg0Nzk4ODMwMjc3ODE5Mjk1OTIyMjY%3D; expires=Wed,
-        19 Sep 2018 15:38:55
-        GMT; Path=/; httponly'
-      x-server-response-time: '64'
-      x-dropbox-request-id: 349e4a2b10c59d22f4e686ddbd608b69
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 83bc363934d5a5457cbcbd0fab8b4cfb
-    body:
-      encoding: UTF-8
-      string: ! '{ "hash": "c4a067b0bfef9feefca072bb14d9be93", "revision": 2636, "rev": "a4c00cbb190",
-        "thumb_exists": false, "bytes": 0, "modified": "Thu, 23 Sep 2010 06:30:15 +0000",
-        "path": "/Writer", "is_dir": true, "icon": "folder", "root": "dropbox", "contents":
-        [ { "revision": 4011, "rev": "fab00cbb190", "thumb_exists": false, "bytes": 11642,
-        "modified": "Sat, 09 Apr 2011 18:54:55 +0000", "client_mtime": "Sat, 09 Apr 2011
-        18:54:55 +0000", "path": "/Writer/About Writer.txt", "is_dir": false, "icon": "page_white_text",
-        "root": "dropbox", "mime_type": "text/plain", "size": "11.4 KB" }, { "revision":
-        2754, "rev": "ac200cbb190", "thumb_exists": false, "bytes": 988, "modified": "Thu,
-        14 Oct 2010 08:32:20 +0000", "client_mtime": "Thu, 14 Oct 2010 08:32:20 +0000",
-        "path": "/Writer/Markdown Test.txt", "is_dir": false, "icon": "page_white_text",
-        "root": "dropbox", "mime_type": "text/plain", "size": "988 bytes" }, { "revision":
-        4009, "rev": "fa900cbb190", "thumb_exists": false, "bytes": 20904, "modified": "Sat,
-        09 Apr 2011 18:54:54 +0000", "client_mtime": "Sat, 09 Apr 2011 18:54:54 +0000",
-        "path": "/Writer/Writer FAQ.txt", "is_dir": false, "icon": "page_white_text", "root":
-        "dropbox", "mime_type": "text/plain", "size": "20.4 KB" } ], "size": "0 bytes" }'
-    http_version: '1.1'
-  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?
-    body:
-      encoding: UTF-8
-      string: ''
-    headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
-  response:
-    status:
-      code: '200'
-      message: OK
-    headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:39:01 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=MjEyNTM5NjUyNDAyMDIwODUzNTU0MTY0NzA0ODU4MzczNTU0NDI%3D; expires=Wed,
-        19 Sep 2018 15:39:01
-        GMT; Path=/; httponly'
-      x-server-response-time: '68'
-      x-dropbox-request-id: d8dbc2e2080168d6e34d85165aa69c0e
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: e03a6c0ded5f7088ba59ecd9e97234a6
-    body:
-      encoding: UTF-8
-      string: ! '{"url": "https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Writer%20FAQ.txt",
-        "expires": "Fri, 20 Sep 2013 19:39:01 +0000"}'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:39:01 GMT
-- request:
-    method: get
-    uri: https://api.dropbox.com/1/media/auto/Writer/Writer%20FAQ.txt
-    body:
-      encoding: UTF-8
-      string: ''
-    headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
-  response:
-    status:
-      code: '200'
-      message: OK
-    headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:39:01 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=MjEyNTM5NjUyNDAyMDIwODUzNTU0MTY0NzA0ODU4MzczNTU0NDI%3D; expires=Wed,
-        19 Sep 2018 15:39:01
-        GMT; Path=/; httponly'
-      x-server-response-time: '68'
-      x-dropbox-request-id: d8dbc2e2080168d6e34d85165aa69c0e
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: e03a6c0ded5f7088ba59ecd9e97234a6
-    body:
-      encoding: UTF-8
-      string: ! '{"url": "https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Writer%20FAQ.txt",
-        "expires": "Fri, 20 Sep 2013 19:39:01 +0000"}'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:39:01 GMT
+      encoding: ASCII-8BIT
+      string: '{"access_token": "test-access-token",
+        "token_type": "bearer", "uid": "test-user-id", "account_id": "dbid:id"}'
+    http_version:
+  recorded_at: Wed, 01 Nov 2017 15:23:50 GMT
 - request:
-    method: get
-    uri: https://api.dropbox.com/1/media/auto/Writer/Markdown%20Test.txt?
+    method: post
+    uri: https://api.dropboxapi.com/2/files/list_folder
     body:
       encoding: UTF-8
-      string: ''
+      string: '{"recursive":false,"include_media_info":false,"include_deleted":false,"path":""}'
     headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
+      Authorization:
+      - Bearer test-token
+      User-Agent:
+      - Faraday v0.12.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
   response:
     status:
-      code: '200'
+      code: 200
       message: OK
     headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:39:02 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=NjgwODYwOTI2NTA5OTAyNzE3NzE4MDU3MzY0NTQ3NTYyNTYyNDE%3D; expires=Wed,
-        19 Sep 2018 15:39:02
-        GMT; Path=/; httponly'
-      x-server-response-time: '78'
-      x-dropbox-request-id: b6fd9a3c039d2aea3def25f8f2f5ac3a
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 30d2c0cf0122795ebce9bd5f26ce0c60
+      Server:
+      - nginx
+      Date:
+      - Thu, 02 Nov 2017 17:24:35 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      X-Content-Type-Options:
+      - nosniff
+      X-Dropbox-Request-Id:
+      - 88a1f2ef2510ba6e8d39629d0950c5cd
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Server-Response-Time:
+      - '420'
     body:
-      encoding: UTF-8
-      string: ! '{"url": "https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Markdown%20Test.txt",
-        "expires": "Fri, 20 Sep 2013 19:39:02 +0000"}'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:39:02 GMT
+      encoding: ASCII-8BIT
+      string: '{"entries": [{".tag": "folder", "name": "Photos", "path_lower": "/photos",
+        "path_display": "/Photos", "id": "id:XAAAAAAAAAALA"}, {".tag": "file", "name":
+        "Getting Started.pdf", "path_lower": "/getting started.pdf", "path_display":
+        "/Getting Started.pdf", "id": "id:XAAAAAAAAAAKg", "client_modified":
+        "2012-11-10T18:33:28Z", "server_modified": "2012-11-10T18:33:27Z", "rev":
+        "60b9427f2", "size": 249159, "content_hash": "c3dfdd86981548e48bc8efb6c4162c76ba961ec92e60f6ba26189068a41fcaf2"}],
+        "cursor": "AAFu-_dOPQTQnqOIb9JklCPYSxWtNRrBBOU4nNkY78wTCc-ktCP4MtIoN1nmOESizkoue2dpu3FbMwDM6BQbgkLObH_Ge-H0BYaPwjfLk5cUHZHd1swkMYGLWELfX_PIHH9hCmU0C8sUL2EJ-7y6BcRFpdOvPmxiu6azVyCx_Il7kA",
+        "has_more": false}'
+    http_version:
+  recorded_at: Thu, 02 Nov 2017 17:24:35 GMT
 - request:
-    method: get
-    uri: https://api.dropbox.com/1/media/auto/Writer/Markdown%20Test.txt
+    method: post
+    uri: https://api.dropboxapi.com/2/files/list_folder
     body:
       encoding: UTF-8
-      string: ''
+      string: '{"recursive":false,"include_media_info":false,"include_deleted":false,"path":"/Photos"}'
     headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
+      Authorization:
+      - Bearer test-token
+      User-Agent:
+      - Faraday v0.12.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
   response:
     status:
-      code: '200'
+      code: 200
       message: OK
     headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:39:02 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=NjgwODYwOTI2NTA5OTAyNzE3NzE4MDU3MzY0NTQ3NTYyNTYyNDE%3D; expires=Wed,
-        19 Sep 2018 15:39:02
-        GMT; Path=/; httponly'
-      x-server-response-time: '78'
-      x-dropbox-request-id: b6fd9a3c039d2aea3def25f8f2f5ac3a
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 30d2c0cf0122795ebce9bd5f26ce0c60
+      Server:
+      - nginx
+      Date:
+      - Thu, 02 Nov 2017 18:24:47 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      X-Content-Type-Options:
+      - nosniff
+      X-Dropbox-Request-Id:
+      - 99449c0009a0b11d68c7be3fd95c344e
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Server-Response-Time:
+      - '249'
     body:
-      encoding: UTF-8
-      string: ! '{"url": "https://dl.dropboxusercontent.com/1/view/FakeDropboxAccessPath/Writer/Markdown%20Test.txt",
-        "expires": "Fri, 20 Sep 2013 19:39:02 +0000"}'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:39:02 GMT
+      encoding: ASCII-8BIT
+      string: '{"entries": [{".tag": "folder", "name": "Sample Album", "path_lower":
+        "/photos/sample album", "path_display": "/Photos/Sample Album", "id": "id:XAAAAAAAAAAKw"}],
+        "cursor": "AAGbwaeSAvSMoUMUP1PFBFovGux_ng7wnPb1sj0d7ovjMe6lvtB0NG1xwOtwFWfyNjIHPx1gkKGFSxn-6A5WsL59EZKn3XbJxk1kZzNTtwcDCVj2GIG7cHSTnCdjeAeNf1e6VEpsaXdnh67WrSjSUu9fsfok4H83z_JlXT1LZ_XVCA",
+        "has_more": false}'
+    http_version:
+  recorded_at: Thu, 02 Nov 2017 18:24:47 GMT
 - request:
-    method: get
-    uri: https://api.dropbox.com/1/metadata/auto/Writer/Writer%20FAQ.txt?file_limit=25000&include_deleted=false&include_media_info=false&list=true
+    method: post
+    uri: https://api.dropboxapi.com/2/files/get_metadata
     body:
       encoding: UTF-8
-      string: ''
+      string: '{"path":"/Getting Started.pdf"}'
     headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
+      Authorization:
+      - Bearer test-token
+      User-Agent:
+      - Faraday v0.12.2
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
   response:
     status:
-      code: '200'
+      code: 200
       message: OK
     headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:38:55 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=Njg4MTEzOTAzNjIxMzA3Mzg0Nzk4ODMwMjc3ODE5Mjk1OTIyMjY%3D; expires=Wed,
-        19 Sep 2018 15:38:55
-        GMT; Path=/; httponly'
-      x-server-response-time: '64'
-      x-dropbox-request-id: 349e4a2b10c59d22f4e686ddbd608b69
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 83bc363934d5a5457cbcbd0fab8b4cfb
+      Server:
+      - nginx
+      Date:
+      - Thu, 02 Nov 2017 18:24:47 GMT
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Cache-Control:
+      - no-cache
+      Pragma:
+      - no-cache
+      X-Content-Type-Options:
+      - nosniff
+      X-Dropbox-Request-Id:
+      - 759ea34f57056e7d7fdf96cf4548014b
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Server-Response-Time:
+      - '170'
     body:
-      encoding: UTF-8
-      string: ! '{ "revision": 4009, "rev": "fa900cbb190", "thumb_exists": false, "bytes": 20904,
-        "modified": "Sat, 09 Apr 2011 18:54:54 +0000", "client_mtime": "Sat, 09 Apr 2011 18:54:54 +0000",
-        "path": "/Writer/Writer FAQ.txt", "is_dir": false, "icon": "page_white_text", "root":
-        "dropbox", "mime_type": "text/plain", "size": "20.4 KB" }'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:38:55 GMT
+      encoding: ASCII-8BIT
+      string: '{".tag": "file", "name": "Getting Started.pdf", "path_lower": "/getting
+        started.pdf", "path_display": "/Getting Started.pdf", "id": "id:XAAAAAAAAAAKw",
+        "client_modified": "2012-11-10T18:33:28Z", "server_modified": "2012-11-10T18:33:27Z",
+        "rev": "60b9427f2", "size": 249159, "content_hash": "c3dfdd86981548e48bc8efb6c4162c76ba961ec92e60f6ba26189068a41fcaf2"}'
+    http_version:
+  recorded_at: Thu, 02 Nov 2017 18:24:47 GMT
 - request:
-    method: get
-    uri: https://api.dropbox.com/1/metadata/auto/Writer/Markdown%20Test.txt?file_limit=25000&include_deleted=false&include_media_info=false&list=true
+    method: post
+    uri: https://content.dropboxapi.com/2/files/download
     body:
       encoding: UTF-8
       string: ''
     headers:
-      Accept: ! '*/*'
-      User-Agent: OfficialDropboxRubySDK/1.6.1
-      Authorization: Bearer FakeDropboxAccessToken01234567890ABCDEF_AAAAAAA987654321
-      Connection: close
-      Host: api.dropbox.com
+      Authorization:
+      - Bearer test-token
+      User-Agent:
+      - Faraday v0.12.2
+      Dropbox-Api-Arg:
+      - '{"path":"/Getting Started.pdf"}'
+      Content-Type:
+      - ''
+      Content-Length:
+      - '0'
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
   response:
     status:
-      code: '200'
+      code: 200
       message: OK
     headers:
-      Server: nginx
-      Date: Fri, 20 Sep 2013 15:38:55 GMT
-      Content-Type: text/javascript
-      Transfer-Encoding: chunked
-      Connection: close
-      set-cookie: ! 'gvc=Njg4MTEzOTAzNjIxMzA3Mzg0Nzk4ODMwMjc3ODE5Mjk1OTIyMjY%3D; expires=Wed,
-        19 Sep 2018 15:38:55
-        GMT; Path=/; httponly'
-      x-server-response-time: '64'
-      x-dropbox-request-id: 349e4a2b10c59d22f4e686ddbd608b69
-      pragma: no-cache
-      cache-control: no-cache
-      x-dropbox-http-protocol: None
-      x-frame-options: SAMEORIGIN
-      X-RequestId: 83bc363934d5a5457cbcbd0fab8b4cfb
+      Server:
+      - nginx
+      Date:
+      - Thu, 02 Nov 2017 17:24:36 GMT
+      Content-Type:
+      - application/octet-stream
+      Content-Length:
+      - '249159'
+      Connection:
+      - keep-alive
+      Accept-Ranges:
+      - bytes
+      Etag:
+      - W/"60b9427f2"
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      Original-Content-Length:
+      - '249159'
+      Dropbox-Api-Result:
+      - '{"name": "Getting Started.pdf", "path_lower": "/getting started.pdf", "path_display":
+        "/Getting Started.pdf", "id": "id:XAAAAAAAAAAKg", "client_modified":
+        "2012-11-10T18:33:28Z", "server_modified": "2012-11-10T18:33:27Z", "rev":
+        "60b9427f2", "size": 249159, "content_hash": "c3dfdd86981548e48bc8efb6c4162c76ba961ec92e60f6ba26189068a41fcaf2"}'
+      X-Server-Response-Time:
+      - '568'
+      X-Dropbox-Request-Id:
+      - 34e2c5d045bc37e50c1874f668a6c8c6
+      X-Robots-Tag:
+      - noindex, nofollow, noimageindex
     body:
-      encoding: UTF-8
-      string: ! '{ "revision": 2754, "rev": "ac200cbb190", "thumb_exists": false,
-        "bytes": 988, "modified": "Thu, 14 Oct 2010 08:32:20 +0000",
-        "client_mtime": "Thu, 14 Oct 2010 08:32:20 +0000",
-        "path": "/Writer/Markdown Test.txt", "is_dir": false, "icon": "page_white_text",
-        "root": "dropbox", "mime_type": "text/plain", "size": "988 bytes" }'
-    http_version: '1.1'
-  recorded_at: Fri, 20 Sep 2013 15:38:55 GMT
-recorded_with: Charles Proxy
+      encoding: ASCII-8BIT
+      string: !binary |-
+        JVBERi0xLjcNJeLjz9MNCjU5IDAgb2JqDTw8L0xpbmVhcml6ZWQgMS9MIDI0
+    http_version:
+  recorded_at: Thu, 02 Nov 2017 17:24:36 GMT
+recorded_with: VCR 3.0.3

data/spec/spec_helper.rb CHANGED Viewed

@@ -53,8 +53,8 @@ module BrowserConfigHelper
                                  client_secret: 'BoxClientSecret'
                                },
                                'dropbox' => {
-                                 app_key: 'DropboxAppKey',
-                                 app_secret: 'DropboxAppSecret'
+                                 client_id: 'DropboxId',
+                                 client_secret: 'DropboxClientSecret'
                                },
                                'google_drive' => {
                                  client_id: 'GoogleClientId',

data/spec/unit/browser_spec.rb CHANGED Viewed

@@ -3,23 +3,23 @@ include BrowserConfigHelper
 describe BrowseEverything::Browser do
   let(:file_config) do
     {
-      file_system: { home: '/file/config/home' },
-      dropbox:    { app_key: 'FileConfigKey', app_secret: 'FileConfigSecret' }
+      file_system:  { home: '/file/config/home' },
+      dropbox:      { client_id: 'DropboxId', client_secret: 'DropboxClientSecret' }
     }.to_yaml
   end
   let(:global_config) do
     {
-      file_system: { home: '/global/config/home' },
-      dropbox:    { app_key: 'GlobalConfigKey', app_secret: 'GlobalConfigSecret' }
+      file_system:  { home: '/global/config/home' },
+      dropbox:      { client_id: 'DropboxId', client_secret: 'DropboxClientSecret' }
     }
   end
   let(:local_config) do
     {
-      file_system: { home: '/local/config/home' },
-      dropbox:    { app_key: 'LocalConfigKey', app_secret: 'LocalConfigSecret' },
-      url_options: url_options
+      file_system:  { home: '/local/config/home' },
+      dropbox:      { client_id: 'DropboxId', client_secret: 'DropboxClientSecret' },
+      url_options:  url_options
     }
   end
@@ -33,7 +33,7 @@ describe BrowseEverything::Browser do
     end
     it 'uses the file configuration' do
-      expect(browser.providers[:dropbox].config[:app_key]).to eq('FileConfigKey')
+      expect(browser.providers[:file_system].config[:home]).to eq('/file/config/home')
     end
   end
@@ -47,7 +47,7 @@ describe BrowseEverything::Browser do
     end
     it 'uses the global configuration' do
-      expect(browser.providers[:dropbox].config[:app_key]).to eq('GlobalConfigKey')
+      expect(browser.providers[:file_system].config[:home]).to eq('/global/config/home')
     end
   end
@@ -59,7 +59,7 @@ describe BrowseEverything::Browser do
     end
     it 'uses the local configuration' do
-      expect(browser.providers[:dropbox].config[:app_key]).to eq('LocalConfigKey')
+      expect(browser.providers[:file_system].config[:home]).to eq('/local/config/home')
     end
   end

data/spec/unit/dropbox_spec.rb CHANGED Viewed

@@ -6,15 +6,21 @@ describe BrowseEverything::Driver::Dropbox, vcr: { cassette_name: 'dropbox', rec
   let(:browser) { BrowseEverything::Browser.new(url_options) }
   let(:provider) { browser.providers['dropbox'] }
-  let(:auth_params) do {
-    'code' => 'FakeDropboxAuthorizationCodeABCDEFG',
-    'state' => 'GjDcUhPNZrZzdsw%2FghBy2A%3D%3D|dropbox'
-  }
+  let(:provider_yml) do
+    {
+      client_id: 'client-id',
+      client_secret: 'client-secret'
+    }
   end
-  let(:csrf_data) { { 'token' => 'GjDcUhPNZrZzdsw%2FghBy2A%3D%3D' } }
-  it '#validate_config' do
-    expect { BrowseEverything::Driver::Dropbox.new({}) }.to raise_error(BrowseEverything::InitializationError)
+  describe '#validate_config' do
+    it 'raises and error with an incomplete configuration' do
+      expect { BrowseEverything::Driver::Dropbox.new({}) }.to raise_error(BrowseEverything::InitializationError)
+    end
+    it 'raises and error with a configuration without a client secret' do
+      expect { BrowseEverything::Driver::Dropbox.new(client_id: 'test-client-id') }.to raise_error(BrowseEverything::InitializationError)
+    end
   end
   describe 'simple properties' do
@@ -24,101 +30,64 @@ describe BrowseEverything::Driver::Dropbox, vcr: { cassette_name: 'dropbox', rec
     its(:icon) { is_expected.to be_a(String) }
   end
-  describe '#auth_link' do
-    subject { provider.auth_link[0] }
-    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
-  describe 'authorization' do
-    subject { provider }
-    before { provider.connect(auth_params, csrf_data) }
-    it { is_expected.to be_authorized }
-  end
+  context 'with a valid configuration' do
+    let(:driver) { described_class.new(provider_yml) }
+    before { driver.connect({ code: 'code' }, {}) }
-  describe '#contents' do
-    before { provider.connect(auth_params, csrf_data) }
-    context 'root directory' do
-      let(:contents) { provider.contents('') }
-      context '[0]' do
-        subject { contents[0] }
-        its(:name) { is_expected.to eq('Apps')   }
-        specify    { is_expected.to be_container }
-      end
-      context '[1]' do
-        subject { contents[1] }
-        its(:name) { is_expected.to eq('Books')  }
-        specify    { is_expected.to be_container }
-      end
-      context '[4]' do
-        subject { contents[4] }
-        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
+    describe '#auth_link' do
+      subject { driver.auth_link }
+      it { is_expected.to start_with('https://www.dropbox.com/oauth2/authorize') }
     end
-    context 'subdirectory' do
-      let(:contents) { provider.contents('/Writer') }
-      context '[0]' do
-        subject { contents[0] }
-        its(:name) { is_expected.to eq('..')     }
-        specify    { is_expected.to be_container }
-      end
-      context '[1]' do
-        subject { contents[1] }
-        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)     { 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] }
+    describe '#authorized?' do
+      subject { driver }
+      it { is_expected.to be_authorized }
+    end
-        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 }
+    describe '#contents' do
+      context 'within the root folder' do
+        let(:contents) { driver.contents }
+        it 'retrieves all folders the root folders' do
+          expect(contents).not_to be_empty
+          folder_metadata = contents.first
+          expect(folder_metadata).to be_a BrowseEverything::FileEntry
+          expect(folder_metadata.id).to eq '/Photos'
+          expect(folder_metadata.location).to eq 'dropbox:/Photos'
+          expect(folder_metadata.name).to eq 'Photos'
+          expect(folder_metadata.size).to eq nil
+          expect(folder_metadata.mtime).to eq nil
+          expect(folder_metadata.container?).to eq true
+        end
       end
     end
-    context '#details' do
-      subject { provider.details('') }
-      its(:name) { is_expected.to eq('Apps') }
+    describe '#details' do
+      subject(:file_metadata) { driver.details('/Getting Started.pdf') }
+      it 'retrieves the metadata for a file' do
+        expect(file_metadata).to be_a BrowseEverything::FileEntry
+        expect(file_metadata.id).to eq '/Getting Started.pdf'
+        expect(file_metadata.location).to eq 'dropbox:/Getting Started.pdf'
+        expect(file_metadata.name).to eq 'Getting Started.pdf'
+        expect(file_metadata.size).to eq 249159
+        expect(file_metadata.mtime).to be_a Time
+        expect(file_metadata.container?).to eq false
+      end
     end
-  end
-  describe '#link_for' do
-    before { provider.connect(auth_params, csrf_data) }
-    context '[0]' do
-      let(:link) { provider.link_for('/Writer/Writer FAQ.txt') }
+    describe '#link_for' do
+      subject(:link_args) { driver.link_for('/Getting Started.pdf') }
-      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
-      let(:link) { provider.link_for('/Writer/Markdown Test.txt') }
+      it 'provides link arguments for accessing the file' do
+        expect(link_args.first).to be_a String
+        expect(link_args.first).to start_with 'file:/'
+        expect(link_args.first).to include 'Getting Started.pdf'
-      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) }
+        File.open(link_args.first.gsub('file:', '')) do |downloaded_file|
+          expect(downloaded_file.read).not_to be_empty
+        end
+      end
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Carolyn Cole
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,19 +58,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dropbox-sdk
+  name: dropbox_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: ruby-box
   requirement: !ruby/object:Gem::Requirement
@@ -554,7 +554,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key:
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services