klipbook 2.1.2 → 2.1.3

data/spec/lib/klipbook/sources/kindle_device/entry_parser_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Klipbook::Sources::KindleDevice::EntryParser do
+RSpec.describe Klipbook::Sources::KindleDevice::EntryParser do
 
   describe '#build_entry' do
     subject { Klipbook::Sources::KindleDevice::EntryParser.new.build_entry(entry_text) }
@@ -8,7 +8,9 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
     context 'passed an empty entry' do
       let(:entry_text) { "  " }
 
-      it { should be_nil }
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
     end
 
     context 'passed an incomplete entry' do
@@ -16,7 +18,9 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Not long enough"
       end
 
-      it { should be_nil }
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
     end
 
     context 'passed an entry with the title line "Book title (Author\'s Name)"' do
@@ -27,9 +31,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Highlight text\n"
       end
 
-      its(:title) { should == 'Book title' }
+      it 'extracts the title' do
+        expect(subject.title).to eq 'Book title'
+      end
 
-      its(:author) { should == "Author's Name" }
+      it 'extracts the author' do
+        expect(subject.author).to eq "Author's Name"
+      end
     end
 
     context 'passed an entry with the title line "Book title (sub title) (Author\'s Name)"' do
@@ -40,9 +48,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Highlight text\n"
       end
 
-      its(:title) { should == 'Book title (sub title)' }
+      it 'extracts the title containing parens' do
+        expect(subject.title).to eq 'Book title (sub title)'
+      end
 
-      its(:author) { should == "Author's Name" }
+      it 'extracts the author' do
+        expect(subject.author).to eq "Author's Name"
+      end
     end
 
     context 'passed an entry with the title line "Book title"' do
@@ -53,9 +65,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Highlight text\n"
       end
 
-      its(:title) { should == 'Book title' }
+      it 'extracts the title' do
+        expect(subject.title).to eq 'Book title'
+      end
 
-      its (:author) { should be_nil }
+      it 'sets author to nil' do
+        expect(subject.author).to be_nil
+      end
     end
 
     context 'passed an entry that is a highlight' do
@@ -67,10 +83,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The second line of the highlight"
       end
 
-      its(:type) { should == :highlight }
+      it 'returns a highlight' do
+        expect(subject.type).to eq :highlight
+      end
 
       it 'extracts the highlighted text' do
-        subject.text.should == "The first line of the highlight\nThe second line of the highlight"
+        expect(subject.text).to eq "The first line of the highlight\nThe second line of the highlight"
       end
     end
 
@@ -83,10 +101,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The second line of the highlight"
       end
 
-      its(:type) { should == :highlight }
+      it 'returns a highlight' do
+        expect(subject.type).to eq :highlight
+      end
 
       it 'extracts the highlighted text' do
-        subject.text.should == "The first line of the highlight\nThe second line of the highlight"
+        expect(subject.text).to eq "The first line of the highlight\nThe second line of the highlight"
       end
     end
 
@@ -98,10 +118,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The note text"
       end
 
-      its(:type) { should == :note }
+      it 'returns a note' do
+        expect(subject.type).to eq :note
+      end
 
       it 'extracts the note text' do
-        subject.text.should == "The note text"
+        expect(subject.text).to eq "The note text"
       end
     end
 
@@ -113,10 +135,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The note text"
       end
 
-      its(:type) { should == :note }
+      it 'returns a note' do
+        expect(subject.type).to eq :note
+      end
 
       it 'extracts the note text' do
-        subject.text.should == "The note text"
+        expect(subject.text).to eq "The note text"
       end
     end
 
@@ -128,9 +152,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "\n"
       end
 
-      its(:type) { should == :bookmark }
+      it 'returns a bookmark' do
+        expect(subject.type).to eq :bookmark
+      end
 
-      its(:text) { should == '' }
+      it 'extracts empty text' do
+        expect(subject.text).to eq ""
+      end
     end
 
     context 'passed an entry with a 4th-generation bookmark' do
@@ -141,9 +169,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "\n"
       end
 
-      its(:type) { should == :bookmark }
+      it 'returns a bookmark' do
+        expect(subject.type).to eq :bookmark
+      end
 
