epubforge 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/config/actions/init.rb

@@ -15,7 +15,7 @@ module EpubForge
         
         @template_dir = EpubForge.root.join( "templates", @template_to_use )
         src_entries = @template_dir.glob( "**", "*" ).map{ |entry|
-          entry.relative_to( @template_dir )
+          entry.relative_path_from( @template_dir )
         }
         
         self.source_paths.push( @template_dir )
@@ -74,7 +74,7 @@ module EpubForge
             configure_git( opts[:git] || {} )
           end
         else
-          say_in_warning("The program 'git' must be installed and locatable if you want epubforge to back up your project.")
+          warn("The program 'git' must be installed and locatable if you want epubforge to back up your project.")
         end
       end
       
@@ -121,7 +121,6 @@ module EpubForge
         end
 
         self.destination_root_filepath = root.fwf_filepath
-        debugger if self.destination_root_filepath != root.fwf_filepath.expand
         
         if self.destination_root_filepath.exist? && 
             (!(self.destination_root_filepath.empty?) || !(self.destination_root_filepath.directory?))

data/config/actions/kindle.rb

@@ -4,6 +4,7 @@ module EpubForge
       description "Create a .mobi book and try to push it to your Kindle (conversion requires Calibre)"
       keywords    :kindle, :push, :b2k
       usage       "#{$PROGRAM_NAME} b2k <project_directory>"
+      # requires_executable "ebook-convert"
       
       # TODO:  Hard-coded.  Need a global settings file?
       KINDLE_DEVICE_DIR = "/".fwf_filepath.join( "Volumes", "Kindle" )
@@ -15,7 +16,6 @@ module EpubForge
         @src_epub = @project.filename_for_epub_book.fwf_filepath
         @dst_mobi = @project.filename_for_mobi_book.fwf_filepath
 
-        mobify
       end
       
       protected
@@ -31,8 +31,8 @@ module EpubForge
           say_all_is_well "Formatted for Kindle (.mobi file).  File at #{@dst_mobi}."
           push_to_device @dst_mobi
         else
-          say_warning( "Something went wrong during the conversion process." )
-          say_warning( "#{@dst_mobi} exists, but may not be complete or correct." ) if @dst_mobi.exist?  
+          warn( "Something went wrong during the conversion process." )
+          warn( "#{@dst_mobi} exists, but may not be complete or correct." ) if @dst_mobi.exist?  
           false
         end
       end

data/config/actions/mobify.rb

@@ -0,0 +1,69 @@
+module EpubForge
+  module Action
+    class Mobify < ThorAction
+      description "Create a .mobi book and try to push it to your Kindle (conversion requires Calibre)"
+      keywords    :mobify
+      usage       "#{$PROGRAM_NAME} mobify <project_directory(optional)>"
+      # requires_executable "ebook-convert", "ebook-convert is included as part of the Calibre ebook management software."
+      
+      desc( "do:kindle", "Turn your .epub file into a .mobi file.  Check to see if your Kindle is connected, then pushes it." )
+      def do( project, *args )
+        @project = project
+        @src_epub = @project.filename_for_epub_book.fwf_filepath
+        @dst_mobi = @project.filename_for_mobi_book.fwf_filepath
+        
+        @args = args
+        
+        mobify
+        
+        
+      end
+      
+      protected
+      def mobify
+        return false unless fulfill_requirements
+        
+        say "converting from #{@src_epub} to #{@dst_mobi}"
+        cmd = "ebook-convert #{@src_epub} #{@dst_mobi}"
+        say "executing: #{cmd}"
+        `#{cmd}`
+
+        if $?.success? && @dst_mobi.exist?
+          say_all_is_well "Formatted for Kindle (.mobi file).  File at #{@dst_mobi}."
+          push_to_device @dst_mobi
+        else
+          warn( "Something went wrong during the conversion process." )
+          warn( "#{@dst_mobi} exists, but may not be complete or correct." ) if @dst_mobi.exist?  
+          false
+        end
+      end
+      
+      def push_to_device mobi_file
+        if KINDLE_DEVICE_DIR.directory? && KINDLE_PUSH_DIR.directory?
+          FileUtils.copy( mobi_file, KINDLE_PUSH_DIR )
+          say_all_is_well "File pushed to Kindle."
+          true
+        else
+          say_error "NOT installed on Kindle.  It may not be plugged in."
+          false
+        end   
+      end
+      
+      def fulfill_requirements
+        unless ebook_convert_installed?
+          say_error( "ebook-convert is not installed.  Quitting." )
+          return false 
+        end
+        
+        BookToEpub.new.do( @project )
+        
+        unless @src_epub.exist?
+          say_error( "Cannot find source .epub #{src_epub}" )
+          return false
+        end
+
+        true
+      end
+    end
+  end
+end

