browse-everything 0.11.1 → 0.12.0

data/spec/unit/file_entry_spec.rb

@@ -1,89 +1,50 @@
 describe BrowseEverything::FileEntry do
   let(:mtime) { Time.now }
+
   describe 'regular file' do
     subject do
-      BrowseEverything::FileEntry.new(
+      described_class.new(
         'file_id_01234', 'my_provider:/location/pa/th/file.m4v',
         'file.m4v', '1.2 GB', mtime, false
       )
     end
 
-    it 'should be a BrowseEverything::FileEntry' do
-      expect(subject).to be_a BrowseEverything::FileEntry
-    end
-
-    it '#id' do
-      expect(subject.id).to eq('file_id_01234')
-    end
-
-    it '#location' do
-      expect(subject.location).to eq('my_provider:/location/pa/th/file.m4v')
-    end
-
-    it '#name' do
-      expect(subject.name).to eq('file.m4v')
-    end
-
-    it '#size' do
-      expect(subject.size).to eq('1.2 GB')
-    end
-
-    it '#mtime' do
-      expect(subject.mtime).to eq(mtime)
-    end
-
-    it '#type' do
-      expect(subject.type).to eq('video/mp4')
-    end
-
-    it '#container?' do
-      expect(subject.container?).to be false
-    end
+    it { is_expected.to be_a(described_class) }
+    it { is_expected.not_to be_container }
+    it { is_expected.not_to be_relative_parent_path }
 
-    it '#relative_parent_path?' do
-      expect(subject.relative_parent_path?).to be false
-    end
+    its(:id)       { is_expected.to eq('file_id_01234') }
+    its(:location) { is_expected.to eq('my_provider:/location/pa/th/file.m4v') }
+    its(:name)     { is_expected.to eq('file.m4v') }
+    its(:size)     { is_expected.to eq('1.2 GB') }
+    its(:mtime)    { is_expected.to eq(mtime) }
+    its(:type)     { is_expected.to eq('video/mp4') }
   end
 
   describe 'directory' do
     subject do
-      BrowseEverything::FileEntry.new(
+      described_class.new(
         'directory_id_1234', 'my_provider:/location/pa/th',
         'th', '', mtime, true
       )
     end
 
-    it '#type' do
-      expect(subject.type).to eq('application/x-directory')
-    end
-
-    it '#container?' do
-      expect(subject.container?).to be true
-    end
+    it { is_expected.to be_container }
+    it { is_expected.not_to be_relative_parent_path }
 
-    it '#relative_parent_path?' do
-      expect(subject.relative_parent_path?).to be false
-    end
+    its(:type) { is_expected.to eq('application/x-directory') }
   end
 
   describe 'parent path' do
     subject do
-      BrowseEverything::FileEntry.new(
+      described_class.new(
         'directory_id_1234', 'my_provider:/location/pa/th',
         '..', '', mtime, true
       )
     end
+    it { is_expected.to be_container }
+    it { is_expected.to be_relative_parent_path }
 
-    it '#type' do
-      expect(subject.type).to eq('application/x-directory')
-    end
-
-    it '#container?' do
-      expect(subject.container?).to be true
-    end
-
-    it '#relative_parent_path?' do
-      expect(subject.relative_parent_path?).to be true
-    end
+    its(:type) { is_expected.to eq('application/x-directory') }
   end
 end

data/spec/unit/file_system_spec.rb

@@ -8,15 +8,15 @@ describe BrowseEverything::Driver::FileSystem do
   let(:provider) { browser.providers['file_system'] }
 
   it '#validate_config' do
-    expect { BrowseEverything::Driver::FileSystem.new({}) }.to raise_error(BrowseEverything::InitializationError)
+    expect { described_class.new({}) }.to raise_error(BrowseEverything::InitializationError)
   end
 
   describe 'simple properties' do
     subject    { provider                }
-    its(:name) { should == 'File System' }
-    its(:key)  { should == 'file_system' }
-    its(:icon) { should be_a(String)     }
-    specify    { should be_authorized    }
+    its(:name) { is_expected.to eq('File System') }
+    its(:key)  { is_expected.to eq('file_system') }
+    its(:icon) { is_expected.to be_a(String)     }
+    specify    { is_expected.to be_authorized    }
   end
 
   describe '#contents' do
@@ -24,29 +24,29 @@ describe BrowseEverything::Driver::FileSystem do
       let(:contents) { provider.contents('/') }
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == 'dir_1'   }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('dir_1') }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name) { should == 'dir_2'   }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('dir_2') }
+        specify    { is_expected.to be_container }
       end
       context '[2]' do
         subject { contents[2] }
-        its(:name)     { should == 'file 1.pdf'              }
-        its(:size)     { should == 2256                      }
-        its(:location) { should == "file_system:#{File.join(home, 'file 1.pdf')}" }
-        its(:type)     { should == 'application/pdf'         }
-        specify        { should_not be_container             }
+        its(:name)     { is_expected.to eq('file 1.pdf')              }
+        its(:size)     { is_expected.to eq(2256)                      }
+        its(:location) { is_expected.to eq("file_system:#{File.join(home, 'file 1.pdf')}") }
+        its(:type)     { is_expected.to eq('application/pdf') }
+        specify        { is_expected.not_to be_container }
       end
       context '[3]' do
         subject { contents[3] }
-        its(:name)     { should == 'file_1.pdf'              }
-        its(:size)     { should == 2256                      }
-        its(:location) { should == "file_system:#{File.join(home, 'file_1.pdf')}" }
-        its(:type)     { should == 'application/pdf'         }
-        specify        { should_not be_container             }
+        its(:name)     { is_expected.to eq('file_1.pdf')              }
+        its(:size)     { is_expected.to eq(2256)                      }
+        its(:location) { is_expected.to eq("file_system:#{File.join(home, 'file_1.pdf')}") }
+        its(:type)     { is_expected.to eq('application/pdf') }
+        specify        { is_expected.not_to be_container }
       end
     end
 
@@ -54,20 +54,20 @@ describe BrowseEverything::Driver::FileSystem do
       let(:contents) { provider.contents('/dir_1') }
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == '..'      }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('..') }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name) { should == 'dir_3'   }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('dir_3') }
+        specify    { is_expected.to be_container }
       end
       context '[2]' do
         subject { contents[2] }
-        its(:name)     { should == 'file_2.txt' }
-        its(:location) { should == "file_system:#{File.join(home, 'dir_1/file_2.txt')}" }
-        its(:type)     { should == 'text/plain'      }
-        specify        { should_not be_container     }
+        its(:name)     { is_expected.to eq('file_2.txt') }
+        its(:location) { is_expected.to eq("file_system:#{File.join(home, 'dir_1/file_2.txt')}") }
+        its(:type)     { is_expected.to eq('text/plain') }
+        specify        { is_expected.not_to be_container }
       end
     end
 
@@ -75,17 +75,17 @@ describe BrowseEverything::Driver::FileSystem do
       let(:contents) { provider.contents('/dir_1/dir_3/file_3.m4v') }
       context '[0]' do
         subject { contents[0] }
-        its(:name)     { should == 'file_3.m4v' }
-        its(:location) { should == "file_system:#{File.join(home, 'dir_1/dir_3/file_3.m4v')}" }
-        its(:size)     { should == 3879              }
-        its(:type)     { should == 'video/mp4'       }
-        specify        { should_not be_container     }
+        its(:name)     { is_expected.to eq('file_3.m4v') }
+        its(:location) { is_expected.to eq("file_system:#{File.join(home, 'dir_1/dir_3/file_3.m4v')}") }
+        its(:size)     { is_expected.to eq(3879)              }
+        its(:type)     { is_expected.to eq('video/mp4')       }
+        specify        { is_expected.not_to be_container }
       end
     end
   end
 
   describe "#link_for('/path/to/file')" do
     subject { provider.link_for('/path/to/file') }
