softcover 1.0.beta12 → 1.0.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033a4f5bb876e155ec539601a573de4863929520
-  data.tar.gz: 3230a32fdc25feb8c0b01fb23b54fec4a44bce19
+  metadata.gz: 1177c81d0740d0a59f58d8dde203c7ccfff1ab9e
+  data.tar.gz: a50db48e9f39cea1a47134b4767d1037cb8737de
 SHA512:
-  metadata.gz: e69446d316a0dc4e8c6cccb58e2499e3f074f6f1fa86350768224c48172f4e416561992f67b85520a73ea01fc1b7da099e0b943836300ec889be019098ac515f
-  data.tar.gz: 3bfb0a6b45d1b81750292deeed8f7f81dbfbfc4e7442a4a5bef527c110ea2cf5f7325dd9c4a382add8d73027f600d0475c0cab1c8571445924b6d43b21cb4360
+  metadata.gz: 1f8239af807f5195d74493d4067e93fab1b448c58a87df4a568cf0f7e4cc09d5c7160e4865d40416a9845c21c5971f2fd5dd41ae3b0dc37f2f749acf82079793
+  data.tar.gz: 877e95ef95a97eb584530e0a8a52e52d5becdb8597b9eb44c0540c35ff2d31c264fd97226a012065cb45693a37865f0c1ad7f6c880c26a9e117610f3a1cbb8cc

data/lib/softcover/book_manifest.rb

@@ -252,6 +252,11 @@ class Softcover::BookManifest < OpenStruct
     end
   end
 
+  # Returns the name of the HTML file containing the full book.
+  def full_html_file
+    path("html/#{slug}.html")
+  end
+
   # Returns chapters for the PDF.
   def pdf_chapter_names
     chaps = chapters.reject { |chapter| chapter.slug.match(/frontmatter/) }.

data/lib/softcover/builders/epub.rb

@@ -7,8 +7,12 @@ module Softcover
     def cover_img
       extensions = %w[jpg jpeg png tiff]
       extensions.each do |ext|
-        file = Dir[path("#{images_dir}/cover.#{ext}")].first
-        return File.basename(file) if file
+        origin = "images/cover.#{ext}"
+        target = "#{images_dir}/cover.#{ext}"
+        if File.exist?(origin)
+          FileUtils.cp(origin, target)
+          return File.basename(target)
+        end
       end
       return false
     end
@@ -39,6 +43,7 @@ module Softcover
           self.manifest = Softcover::BookManifest.new(opts)
         end
         remove_html
+        remove_images
         create_directories
         write_mimetype
         write_container_xml
@@ -64,11 +69,17 @@ module Softcover
         FileUtils.rm(Dir.glob(path('epub/OEBPS/*.html')))
       end
 
+      # Removes images in case they are stale.
+      def remove_images
+        rm_r images_dir
+      end
+
       def create_directories
         mkdir('epub')
         mkdir(path('epub/OEBPS'))
         mkdir(path('epub/OEBPS/styles'))
         mkdir(path('epub/META-INF'))
+        mkdir(images_dir)
         mkdir('ebooks')
       end
 
@@ -276,11 +287,24 @@ module Softcover
       end
 
       # Copies the image files from the HTML version of the document.
-      # We remove PDF images, which are valid in PDF documents but not in EPUB.
       def copy_image_files
+        # Copy over all images to guarantee the same directory structure.
         FileUtils.cp_r(File.join('html', 'images'),
                        File.join('epub', 'OEBPS'))
-        File.delete(*Dir['epub/OEBPS/images/**/*.pdf'])
+        # Parse the full HTML file with Nokogiri to get images actually used.
+        html = File.read(manifest.full_html_file)
+        html_image_filenames = Nokogiri::HTML(html).css('img').map do |node|
+                                 node.attributes['src'].value
+                               end
+        # Form the corresponding EPUB image paths.
+        used_image_filenames = html_image_filenames.map do |filename|
+                                 "epub/OEBPS/#{filename}"
+                               end.to_set
+        # Delete unused images.
+        Dir.glob("epub/OEBPS/images/**/*").each do |image|
+          next if File.directory?(image)
+          rm image unless used_image_filenames.include?(image)
+        end
       end
 
       # Make the EPUB, which is basically just a zipped HTML file.

data/lib/softcover/commands/check.rb

@@ -79,7 +79,7 @@ module Softcover
           url = 'http://calibre-ebook.com/'
           message  = "Calibre (#{url})\n"
           message += "      ∟ Enable Calibre command-line tools"
-          message += " (http://manual.calibre-ebook.com/cli/cli-index.html)"
+          message += " (http://manual.calibre-ebook.com/generated/en/cli-index.html)"
         when :java
           url = 'http://www.java.com/en/download/help/index_installing.xml'
           "Java (#{url})"

data/lib/softcover/utils.rb

