bindery 2.0.0 → 2.1.0

data/lib/bindery/content_methods.rb

@@ -19,18 +19,22 @@ module Bindery
     def chapter(title, filename, options={}, &block)
       div('chapter', title, filename, options, &block)
     end
-    
+
     def section(title, filename, options={}, &block)
       div('section', title, filename, options, &block)
     end
-    
+
     def part(title, filename, options={}, &block)
       div('part', title, filename, options, &block)
     end
-    
+
     def appendix(title, filename, options={}, &block)
       div('appendix', title, filename, options, &block)
     end
-    
+
+    def index(title, filename, options={}, &block)
+      div('index', title, filename, options, &block)
+    end
+
   end
 end

data/lib/bindery/division.rb

@@ -6,14 +6,14 @@ module Bindery
     attr_accessor :options
 
     include ContentMethods
-    
+
     def initialize(div_type, title, file, options)
       self.div_type = div_type
       self.title = title
       self.file = file
       self.options = options
     end
-    
+
     def valid?
       true
       # ??? title specified? Is this required by the spec? Think about
@@ -25,17 +25,17 @@ module Bindery
       #   chapters that would break up the text flow?
       # file exists, readable
       # file content properly formed?  Does that matter?  Can we
-      #   verify it? 
+      #   verify it?
     end
 
     def divisions
       @divisions ||= []
     end
-    
+
     def body_only?
       options.fetch(:body_only, true)
     end
-    
+
     def include_images?
       options.fetch(:include_images, true)
     end

data/lib/bindery/formats/epub.rb

@@ -2,10 +2,11 @@ require 'builder'
 require 'zip'
 require 'bindery/extensions/zip_file'
 require 'nokogiri'
+require 'uri'
 
 module Bindery
   module Formats
-    
+
     # Builds an EPUB book file from the book description.
     #
     # The {EPUB Wikipedia entry}[http://en.wikipedia.org/wiki/EPUB] provides a nice, concise overview of the EPUB format.
@@ -20,25 +21,25 @@ module Bindery
     # * Details of the format of other files allowed in EPUB documents are found in
     #   {Open Publication Structure (OPS) 2.0.1 - Recommended Specification}[http://idpf.org/epub/20/spec/OPS_2.0.1_draft.htm].
     class Epub
-      
+
       MimeTypes = {
         '.jpg' => 'image/jpeg',
         '.png' => 'image/png',
         '.gif' => 'image/gif',
       }
-      
+
       class ManifestEntry < Struct.new(:file_name, :xml_id, :mime_type)
       end
-      
+
       attr_accessor :book, :manifest_entries
-      
+
       def initialize(book)
         self.book = book
         book.extend BookMethods
         book.divisions.each{|division| division.extend DivisionMethods}
         self.manifest_entries = []
       end
-      
+
       def generate
         File.delete(book.epub_output_file) if File.exist?(book.epub_output_file)
         Zip::ZipFile.open(book.epub_output_file, Zip::ZipFile::CREATE) do |zipfile|
@@ -46,12 +47,12 @@ module Bindery
           zipfile.write_uncompressed_file 'mimetype', mimetype
           zipfile.mkdir 'META-INF'
           zipfile.write_file 'META-INF/container.xml', container
-          
+
           # also frontmatter, backmatter
           book.divisions.each do |division|
             write_division(division, zipfile)
           end
-          
+
           zipfile.mkdir 'css'
           zipfile.write_file 'css/book.css', stylesheet
 
@@ -59,13 +60,13 @@ module Bindery
           zipfile.write_file 'book.ncx', ncx
         end
       end
-            
+
       def mimetype
         # the mimetype file must be the first file in the archive
         # it must be ASCII, uncompressed, and unencrypted
         'application/epub+zip'
       end
-      
+
       def container
         %q{|<?xml version="1.0" encoding="UTF-8" ?>
            |<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
@@ -75,23 +76,23 @@ module Bindery
            |</container>
            |}.strip_margin
       end
-      
+
       def opf
         xm = Builder::XmlMarkup.new(:indent => 2)
         xm.instruct!
         xm.package('version'=>'2.0', 'xmlns'=>'http://www.idpf.org/2007/opf', 'unique-identifier'=>'BookId') {
-          
+
           xm.metadata('xmlns:dc'=>'http://purl.org/dc/elements/1.1/', 'xmlns:opf'=>'http://www.idpf.org/2007/opf') {
             # required elements
             xm.dc :title, book.full_title
             xm.dc :language, book.language
             xm.dc :identifier, book.url, ident_options('opf:scheme'=>'URL') if book.url
-            xm.dc :identifier, book.isbn, ident_options('opf:scheme'=>'ISBN') if book.isbn            
-            
+            xm.dc :identifier, book.isbn, ident_options('opf:scheme'=>'ISBN') if book.isbn
+
             # optional elements
             xm.dc :creator, book.author, 'opf:role'=>'aut' if book.author
           }
-          
+
           xm.manifest {
             book.divisions.each{|division| division.write_item(xm)}
             # also frontmatter, backmatter
@@ -102,17 +103,17 @@ module Bindery
             # xm.item 'id'=>'myfont', 'href'=>'css/myfont.otf', 'media-type'=>'application/x-font-opentype'
             xm.item 'id'=>'ncx', 'href'=>'book.ncx', 'media-type'=>'application/x-dtbncx+xml'
           }
-          
+
           xm.spine('toc'=>'ncx') {
             book.divisions.each{|division| division.write_itemref(xm)}
           }
-          
+
           # xm.guide {
           #   xm.reference 'type'='loi', 'title'=>'List of Illustrations', 'href'=>'appendix.html#figures'
           # }
         }
       end
-      
+
       def ncx
         xm = Builder::XmlMarkup.new(:indent => 2)
         xm.instruct!
@@ -124,18 +125,18 @@ module Bindery
             xm.meta 'name'=>'dtb:totalPageCount', 'content'=>0
             xm.meta 'name'=>'dtb:maxPageNumber', 'content'=>0
           }
-          
+
           xm.docTitle {
             xm.text book.full_title
           }
-          
+
           xm.docAuthor {
             xm.text book.author
           }
-          
+
           xm.navMap {
             play_order = 0
-            
+
             # also frontmatter, backmatter
             book.divisions.each do |division|
               play_order += 1
@@ -174,7 +175,7 @@ module Bindery
           write_division(div, zipfile)
         end
       end
-      
+
       def include_images(doc, zipfile)
         # TODO: where else can images appear? Style sheets?
         zipfile.mkdir('images') unless zip_dir_exists?(zipfile, 'images')
@@ -195,12 +196,12 @@ module Bindery
           end
         end
       end
-      
+
       def add_manifest_entry(file_name)
         xml_id, ext = File.base_parts(file_name.gsub('/', '-'))
         manifest_entries << ManifestEntry.new(file_name, xml_id, MimeTypes[ext])
       end
-      
+
       def cover
         xm = Builder::XmlMarkup.new(:indent => 2)
         xm.instruct!
@@ -223,7 +224,7 @@ module Bindery
           }
         }
       end
-      
+
       def stylesheet
         # This is a start, but needs work.
         %q{|@page {
@@ -257,7 +258,7 @@ module Bindery
            |h3.section_title {text-align: center;}
            |}.strip_margin
       end
-      
+
       def ident_options(opts)
         if book.isbn
           return opts.merge('id'=>'BookId') if opts['opf:scheme'] == 'ISBN'
@@ -266,18 +267,19 @@ module Bindery
         end
         opts
       end
-      
+
       def zip_dir_exists?(zipfile, dirname)
         dirname = "#{dirname}/" unless dirname =~ %r{/$}
         zipfile.entries.any?{|e| e.directory? && e.name == dirname}
       end
-            
+
       def zip_file_exists?(zipfile, filename)
         zipfile.entries.any?{|e| e.name == filename}
       end
-            
+
       def make_image_file_name(zipfile, url)
-        stem, ext = File.base_parts(url)
+        uri = URI(url)
+        stem, ext = File.base_parts(uri.path)
         filename = "images/#{stem}#{ext}"
         n = 0
         while zip_file_exists?(zipfile, filename)
@@ -286,31 +288,31 @@ module Bindery
         end
         filename
       end
-      
+
       module BookMethods
         def epub_output_file
           @epub_output_file ||= "#{output}.epub"
         end
-        
+
         def depth
           (divisions.map(&:depth) + [0]).max
         end
-        
+
         def ident
           isbn || url
         end
       end
-      
+
       module DivisionMethods
 
         def self.extended(obj)
           obj.divisions.each{|division| division.extend DivisionMethods}
         end
-          
+
         def epub_id
           @epub_id ||= File.stemname(file)
         end
-        
+
         def epub_output_file
           @epub_output_file ||= "#{epub_id}.xhtml"
         end
@@ -346,14 +348,14 @@ module Bindery
         end
 
       end
-      
+
       module MetadataMethods
         def to_xml(builder)
           builder.meta(options.merge(:name => name, :content => value))
           %{<dc:#{name}>#{value}</dc:#{name}>}
         end
       end
-      
+
       module DublinMetadataMethods
         def to_xml(builder)
           builder.dc name, value, options

data/lib/bindery/version.rb

@@ -1,3 +1,3 @@
 module Bindery
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindery
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -394401607600380017
+      hash: 4117656268896811284
 requirements: []
 rubyforge_project: bindery
 rubygems_version: 1.8.23