repub 0.3.2 → 0.3.3

data/lib/repub/app/parser.rb

@@ -121,7 +121,7 @@ module Repub
             # Get item's anchor and href
             a = item.name == 'a' ? item : item.at('a')
             next if !a
-            href = a[:href]
+            href = a['href']
             next if !href
             # Is this a leaf item or node ?
             subsection = item.xpath(@selectors[:toc_section]).first

data/lib/repub/app/profile.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'yaml'
 
 module Repub
   class App
@@ -29,26 +30,26 @@ module Repub
         profile = Profile.new
         if p = profile[name]
           keys = p.keys.map{|k| k.to_s }.sort.map{|k| k.to_sym }
-          keys.each do |k|
-            v = p[k]
-            next if v.nil? || (v.respond_to?(:empty?) && v.empty?)
-            case k
+          keys.each do |key|
+            val = p[key]
+            next if val.nil? || (val.respond_to?(:empty?) && val.empty?)
+            case key
             when :selectors
-              printf("%4s%-6s\n", '', k)
-              selector_keys = v.keys.map{|k| k.to_s }.sort.map{|k| k.to_sym }
-              selector_keys.each { |sk| printf("%8s%-12s %s\n", '', sk, v[sk]) }
+              printf("%4s%-6s\n", '', key)
+              selector_keys = val.keys.map{|k| k.to_s }.sort.map{|k| k.to_sym }
+              selector_keys.each { |sk| printf("%8s%-12s %s\n", '', sk, val[sk]) }
             when :remove
-              printf("%4s%-6s\n", '', k)
-              v.each { |rk| printf("%20s %s\n", '', rk) }
+              printf("%4s%-6s\n", '', key)
+              val.each { |rk| printf("%20s %s\n", '', rk) }
             when :rx
-              printf("%4s%-6s\n", '', k)
-              v.each { |rk| printf("%20s %s\n", '', rk) }
+              printf("%4s%-6s\n", '', key)
+              val.each { |rk| printf("%20s %s\n", '', rk) }
             when :metadata
-              printf("%4s%-6s\n", '', k)
-              metadata_keys = v.keys.map{|k| k.to_s }.sort.map{|k| k.to_sym }
-              metadata_keys.each { |mk| printf("%8s%-12s %s\n", '', mk, v[mk]) }
+              printf("%4s%-6s\n", '', key)
+              metadata_keys = val.keys.map{|k| k.to_s }.sort.map{|k| k.to_sym }
+              metadata_keys.each { |mk| printf("%8s%-12s %s\n", '', mk, val[mk]) }
             else
-              printf("%4s%-16s %s\n", '', k, v)
+              printf("%4s%-16s %s\n", '', key, val)
             end
           end
         end

data/lib/repub/epub/container.rb

@@ -1,28 +1,28 @@
-require 'rubygems'
-require 'builder'
-
-module Repub
-  module Epub
-  
-  class Container
-    def to_xml
-      out = ''
-      builder = Builder::XmlMarkup.new(:target => out, :indent => 4)
-      builder.instruct!
-      builder.container :xmlns => "urn:oasis:names:tc:opendocument:xmlns:container", :version => "1.0" do
-        builder.rootfiles do
-          builder.rootfile 'full-path' => "content.opf", 'media-type' => "application/oebps-package+xml"
-        end
-      end
-      out
-    end
-  
-    def save(path = 'container.xml')
-      File.open(path, 'w') do |f|
-        f << to_xml
-      end
-    end
-  end
-
-  end
-end
+require 'rubygems'
+require 'builder'
+
+module Repub
+  module Epub
+  
+  class Container
+    def to_xml
+      out = ''
+      builder = Builder::XmlMarkup.new(:target => out)
+      builder.instruct!
+      builder.container :xmlns => "urn:oasis:names:tc:opendocument:xmlns:container", :version => "1.0" do
+        builder.rootfiles do
+          builder.rootfile 'full-path' => "content.opf", 'media-type' => "application/oebps-package+xml"
+        end
+      end
+      out
+    end
+  
+    def save(path = 'container.xml')
+      File.open(path, 'w') do |f|
+        f << to_xml
+      end
+    end
+  end
+
+  end
+end

data/lib/repub/epub/content.rb

@@ -8,12 +8,9 @@ module Repub
     
     def initialize(uid)
       @metadata = Metadata.new('Untitled', 'en', uid, Date.today.to_s)
-      @css_counter = 0
-      @img_counter = 0
-      @html_counter = 0
       @manifest_items = []
       @spine_items = []
-      @manifest_items << ContentItem.new('ncx', 'toc.ncx', 'application/x-dtbncx+xml')
+      @manifest_items << ContentItem.new('ncx', 'toc.ncx')
     end
     
     class Metadata < Struct.new(
@@ -31,40 +28,42 @@ module Repub
     end
     
     attr_reader :metadata
-    
-    def add_page_template(href = 'page-template.xpgt', id = 'pt')
-      @manifest_items << ContentItem.new(id, href, 'application/vnd.adobe-page-template+xml')
-    end
-    
-    def add_stylesheet(href, id = nil)
-      @manifest_items << ContentItem.new(id || "css_#{@css_counter += 1}", href, 'text/css')
-    end
-    
-    def add_image(href, id = nil)
-      image_type = case(href.strip.downcase)
-        when /.*\.(jpeg|jpg)$/
-          'image/jpeg'
-        when /.*\.png$/
-          'image/png'
-        when /.*\.gif$/
-          'image/gif'
-        when /.*\.svg$/
-          'image/svg+xml'
-        else
-          raise 'Unsupported image type'
-      end
-      @manifest_items << ContentItem.new(id || "img_#{@img_counter += 1}", href, image_type)
+
+    def add_item(href, id = nil)
+      item = ContentItem.new(id || "item_#{@manifest_items.size}", href)
+      @manifest_items << item
+      @spine_items << item if item.document?
     end
     
-    def add_document(href, id = nil)
-      manifest_item = ContentItem.new(id || "item_#{@html_counter += 1}", href, 'application/xhtml+xml')
-      @manifest_items << manifest_item
-      @spine_items << manifest_item
-    end
+    #def add_stylesheet(href, id = nil)
+    #  @manifest_items << ContentItem.new(id || "css_#{@css_counter += 1}", href, 'text/css')
+    #end
+    #
+    #def add_image(href, id = nil)
+    #  image_type = case(href.strip.downcase)
+    #    when /.*\.(jpeg|jpg)$/
+    #      'image/jpeg'
+    #    when /.*\.png$/
+    #      'image/png'
+    #    when /.*\.gif$/
+    #      'image/gif'
+    #    when /.*\.svg$/
+    #      'image/svg+xml'
+    #    else
+    #      raise 'Unsupported image type'
+    #  end
+    #  @manifest_items << ContentItem.new(id || "img_#{@img_counter += 1}", href, image_type)
+    #end
+    #
+    #def add_document(href, id = nil)
+    #  manifest_item = ContentItem.new(id || "item_#{@html_counter += 1}", href, 'application/xhtml+xml')
+    #  @manifest_items << manifest_item
+    #  @spine_items << manifest_item
+    #end
     
     def to_xml
       out = ''
-      builder = Builder::XmlMarkup.new(:target => out, :indent => 4)
+      builder = Builder::XmlMarkup.new(:target => out)
       builder.instruct!
       builder.package :xmlns => "http://www.idpf.org/2007/opf",
           'unique-identifier' => "dcidid",
@@ -83,7 +82,7 @@ module Repub
     end
     
     private
-    
+
     def metadata_to_xml(builder)
       builder.metadata 'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
         'xmlns:dcterms' => "http://purl.org/dc/terms/",
@@ -129,6 +128,32 @@ module Repub
         :href,
         :media_type
       )
+
+      def initialize(id, href)
+        super(id, href)
+        self.media_type = case href.strip.downcase
+          when /.*\.html?$/
+            'application/xhtml+xml'
+          when /.*\.css$/
+            'text/css'
+          when /.*\.(jpeg|jpg)$/
+            'image/jpeg'
+          when /.*\.png$/
+            'image/png'
+          when /.*\.gif$/
+            'image/gif'
+          when /.*\.svg$/
+            'image/svg+xml'
+          when /.*\.ncx$/
+            'application/x-dtbncx+xml'
+          else
+            raise 'Unknown media type'
+        end
+      end
+
+      def document?
+        self.media_type == 'application/xhtml+xml'
+      end
     end
     
     def manifest_to_xml(manifest_items, builder)

data/lib/repub/epub/toc.rb

@@ -1,139 +1,139 @@
-require 'rubygems'
-require 'builder'
-
-module Repub
-  module Epub
-  
-  class Toc
-    
-    def initialize(uid)
-      @head = Head.new(uid)
-      @doc_title = DocTitle.new('Untitled')
-      @nav_map = NavMap.new
-    end
-
-    def title
-      @doc_title.text
-    end
-    
-    def title=(text)
-      @doc_title = DocTitle.new(text)
-    end
-    
-    attr_reader :nav_map
-    
-    def to_xml
-      out = ''
-      builder = Builder::XmlMarkup.new(:target => out, :indent => 4)
-      builder.instruct!
-      builder.declare! :DOCTYPE, :ncx, :PUBLIC, "-//NISO//DTD ncx 2005-1//EN", "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd"
-      builder.ncx :xmlns => "http://www.daisy.org/z3986/2005/ncx/", :version => "2005-1" do
-        @nav_map.calc_depth_and_play_order
-        @head.depth = @nav_map.depth
-        @head.to_xml(builder)
-        @doc_title.to_xml(builder)
-        @nav_map.to_xml(builder)
-      end
-      out
-    end
-    
-    def save(path = 'toc.ncx')
-      File.open(path, 'w') do |f|
-        f << to_xml
-      end
-    end
-    
-    class Head < Struct.new(
-        :uid
-      )
-      
-      attr_accessor :depth
-      
-      def to_xml(builder)
-        builder.head do 
-          builder.meta :name => "dtb:uid", :content => self.uid
-          builder.meta :name => "dtb:depth", :content => @depth
-          builder.meta :name => "dtb:totalPageCount", :content => 0
-          builder.meta :name => "dtb:dtb:maxPageNumber", :content => 0
-        end
-      end
-    end
-    
-    class DocTitle < Struct.new(
-        :text
-      )
-      
-      def to_xml(builder)
-        builder.docTitle do 
-          builder.text self.text
-        end
-      end
-    end
-    
-    class NavMap
-      class NavPoint < Struct.new(
-          :title,
-          :src
-        )
-        
-        def initialize(title, src)
-          super
-          @@last_play_order = 0
-          @play_order = 0
-          @child_points = []
-        end
-        
-        def add_nav_point(title, src)
-          nav_point = NavPoint.new(title, src)
-          @child_points << nav_point
-          nav_point
-        end
-        
-        def to_xml(builder)
-          builder.navPoint :id => "navPoint-#{@play_order}", :playOrder => @play_order do
-            builder.navLabel do
-              builder.text self.title
-            end
-            builder.content :src => self.src
-            @child_points.each { |child_point| child_point.to_xml(builder) }
-          end
-        end
-        
-        def calc_depth_and_play_order(nav_map, depth)
-          nav_map.depth = depth
-          @play_order = @@last_play_order += 1
-          @child_points.each { |child_point| child_point.calc_depth_and_play_order(nav_map, depth + 1) }
-        end
-      end
-      
-      def initialize
-        @nav_points = []
-        @depth = 1
-      end
-      
-      def add_nav_point(title, src)
-        nav_point = NavPoint.new(title, src)
-        @nav_points << nav_point
-        nav_point
-      end
-    
-      attr_reader :depth
-      
-      def depth=(value)
-        @depth = value if value > @depth
-      end
-      
-      def calc_depth_and_play_order
-        @nav_points.each { |nav_point| nav_point.calc_depth_and_play_order(self, 1) }
-      end
-      
-      def to_xml(builder)
-        builder.navMap do
-          @nav_points.each { |nav_point| nav_point.to_xml(builder) }
-        end
-      end
-    end
-  end
-
-  end
-end
+require 'rubygems'
+require 'builder'
+
+module Repub
+  module Epub
+  
+  class Toc
+    
+    def initialize(uid)
+      @head = Head.new(uid)
+      @doc_title = DocTitle.new('Untitled')
+      @nav_map = NavMap.new
+    end
+
+    def title
+      @doc_title.text
+    end
+    
+    def title=(text)
+      @doc_title = DocTitle.new(text)
+    end
+    
+    attr_reader :nav_map
+    
+    def to_xml
+      out = ''
+      builder = Builder::XmlMarkup.new(:target => out)
+      builder.instruct!
+      builder.declare! :DOCTYPE, :ncx, :PUBLIC, "-//NISO//DTD ncx 2005-1//EN", "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd"
+      builder.ncx :xmlns => "http://www.daisy.org/z3986/2005/ncx/", :version => "2005-1" do
+        @nav_map.calc_depth_and_play_order
+        @head.depth = @nav_map.depth
+        @head.to_xml(builder)
+        @doc_title.to_xml(builder)
+        @nav_map.to_xml(builder)
+      end
+      out
+    end
+    
+    def save(path = 'toc.ncx')
+      File.open(path, 'w') do |f|
+        f << to_xml
+      end
+    end
+    
+    class Head < Struct.new(
+        :uid
+      )
+      
+      attr_accessor :depth
+      
+      def to_xml(builder)
+        builder.head do 
+          builder.meta :name => "dtb:uid", :content => self.uid
+          builder.meta :name => "dtb:depth", :content => @depth
+          builder.meta :name => "dtb:totalPageCount", :content => 0
+          builder.meta :name => "dtb:maxPageNumber", :content => 0
+        end
+      end
+    end
+    
+    class DocTitle < Struct.new(
+        :text
+      )
+      
+      def to_xml(builder)
+        builder.docTitle do 
+          builder.text self.text
+        end
+      end
+    end
+    
+    class NavMap
+      class NavPoint < Struct.new(
+          :title,
+          :src
+        )
+        
+        def initialize(title, src)
+          super
+          @@last_play_order = 0
+          @play_order = 0
+          @child_points = []
+        end
+        
+        def add_nav_point(title, src)
+          nav_point = NavPoint.new(title, src)
+          @child_points << nav_point
+          nav_point
+        end
+        
+        def to_xml(builder)
+          builder.navPoint :id => "navPoint-#{@play_order}", :playOrder => @play_order do
+            builder.navLabel do
+              builder.text self.title
+            end
+            builder.content :src => self.src
+            @child_points.each { |child_point| child_point.to_xml(builder) }
+          end
+        end
+        
+        def calc_depth_and_play_order(nav_map, depth)
+          nav_map.depth = depth
+          @play_order = @@last_play_order += 1
+          @child_points.each { |child_point| child_point.calc_depth_and_play_order(nav_map, depth + 1) }
+        end
+      end
+      
+      def initialize
+        @nav_points = []
+        @depth = 1
+      end
+      
+      def add_nav_point(title, src)
+        nav_point = NavPoint.new(title, src)
+        @nav_points << nav_point
+        nav_point
+      end
+    
+      attr_reader :depth
+      
+      def depth=(value)
+        @depth = value if value > @depth
+      end
+      
+      def calc_depth_and_play_order
+        @nav_points.each { |nav_point| nav_point.calc_depth_and_play_order(self, 1) }
+      end
+      
+      def to_xml(builder)
+        builder.navMap do
+          @nav_points.each { |nav_point| nav_point.to_xml(builder) }
+        end
+      end
+    end
+  end
+
+  end
+end