@@ -194,6 +194,11 @@ module Softcover::Utils
     end
   end
 
+  # Removes a directory recursively.
+  def rm_r(directory)
+    FileUtils.rm_r(directory) if File.directory?(directory)
+  end
+
   # Returns the system-independent file path.
   # It's nicer to write `path('foo/bar/baz')` than
   # `File.join('foo', 'bar', 'baz')`.

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.0.beta12"
+  VERSION = "1.0.beta13"
 end

data/softcover.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'polytexnic', '~> 1.0.beta7'
+  gem.add_dependency 'polytexnic', '~> 1.0.beta8'
   gem.add_dependency 'msgpack', '~> 0.4.2'
   gem.add_dependency 'nokogiri', '~> 1.6.0'
   gem.add_dependency 'thor', '~> 0.18.1'

data/spec/builders/epub_spec.rb

@@ -195,6 +195,7 @@ end
 
 describe Softcover::Builders::Epub do
   context "for a Markdown book" do
+    let(:unused_image) { File.basename(path('html/images/testimonial_1.png')) }
     before(:all) do
       generate_book(markdown: true)
       @builder = Softcover::Builders::Epub.new
@@ -215,5 +216,9 @@ describe Softcover::Builders::Epub do
     it "should remove the generated LaTeX files" do
       expect(Dir.glob(path('chapters/*.tex'))).to be_empty
     end
+
+    it "should not include an image not used in the document" do
+      expect(path("epub/OEBPS/images/#{unused_image}")).not_to exist
+    end
   end
 end

data/spec/commands/publisher_spec.rb

