epubforge 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/config/actions/kindle.rb

@@ -23,7 +23,7 @@ module EpubForge
         return false unless fulfill_requirements
         
         say "converting from #{@src_epub} to #{@dst_mobi}"
-        cmd = "ebook-convert #{@src_epub} #{@dst_mobi}"
+        cmd = "ebook-convert --no-default-epub-cover #{@src_epub} #{@dst_mobi}"
         say "executing: #{cmd}"
         `#{cmd}`
 

data/lib/core_extensions/string.rb

@@ -15,7 +15,6 @@ class String
   def epf_titlecap_words
     nocaps = %w(a and at be but in is nor of or so teh the to with)
     upcase = %w(Ii Ii: Iii M.d.)       # TODO:  ick
-    debugger if self.match( /ii/i )
 
     words = self.downcase.gsub(/\u00a0/, ' ').split(/(\s|\n)+/).map(&:strip).delete_if(&:epf_blank?)
     first_word = true

data/lib/epub/assets/asset.rb

@@ -5,6 +5,10 @@ module EpubForge
         def media_type
           MEDIA_TYPES[@ext]
         end
+        
+        def cover?
+          false
+        end
       end
     end
   end

data/lib/epub/assets/font.rb

@@ -0,0 +1,21 @@
+module EpubForge
+  module Epub
+    module Assets
+      class Font < Asset
+        attr_reader :ext, :filename, :name
+        def initialize( filename, options = {} )
+          @filename = filename.fwf_filepath
+          @name, @ext  = @filename.basename_and_ext
+        end
+        
+        def link
+          FONT_DIR.join( @filename.basename.to_s )
+        end
+        
+        def item_id
+          @filename.basename.to_s
+        end
+      end
+    end
+  end
+end

data/lib/epub/assets/image.rb

@@ -9,7 +9,15 @@ module EpubForge
         end
   
         def link
-          IMAGES_DIR.join( "#{@name}.#{@ext}"  )
+          IMAGE_DIR.join( "#{@name}.#{@ext}"  )
+        end
+        
+        def item_id
+          cover? ? "cover-image" : self.link.basename
+        end
+        
+        def cover?
+          self.name == "cover"
         end
       end
     end

data/lib/epub/assets/page.rb

@@ -44,22 +44,16 @@ module EpubForge
           TEXT_DIR.join( "#{@section_id}.#{@dest_extension}" )
         end
         
-        def media_type
-          MEDIA_TYPES[@dest_extension]
+        def item_id
+          cover? ? "cover" : self.link.basename
         end
         
-        def cover( val = nil )
-          unless val.nil?
-            @cover = val
-          end
-          @cover
+        def media_type
+          MEDIA_TYPES[@dest_extension]
         end
         
-        def cover_asset( val = nil )
-          unless val.nil?
-            @cover = val
-          end
-          @cover
+        def cover?
+          @section_id == "cover"
         end
       end
     end

data/lib/epub/assets/stylesheet.rb

@@ -13,6 +13,10 @@ module EpubForge
           STYLE_DIR.join( @name )
         end
         
+        def item_id
+          @name
+        end
+        
         def media_type
           MEDIA_TYPES["css"]
         end

data/lib/epub/builder.rb

@@ -5,16 +5,18 @@ module EpubForge
   module Epub
     PAGE_FILE_EXTENSIONS  = %w(html markdown textile xhtml)
     IMAGE_FILE_EXTENSIONS = %w(jpg png gif)
+    FONT_FILE_EXTENSION   = %w(ttf otf)
 
     MEDIA_TYPES = { "gif" => "image/gif", "jpg" => "image/jpeg", "png" => "image/png",
                     "css" => "text/css", "js" => "application/javascript", "pdf" => "application/pdf",
-                    "txt" => "text/plain", "xhtml" => "application/xhtml+xml"
+                    "txt" => "text/plain", "xhtml" => "application/xhtml+xml",
+                    "ttf" => "application/x-font-ttf", "otf" => "application/x-font-opentype"
                   }
     