data/config/htmlizers.rb

@@ -1,3 +1,11 @@
+EpubForge::Utils::Htmlizer.define do |html|
+  html.format     :xhtml
+  html.group      :default
+  html.executable "false"
+  html.cmd        "cat {{f}}"
+end
+
+
 EpubForge::Utils::Htmlizer.define do |html|
   html.format     :markdown
   html.group      :default                   # the default is :user, so user-defined ones don't have to set it

data/lib/action/run_description.rb

@@ -1,11 +1,13 @@
 module EpubForge
   module Action
     class RunDescription
-      attr_accessor :args
-      attr_accessor :project
-      attr_accessor :keyword
-      attr_accessor :klass
-      attr_accessor :errors
+      attr_accessor :args,
+                    :project,
+                    :keyword,
+                    :klass,
+                    :errors,
+                    :state,
+                    :execution_returned
       
       def initialize
         @args = nil
@@ -13,10 +15,58 @@ module EpubForge
         @keyword = nil
         @klass = nil
         @errors = []
+        @state = :initialized
       end
+
+      def run
+        if self.runnable?
+          handle_errors do
+            @execution_returned = self.klass.new.do( self.project, *(self.args) )
+          end
+        else
+          puts "Error(s) trying to complete the requested action:"
+          puts self.errors.join("\n")
+        end
+        
+        self.finish
+        self
+      end
+      
+      def handle_errors &block
+        yield
+      rescue Exception => e
+        @errors << "#{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
+        self
+      end
+      
       
       def runnable?
-        @errors.epf_blank?
+        ! errors?
+      end
+      
+      def errors?
+        !@errors.epf_blank?
+      end
+      
+      def success?
+        finished? && ! errors?
+      end
+      
+      def finished?
+        @state == :finished
+      end
+      
+      def finish
+        @state = :finished
+      end
+      
+      def to_s
+        str = "RunDescription:\n"
+        [ :args, :project, :keyword, :klass, :errors, :state ].each do |data|
+          str << "#{data} : #{self.send(data)}\n"
+        end
+
+        str
       end
     end
   end

data/lib/action/runner.rb

@@ -17,12 +17,9 @@ module EpubForge
       end
             
       def run
-        if @run_description.runnable?
-          @run_description.klass.new.do( @run_description.project, *(@run_description.args) )
-        else
-          puts "Error(s) trying to complete the requested action:"
-          puts @run_description.errors.join("\n")
-        end
+        @run_description.run
+        puts @run_description
+        @run_description
       end
       
       # order:  project_dir(optional), keyword, args
@@ -36,9 +33,6 @@ module EpubForge
         # print help message if no keywords given
         parse_args
         
-        # finish setting up run_description
-        @run_description.args = @args
-        
         run
       end
     
@@ -86,6 +80,8 @@ module EpubForge
         
         if !existing_project && @run_description.klass.project_required?
           @run_description.errors << "Could not find a project directory, but the action #{@run_description.klass} requires one. Current directory is not an epubforge project."
+        else
+          @run_description.args = @args
         end
       end
       

data/lib/action/thor_action.rb