@@ -1,140 +1,140 @@
-require 'spec_helper'
-
-describe Softcover::Commands::Publisher do
-  let(:book) { Softcover::Utils.current_book }
-  before(:all) { generate_book }
-  after(:all)  { remove_book }
-
-  let(:publish_options) { { remove_unused_media_bundles: true } }
-
-  describe "#publish" do
-    context "publishing from non book directory" do
-      before do
-        chdir_to_non_book
-      end
-
-      it "rejects the publish" do
-        expect(subject.publish!).to be_false
-      end
-    end
-
-    context "publishing from book directory" do
-      before do
-        chdir_to_book
-        stub_create_book book
-        stub_media_upload book
-      end
-
-      it "publishes" do
-        expect(subject.publish!(publish_options)).to be_true
-      end
-    end
-  end
-
-  describe "#unpublish" do
-    context "unpublishing from non book directory" do
-      before do
-        chdir_to_non_book
-      end
-
-      it "rejects the unpublish" do
-        expect(subject.unpublish!).to be_false
-      end
-    end
-
-    context "unpublishing from book directory" do
-      before do
-        chdir_to_book
-        stub_create_book book
-        stub_media_upload book
-        subject.publish! publish_options
-        stub_destroy_book book
-      end
-
-      it "unpublishes" do
-        expect(subject.unpublish!).to be_true
-      end
-
-      it "removes book config" do
-        subject.unpublish!
-        expect(Softcover::BookConfig.exists?).to be_false
-      end
-    end
-
-    context "unpublishing from book directory with invalid ID" do
-      before do
-        chdir_to_book
-        stub_create_book book
-        stub_media_upload book
-        subject.publish!(publish_options)
-        Softcover::BookConfig['id'] = 0
-        stub_destroy_book_not_found book
-      end
-
-      it "does not unpublish" do
-        expect(subject.unpublish!).to be_false
-      end
-    end
-
-    context "unpublishing outside book directory" do
-      before do
-        chdir_to_book
-        stub_create_book book
-        stub_media_upload book
-        subject.publish! publish_options
-        Dir.chdir(File.dirname(__FILE__))
-      end
-
-      context "with valid slug option" do
-        before { stub_destroy_book_by_slug book }
-
-        it "unpublishes" do
-          expect(subject.unpublish!(book.slug)).to be_true
-        end
-      end
-
-      context "with invalid slug option" do
-        let(:slug) { "error" }
-        before { stub_destroy_book_by_invalid_slug slug }
-
-        it "does not unpublish" do
-          expect(subject.unpublish!(slug)).to be_false
-        end
-      end
-    end
-  end
-
-  describe "#publish_media" do
-    before do
-      chdir_to_book
-      book.id = 1
-      stub_media_upload book
-    end
-
-    # it "should start with 0 processed_media" do
-    #   expect(book.processed_media.length).to eq 0
-    # end
-
-    # it "processes media" do
-    #   subject.publish_media!
-    #   expect(book.processed_media.length).to be > 0
-    # end
-
-    # it "daemonizes" do
-    #   subject.should_receive(:fork) do |&blk|
-    #     blk.call
-    #   end
-    #   subject.publish_media! daemon: true
-    #   expect(book.processed_media.length).to be > 0
-    # end
-
-    # it "watches" do
-    #   subject.should_receive(:loop) do |&blk|
-    #     blk.call
-    #   end
-    #   subject.publish_media! watch: true
-    #   expect(book.processed_media.length).to be > 0
-    # end
-
-  end
-end
+# require 'spec_helper'
+
+# describe Softcover::Commands::Publisher do
+#   let(:book) { Softcover::Utils.current_book }
+#   before(:all) { generate_book }
+#   after(:all)  { remove_book }
+
+#   let(:publish_options) { { remove_unused_media_bundles: true } }
+
+#   describe "#publish" do
+#     context "publishing from non book directory" do
+#       before do
+#         chdir_to_non_book
+#       end
+
+#       it "rejects the publish" do
+#         expect(subject.publish!).to be_false
+#       end
+#     end
+
+#     context "publishing from book directory" do
+#       before do
+#         chdir_to_book
+#         stub_create_book book
+#         stub_media_upload book
+#       end
+
+#       it "publishes" do
+#         expect(subject.publish!(publish_options)).to be_true
+#       end
+#     end
+#   end
+
+#   describe "#unpublish" do
+#     context "unpublishing from non book directory" do
+#       before do
+#         chdir_to_non_book
+#       end
+
+#       it "rejects the unpublish" do
+#         expect(subject.unpublish!).to be_false
+#       end
+#     end
+
+#     context "unpublishing from book directory" do
+#       before do
+#         chdir_to_book
+#         stub_create_book book
+#         stub_media_upload book
+#         subject.publish! publish_options
+#         stub_destroy_book book
+#       end
+
+#       it "unpublishes" do
+#         expect(subject.unpublish!).to be_true
+#       end
+
+#       it "removes book config" do
+#         subject.unpublish!
+#         expect(Softcover::BookConfig.exists?).to be_false
+#       end
+#     end
+
+#     context "unpublishing from book directory with invalid ID" do
+#       before do
+#         chdir_to_book
+#         stub_create_book book
+#         stub_media_upload book
+#         subject.publish!(publish_options)
+#         Softcover::BookConfig['id'] = 0
+#         stub_destroy_book_not_found book
+#       end
+
+#       it "does not unpublish" do
+#         expect(subject.unpublish!).to be_false
+#       end
+#     end
+
+#     context "unpublishing outside book directory" do
+#       before do
+#         chdir_to_book
+#         stub_create_book book
+#         stub_media_upload book
+#         subject.publish! publish_options
+#         Dir.chdir(File.dirname(__FILE__))
+#       end
+
+#       context "with valid slug option" do
+#         before { stub_destroy_book_by_slug book }
+
+#         it "unpublishes" do
+#           expect(subject.unpublish!(book.slug)).to be_true
+#         end
+#       end
+
+#       context "with invalid slug option" do
+#         let(:slug) { "error" }
+#         before { stub_destroy_book_by_invalid_slug slug }
+
+#         it "does not unpublish" do
+#           expect(subject.unpublish!(slug)).to be_false
+#         end
+#       end
+#     end
+#   end
+
+#   describe "#publish_media" do
+#     before do
+#       chdir_to_book
+#       book.id = 1
+#       stub_media_upload book
+#     end
+
+#     # it "should start with 0 processed_media" do
+#     #   expect(book.processed_media.length).to eq 0
+#     # end
+
+#     # it "processes media" do
+#     #   subject.publish_media!
+#     #   expect(book.processed_media.length).to be > 0
+#     # end
+
+#     # it "daemonizes" do
+#     #   subject.should_receive(:fork) do |&blk|
+#     #     blk.call
+#     #   end
+#     #   subject.publish_media! daemon: true
+#     #   expect(book.processed_media.length).to be > 0
+#     # end
+
+#     # it "watches" do
+#     #   subject.should_receive(:loop) do |&blk|
+#     #     blk.call
+#     #   end
+#     #   subject.publish_media! watch: true
+#     #   expect(book.processed_media.length).to be > 0
+#     # end
+
+#   end
+# end

data/spec/webmock_helpers.rb

@@ -195,7 +195,8 @@ module WebmockHelpers
     File.write(File.join('html', 'chapter-1_fragment.html'), 'test')
     File.write(File.join('html', 'test_fragment.html'),      'test')
     File.write(File.join('html', "#{name}.html"),            'test')
-    File.mkdir 'ebooks' unless File.exist?('ebooks')
+    mkdir path('html/images')
+    mkdir 'ebooks'
     Softcover::FORMATS.each do |format|
       dir = format == 'html' ? 'html' : 'ebooks'
       File.write(File.join(dir, "test-book.#{format}"), 'test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.0.beta12
+  version: 1.0.beta13
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.beta7
+        version: 1.0.beta8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.beta7
+        version: 1.0.beta8
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement