gepub 0.6.3.1 → 0.6.4

data/bin/gepuber

@@ -44,12 +44,45 @@ destbasedir = File.expand_path(destbasedir)
 srcdir = opt.parse(ARGV)[0]
 srccheck(srcdir, configfilename)
 
+epubname_to_generate = 'gepuber_generated.epub'
+
 Dir.chdir(srcdir)
 begin
   File.open(configfilename, 'rb') {
     |io|
-    gepuber = GEPUB::Gepuber.new(eval("#{io.read}"))
-    gepuber.create destbasedir
+    GEPUB::Builder.new {
+      table_of_contents = {}
+      (class<< self;self;end).send(
+                                   :define_method,
+                                   :epub_name, Proc.new { |name|
+                                     epubname_to_generate = name
+                                   })
+      eval "#{io.read}"
+      resources  {
+        Dir.glob('*.css') {
+          |f|
+          file f
+        }
+        Dir.glob('img/*') {
+          |f|
+          if File.basename(f) == 'cover.jpg'
+            cover_image f
+          else
+            file f
+          end
+        }
+        ordered {
+          Dir.glob('[0-9]*.{xhtml,html}') {
+            |f|
+            file f
+            if table_of_contents[f]
+              heading table_of_contents[f]
+            end
+          }
+        }
+      }
+    }.generate_epub(File.join(destbasedir, epubname_to_generate))
   }
 end
+  
 

data/lib/gepub/gepuber.rb

@@ -2,65 +2,40 @@ require 'rubygems'
 
 module GEPUB
   class Gepuber
-    class FileProvider
-      include Enumerable
-      def initialize(pattern)
-        @list = Dir.glob(pattern)
-      end
-
-      def each (&block)
-        @list.each {
-          |f|
-          File.open(f, 'rb') {
-            |fio|
-            yield f, fio
-          }
-        }
-      end
+    def initialize(&block)
+      @block = block
     end
 
-    attr_accessor :texts, :resources, :epubname, :coverimg, :table_of_contents, :provider
-    
-    def method_missing(name, *args)
-      @book.send(name, *args)
-    end
-    
-    def initialize(param)
-      @book = GEPUB::Book.new()
-      param.each {
-        |k,v|
-        self.send "#{k}=", v
-      }
-      @texts ||= ['[0-9]*.{xhtml,html}'] 
-      @resources ||= ['*.css',  'img/*']
-      @coverimg ||= 'cover.jpg'
-      @table_of_contents ||= {}
-      @epubname ||= 'gepuber_generated'
-      @provider ||= FileProvider
-    end
+    def create
+      table_of_contents = {}
+      epub_name = 'gepuber_generated.epub'
+      GEPUB::Builder.new {
+        block.call
+        resources {
+          Dir.glob('*.css') {
+            |f|
+            file f
+          }
+          Dir.glob('img/*') {
+            |f|
+            if File.basename(f) == 'cover.jpg'
+              cover_image f
+            else
+              file f
+            end
+          }
 
-    def create(destbasedir = ".")
-      @provider.new(@texts).each {
-        |f, fio|
-        @book.ordered {
-          item = add_item(f, fio)
-          if !@table_of_contents[f].nil?
-            item.toc_text table_of_contents[f] 
-            @table_of_contents.each {
-              |k,v|
-              k =~ /^#{f}#(.*)$/
-              add_nav(item, v, $1) unless $1.nil?
+          ordered {
+            Dir.glob('[0-9]*.{xhtml,html}') {
+              |f|
+              file f
+              if table_of_contents[f]
+                heading table_of_contents[f]
+              end
             }
-          end
+          }
         }
       }
-
-      @provider.new(@resources).each {
-        |f, fio|
-        item = add_item(f, fio)
-        item.cover_image if File.basename(f) == @coverimg
-      }
-      generate_epub(File.join(destbasedir, @epubname + '.epub'))      
     end
   end
 end

data/lib/gepub/version.rb

@@ -1,3 +1,3 @@
 module GEPUB
-  VERSION = "0.6.3.1"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 0.6.3.1
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70317965172840 !ruby/object:Gem::Requirement
+  requirement: &70124628533140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70317965172840
+  version_requirements: *70124628533140
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70317964165820 !ruby/object:Gem::Requirement
+  requirement: &70124628532640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317964165820
+  version_requirements: *70124628532640
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70317964163220 !ruby/object:Gem::Requirement
+  requirement: &70124628532180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70317964163220
+  version_requirements: *70124628532180
 description: gepub is a generic EPUB parser/generator. Generates and parse EPUB2 and
   EPUB3
 email:
@@ -99,7 +99,6 @@ files:
 - spec/fixtures/testdata/image1.jpg
 - spec/fixtures/testdata/test.opf
 - spec/gepub_spec.rb
-- spec/gepuber_spec.rb
 - spec/manifest_spec.rb
 - spec/metadata_spec.rb
 - spec/package_spec.rb
@@ -152,7 +151,6 @@ test_files:
 - spec/fixtures/testdata/image1.jpg
 - spec/fixtures/testdata/test.opf
 - spec/gepub_spec.rb
-- spec/gepuber_spec.rb
 - spec/manifest_spec.rb
 - spec/metadata_spec.rb
 - spec/package_spec.rb

data/spec/gepuber_spec.rb

@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require 'rubygems'
-
-describe GEPUB::Gepuber do
-  it "should be initialized with empty conf" do
-    gepuber = GEPUB::Gepuber.new({})
-    gepuber.texts.should == ['[0-9]*.{xhtml,html}']
-    gepuber.resources.should == ['*.css',  'img/*']
-    gepuber.title.to_s.should == ""
-    gepuber.table_of_contents.should == {}
-  end
-
-  it "should read config hash" do
-    conf = 
-      {
-      :language => 'ja',
-      :title => 'theTitle',
-      :creator => 'theAuthor',
-      :publisher => 'thePublisher',
-      :date => '2011-03-11',
-      :identifier => 'http://skoji.jp/gepuber/2011-03-11.0.0',
-      :epubname => 'gepub_00',
-      :table_of_contents => {
-        '1_.html' => '1st toc',
-        '3_.html' => '3rd toc',
-        '3_.html#a1' => '3rd toc 2',
-        '9_.html' => 'last toc'
-      },
-      :coverimg => 'cover.gif',
-      :texts => [ '*.html' ],
-      :resources => ['*.css','*.gif']
-    }
-
-    gepuber = GEPUB::Gepuber.new(conf )
-    gepuber.title.to_s.should == "theTitle"
-    gepuber.language.to_s.should == "ja"
-    gepuber.creator.to_s.should == "theAuthor"
-    gepuber.publisher.to_s.should == "thePublisher"
-    gepuber.date.to_s.should == "2011-03-11"
-    gepuber.identifier.should == 'http://skoji.jp/gepuber/2011-03-11.0.0'
-    gepuber.epubname.should == 'gepub_00'
-    gepuber.coverimg.should == 'cover.gif'
-    gepuber.table_of_contents.should == {  '1_.html' => '1st toc',  '3_.html' => '3rd toc', '3_.html#a1' => '3rd toc 2','9_.html' => 'last toc'}
-    gepuber.texts.should == ['*.html']
-    gepuber.resources.should == ['*.css',  '*.gif']
-
-  end
-end