-      its(:text) { should == '' }
+      it 'extracts empty text' do
+        expect(subject.text).to eq ""
+      end
     end
 
     context 'passed an entry with a single location value' do
@@ -155,9 +187,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The second line of the highlight"
       end
 
-      its(:location) { should == 465 }
+      it 'returns the correct location' do
+        expect(subject.location).to eq 465
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed a 4th-generation entry with a single location value' do
@@ -169,9 +205,13 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "The second line of the highlight"
       end
 
-      its(:location) { should == 465 }
+      it 'returns the correct location' do
+        expect(subject.location).to eq 465
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed an entry with a location range' do
@@ -184,10 +224,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
       end
 
       it 'extracts the first element of the location range' do
-        subject.location.should == 466
+        expect(subject.location).to eq 466
       end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed a 4th-generation entry with a location range' do
@@ -200,10 +242,12 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
       end
 
       it 'extracts the first element of the location range' do
-        subject.location.should == 466
+        expect(subject.location).to eq 466
       end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed an entry with a page number and location range' do
@@ -216,12 +260,16 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
       end
 
       it 'extracts the first element of the location range' do
-        subject.location.should == 1858
+        expect(subject.location).to eq 1858
       end
 
-      its(:page) { should == 171 }
+      it 'extracts the page number' do
+        expect(subject.page).to eq 171
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed a 4th-generation entry with a page number and location range' do
@@ -234,12 +282,16 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
       end
 
       it 'extracts the first element of the location range' do
-        subject.location.should == 1858
+        expect(subject.location).to eq 1858
       end
 
-      its(:page) { should == 171 }
+      it 'extracts the page number' do
+        expect(subject.page).to eq 171
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed an entry with a page number and no location' do
@@ -250,11 +302,17 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Clipping"
       end
 
-      its(:location) { should == 0 }
+      it 'sets location to 0' do
+        expect(subject.location).to eq 0
+      end
 
-      its(:page) { should == 9 }
+      it 'extracts the page number' do
+        expect(subject.page).to eq 9
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
 
     context 'passed a 4th-generation entry with a page number and no location' do
@@ -265,11 +323,17 @@ describe Klipbook::Sources::KindleDevice::EntryParser do
         "Clipping"
       end
 
-      its(:location) { should == 0 }
+      it 'sets location to 0' do
+        expect(subject.location).to eq 0
+      end
 
-      its(:page) { should == 9 }
+      it 'extracts the page number' do
+        expect(subject.page).to eq 9
+      end
 
-      its(:added_on) { should == DateTime.parse('Thursday, April 21, 2011, 07:31 AM') }
+      it 'returns the correct added date' do
+        expect(subject.added_on).to eq DateTime.parse('Thursday, April 21, 2011, 07:31 AM')
+      end
     end
   end
 end

data/spec/lib/klipbook/sources/kindle_device/file_parser_spec.rb

@@ -2,14 +2,12 @@
 
 require 'spec_helper'
 
-describe Klipbook::Sources::KindleDevice::FileParser do
+RSpec.describe Klipbook::Sources::KindleDevice::FileParser do
 
   let(:parser) { Klipbook::Sources::KindleDevice::FileParser.new(entry_parser) }
 
   let(:entry_parser) do
-    mock_parser = Object.new
-    stub(mock_parser).build_entry
-    mock_parser
+    double('parser', build_entry: nil)
   end
 
   describe '#extract_entries' do
@@ -19,7 +17,9 @@ describe Klipbook::Sources::KindleDevice::FileParser do
 
       let(:raw_text) { '' }
 
-      it { should be_empty }
+      it 'return an empty set of entries' do
+        expect(subject).to be_empty
+      end
     end
 
     context 'called with text containing two entries' do
@@ -34,10 +34,10 @@ describe Klipbook::Sources::KindleDevice::FileParser do
         entry_one = Object.new
         entry_two = Object.new
 
-        stub(entry_parser).build_entry(' entry one') { entry_one }
-        stub(entry_parser).build_entry(' entry two') { entry_two }
+        allow(entry_parser).to receive(:build_entry).with(' entry one') { entry_one }
+        allow(entry_parser).to receive(:build_entry).with(' entry two') { entry_two }
 
