sc2epub 0.0.3 → 0.0.4

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.0.4
+Rewrite directory recursion to loop. for performance.
+Fix bug in Makefile
+
 = 0.0.3
 Rewrite some class.
 Add encoding-convert.

data/lib/sc2epub/converter.rb

@@ -1,5 +1,5 @@
 class Sc2epub::Converter
-    require 'kconv'
+    require 'nkf'
     require 'fileutils'
     def initialize env, root, output
         @root = path(root)
@@ -73,17 +73,18 @@ class Sc2epub::Converter
         end
     end
     def dofile path
-        if File::extname(path) == '.html' or File::extname(path) == '.xhtml'
+        ext = File::extname(path)
+        if ext == '.html' or ext == '.xhtml' or ext == '.jpg' or ext == '.gif' or ext == '.png'
             FileUtils::cp(path, @output)
             return
         end
         output = @output
         s = open(path){|io|io.read}
-        enc = Kconv::guess(s)
-        if enc==Kconv::BINARY
+        enc = NKF::guess(s)
+        if enc==NKF::BINARY
             return nil
-        elsif enc!=Kconv::UTF8
-            s = s.toutf8
+        elsif enc!=NKF::ASCII and enc!=NKF::UTF8
+            s = NKF::nkf('-wxm0', s)
         end
         title = title(local(path))
         s = @template.xhtml('title'=>local(path), 'body'=>s)
@@ -101,18 +102,31 @@ class Sc2epub::Converter
     end
     def dodir dir
         return [] if File::basename(dir)=~/^\..*/