@@ -40,6 +40,9 @@ module EpubForge
       include Thor::Actions
       extend SharedActionInterface
       
+      method_option :verbose, :type => :boolean, :default => false, :aliases => "-v"
+      method_option :debug, :type => :boolean, :default => false, :aliases => "--dbg"
+      
       
       CLEAR     = Thor::Shell::Color::CLEAR
       RED       = Thor::Shell::Color::RED
@@ -52,6 +55,14 @@ module EpubForge
       
       
       protected
+      def say_when_verbose( *args )
+        say( *args ) if @verbose
+      end
+      
+      def say_when_debugging( *args )
+        say( *args ) if @debug
+      end
+      
       def say_error( statement )
         say( "ERROR : #{statement}", RED + ON_BLUE )
       end
@@ -64,10 +75,6 @@ module EpubForge
         say( statement, GREEN )
       end
       
-      def say_in_warning( statement )
-        warn( statement, RED )
-      end
-      
       def say_subtly( statement )
         say( statement, MAGENTA )
       end
@@ -133,6 +140,27 @@ module EpubForge
         @executables[name]  
       end
       
+      def requirements
+        @requirements ||= []
+      end
+      
+      def add_requirement( *args, &block )
+        @requirements ||= []
+        @requirements.push( [args, block] )
+      end
+      
+      def requires_executable( ex, fail_msg )
+        add_requirement( ex, fail_msg ) do
+          executable_installed?( ex, fail_msg )
+        end
+      end
+      
+      def must_target_a_project( project_dir )
+        add_requirement( project_dir ) do
+          Project.is_project_dir?( project_dir )
+        end
+      end
+      
       def git_installed?
         executable_installed?('git')
       end

data/lib/core_extensions/kernel.rb

@@ -1,24 +1,4 @@
 module Kernel
-  # def puts_nowhere( &block )
-  #   collect_stdout( "/dev/null", &block )
-  # end
-  # 
-  # def collect_stdout( dest, &block )
-  #   @puts_nowhere_keep_old_stdout ||= []
-  #   @puts_nowhere_keep_old_stdout << $stdout 
-  #   if dest.is_a?(String)
-  #       $stdout = File.open( dest, "w" )
-  #     else
-  #       $stdout = dest
-  #     end
-  # 
-  #   $stdout.sync = true
-  # 
-  #   yield
-  # 
-  #   $stdout = @puts_nowhere_keep_old_stdout.pop 
-  # end
-  
   # yields an alternate reality block where instance methods
   # are different from what they were.  At the end of the block
   # it resets the initial values of the instance variables.

data/lib/custom_helpers.rb

@@ -27,33 +27,34 @@ module EpubForge
     end
 
     def collect_stdout( dest = StringIO.new, &block )
-              raise ArgumentError.new("No block given.") unless block_given?
-              
-              prior_stdout = $stdout
-              # @epf_prior_stdout_stack ||= []
-              # @epf_prior_stdout_stack << $stdout
-               
-              $stdout = begin
-                          if dest.is_a?( String ) || dest.is_a?( Pathname )
-                            File.open( dest, "a" )
-                          elsif dest.is_a?( IO ) || dest.is_a?( StringIO )
-                            dest
-                          else
-                            raise ArgumentError.new("collect_stdout cannot take a <#{dest.class.name}> as an argument.")
-                          end
-                        end
-            
-              $stdout.sync = true
-              yield
-            
-              $stdout = prior_stdout
-              
-              dest.is_a?( StringIO ) ? dest.string : nil
-            end
-                    # 
-                    # def collect_stdout( *args, &block )
-                    #   yield
-                    # end
+      raise ArgumentError.new("No block given.") unless block_given?
+      
+      prior_stdout = $stdout
+      # @epf_prior_stdout_stack ||= []
+      # @epf_prior_stdout_stack << $stdout
+       
+      $stdout = begin
+                  if dest.is_a?( String ) || dest.is_a?( Pathname )
+                    File.open( dest, "a" )
+                  elsif dest.is_a?( IO ) || dest.is_a?( StringIO )
+                    dest
+                  else
+                    raise ArgumentError.new("collect_stdout cannot take a <#{dest.class.name}> as an argument.")
+                  end
+                end
+    
+      $stdout.sync = true
+      yield
+    
+      $stdout = prior_stdout
+      
+      dest.is_a?( StringIO ) ? dest.string : nil
+    end
+    
+    # def collect_stdout( *args, &block )
+    #   yield
+    #   ""
+    # end
   end
 end
 

data/lib/epub/assets/image.rb

@@ -5,12 +5,11 @@ module EpubForge
         attr_reader :ext, :filename, :name
         def initialize( filename, options = {} )
           @filename = filename.fwf_filepath
-          @name     = @filename.basename.to_s.split(".")[0..-2].join(".")
-          @ext      = @filename.extname.gsub( /^\./, "" )
+          @name, @ext  = @filename.basename_and_ext
         end
   
         def link
-          IMAGES_DIR.join( @name )
+          IMAGES_DIR.join( "#{@name}.#{@ext}"  )
         end
       end
     end

data/lib/epub/assets/page.rb

@@ -2,30 +2,57 @@ module EpubForge
   module Epub
     module Assets
       class Page < Asset
-        attr_reader :html, :original_file, :title, :project, :media_type, :dest_extension
-        attr_accessor :section_id, :section_number
+        attr_reader :html, :original_file, :title, :project, :media_type, :dest_extension, :dest_filename
+        attr_reader :section_id
 
         def initialize file, metadata, project
           raise "NIL" if project.nil?
+          
+          @original_file = file.fwf_filepath
         
           @metadata = metadata
           @project  = project
-          @original_file = file
           @dest_extension = "xhtml"
+          @section_id = @original_file.basename_no_ext
+          @dest_filename = "#{@section_id}.#{@dest_extension}"
 
-          @html = Utils::Htmlizer.instance.translate( file )
-          @title = File.basename( file ).split(".")[0..-2].map(&:capitalize).join(" : ")
+          get_html
+          get_title
+          
           @content = ""
+          @cover = false
           puts "Initialized #{file} with title [#{@title}]"
         end
         
+        def get_html
+          @html = Utils::Htmlizer.instance.translate( @original_file )
+        end
+        
+        def get_title
+          @title = @original_file.basename.to_s.split(".")[0..-2].map(&:capitalize).join(" : ")
+        end
+        
         def link
-          TEXT_DIR.join( "section#{ sprintf("%04i", @section_number) }.#{@dest_extension}" )
+          TEXT_DIR.join( "#{@section_id}.#{@dest_extension}" )
         end
         
         def media_type
           MEDIA_TYPES[@dest_extension]
         end
+        
+        def cover( val = nil )
+          unless val.nil?
+            @cover = val
+          end
+          @cover
+        end
+        
+        def cover_asset( val = nil )
+          unless val.nil?
+            @cover = val
+          end
+          @cover
+        end
       end
     end
   end

data/lib/epub/assets/xhtml.rb

@@ -0,0 +1,8 @@
+module EpubForge
+  module Epub
+    module Assets
+      class XHTML < Page
+      end
+    end
+  end
+end

data/lib/epub/builder.rb

@@ -3,7 +3,7 @@ XmlBuilder = Builder
 
 module EpubForge
   module Epub
-    PAGE_FILE_EXTENSIONS  = %w(html markdown textile)
+    PAGE_FILE_EXTENSIONS  = %w(html markdown textile xhtml)
     IMAGE_FILE_EXTENSIONS = %w(jpg png gif)
 
     MEDIA_TYPES = { "gif" => "image/gif", "jpg" => "image/jpeg", "png" => "image/png",
@@ -26,12 +26,12 @@ module EpubForge
         @book_dir = @project.target_dir.join( @book_dir_short ).fwf_filepath
         @config = @project.config
         
-        @config["page_orderer"] = Utils::FileOrderer.new( opts[:page_order] || @config["pages"][@book_dir_short] )
+        @config.page_orderer = Utils::FileOrderer.new( opts[:page_order] || @config.pages[@book_dir_short] )
 
-        @metadata = @config["metadata"] || {}
+        @metadata = @config.metadata || {}
         
         page_files = @book_dir.glob( ext: PAGE_FILE_EXTENSIONS ) 
-        @section_files = @config["page_orderer"].reorder( page_files )
+        @section_files = @config.page_orderer.reorder( page_files )
         
         @sections = @section_files.map do |section|
           case section.to_s.split(".").last
@@ -41,21 +41,42 @@ module EpubForge
             Assets::HTML.new( section, @metadata, self )
           when "textile"
             Assets::Textile.new( section, @metadata, self )
+          when "xhtml"
+            Assets::XHTML.new( section, @metadata, self )  # These files are inserted into the book unaltered
           else
             raise "UNKNOWN EXTENSION TYPE"
           end
         end
         
-        @sections.each_with_index{ |sec, i| sec.section_number = i }
+        # @sections.each_with_index{ |sec, i| sec.section_number = i }
 
         images = @book_dir.glob( "images", ext: IMAGE_FILE_EXTENSIONS )
         @images = images.map{ |img| Assets::Image.new(img) }
-        
+
         @stylesheets = @book_dir.glob( "stylesheets", "*.css" ).map do |sheet| 
           Assets::Stylesheet.new( sheet ) 
         end
     
-        @scratch_dir = Dir.mktmpdir.fwf_filepath.join( "ebookdir" )
+        install_cover
+        
+        @scratch_dir = FunWith::Files::FilePath.tmpdir.join( "ebookdir" )
+      end
+      
+      def install_cover
+        # Existing cover is moved to the very front
+        if cover_section = @sections.detect{|sec| sec.original_file.basename_no_ext.match( /^cover$/ ) }
+          cover_section.cover( true )
+        elsif cover_image = @images.find{ |img| img.name == "cover" }
+          # actually install cover
+          contents = "<div id='cover'><img class='cover' src='#{cover_image.link.relative_path_from(TEXT_DIR)}' alt='#{@metadata.name}, by #{@metadata.author}'/></div>"
+          cover_file = @project.book_dir.join( "cover.xhtml" )
+          cover_file.write( wrap_page( contents ) )
+          cover_section = Assets::Page.new( cover_file, @metadata, @project )
+          @sections.unshift( cover_section )
+          puts "cover page generated"
+        else
+          return false
+        end
       end
 
       def toc
@@ -76,6 +97,7 @@ module EpubForge
             b.meta :name => "dtb:depth", :content => "1"
             b.meta :name => "dtb:totalPageCount", :content => "0"
             b.meta :name => "dtb:maxPageNumber", :content=> "0"
+
           end
       
           #     <docTitle>
@@ -98,7 +120,7 @@ module EpubForge
                 b.navLabel do
                   b.text section.title
                 end
-                b.content :src => section.link
+                b.content :src => section.link.relative_path_from( "/OEBPS" )
               end
             end
           end
@@ -157,6 +179,11 @@ module EpubForge
             b.dc :publisher, @metadata["publisher"] || "A Pack of Orangutans"
             b.dc :date, {:"opf:event" => "original-publication"}, @metadata["original-publication"] || Time.now.year
             b.dc :date, {:"opf:event" => "epub-publication"}, @metadata["epub-publication"] || Time.now.year
+            
+            
+            if @sections.first.cover
+              b.meta :name => "cover", :content => @sections.first.cover
+            end
           end
       
           # <manifest>
@@ -165,22 +192,22 @@ module EpubForge
             b.item :id => "ncx", :href => "toc.ncx", :"media-type" => "application/x-dtbncx+xml"
         
             @sections.each_with_index do |section, i|
-              b.item :id => section.link, :href => section.link, :"media-type" => section.media_type
+              b.item :id => section.link.basename, :href => section.link.relative_path_from("/OEBPS"), :"media-type" => section.media_type
             end
         
             @images.each do |image|
-              b.item :id => image.name, :href => image.link, :"media-type" => image.media_type
+              b.item :id => image.filename.basename, :href => image.link.relative_path_from("/OEBPS"), :"media-type" => image.media_type
             end
             
             @stylesheets.each do |sheet|
-              b.item :id => sheet.name, :href => sheet.link, :"media-type" => sheet.media_type
+              b.item :id => sheet.name, :href => sheet.link.relative_path_from("/OEBPS"), :"media-type" => sheet.media_type
             end
           end
       
           # <spine toc="ncx"> 
           b.spine :toc => "ncx" do
-            @sections.each_with_index do |section, i|
-              b.itemref :idref => "section#{sprintf("%04i",i)}.xhtml"
+            @sections.each do |section|
+              b.itemref :idref => section.dest_filename
             end
           end
       
@@ -196,7 +223,7 @@ module EpubForge
     
         b.target!.to_s
       end
-                
+   
       # zips up contents
       def build
         Utils::DirectoryBuilder.create( @scratch_dir ) do |build|
@@ -212,8 +239,10 @@ module EpubForge
             build.file( "content.opf", content_opf )
             
             build.dir( "Text" ) do
-              @sections.each_with_index do |section, i|
-                build.file( "section#{sprintf("%04i",i)}.xhtml", wrap_page( section.html ) )
+              @sections.each do |section|
+                build.file( section.dest_filename, 
+                            section.is_a?( Assets::XHTML ) ? section.html : wrap_page( section.html )
+                          )
               end
             end
           
@@ -245,7 +274,7 @@ module EpubForge
       end
       
       protected      
-      def wrap_page content
+      def wrap_page content = ""
         b = XmlBuilder::XmlMarkup.new( :indent => 2)
         b.instruct! :xml, :encoding => "utf-8", :standalone => "no"
         b.declare! :DOCTYPE, :html, :PUBLIC, "-//W3C//DTD XHTML 1.1//EN", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
@@ -254,7 +283,7 @@ module EpubForge
           b.head do 
             b.title( @metadata["name"] )
             for sheet in @stylesheets
-              b.link :href => sheet.link, :media => "screen", :rel => "stylesheet", :type => "text/css"
+              b.link :href => sheet.link.relative_path_from("/OEBPS/Text"), :media => "screen", :rel => "stylesheet", :type => "text/css"
             end
           end
     

data/lib/epubforge.rb

@@ -4,6 +4,7 @@
 # require 'singleton'
 # require 'builder'
 require 'thor'
+require 'optparse'
 require 'xdg'            # keep configuration files in sane places
 require 'debugger'
 require 'erb'
@@ -15,7 +16,6 @@ require 'net/http'
 require 'open-uri'            # needed by Utils::Downloader
 require 'yaml'
 require 'rbconfig'
-# require 'configurator'
 require 'fun_with_files'
 require 'fun_with_configurations'
 
@@ -90,6 +90,7 @@ require_relative 'epub/assets/markdown'
 require_relative 'epub/assets/textile'
 require_relative 'epub/assets/image'
 require_relative 'epub/assets/stylesheet'
+require_relative 'epub/assets/xhtml'
 require_relative 'project/project'
 
 puts "Requirements loaded" if debugging?

data/lib/utils/class_loader.rb

@@ -73,8 +73,7 @@ module EpubForge
               self.require_me( entry )
             end
           else
-            puts "Warning: Could not find file #{loadable} to load htmlizers from."
-            raise "AAAH"
+            puts "Warning: Could not find file #{loadable} to load classes from."
           end
         end
       end

data/lib/utils/file_orderer.rb

@@ -5,7 +5,7 @@ module EpubForge
     # by matching the filenames against one regex after another.  Allows you to say,
     # "I want the title page, the foreward, then all the chapters, then all the appendixes, then the afterword."
     # Ex:  FileOrderer( ["title_page", "forward", "chapter-.*", "afterword", "appendix.*" ).reorder( pages )
-    # Only compares the basename minus extension.  Files should come from the same directory
+    # Only compares the basename minus extension.  Files should come from the same directory.  cover.extension always comes first.
     class FileOrderer
       def initialize( matchers )
         @matchers = matchers.map do |m| 
@@ -17,26 +17,26 @@ module EpubForge
           end
         end
         
+        @matchers.unshift( /^cover$/ )
         @matchers.push( /^.*$/ )
       end
       
       def reorder( files )
         files = files.map(&:fwf_filepath)
         
-        files.sort_by!{ |f|
-          f.basename_no_ext.to_s  
-        }
-        
-        
         ordered_files = @matchers.inject( [] ) do |collector, matcher|
           matched_files = files.select do |f| 
             name = f.basename_no_ext.to_s
             matcher.match( name )
           end
-
-          collector += matched_files
+          
+          matched_files.sort_by! do |filename|
+            filename.basename_no_ext.to_s
+          end
+          
+          collector += matched_files.sort
           files -= matched_files
-  
+          
           collector
         end
       end

data/lib/utils/file_path.rb

@@ -129,7 +129,7 @@ module EpubForge
         self.basename.to_s.split(".").last || ""
       end
       
-      def relative_to( ancestor_dir )
+      def relative_path_from( ancestor_dir )
         depth = ancestor_dir.to_s.split(File::SEPARATOR).length
         relative_path = self.to_s.split(File::SEPARATOR)
         relative_path[(depth)..-1].join(File::SEPARATOR).fwf_filepath

data/lib/utils/html_translator.rb

@@ -74,7 +74,7 @@ module EpubForge
       def translate( filename, opts = "" )
         return false unless can_do_job?( filename )
       
-        result = "<!-- generated from #{@format} by htmlizer #{@name} -->\n\n" 
+        result =  ""
         if @custom_proc
           result += @custom_proc.call( filename, *opts )
         elsif @cmd
@@ -88,6 +88,7 @@ module EpubForge
           return false
         end
       
+        result += "\n\n<!-- generated from #{@format} by htmlizer #{@name} -->\n" 
         result
       end
     

data/lib/utils/htmlizer.rb

@@ -81,7 +81,7 @@ module EpubForge
       end
       
       def self.format_from_filename( filename )
-        ext = filename.fwf_filepath.extname.gsub(/^\./, "")
+        ext = filename.fwf_filepath.ext
         ext.epf_blank? ? :unknown : ext.to_sym
       end
     end

data/templates/default/book/cover.xhtml.template

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title></title>
+</head>
+
+<body>
+  <p><img class="cover" alt="The Improbable Rise of Singularity Girl, by Bryce Anderson" src="../Images/cover.jpg" /></p>
+</body>
+</html>

data/templates/default/settings/config.rb.form

@@ -42,7 +42,7 @@ FunWith::Configurations::Config.new do
       # chapter_summary that comes after, you might want to define the matcher more
       # specifically, for example 'chapter-\d+'  (chapter followed by dash followed by any number of numbers).
       # 
-      "chapter-*", 
+      "chapter-.*", 
       "afterword"
     ]
 