-    IMAGES_DIR = "".fwf_filepath.join( "/", "OEBPS", "Images" )
-    STYLE_DIR  = "".fwf_filepath.join( "/", "OEBPS", "Styles" )
-    TEXT_DIR   = "".fwf_filepath.join( "/", "OEBPS", "Text" )
-    
+    IMAGE_DIR, STYLE_DIR, TEXT_DIR, FONT_DIR = %w(Images Styles Text Fonts).map{ |dir| 
+      "/".fwf_filepath.join("OEBPS", dir) 
+    }
+        
     class Builder
       attr_reader :stylesheets
       
@@ -56,6 +58,10 @@ module EpubForge
         @stylesheets = @book_dir.glob( "stylesheets", "*.css" ).map do |sheet| 
           Assets::Stylesheet.new( sheet ) 
         end
+        
+        @fonts = @book_dir.glob( "fonts", ext: FONT_FILE_EXTENSION ).map do |font|
+          Assets::Font.new( font )
+        end
     
         install_cover
         
@@ -64,15 +70,15 @@ module EpubForge
       
       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" }
+        if @cover_section = @sections.detect(&:cover?)
+          # no need to do anything
+        elsif @cover_image = @images.detect(&: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>"
+          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 )
+          @cover_section = Assets::Page.new( cover_file, @metadata, @project )
+          @sections.unshift( @cover_section )
           puts "cover page generated"
         else
           return false
@@ -181,8 +187,8 @@ module EpubForge
             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
+            if @cover_section
+              b.meta :name => "cover", :content => "cover"
             end
           end
       
@@ -190,24 +196,16 @@ module EpubForge
           b.manifest do
             #     <item id="ncx" href="toc.ncx" media-type="application/x-dtbncx+xml"/>
             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.basename, :href => section.link.relative_path_from("/OEBPS"), :"media-type" => section.media_type
-            end
-        
-            @images.each do |image|
-              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.relative_path_from("/OEBPS"), :"media-type" => sheet.media_type
+            [@sections, @images, @stylesheets, @fonts].flatten.each do |asset|
+              b.item :id => asset.item_id, :href => asset.link.relative_path_from("/OEBPS"), :"media-type" => asset.media_type
             end
           end
       
           # <spine toc="ncx"> 
           b.spine :toc => "ncx" do
             @sections.each do |section|
-              b.itemref :idref => section.dest_filename
+              b.itemref :idref => section.item_id
             end
           end
       
@@ -246,7 +244,7 @@ module EpubForge
               end
             end
           
-            if @images.length > 0
+            unless @images.epf_blank?
               build.dir "Images" do
                 for img in @images
                   build.copy( img.filename )
@@ -261,6 +259,14 @@ module EpubForge
                 end
               end
             end
+            
+            unless @fonts.epf_blank?
+              build.dir "Fonts" do
+                for font in @fonts
+                  build.copy( font.filename )
+                end
+              end
+            end
           end
         end
       end
@@ -268,11 +274,11 @@ module EpubForge
       def package epub_filename
         Packager.new( @scratch_dir, epub_filename ).package
       end
-  
+      
       def clean
-        # `rm -r #{@scratch_dir}`
+        # do nothing
       end
-      
+
       protected      
       def wrap_page content = ""
         b = XmlBuilder::XmlMarkup.new( :indent => 2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epubforge
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -244,6 +244,7 @@ files:
 - ./lib/core_extensions/string.rb
 - ./lib/custom_helpers.rb
 - ./lib/epub/assets/asset.rb
+- ./lib/epub/assets/font.rb
 - ./lib/epub/assets/html.rb
 - ./lib/epub/assets/image.rb
 - ./lib/epub/assets/markdown.rb
@@ -316,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2723822957058462033
+      hash: -2032858985098992460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: