softcover 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 429fc241bb03481db6354913c6dd45c503080cd9
-  data.tar.gz: a3f3efe10906b2b0baf85d0c8198eedb5894fb58
+  metadata.gz: d3c3f7ec1c29b0d9916d06aaab5a587d197d2a5a
+  data.tar.gz: db1916e845252bcd7816dc6dbfd68ae71b1c3f8d
 SHA512:
-  metadata.gz: c1f4cfa61f2a5b90cbaf511ae24164eaa0f39d27fa96d42ab319edf4c07971f341ebf63c5701756f3d9f8bf55c3a79ccee8265f6b3a9fc2268fa58f45c776090
-  data.tar.gz: b83b64907e873f7d88715f205ffa5a3a1c2e228b3c1f3502fd8de8202a262ee6a9e944bfd13a540818c702db41b39f14215fc1cc12a7586977bfbc0e2f962b61
+  metadata.gz: 6621e690252b6d378e5b2d5850b705ad6ac5464cbf2065e228148488eae1c885a827198033de49ca76bc238f537962e432d3d290c4e8fbdd235a257a92c569ad
+  data.tar.gz: b109970ac67eac9ff43c696c9da122bb3adce718cce79bd7c6dcb407c302c8dc6fb1d4db56cab5e91251ed01bed1e7a1f61d4df65301b24b01a20653eeb3213c

data/lib/softcover/book_manifest.rb

@@ -36,6 +36,19 @@ class Softcover::BookManifest < OpenStruct
     def to_hash
       marshal_dump.merge({ menu_heading: menu_heading })
     end
+
+    def source
+      case extension
+      when '.md'
+        :markdown
+      when '.tex'
+        :polytex
+      end
+    end
+
+    def full_name
+      "#{slug}#{extension}"
+    end
   end
 
   class Section < OpenStruct
@@ -153,11 +166,13 @@ class Softcover::BookManifest < OpenStruct
   def chapter_file_paths
     pdf_chapter_names.map do |name|
       file_path = case
-      when markdown? || @origin == :markdown
-        File.join("chapters", "#{name}.md")
-      when polytex?
-        File.join("chapters", "#{name}.tex")
-      end
+                  when markdown? || @origin == :markdown
+                    chapter = chapters.find { |chapter| chapter.slug == name }
+                    extension = chapter.nil? ? '.md' : chapter.extension
+                    File.join("chapters", "#{name}#{extension}")
+                  when polytex?
+                    File.join("chapters", "#{name}.tex")
+                  end
 
       yield file_path if block_given?
 
@@ -166,8 +181,6 @@ class Softcover::BookManifest < OpenStruct
   end
 
   # Returns chapters for the PDF.
-  # The frontmatter pseudo-chapter exists for the sake of HTML/EPUB/MOBI, so
-  # it's not returned as part of the chapters.
   def pdf_chapter_names
     chaps = chapters.reject { |chapter| chapter.slug.match(/frontmatter/) }.
                      collect(&:slug)
@@ -227,6 +240,33 @@ class Softcover::BookManifest < OpenStruct
     raise NotFound
   end
 
+  # Returns the source files specified by Book.txt.
+  # Allows a mixture of Markdown and PolyTeX files.
+  def source_files
+    self.class.find_book_root!
+    md_tex = /.*(?:\.md|\.tex)/
+    File.readlines(MD_PATH).select { |path| path =~ md_tex }.map(&:strip)
+  end
+
+  def basenames
+    source_files.map { |file| File.basename(file, '.*') }
+  end
+
+  def extensions
+    source_files.map { |file| File.extname(file) }
+  end
+
+  def chapter_objects
+    basenames.zip(extensions).map do |name, extension|
+      Chapter.new(slug: name, extension: extension)
+    end
+  end
+
+  def read_from_md
+    { chapters: chapter_objects, filename: MD_PATH }
+  end
+
+
   private
 
     def read_from_yml
@@ -236,18 +276,9 @@ class Softcover::BookManifest < OpenStruct
       YAML.load_file(YAML_PATH)
     end
 
-    def read_from_md
-      self.class.find_book_root!
-      chapters = File.readlines(MD_PATH).select do |path|
-                   path =~ /(.*)\.md/
-                 end.map do |file|
-                   Chapter.new(slug: File.basename(file.strip, '.md'))
-                 end
-      { chapters: chapters, filename: MD_PATH }
-    end
 
     def verify_paths!
-      chapter_file_paths do |chapter_path, i|
+      chapter_file_paths do |chapter_path|
         next if chapter_path =~ /frontmatter/
         unless File.exist?(chapter_path)
           raise "Chapter file in manifest not found in #{chapter_path}"

data/lib/softcover/builders/html.rb

@@ -28,7 +28,7 @@ module Softcover
           rewrite_master_latex_file
           # Reset the manifest to use PolyTeX.
           self.manifest = Softcover::BookManifest.new(source: :polytex,
-                                                      verify_paths: true,
+                                                      verify_paths: false,
                                                       origin: :markdown)
         end
 
@@ -54,12 +54,16 @@ module Softcover
 
       # Writes the LaTeX files for a given Markdown chapter.
       def write_latex_files(chapter, options = {})
-        path = File.join('chapters', chapter.slug + '.md')
-        cc = Softcover.custom_styles
-        md = Polytexnic::Pipeline.new(File.read(path), source: :md,
-                                                       custom_commands: cc)
         filename = path("#{manifest.polytex_dir}/#{chapter.slug}.tex")
-        File.write(filename, md.polytex)
+        if chapter.source == :polytex
+          FileUtils.cp path("chapters/#{chapter.full_name}"), filename
+        else
+          path = File.join('chapters', chapter.full_name)
+          cc = Softcover.custom_styles
+          md = Polytexnic::Pipeline.new(File.read(path), source: :markdown,
+                                                         custom_commands: cc)
+          File.write(filename, md.polytex)
+        end
       end
 
       # Rewrites the master LaTeX file <name>.tex to use chapters from Book.txt.
@@ -68,7 +72,7 @@ module Softcover
         lines = File.readlines('Book.txt')
         tex_file = []
         lines.each do |line|
-          if line =~ /(.*)\.md\s*$/
+          if line =~ /(.*)(?:\.md|\.tex)\s*$/
             tex_file << "\\include{#{manifest.polytex_dir}/#{$1}}"
           elsif line =~ /(.*):\s*$/  # frontmatter or mainmatter
             tex_file << "\\#{$1}"

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/book_manifest_spec.rb

@@ -48,6 +48,28 @@ describe Softcover::BookManifest do
         its(:title) { should eq "book" }
       end
     end
+
+
+    context "with mixed Markdown & PolyTeX files" do
+      before do
+        manifest.stub(:source_files).and_return(['foo.md', 'bar.tex'])
+      end
+
+      it "should have the right basenames" do
+        expect(manifest.basenames).to eq ['foo', 'bar']
+      end
+
+      it "should have the right extensions" do
+        expect(manifest.extensions).to eq ['.md', '.tex']
+      end
+
+      it "should have the right chapter objects" do
+        expect(manifest.chapter_objects[0].slug).     to eq 'foo'
+        expect(manifest.chapter_objects[0].extension).to eq '.md'
+        expect(manifest.chapter_objects[1].slug).     to eq 'bar'
+        expect(manifest.chapter_objects[1].extension).to eq '.tex'
+      end
+    end
   end
 
   context "in an invalid book directory" do
@@ -55,4 +77,4 @@ describe Softcover::BookManifest do
       expect{ subject }.to raise_error(Softcover::BookManifest::NotFound)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -365,6 +365,7 @@ files:
 - .pull_requests/1384468478
 - .pull_requests/1384801823
 - .pull_requests/1385070261
+- .pull_requests/1385518404
 - .rspec
 - .ruby-gemset
 - .ruby-version