data/test/test_epubforge.rb

@@ -7,7 +7,7 @@ class TestEpubforge < Test::Unit::TestCase  #
       printout = EpubForge.collect_stdout do
         EpubForge::Action::Runner.new.exec    # empty args, should append --help
       end
-      
+
       assert_match /\( wc \| count \)/, printout
       assert_match /epubforge \[action\] \[folder\]/, printout
     end
@@ -27,10 +27,10 @@ class TestEpubforge < Test::Unit::TestCase  #
       should "successfully count ALL THE WORDS!" do
         create_project do
           EpubForge.collect_stdout do
-            report = EpubForge::Action::Runner.new.exec( "wc", @project_dir )
+            report = EpubForge::Action::Runner.new.exec( "wc", @project_dir ).execution_returned
             assert_kind_of Hash, report
-            assert_equal 87, report["Book"]
-            assert_equal 94, report["Today"]
+            assert_equal 119, report["Book"]
+            assert_equal 126, report["Today"]
             assert @project_dir.join( EpubForge::Project::SETTINGS_FOLDER, EpubForge::Action::WordCount::WORD_COUNT_FILE ).exist?
           end
         end  
@@ -39,7 +39,9 @@ class TestEpubforge < Test::Unit::TestCase  #
       should "fail to count words when no project is given and cwd is not a project" do
         create_project do
           printout = EpubForge.collect_stdout do
-            assert !EpubForge::Action::Runner.new.exec( "wc" )
+            run_description = EpubForge::Action::Runner.new.exec( "wc" )
+            assert_equal nil, run_description.execution_returned
+            assert_equal false, run_description.success?
           end
           
           assert_match /Error\(s\) trying to complete the requested action/, printout
@@ -74,8 +76,8 @@ class TestEpubforge < Test::Unit::TestCase  #
               end
               
               d.join("Text") do |d|
-                d.join( "section0002.xhtml" ) do |section|
-                  assert section.file?
+                d.join( "afterword.xhtml" ) do |section|
+                  assert section.file?, "file should exist: chapter-0002.xhtml"
                   section_text = section.read
                   assert_match /DOCTYPE/, section_text
                   assert_match /<title>#{@book_title}<\/title>/, section_text
@@ -90,7 +92,7 @@ class TestEpubforge < Test::Unit::TestCase  #
               d.join( "content.opf" ) do |content|
                 content_text = content.read
                 assert_match /<dc:title>#{@book_title}<\/dc:title>/, content_text
-                assert_match /Text\/section0003/, content_text
+                assert_match /Text\/chapter-0003/, content_text
               end
               
               d.join( "toc.ncx" ) do |toc|
@@ -128,7 +130,6 @@ class TestEpubforge < Test::Unit::TestCase  #
         
         assert @project_dir.directory?, "Project directory doesn't exist.  Cannot proceed."
         
