ferver 1.3.0 → 1.3.1

data/spec/file_list_spec.rb

@@ -1,138 +1,66 @@
-require 'spec_helper'
+# frozen_string_literal: true
+RSpec.describe Ferver::FileList do
+  subject { described_class.new(files) }
 
-describe Ferver::FileList do
-  let(:file_1) { double('file', name: 'file1') }
-  let(:file_2) { double('file', name: 'file2') }
+  let(:files) { [] }
 
-  before { allow(Dir).to receive(:exist?).and_return(true) }
-  subject { Ferver::FileList.new('/foo') }
-
-  describe 'creating instance' do
-    context 'when empty path argument is passed' do
-      it 'should raise exception if no argument passed' do
-        expect { Ferver::FileList.new }.to raise_error(ArgumentError)
-      end
+  describe "#size" do
+    it "is the size of the files available" do
+      expect(subject.size).to eq 0
     end
 
-    context 'when valid path argument is passed' do
-      let(:path) { '/foo' }
-
-      it 'should find files in path argument' do
-        expect(Dir).to receive(:foreach).with(path).and_return(EMPTY_FILE_LIST)
-
-        Ferver::FileList.new(path)
-      end
-    end
-
-    context 'when path argument passed does not exist' do
-      let(:path) { '/foo' }
-
-      it 'should test if directory exists' do
-        expect(Dir).to receive(:exist?).with(path).and_return(true)
-        allow(Dir).to receive(:foreach).with(path).and_return(EMPTY_FILE_LIST)
-
-        Ferver::FileList.new(path)
-      end
-
-      it 'should raise exception' do
-        allow(Dir).to receive(:exist?).with(path).and_return(false)
+    context "with files" do
+      let(:files) { three_files }
 
-        expect { Ferver::FileList.new(path) }.to raise_error(Ferver::DirectoryNotFoundError)
+      it "is the size of the files available" do
+        expect(subject.size).to eq 3
       end
     end
   end
 
-  context 'when path directory is empty' do
-    before { allow(Dir).to receive(:foreach).and_return(EMPTY_FILE_LIST) }
-
-    it 'should have zero #file_count' do
-      expect(subject.size).to eq(0)
-    end
-
-    it 'should return empty array of files' do
-      expect(subject.to_a).to eq(EMPTY_FILE_LIST)
-    end
-  end
-
-  context 'when path directory contains current working dir and parent' do
-    before(:each) do
-      allow(Dir).to receive(:foreach).and_yield('.').and_yield('.').and_yield(file_1.name)
-      allow(File).to receive(:file?).and_return(true)
-      allow(File).to receive(:zero?).and_return(false)
-    end
-
-    it 'should not count current working dir and parent' do
-      expect(subject.size).to eq(1)
-    end
+  describe "#each" do
+    let(:files) { three_files }
 
-    it 'should not include current working dir and parent' do
-      expect(subject.to_a.first.name).to eq(file_1.name)
+    it "responds to each_with_index" do
+      expect(subject).to respond_to(:each_with_index)
     end
-  end
 
-  context 'when path directory contains file and directory' do
-    before(:each) do
-      allow(Dir).to receive(:foreach).and_yield(file_1.name).and_yield('a_directory')
-      allow(File).to receive(:file?).twice.and_return(true, false)
-      allow(File).to receive(:zero?).twice.and_return(false, true)
-    end
+    it "returns yields files in sorted order" do
+      ordered_file_names = %w(file1 file2 file3)
+      i = 0
 
-    it 'should not count the directory' do
-      expect(subject.size).to eq(1)
-    end
-
-    it 'should not include the directory' do
-      expect(subject.to_a.first.name).to eq(file_1.name)
+      subject.each do |actual_file|
+        expect(actual_file.name).to eq ordered_file_names[i]
+        i += 1
+      end
     end
   end
 
-  context 'when path directory contains valid files' do
-    before do
-      allow(Dir).to receive(:foreach).and_yield(file_1.name).and_yield(file_2.name)
-      allow(File).to receive(:file?).twice.and_return(true)
-      allow(File).to receive(:zero?).twice.and_return(false)
-    end
+  describe "#file_by_id" do
+    context "with a request for a file index within range" do
+      let(:files) { three_files }
 
-    it 'should count all files' do
-      expect(subject.size).to eq(2)
+      it "returns the file requested in sorted order" do
+        expect(subject.file_by_id(0).name).to eq "file1"
+        expect(subject.file_by_id(1).name).to eq "file2"
+        expect(subject.file_by_id(2).name).to eq "file3"
+      end
     end
 
-    describe "ordering" do
-      let(:file_2) { double('file', name: 'alpha') }
-      let(:file_1) { double('file', name: 'zeta') }
-      let(:ordered_files) { [file_2.name, file_1.name] }
-
-      it 'should yield files in order' do
-        i = 0
-        subject.each do | file |
-          expect(file.name).to eq(ordered_files[i])
-          i += 1
-        end
+    context "with a request for a file index out of range" do
+      it "raises file not found error" do
+        expect { subject.file_by_id(0) }.to raise_error(Ferver::FileNotFoundError, "File id=0 not found")
       end
     end
   end
 
-  describe 'requesting files' do
-    before(:each) do
-      allow(Dir).to receive(:foreach).and_yield(file_1.name).and_yield(file_2.name)
-      allow(File).to receive(:file?).and_return(true)
-      allow(File).to receive(:zero?).and_return(false)
-    end
+  private
 
-    context 'when requesting valid file_id' do
-      it '#file_by_id should return the correct file for the first file' do
-        expect(subject.file_by_id(0).name).to eq(file_1.name)
-      end
-
-      it '#file_by_id should return the correct file for the second file' do
-        expect(subject.file_by_id(1).name).to eq(file_2.name)
-      end
-    end
-
-    context 'when requesting invalid file_id' do
-      it 'should raise_error if file_by_id is called' do
-        expect { subject.file_by_id(2) }.to raise_error(IndexError)
-      end
-    end
+  def three_files
+    [
+      double("file", name: "file2"),
+      double("file", name: "file3"),
+      double("file", name: "file1")
+    ]
   end
 end

data/spec/found_file_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+RSpec.describe Ferver::FoundFile do
+  subject { described_class.new("/dir", "file") }
+
+  describe "#name" do
+    it "is the file name" do
+      expect(subject.name).to eq "file"
+    end
+  end
+
+  describe "#path_to_file" do
+    it "is the full path to file" do
+      expect(subject.path_to_file).to eq "/dir/file"
+    end
+  end
+
+  describe "#valid?" do
+    context "when file exists" do
+      before do
+        allow(File).to receive(:file?).and_return true
+      end
+
+      context "when file is not empty" do
+        before do
+          allow(File).to receive(:zero?).and_return false
+        end
+
+        it "is valid" do
+          expect(subject).to be_valid
+        end
+      end
+
+      context "when file is empty" do
+        before do
+          allow(File).to receive(:zero?).and_return true
+        end
+
+        it "is not valid" do
+          expect(subject).not_to be_valid
+        end
+      end
+    end
+
+    context "when file does not exist" do
+      before do
+        allow(File).to receive(:file?).and_return false
+      end
+
+      it "is not valid" do
+        expect(subject).not_to be_valid
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,41 +1,56 @@
-require 'rubygems'
-require 'spork'
-require 'coveralls'
-require 'codeclimate-test-reporter'
+# frozen_string_literal: true
+require "rubygems"
+require "coveralls"
+require "simplecov"
+
+# Loading more in this block will cause your tests to run faster. However,
+# if you change any configuration or code from libraries loaded here, you'll
+# need to restart spork for it take effect.
+require File.join(File.dirname(__FILE__), "..", "/lib/", "ferver")
+require "ferver"
+require "rubygems"
+require "sinatra"
+require "rack/test"
+require "rspec-html-matchers"
+require "byebug"
 
 # force the environment to 'test'
-ENV['RACK_ENV'] = 'test'
+ENV["RACK_ENV"] = "test"
 
-CodeClimate::TestReporter.start
+SimpleCov.start
 Coveralls.wear!
 
-Spork.prefork do
-  require File.join(File.dirname(__FILE__), '..', '/lib/', 'ferver')
-  require 'ferver'
-
-  require 'rubygems'
-  require 'sinatra'
-  require 'rspec'
-  require 'rack/test'
-  require 'rspec-html-matchers'
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-  # test environment stuff
-  set :environment, :test
-  set :run, false
-  set :raise_errors, true
-  set :logging, false
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
 
-  EMPTY_FILE_LIST = []
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.filter_run_when_matching :focus
+  config.disable_monkey_patching!
+  config.warnings = true
+  config.default_formatter = "doc" if config.files_to_run.one?
 
-  RSpec.configure do |config|
-    config.include Rack::Test::Methods
-    config.include RSpecHtmlMatchers
-  end
+  config.order = :random
+  Kernel.srand config.seed
 
-  def app
-    @app ||= Ferver::App
-  end
+  config.include Rack::Test::Methods
+  config.include RSpecHtmlMatchers
 end
 
-Spork.each_run do
+# test environment stuff
+set :environment, :test
+set :run, false
+set :raise_errors, true
+set :logging, false
+
+EMPTY_FILE_LIST = [].freeze
+
+def app
+  @app ||= Ferver::App
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ferver
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Rob Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -67,49 +81,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: spork
+  name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rspec-html-matchers
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -147,6 +161,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -160,16 +175,17 @@ files:
 - lib/ferver/app.rb
 - lib/ferver/configuration.rb
 - lib/ferver/controller.rb
-- lib/ferver/directory_not_found_error.rb
-- lib/ferver/file_id_request.rb
+- lib/ferver/errors.rb
+- lib/ferver/ferver_directory.rb
 - lib/ferver/file_list.rb
 - lib/ferver/found_file.rb
 - lib/ferver/version.rb
 - lib/ferver/views/index.erb
 - spec/configuration_spec.rb
+- spec/ferver_directory_spec.rb
 - spec/ferver_spec.rb
-- spec/file_id_request_spec.rb
 - spec/file_list_spec.rb
+- spec/found_file_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rob-murray/ferver
 licenses:
@@ -183,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -191,13 +207,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple web app to serve files over HTTP.
 test_files:
 - spec/configuration_spec.rb
+- spec/ferver_directory_spec.rb
 - spec/ferver_spec.rb
-- spec/file_id_request_spec.rb
 - spec/file_list_spec.rb
+- spec/found_file_spec.rb
 - spec/spec_helper.rb