-        @dirstack.push({:name =>local(dir), :src =>nil,
+        @dirstack.push({:name =>local(dir), :src =>nil, :path => dir,
                            :type => :dir, :level => @dirstack.size})
-        Dir::foreach(dir) do |i|
-            next if i=="."||i==".."
-            path = File::join(dir, i)
-            if FileTest::directory? path
-                dodir(path)
-            elsif FileTest::file? path
-                dofile(path)
+        cache = {}
+        until(@dirstack.empty?)
+            dir = @dirstack.last[:path]
+            flag = false
+            Dir::foreach(dir) do |i|
+                next if i=="."||i==".."
+                path = File::join(dir, i)
+                next if cache[path]
+                if FileTest::directory? path
+                    @dirstack.push({:name =>local(path), :src =>nil, :path => path,
+                                       :type => :dir, :level => @dirstack.size})
+                    flag = true
+                    break
+                elsif FileTest::file? path
+                    dofile(path)
+                    cache[path] = true
+                end
+            end
+            unless flag
+                done = @dirstack.pop
+                cache[done[:path]] = true
             end
         end
-        @dirstack.pop
     end
     def doroot dir
         dir = path(dir)

data/lib/sc2epub/template/makefile.tmpl

@@ -11,8 +11,8 @@ kindle: $(MOBI)
 
 .PHONY: clean
 clean:
-	find ./ -name "*.epub" -exec rm {} \\;
-	find ./ -name "*.mobi" -exec rm {} \\;
+	find ./ -name "*.epub" -exec rm {} \;
+	find ./ -name "*.mobi" -exec rm {} \;
 
 $(EPUB):
 	zip -Xr9D $(EPUB) mimetype META-INF toc.ncx $(PROJECT).opf

data/lib/sc2epub.rb

@@ -2,5 +2,5 @@ module Sc2epub
     require 'sc2epub/converter'
     require 'sc2epub/template'
     require 'sc2epub/main'
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
 end

data/sc2epub.gemspec

@@ -11,8 +11,7 @@ GEMSPEC = Gem::Specification::new do |s|
     s.required_ruby_version = '>= 1.8.6'
     s.executables = ['sc2epub']
     s.default_executable = 'sc2epub'
-
-    s.files = Dir::glob("{lib,bin}/**/*") + ['sc2epub.gemspec', 'README', 'CHANGES']
+    s.files = Dir::glob("{lib,bin,test}/**/*") + ['sc2epub.gemspec', 'README', 'CHANGES']
     s.has_rdoc = false
     s.homepage = 'https://github.com/takada-at/sc2epub'
     s.rubyforge_project = 'sc2epub'

data/test/sc2epubspec.rb

@@ -0,0 +1,100 @@
+require 'rubygems'
+require 'lib/sc2epub'
+
+describe Sc2epub::Converter, 'when on html' do
+    before(:all) do
+        @in = File::join(File::dirname(__FILE__), 'in')
+        @out = File::join(File::dirname(__FILE__), 'out')
+        `rm -r #{@in}` if FileTest::exists? @in
+        `rm -r #{@out}` if FileTest::exists? @out
+        `mkdir #{@in}`
+        `mkdir #{@out}`
+        open(File::join(@in, 'some.html'), 'w') do |io|
+            io.write('<html></html>')
+        end
+        open(File::join(@in, 'some.rb'), 'w') do |io|
+            io.write('puts "hello"')
+        end
+        @converter = Sc2epub::Converter::new({:author => 'test', :lang => 'en'}, @in, @out)
+        @converter.doroot(@in)
+        @converter.dogenerate('test')
+    end
+    it 'should copy html' do
+        FileTest.should be_exists(File::join(@out, 'some.html'))
+    end
+    it 'should rewrite source code' do
+        FileTest.should be_exists(File::join(@out, 'some_rb.html'))
+    end
+    it 'should not rewrite html' do
+        FileTest.should_not be_exists(File::join(@out, 'some_html.html'))
+    end
+    after(:all) do
+        `rm -r #{@in}` if FileTest::exists? @in
+        `rm -r #{@out}` if FileTest::exists? @out
+    end
+end
+describe Sc2epub::Converter, 'when on sc2epub/lib'do
+    before(:all) do
+        @lib = File::join(File::dirname(__FILE__), '../lib')
+        @out = File::join(File::dirname(__FILE__), 'out')
+        `mkdir #{@out}`
+        @converter = Sc2epub::Converter::new({:author => 'test', :lang => 'en'}, @lib, @out)
+        @converter.doroot(@lib)
+        @converter.dogenerate('test')
+    end
+    it 'should create META-INF and container.xml' do
+        FileTest.should be_exists(File::join(@out, 'META-INF'))
+        FileTest.should be_directory(File::join(@out, 'META-INF'))
+        FileTest.should be_exists(File::join(@out, 'META-INF', 'container.xml'))
+    end
+    it 'should create mimetype' do
+        FileTest.should be_exists(File::join(@out, 'mimetype'))
+    end
+    it 'should create Makefile' do
+        FileTest.should be_exists(File::join(@out, 'Makefile'))
+    end
+    it 'should create toc.ncx, test.opf' do
+        FileTest.should be_exists(File::join(@out, 'toc.ncx'))
+        FileTest.should be_exists(File::join(@out, 'test.opf'))
+    end
+    it 'should create "sc2epub_rb.html"' do
+        FileTest.should be_exists(File::join(@out, 'sc2epub_rb.html'))
+    end
+    it 'should create "sc2epub_converter_rb.html"' do
+        FileTest.should be_exists(File::join(@out, 'sc2epub_converter_rb.html'))
+    end
+    it 'should create html for any file in directory' do
+        checkfile = lambda do |f|
+            return if File::extname(f)=='.jpg'
+            f = @converter.path(f)
+            html = @converter.title(@converter.local(f))+'.html'
+            FileTest.should be_exists(File::join(@out, html))
+        end
+        checkdir = lambda do |d|
+            Dir::foreach(d) do |c|
+                next if c == '.' or c == '..'
+                path = File::join(d, c)
+                if FileTest::file? path
+                    checkfile.call(path)
+                elsif FileTest::directory? path
+                    checkdir.call(path)
+                end
+            end
+        end
+        checkdir.call(@lib)
+    end
+    it 'should have "test" in title' do
+        s = open(File::join(@out, 'test.opf')){|io|io.read}
+        /<dc:Title>(.*)<\/dc:Title>/.match(s).should_not be(nil)
+        Regexp::last_match[1].should == 'test'
+        /<dc:Language>(.*)<\/dc:Language>/.match(s).should_not be(nil)
+        Regexp::last_match[1].should == 'en'
+        /<dc:Creator>(.*)<\/dc:Creator>/.match(s).should_not be(nil)
+        Regexp::last_match[1].should == 'test'
+    end
+    after(:all) do
+        if FileTest::exists? @out
+            `rm -r #{@out}`
+        end
+    end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - takada-at
@@ -41,6 +41,7 @@ files:
 - lib/sc2epub/converter.rb
 - lib/sc2epub/main.rb
 - bin/sc2epub
+- test/sc2epubspec.rb
 - sc2epub.gemspec
 - README
 - CHANGES