-        
         @book_title = fill_in_project_options[:answers][:title]
         @chapter_count = fill_in_project_options[:answers][:chapter_count].to_i
         @ebook_file = @project_dir.join( @book_title.epf_underscorize + ".epub" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubforge
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdg
@@ -223,6 +223,7 @@ files:
 - ./config/actions/help.rb
 - ./config/actions/init.rb
 - ./config/actions/kindle.rb
+- ./config/actions/mobify.rb
 - ./config/actions/notes_to_epub.rb
 - ./config/actions/notes_to_kindle.rb
 - ./config/actions/word_count.rb
@@ -248,6 +249,7 @@ files:
 - ./lib/epub/assets/page.rb
 - ./lib/epub/assets/stylesheet.rb
 - ./lib/epub/assets/textile.rb
+- ./lib/epub/assets/xhtml.rb
 - ./lib/epub/builder.rb
 - ./lib/epub/packager.rb
 - ./lib/epubforge.rb
@@ -268,11 +270,13 @@ files:
 - ./lib/utils/template_evaluator.rb
 - ./templates/default/book/afterword.markdown.template
 - ./templates/default/book/chapter-%i%.markdown.sequence
+- ./templates/default/book/cover.xhtml.template
 - ./templates/default/book/foreword.markdown.template
 - ./templates/default/book/images/cover.png
 - ./templates/default/book/stylesheets/stylesheet.css.template
 - ./templates/default/book/title_page.markdown.template
 - ./templates/default/notes/character.named.markdown.template
+- ./templates/default/notes/images/cover.png
 - ./templates/default/notes/stylesheets/stylesheet.css.template
 - ./templates/default/payload.rb
 - ./templates/default/settings/actions/local_action.rb.example
@@ -311,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4298602007966861026
+      hash: 243230996870064853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: