ferver 1.1.0 → 1.2.0

data/spec/file_id_request_spec.rb

@@ -1,86 +1,65 @@
 require 'spec_helper'
 
 describe Ferver::FileIdRequest do
+  describe 'creating new instance' do
+    context 'when valid Integer is passed' do
+      subject { Ferver::FileIdRequest.new(1) }
 
-    describe "creating new instance" do
-
-        context "when valid Integer is passed" do
-
-            let(:id_request) { Ferver::FileIdRequest.new(1) }
-
-            it "should create instance" do
-                expect(id_request).not_to be_nil
-            end
-
-            it "should return expected value" do
-                expect(id_request.value).to eq(1)
-            end
-
-        end
-
-        context "when nil argument is passed" do
-
-            it "should be invalid" do
-                id_request = Ferver::FileIdRequest.new(nil)
-                expect(id_request.valid?).to be_false
-            end
-
-        end
-
+      it 'should return expected value' do
+        expect(subject.value).to eq(1)
+      end
     end
 
-    describe "#value= method" do
-
-        let(:id_request) { Ferver::FileIdRequest.new }
-
-        context "when valid Integer is passed" do
+    context 'when nil argument is passed' do
+      it 'should be invalid' do
+        id_request = Ferver::FileIdRequest.new(nil)
 
-            before { id_request.value = 1 }
-
-            it "should be valid" do
-                expect(id_request.valid?).to be_true
-            end
-
-            it "should return expected value" do
-                expect(id_request.value).to eq(1)
-            end
-
-        end
-
-        context "when valid String as Integer is passed" do
-
-            before { id_request.value = "1" }
-
-            it "should be valid" do
-                expect(id_request.valid?).to be_true
-            end
-
-            it "should return expected value" do
-                expect(id_request.value).to eq(1)
-            end
+        expect(id_request.valid?).to be_falsey
+      end
+    end
+  end
 
-        end
+  describe '#value= method' do
+    subject { Ferver::FileIdRequest.new }
 
-        context "when a string is passed" do
+    context 'when valid Integer is passed' do
+      before { subject.value = 1 }
 
-            before { id_request.value = "foo" }
+      it 'should be valid' do
+        expect(subject.valid?).to be_truthy
+      end
 
-            it "should be invalid" do
-                expect(id_request.valid?).to be_false
-            end
+      it 'should return expected value' do
+        expect(subject.value).to eq(1)
+      end
+    end
 
-        end
+    context 'when valid String as Integer is passed' do
+      before { subject.value = '1' }
 
-        context "when an empty string is passed" do
+      it 'should be valid' do
+        expect(subject.valid?).to be_truthy
+      end
 
-            it "should be invalid" do
-                id_request.value = ""
-                expect(id_request.valid?).to be_false
-            end
+      it 'should return expected value' do
+        expect(subject.value).to eq(1)
+      end
+    end
 
-        end
+    context 'when a string is passed' do
+      before { subject.value = 'foo' }
 
+      it 'should be invalid' do
+        expect(subject.valid?).to be_falsey
+      end
     end
 
+    context 'when an empty string is passed' do
+      it 'should be invalid' do
+        subject.value = ''
 
-end
+        expect(subject.valid?).to be_falsey
+      end
+    end
+  end
+end

data/spec/file_list_spec.rb

@@ -1,167 +1,146 @@
 require 'spec_helper'
 
 describe Ferver::FileList do
+  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
+    end
 
-    before { Dir.stubs(:exists?).returns(true) }
-
-    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
-
-        end
-
-        context "when valid path argument is passed" do
-
-            let(:path) { "/foo" }
-
-            it "should find files in path argument" do
-                Dir.expects(:foreach).with(path).returns(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
-                Dir.expects(:exists?).with(path).returns(true)
-                Dir.stubs(:foreach).returns(EMPTY_FILE_LIST)
-
-                Ferver::FileList.new(path)
-            end
-
-            it "should raise exception" do
-                Dir.stubs(:exists?).returns(false)
-                expect { Ferver::FileList.new(path) }.to raise_error(Ferver::DirectoryNotFoundError)
-            end
+    context 'when valid path argument is passed' do
+      let(:path) { '/foo' }
 
-        end
+      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 directory is empty" do
+    context 'when path argument passed does not exist' do
+      let(:path) { '/foo' }
 
-        let(:file_list) { Ferver::FileList.new("/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)
 
-        before { Dir.stubs(:foreach).returns(EMPTY_FILE_LIST) }
+        Ferver::FileList.new(path)
+      end
 
-        it "should have zero #file_count" do
-            expect(file_list.file_count).to eq(0)
-        end
-
-        it "should return empty array of files" do
-            expect(file_list.files).to eq(EMPTY_FILE_LIST)
-        end
+      it 'should raise exception' do
+        allow(Dir).to receive(:exist?).with(path).and_return(false)
 
+        expect { Ferver::FileList.new(path) }.to raise_error(Ferver::DirectoryNotFoundError)
+      end
     end
+  end
 
-    context "when path directory contains current working dir and parent" do
-
-        let(:file_list) { Ferver::FileList.new("/foo") }
-
-        before(:each) do
-            Dir.stubs(:foreach).multiple_yields(".", "..", "file1")
-            File.stubs(:file?).returns(true)
-        end
-
-        it "should not count current working dir and parent" do
-            expect(file_list.file_count).to eq(1)
-        end
-
-        it "should not include current working dir and parent" do
-            expect(file_list.files).to eq(["file1"])
-        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
 
-    context "when path directory contains file and directory" do
+    it 'should return empty array of files' do
+      expect(subject.all).to eq(EMPTY_FILE_LIST)
+    end
+  end
 
-        let(:file_list) { Ferver::FileList.new("/foo") }
+  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('file1')
+      allow(File).to receive(:file?).and_return(true)
+    end
 
-        before(:each) do
-            Dir.stubs(:foreach).multiple_yields("file1", "a_directory")
-            File.expects(:file?).at_most(2).returns(true, false)
-        end
+    it 'should not count current working dir and parent' do
+      expect(subject.size).to eq(1)
+    end
 
-        it "should not count the directory" do
-            expect(file_list.file_count).to eq(1)
-        end
+    it 'should not include current working dir and parent' do
+      expect(subject.all).to eq(['file1'])
+    end
+  end
 
-        it "should not include the directory" do
-            expect(file_list.files).to eq(["file1"])
-        end
+  context 'when path directory contains file and directory' do
+    before(:each) do
+      allow(Dir).to receive(:foreach).and_yield('file1').and_yield('a_directory')
+      allow(File).to receive(:file?).twice.and_return(true, false)
+    end
 
+    it 'should not count the directory' do
+      expect(subject.size).to eq(1)
     end
 
-    context "when path directory contains valid files" do
+    it 'should not include the directory' do
+      expect(subject.all).to eq(['file1'])
+    end
+  end
 
-        let(:file_list) { Ferver::FileList.new("/foo") }
+  context 'when path directory contains valid files' do
+    let(:files) { %w(file1 file2) }
+    before do
+      allow(Dir).to receive(:foreach).and_yield(files[0]).and_yield(files[1])
+      allow(File).to receive(:file?).twice.and_return(true)
+    end
 
-        before {
-            Dir.stubs(:foreach).multiple_yields("file1", "file2")
-            File.stubs(:file?).returns(true)
-        }
+    it 'should count all files' do
+      expect(subject.size).to eq(2)
+    end
 
-        it "should count all files" do
-            expect(file_list.file_count).to eq(2)
-        end
+    it 'should list all files' do
+      expect(subject.all).to eq(files)
+    end
 
-        it "should list all files" do
-            expect(file_list.files).to eq(["file1", "file2"])
+    describe 'iterating over files list' do
+      it 'should yield files in order' do
+        i = 0
+        subject.each do | file |
+          expect(file).to eq(files[i])
+          i += 1
         end
-
+      end
     end
+  end
 
-    describe "requesting files" do
-
-        let(:file_list) { Ferver::FileList.new("/foo") }
-
-        before {
-            Dir.stubs(:foreach).multiple_yields("file1", "file2")
-            File.stubs(:file?).returns(true)
-        }
-
-        context "when requesting valid file_id" do
-
-            #todo: poss to redesign this
-
-            it "#file_id_is_valid? should return true for first file" do
-                file_list.file_id_is_valid?(0).should be_true
-            end
-
-            it "#file_id_is_valid? should return true for second file" do
-                file_list.file_id_is_valid?(1).should be_true
-            end
-
-            it "#file_by_id should return the correct file for the first file" do
-                expect(file_list.file_by_id(0)).to eq("file1")
-            end
-
-            it "#file_by_id should return the correct file for the second file" do
-                expect(file_list.file_by_id(1)).to eq("file2")
-            end
-
-        end
+  describe 'requesting files' do
+    before(:each) do
+      allow(Dir).to receive(:foreach).and_yield('file1').and_yield('file2')
+      allow(File).to receive(:file?).and_return(true)
+    end
 
-        context "when requesting invalid file_id" do
+    context 'when requesting valid file_id' do
+      # TODO: possible to redesign this
 
-            it "should return false for invalid file_id" do
-                file_list.file_id_is_valid?(2).should be_false
-            end
+      it '#file_id_is_valid? should return true for first file' do
+        expect(subject.file_id_is_valid?(0)).to be_truthy
+      end
 
-            it "should raise_error if file_by_id is called" do
-                expect { file_list.file_by_id(2) }.to raise_error(IndexError)
-            end
+      it '#file_id_is_valid? should return true for second file' do
+        expect(subject.file_id_is_valid?(1)).to be_truthy
+      end
 
-        end
+      it '#file_by_id should return the correct file for the first file' do
+        expect(subject.file_by_id(0)).to eq('file1')
+      end
 
+      it '#file_by_id should return the correct file for the second file' do
+        expect(subject.file_by_id(1)).to eq('file2')
+      end
     end
 
+    context 'when requesting invalid file_id' do
+      it 'should return false for invalid file_id' do
+        expect(subject.file_id_is_valid?(2)).to be_falsey
+      end
 
-end
+      it 'should raise_error if file_by_id is called' do
+        expect { subject.file_by_id(2) }.to raise_error(IndexError)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,24 @@
 require 'rubygems'
 require 'spork'
 require 'coveralls'
+require 'codeclimate-test-reporter'
 
 # force the environment to 'test'
-ENV['RACK_ENV'] = 'test' 
+ENV['RACK_ENV'] = 'test'
 
-Coveralls.wear! # this uses SimpleCov under its bonnet
+CodeClimate::TestReporter.start
+Coveralls.wear!
 
 Spork.prefork do
-  require File.join(File.dirname(__FILE__), '..', '/lib/', 'ferver', 'file_list')
-  require File.join(File.dirname(__FILE__), '..', '/lib/', 'ferver', 'file_id_request')
+  require File.join(File.dirname(__FILE__), '..', '/lib/', 'ferver')
   require 'ferver'
 
   require 'rubygems'
   require 'sinatra'
   require 'rspec'
   require 'rack/test'
-  require 'webrat'
-  
+  require 'rspec-html-matchers'
+
   # test environment stuff
   set :environment, :test
   set :run, false
@@ -26,9 +27,8 @@ Spork.prefork do
 
   EMPTY_FILE_LIST = []
 
-  RSpec.configure do |conf|
-    conf.include Rack::Test::Methods
-    conf.mock_framework = :mocha
+  RSpec.configure do |config|
+    config.include Rack::Test::Methods
   end
 
   def app
@@ -37,4 +37,4 @@ Spork.prefork do
 end
 
 Spork.each_run do
-end
+end