klipbook 2.0.0 → 2.1.0

data/lib/klipbook.rb

@@ -7,7 +7,6 @@ require 'klipbook/commands/collate'
 require 'klipbook/commands/list_books'
 require 'klipbook/commands/pretty_print'
 
-require 'klipbook/sources/book_source'
 require 'klipbook/sources/book'
 require 'klipbook/sources/clipping'
 require 'klipbook/sources/invalid_source_error'

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Klipbook::Sources::KindleDevice::File do
 
-  let(:file) { Klipbook::Sources::KindleDevice::File.new('file path', max_books, file_parser) }
+  let(:file) { Klipbook::Sources::KindleDevice::File.new(input_file, max_books, file_parser) }
 
   let(:max_books) { 30 }
 
@@ -20,20 +20,6 @@ describe Klipbook::Sources::KindleDevice::File do
     end
   end
 
-  before :each do
-    stub(File).open.returns do |*args|
-      passed_block = args.last
-      passed_block.call(input_file)
-    end
-  end
-
-  describe 'initially' do
-    it 'reads the contents of the input file' do
-      file
-      File.should have_received.open('file path', 'r')
-    end
-  end
-
   describe '#books' do
     subject { file.books }
 

metadata

@@ -1,254 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: klipbook
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Ray Grasso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: slop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.8
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Process your Kindle clippings file to generate a nicely formatted compilation
@@ -263,6 +204,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .ruby-version
 - .yardopts
 - CHANGELOG.txt
 - Gemfile
@@ -273,14 +215,14 @@ files:
 - Rakefile
 - bin/klipbook
 - example.png
-- features/collate.feature
 - features/fixtures/clippings-for-three-books.txt
 - features/list.feature
-- features/pretty_print.feature
-- features/step_definitions/collate_steps.rb
 - features/step_definitions/list_steps.rb
-- features/step_definitions/pretty_print_steps.rb
+- features/step_definitions/tohtml_steps.rb
+- features/step_definitions/tojson_steps.rb
 - features/support/env.rb
+- features/tohtml.feature
+- features/tojson.feature
 - klipbook.gemspec
 - lib/klipbook.rb
 - lib/klipbook/collate/book_file.rb
@@ -293,7 +235,6 @@ files:
 - lib/klipbook/sources/amazon_site/book_scraper.rb
 - lib/klipbook/sources/amazon_site/site_scraper.rb
 - lib/klipbook/sources/book.rb
-- lib/klipbook/sources/book_source.rb
 - lib/klipbook/sources/clipping.rb
 - lib/klipbook/sources/invalid_source_error.rb
 - lib/klipbook/sources/kindle_device/entry.rb
@@ -307,7 +248,6 @@ files:
 - spec/lib/klipbook/commands/list_books_spec.rb
 - spec/lib/klipbook/commands/pretty_print_spec.rb
 - spec/lib/klipbook/pretty_print/html_printer_spec.rb
-- spec/lib/klipbook/sources/book_source_spec.rb
 - spec/lib/klipbook/sources/book_spec.rb
 - spec/lib/klipbook/sources/kindle_device/entry_parser_spec.rb
 - spec/lib/klipbook/sources/kindle_device/file_parser_spec.rb
@@ -318,30 +258,26 @@ files:
 homepage: https://github.com/grassdog/klipbook
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -33745898634206631
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Klipbook creates a nice html summary of the clippings you've created on your
   Kindle.
 test_files: []

data/features/step_definitions/collate_steps.rb

@@ -1,17 +0,0 @@
-
-When /^I collate clippings for "([^"]*)" books from the file "([^"]*)" to the output file "([^"]*)"$/ do |book_count, input_file, output_file|
-  run_collate(book_count, output_file, input_file)
-end
-
-Then /^I should find a file called "([^"]*)" that contains "([^"]*)"$/ do |output_file, expected_text|
-  in_current_dir do
-    File.exists?(output_file).should be_true
-    File.open(output_file, 'r') do |f|
-      f.read.should match(/#{expected_text}/m)
-    end
-  end
-end
-
-def run_collate(book_count, output_file, input_file)
-  run_simple(unescape("klipbook -n #{book_count} collate -c #{output_file} file:#{input_file}"), false)
-end

data/lib/klipbook/sources/book_source.rb

@@ -1,26 +0,0 @@
-module Klipbook::Sources
-  class BookSource
-    def initialize(source_spec, max_books)
-      raise InvalidSourceError unless valid_source?(source_spec)
-
-      if (source_spec =~ /file:(.+)/)
-        file_path = $1
-        @source = Klipbook::Sources::KindleDevice::File.new(file_path, max_books)
-      elsif (source_spec =~ /site:(.+):(.+)/)
-        username = $1
-        password = $2
-        @source = Klipbook::Sources::AmazonSite::SiteScraper.new(username, password, max_books)
-      end
-    end
-
-    def books
-      @source.books
-    end
-
-    private
-
-    def valid_source?(source_spec)
-      source_spec =~ /(file:|site:.+:.+)/
-    end
-  end
-end

data/spec/lib/klipbook/sources/book_source_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Klipbook::Sources::BookSource do
-
-  let(:fake_source) do
-    Object.new.tap do |fakey|
-      stub(fakey).books { books }
-    end
-  end
-
-  context 'when created with an invalid source' do
-    it 'raises an error' do
-      expect { Klipbook::Sources::BookSource.new('sdf' , 2) }.to raise_error(InvalidSourceError)
-    end
-  end
-
-  context 'when created with a site source' do
-    subject { book_source }
-
-    let(:book_source) { Klipbook::Sources::BookSource.new('site:username@example.com:password', 2) }
-
-    before(:each) do
-      stub(Klipbook::Sources::AmazonSite::SiteScraper).new { fake_source }
-    end
-
-    it 'creates a site scraper with the provided credentials' do
-      subject
-      Klipbook::Sources::AmazonSite::SiteScraper.should have_received.new('username@example.com', 'password', 2)
-    end
-
-    describe '#books' do
-      subject { book_source.books }
-
-      let(:books) { [] }
-
-      it 'returns the books returned by the site source' do
-        subject.should == books
-      end
-    end
-  end
-
-  context 'when created with a file source' do
-    subject { book_source }
-
-    let(:book_source) { Klipbook::Sources::BookSource.new('file:filename', 2) }
-
-    let(:fake_file) do
-      Object.new.tap do |file|
-        stub(file).read { file_contents }
-      end
-    end
-
-    let(:file_contents) { 'fake contents ' }
-
-    before(:each) do
-      stub(Klipbook::Sources::KindleDevice::File).new { fake_source }
-      stub(File).open { fake_file }
-    end
-
-    it "reads the file's contents from disk" do
-      subject
-      File.should have_received.open('filename', 'r')
-    end
-
-    pending 'uses the file contents to create a file source' do
-      subject
-
-      Klipbook::Sources::KindleDevice::File.should have_received.new('fake contents', 2)
-    end
-
-    describe '#books' do
-      subject { book_source.books }
-
-      let(:books) { [] }
-
-      pending 'returns the books returned by the file source' do
-        subject.should == books
-      end
-    end
-  end
-end