-    it { should == ['file:///path/to/file', { file_name: 'file', file_size: 0 }] }
+    it { is_expected.to eq(['file:///path/to/file', { file_name: 'file', file_size: 0 }]) }
   end
 end

data/spec/unit/retriever_spec.rb

@@ -1,5 +1,5 @@
 describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record: :none } do
-  subject { BrowseEverything::Retriever.new }
+  let(:retriever) { described_class.new }
   let(:datafile) { File.expand_path('../../fixtures/file_system/file_1.pdf', __FILE__) }
   let(:datafile_with_spaces) { File.expand_path('../../fixtures/file_system/file 1.pdf', __FILE__) }
   let(:data) { File.open(datafile, 'rb', &:read) }
@@ -22,23 +22,23 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     context '#retrieve' do
       it 'content' do
         content = ''
-        subject.retrieve(spec['0']) { |chunk, _retrieved, _total| content << chunk }
+        retriever.retrieve(spec['0']) { |chunk, _retrieved, _total| content << chunk }
         expect(content).to eq(data)
       end
 
       it 'callbacks' do
-        expect { |block| subject.retrieve(spec['0'], &block) }.to yield_with_args(data, data.length, data.length)
+        expect { |block| retriever.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'])
+        file = retriever.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)
+        expect { |block| retriever.download(spec['0'], &block) }.to yield_with_args(String, data.length, data.length)
       end
     end
   end
@@ -62,32 +62,30 @@ describe BrowseEverything::Retriever, vcr: { cassette_name: 'retriever', record:
     context '#retrieve' do
       it 'content' do
         content = ''
-        subject.retrieve(spec['0']) { |chunk, _retrieved, _total| content << chunk }
+        retriever.retrieve(spec['0']) { |chunk, _retrieved, _total| content << chunk }
         expect(content).to eq(data)
       end
 
       it 'content with spaces' do
         content = ''
-        subject.retrieve(spec['1']) { |chunk, _retrieved, _total| content << chunk }
+        retriever.retrieve(spec['1']) { |chunk, _retrieved, _total| content << chunk }
         expect(content).to eq(data_with_spaces)
       end
 
       it 'callbacks' do
-        expect { |block| subject.retrieve(spec['0'], &block) }.to yield_with_args(data, data.length, data.length)
+        expect { |block| retriever.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'])
+        file = retriever.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)
+        expect { |block| retriever.download(spec['0'], &block) }.to yield_with_args(String, data.length, data.length)
       end
     end
   end
-
-  context ''
 end

data/spec/unit/s3_spec.rb

@@ -15,62 +15,62 @@ describe BrowseEverything::Driver::FileSystem do
       before do
         Aws.config[:s3] = {
           stub_responses: {
-            list_objects: { is_truncated: false, marker: "", next_marker: nil, contents: [], name: "s3.bucket", prefix: "", delimiter: "/", max_keys: 1000, common_prefixes: [ { prefix: 'foo/' }, { prefix: 'bar/'} ], encoding_type: "url" },
+            list_objects: { is_truncated: false, marker: '', next_marker: nil, contents: [], name: 's3.bucket', prefix: '', delimiter: '/', max_keys: 1000, common_prefixes: [{ prefix: 'foo/' }, { prefix: 'bar/' }], encoding_type: 'url' }
           }
         }
       end
-      
+
       let(:contents) { provider.contents('') }
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == 'bar'     }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('bar') }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name) { should == 'foo'     }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('foo') }
+        specify    { is_expected.to be_container }
       end
     end
-    
+
     context 'subdirectory' do
       before do
         Aws.config[:s3] = {
           stub_responses: {
-            list_objects: 
+            list_objects:
               {
-                is_truncated: false, marker: "", next_marker: nil, name: "s3.bucket", prefix: "foo/", delimiter: "/", max_keys: 1000, common_prefixes: [], encoding_type: "url",
+                is_truncated: false, marker: '', next_marker: nil, name: 's3.bucket', prefix: 'foo/', delimiter: '/', max_keys: 1000, common_prefixes: [], encoding_type: 'url',
                 contents: [
-                  { key: "foo/", last_modified: Time.parse('2014-02-03 16:27:01 UTC'), etag: "\"d41d8cd98f00b204e9800998ecf8427e\"", size: 0, storage_class: "STANDARD", owner: { display_name: "mbklein" } },
-                  { key: "foo/baz.jpg", last_modified: Time.parse('2016-10-31 20:12:32 UTC'), etag: "\"4e2ad532e659a65e8f106b350255a7ba\"", size: 52645, storage_class: "STANDARD", owner: { display_name: "mbklein" } },
-                  { key: "foo/quux.png", last_modified: Time.parse('2016-10-31 22:08:12 UTC'), etag: "\"a92bbe23736ebdbd37bdc795e7d570ad\"", size: 1511860, storage_class: "STANDARD", owner: { display_name: "mbklein" } }
+                  { key: 'foo/', last_modified: Time.zone.parse('2014-02-03 16:27:01 UTC'), etag: '"d41d8cd98f00b204e9800998ecf8427e"', size: 0, storage_class: 'STANDARD', owner: { display_name: 'mbklein' } },
+                  { key: 'foo/baz.jpg', last_modified: Time.zone.parse('2016-10-31 20:12:32 UTC'), etag: '"4e2ad532e659a65e8f106b350255a7ba"', size: 52645, storage_class: 'STANDARD', owner: { display_name: 'mbklein' } },
+                  { key: 'foo/quux.png', last_modified: Time.zone.parse('2016-10-31 22:08:12 UTC'), etag: '"a92bbe23736ebdbd37bdc795e7d570ad"', size: 1_511_860, storage_class: 'STANDARD', owner: { display_name: 'mbklein' } }
                 ]
               }
           }
         }
       end
-      
+
       let(:contents) { provider.contents('foo/') }
       context '[0]' do
         subject { contents[0] }
-        its(:name) { should == '..'      }
-        specify    { should be_container }
+        its(:name) { is_expected.to eq('..') }
+        specify    { is_expected.to be_container }
       end
       context '[1]' do
         subject { contents[1] }
-        its(:name)     { should == 'baz.jpg' }
-        its(:location) { should == "s3:foo/baz.jpg"  }
-        its(:type)     { should == 'image/jpeg'      }
-        its(:size)     { should == 52645             }
-        specify        { should_not be_container     }
+        its(:name)     { is_expected.to eq('baz.jpg') }
+        its(:location) { is_expected.to eq('s3:foo/baz.jpg')  }
+        its(:type)     { is_expected.to eq('image/jpeg')      }
+        its(:size)     { is_expected.to eq(52645)             }
+        specify        { is_expected.not_to be_container }
       end
       context '[2]' do
         subject { contents[2] }
-        its(:name)     { should == 'quux.png' }
-        its(:location) { should == "s3:foo/quux.png" }
-        its(:type)     { should == 'image/png'       }
-        its(:size)     { should == 1511860           }
-        specify        { should_not be_container     }
+        its(:name)     { is_expected.to eq('quux.png') }
+        its(:location) { is_expected.to eq('s3:foo/quux.png') }
+        its(:type)     { is_expected.to eq('image/png')       }
+        its(:size)     { is_expected.to eq(1_511_860) }
+        specify        { is_expected.not_to be_container }
       end
     end
   end

data/spec/unit/sky_drive_spec.rb

@@ -1,51 +1,65 @@
 describe BrowseEverything::Driver::SkyDrive do
   include BrowseEverything::Engine.routes.url_helpers
 
-  def provider_yml
-    { client_id: 'CLIENTID', client_secret: 'CLIENTSECRET', url_options: { port: '3000', protocol: 'http://', host: 'example.com' } }
+  let(:provider_yml) do
+    {
+      client_id: 'CLIENTID', client_secret: 'CLIENTSECRET',
+      url_options: { port: '3000', protocol: 'http://', host: 'example.com' }
+    }
   end
 
-  def redirect_url
-    connector_response_url(provider_yml[:url_options])
+  let(:redirect_url) { connector_response_url(provider_yml[:url_options]) }
+
+  let(:response_body) do
+    {
+      'client_id' => 'CLIENTID', 'client_secret' => 'CLIENTSECRET', 'code' => 'code',
+      'grant_type' => 'authorization_code', 'redirect_uri' => redirect_url.to_s
+    }
   end
 
-  it 'can connect' do
-    stub_request(:post, 'https://login.live.com/oauth20_token.srf')
-        .with(body: { 'client_id' => 'CLIENTID', 'client_secret' => 'CLIENTSECRET', 'code' => 'code', 'grant_type' => 'authorization_code', 'redirect_uri' => redirect_url.to_s })
-        .to_return(status: 200,
-                   body: {
-                     'token_type'            =>  'bearer',
-                     'expires_at'            =>  (Time.now + (60 * 60 * 24)).to_i,
-                     'scope'                 =>  'wl.skydrive_update,wl.offline_access',
-                     'access_token'          =>  'access_token',
-                     'refresh_token'         =>  'refresh_token',
-                     'authentication_token'  =>  'authentication_token'
-                   }.to_json,
-                   headers: {
-                     'content-type'          =>  'application/json' })
-
-    driver = BrowseEverything::Driver::SkyDrive.new(provider_yml)
-    driver.connect({ code: 'code' }, {})
-    driver.authorized?.should == true
+  let(:driver) { described_class.new(provider_yml) }
+
+  subject { driver }
+
+  context 'when expiration is in the future' do
+    before do
+      stub_request(:post, 'https://login.live.com/oauth20_token.srf')
+          .with(body: response_body)
+          .to_return(status: 200,
+                     body: {
+                       'token_type'            =>  'bearer',
+                       'expires_at'            =>  (Time.now + (60 * 60 * 24)).to_i,
+                       'scope'                 =>  'wl.skydrive_update,wl.offline_access',
+                       'access_token'          =>  'access_token',
+                       'refresh_token'         =>  'refresh_token',
+                       'authentication_token'  =>  'authentication_token'
+                     }.to_json,
+                     headers: {
+                       'content-type'          =>  'application/json' })
+      driver.connect({ code: 'code' }, {})
+    end
+
+    it { is_expected.to be_authorized }
   end
 
-  it 'can connect but expires' do
-    stub_request(:post, 'https://login.live.com/oauth20_token.srf')
-        .with(body: { 'client_id' => 'CLIENTID', 'client_secret' => 'CLIENTSECRET', 'code' => 'code', 'grant_type' => 'authorization_code', 'redirect_uri' => redirect_url.to_s })
-        .to_return(status: 200,
-                   body: {
-                     'token_type'            =>  'bearer',
-                     'expires_at'            =>  (Time.now - (60 * 60 * 24)).to_i,
-                     'scope'                 =>  'wl.skydrive_update,wl.offline_access',
-                     'access_token'          =>  'access_token',
-                     'refresh_token'         =>  'refresh_token',
-                     'authentication_token'  =>  'authentication_token'
-                   }.to_json,
-                   headers: {
-                     'content-type'          =>  'application/json' })
-
-    driver = BrowseEverything::Driver::SkyDrive.new(provider_yml)
-    driver.connect({ code: 'code' }, {})
-    driver.authorized?.should == false
+  context 'when the session has expired' do
+    before do
+      stub_request(:post, 'https://login.live.com/oauth20_token.srf')
+          .with(body: response_body)
+          .to_return(status: 200,
+                     body: {
+                       'token_type'            =>  'bearer',
+                       'expires_at'            =>  (Time.now - (60 * 60 * 24)).to_i,
+                       'scope'                 =>  'wl.skydrive_update,wl.offline_access',
+                       'access_token'          =>  'access_token',
+                       'refresh_token'         =>  'refresh_token',
+                       'authentication_token'  =>  'authentication_token'
+                     }.to_json,
+                     headers: {
+                       'content-type'          =>  'application/json' })
+      driver.connect({ code: 'code' }, {})
+    end
+
+    it { is_expected.not_to be_authorized }
   end
 end