-        subject.should == [ entry_one, entry_two ]
+        expect(subject).to eq [ entry_one, entry_two ]
       end
     end
 
@@ -49,7 +49,7 @@ describe Klipbook::Sources::KindleDevice::FileParser do
 
       it 'strips carriage returns before calling the entry parser' do
         subject
-        entry_parser.should have_received.build_entry('Example  text')
+        expect(entry_parser).to have_received(:build_entry).with('Example  text')
       end
     end
 
@@ -61,7 +61,7 @@ describe Klipbook::Sources::KindleDevice::FileParser do
 
       it 'strips control characters before calling the entry parser' do
         subject
-        entry_parser.should have_received.build_entry('Example  text')
+        expect(entry_parser).to have_received(:build_entry).with('Example  text')
       end
     end
   end

data/spec/lib/klipbook/sources/kindle_device/file_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Klipbook::Sources::KindleDevice::File do
+RSpec.describe Klipbook::Sources::KindleDevice::File do
 
   let(:file) { Klipbook::Sources::KindleDevice::File.new(input_file, max_books, file_parser) }
 
@@ -8,24 +8,16 @@ describe Klipbook::Sources::KindleDevice::File do
 
   let(:entries) { [] }
 
-  let(:file_parser) do
-    Object.new.tap do |fake_parser|
-      stub(fake_parser).extract_entries { entries }
-    end
-  end
+  let(:file_parser) { double(extract_entries: entries) }
 
-  let(:input_file) do
-    Object.new.tap do |fake_file|
-      stub(fake_file).read { 'file text' }
-    end
-  end
+  let(:input_file) { double(read: 'file text') }
 
   describe '#books' do
     subject { file.books }
 
     it 'parses the file text with the file parser' do
       subject
-      file_parser.should have_received.extract_entries('file text')
+      expect(file_parser).to have_received(:extract_entries).with('file text')
     end
 
     context 'with entries for three books' do
@@ -59,11 +51,11 @@ describe Klipbook::Sources::KindleDevice::File do
       end
 
       it 'returns three books' do
-        subject.should have(3).items
+        expect(subject.size).to eq 3
       end
 
       it 'returns books sorted by last_update descending' do
-        subject.map(&:title).should == [ 'Book two', 'Book three', 'Book one' ]
+        expect(subject.map(&:title)).to eq [ 'Book two', 'Book three', 'Book one' ]
       end
 
       context 'and max_books set to 2' do
@@ -71,7 +63,7 @@ describe Klipbook::Sources::KindleDevice::File do
         let (:max_books) { 2 }
 
         it 'returns two books' do
-          subject.should have(2).items
+          expect(subject.size).to eq 2
         end
       end
     end
@@ -119,23 +111,23 @@ describe Klipbook::Sources::KindleDevice::File do
       end
 
       it 'returns a single book with the correct title and author information' do
-        subject.first.title.should == 'Book one'
-        subject.first.author.should == 'Author one'
+        expect(subject.first.title).to eq 'Book one'
+        expect(subject.first.author).to eq 'Author one'
       end
 
       it "returns a single book with last update equal to the latest added on date of the book's entries" do
-        subject.first.last_update.should == DateTime.new(2012, 10, 21)
+        expect(subject.first.last_update).to eq DateTime.new(2012, 10, 21)
       end
 
       it "ignores bookmarks when building the book's clipping list" do
-        subject.first.clippings.should have(3).items
-        subject.first.clippings.map(&:type).should_not include(:bookmark)
+        expect(subject.first.clippings.size).to eq 3
+        expect(subject.first.clippings.map(&:type)).not_to include(:bookmark)
       end
 
       it 'returns a single book whose clippings are sorted by location' do
-        subject.first.clippings.map(&:location).should == [2, 3, 10]
-        subject.first.clippings.map(&:text).should == ['Fourth one', 'Third one', 'Second one']
-        subject.first.clippings.map(&:page).should == [1, 2, 3]
+        expect(subject.first.clippings.map(&:location)).to eq [2, 3, 10]
+        expect(subject.first.clippings.map(&:text)).to eq ['Fourth one', 'Third one', 'Second one']
+        expect(subject.first.clippings.map(&:page)).to eq [1, 2, 3]
       end
     end
 
@@ -163,7 +155,9 @@ describe Klipbook::Sources::KindleDevice::File do
         ]
       end
 
-      it { should be_empty }
+      it 'should be empty' do
+        expect(subject).to be_empty
+      end
     end
   end
 end

data/spec/lib/klipbook/tohtml/html_printer_spec.rb

@@ -22,9 +22,7 @@ describe Klipbook::ToHtml::HtmlPrinter do
   end
 
   let(:message_stream) do
-    Object.new.tap do |fake_stream|
-      stub(fake_stream).puts
-    end
+    double(puts: nil)
   end
 
   describe '#print_to_file' do
@@ -43,12 +41,12 @@ describe Klipbook::ToHtml::HtmlPrinter do
 
       it 'writes a file named after the book into the output directory' do
         subject
-        File.exists?(expected_filepath).should be_true
+        expect(File.exists?(expected_filepath)).to be_truthy
       end
 
       it 'writes a html summary to the file' do
         subject
-        File.read(expected_filepath).should include("<h1>Fake book title</h1>")
+        expect(File.read(expected_filepath)).to include("<h1>Fake book title</h1>")
       end
     end
 
@@ -63,12 +61,12 @@ describe Klipbook::ToHtml::HtmlPrinter do
 
         it "won't write to the file" do
           subject
-          File.size(expected_filepath).should == 0
+          expect(File.size(expected_filepath)).to eq 0
         end
 
         it 'prints a message informing that the file is being skipped' do
           subject
-          message_stream.should have_received.puts("\e[33mSkipping \e[0m#{expected_filename}")
+          expect(message_stream).to have_received(:puts).with("\e[33mSkipping \e[0m#{expected_filename}")
         end
       end
 
@@ -77,12 +75,12 @@ describe Klipbook::ToHtml::HtmlPrinter do
 
         it 'overwrites the file' do
           subject
-          File.size(expected_filepath).should > 0
+          expect(File.size(expected_filepath)).to be > 0
         end
 
         it 'prints a message informing that the file is being written' do
           subject
-          message_stream.should have_received.puts("\e[32mWriting \e[0m#{expected_filename}")
+          expect(message_stream).to have_received(:puts).with("\e[32mWriting \e[0m#{expected_filename}")
         end
       end
     end

data/spec/lib/klipbook/tojson/book_file_spec.rb

@@ -10,15 +10,15 @@ describe Klipbook::ToJson::BookFile do
 
       let(:json) { '' }
 
-      its(:books) { should be_empty }
+      it 'returns an object with no books' do
+        expect(subject.books).to be_empty
+      end
     end
   end
 
   describe '#add_books' do
     let (:message_stream) do
-      Object.new.tap do |fake_stream|
-        stub(fake_stream).puts
-      end
+      double(puts: nil)
     end
 
     let(:it) do
@@ -42,8 +42,9 @@ describe Klipbook::ToJson::BookFile do
       end
 
       it.add_books([ new_book ], false, message_stream)
-      it.books.should have(3).items
-      it.books.should include(new_book)
+
+      expect(it.books.size).to eq 3
+      expect(it.books).to include(new_book)
     end
 
     it "replaces books that exist if force is true" do
@@ -54,8 +55,9 @@ describe Klipbook::ToJson::BookFile do
       end
 
       it.add_books([ new_book ], true, message_stream)
-      it.books.should have(2).items
-      it.books.should include(new_book)
+
+      expect(it.books.size).to eq 2
+      expect(it.books).to include(new_book)
     end
 
     it "does not replace existing books if force is false" do
@@ -66,8 +68,9 @@ describe Klipbook::ToJson::BookFile do
       end
 
       it.add_books([ new_book ], false, message_stream)
-      it.books.should have(2).items
-      it.books.should_not include(new_book)
+
+      expect(it.books.size).to eq 2
+      expect(it.books).not_to include(new_book)
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,9 +2,6 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'rspec'
-require 'rr'
-
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 $LOAD_PATH << File.expand_path('../../../lib', __FILE__)
 require 'klipbook'