eeepub 0.6.1 → 0.7.0

data/.gitignore

@@ -3,5 +3,6 @@
 coverage
 doc
 pkg
-*.gemspec
 *.epub
+.rvmrc
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in eeepub.gemspec
+gemspec

data/README.md

@@ -61,7 +61,6 @@ Install
 Requirements
 -------
 
-* ruby 1.8.7
 * builder
 * eBook Reader :)
 

data/Rakefile

@@ -1,39 +1,15 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "eeepub"
-    gem.summary = %Q{ePub generator}
-    gem.description = %Q{EeePub is a Ruby ePub generator.}
-    gem.email = "jugyo.org@gmail.com"
-    gem.homepage = "http://github.com/jugyo/eeepub"
-    gem.authors = ["jugyo"]
-    gem.add_dependency "builder"
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "rr"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new do |t|
+    t.rspec_opts = ['--color']
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+rescue LoadError => e
+  puts "RSpec not installed"
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
 begin

data/eeepub.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name        = "eeepub"
+  s.version     = "0.7.0"
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["jugyo"]
+  s.email       = ["jugyo.org@gmail.com"]
+  s.homepage    = "http://github.com/jugyo/eeepub"
+  s.summary     = %q{ePub generator}
+  s.description = %q{EeePub is a Ruby ePub generator.}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency(%q<zipruby>, ["~> 0.3"])
+  s.add_runtime_dependency(%q<builder>, ["~> 3.0"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.0"])
+  s.add_development_dependency(%q<rr>, ["~> 1.0"])
+  s.add_development_dependency(%q<simplecov>, ["~> 0.4"])
+  s.add_development_dependency(%q<nokogiri>, ["~> 1.4"])
+end

data/lib/eeepub/maker.rb

@@ -73,53 +73,66 @@ module EeePub
     #
     # @param [String] filename the ePub file name to save
     def save(filename)
-      Dir.mktmpdir do |dir|
-        @files.each do |file|
+      create_epub.save(filename)
+    end
+
+    # instead of saving to file, output the file contents. 
+    # important for serving on-the-fly doc creation from
+    # web interface where we don't want to allow file system
+    # writes (Heroku, et al.)
+    def render
+      create_epub.render
+    end
+
+    private
+
+    def create_epub
+      dir = Dir.mktmpdir
+      @files.each do |file|
+        case file
+        when String
+          FileUtils.cp(file, dir)
+        when Hash
+          file_path, dir_path = *file.first
+          dest_dir = File.join(dir, dir_path)
+          FileUtils.mkdir_p(dest_dir)
+          FileUtils.cp(file_path, dest_dir)
+        end
+      end
+
+      NCX.new(
+        :uid => @uid,
+        :title => @titles[0],
+        :nav => @nav
+      ).save(File.join(dir, @ncx_file))
+
+      OPF.new(
+        :title => @titles,
+        :identifier => @identifiers,
+        :creator => @creators,
+        :publisher => @publishers,
+        :date => @dates,
+        :language => @languages,
+        :subject => @subjects,
+        :description => @descriptions,
+        :rights => @rightss,
+        :relation => @relations,
+        :manifest => @files.map{|file|
           case file
           when String
-            FileUtils.cp(file, dir)
+            File.basename(file)
           when Hash
             file_path, dir_path = *file.first
-            dest_dir = File.join(dir, dir_path)
-            FileUtils.mkdir_p(dest_dir)
-            FileUtils.cp(file_path, dest_dir)
+            File.join(dir_path, File.basename(file_path))
           end
-        end
+        },
+        :ncx => @ncx_file
+      ).save(File.join(dir, @opf_file))
 
-        NCX.new(
-          :uid => @uid,
-          :title => @titles[0],
-          :nav => @nav
-        ).save(File.join(dir, @ncx_file))
-
-        OPF.new(
-          :title => @titles,
-          :identifier => @identifiers,
-          :creator => @creators,
-          :publisher => @publishers,
-          :date => @dates,
-          :language => @languages,
-          :subject => @subjects,
-          :description => @descriptions,
-          :rights => @rightss,
-          :relation => @relations,
-          :manifest => @files.map{|file|
-            case file
-            when String
-              File.basename(file)
-            when Hash
-              file_path, dir_path = *file.first
-              File.join(dir_path, File.basename(file_path))
-            end
-          },
-          :ncx => @ncx_file
-        ).save(File.join(dir, @opf_file))
-
-        OCF.new(
-          :dir => dir,
-          :container => @opf_file
-        ).save(filename)
-      end
+      OCF.new(
+        :dir => dir,
+        :container => @opf_file
+      )
     end
   end
 end

data/lib/eeepub/ocf.rb

@@ -1,3 +1,5 @@
+require 'zipruby'
+
 module EeePub
   # Class to create OCF
   class OCF
@@ -89,6 +91,36 @@ module EeePub
     def save(output_path)
       output_path = File.expand_path(output_path)
 
+      create_epub do
+        Zip::Archive.open(output_path, Zip::CREATE | Zip::TRUNC) do |zip|
+          Dir.glob('**/*').each do |path|
+            if File.directory?(path)
+              zip.add_dir(path)
+            else
+              zip.add_file(path)
+            end
+          end
+        end
+      end
+    end
+    
+    # Stream OCF
+    #
+    # @return [String] streaming output of the zip/epub file.
+    def render
+      create_epub do
+        buffer = Zip::Archive.open_buffer(Zip::CREATE) do |zip|
+          Dir.glob('**/*').each do |path|
+            zip.add_buffer(path, path)
+          end
+        end
+
+        return buffer
+      end
+    end
+
+    private
+    def create_epub
       FileUtils.chdir(dir) do
         File.open('mimetype', 'w') do |f|
           f << 'application/epub+zip'
@@ -98,10 +130,9 @@ module EeePub
         FileUtils.mkdir_p(meta_inf)
 
         container.save(File.join(meta_inf, 'container.xml'))
-
-        %x(zip -X9 \"#{output_path}\" mimetype)
-        %x(zip -Xr9D \"#{output_path}\" * -xi mimetype)
+        yield
       end
+
     end
   end
 end

data/spec/eeepub/maker_spec.rb

@@ -42,7 +42,7 @@ describe "EeePub::Maker" do
 
   it 'should save' do
     stub(FileUtils).cp.with_any_args
-    mock(Dir).mktmpdir {|i| i.call('/tmp')}
+    mock(Dir).mktmpdir { '/tmp' }
     mock(EeePub::NCX).new(
       :title => "sample",
       :nav => [
@@ -100,7 +100,7 @@ describe "EeePub::Maker" do
     it 'should save' do
       stub(FileUtils).cp.with_any_args
       stub(FileUtils).mkdir_p.with_any_args
-      mock(Dir).mktmpdir {|i| i.call('/tmp')}
+      mock(Dir).mktmpdir { '/tmp' }
       mock(EeePub::NCX).new.with_any_args { stub!.save }
       mock(EeePub::OPF).new(
         :title => ["sample"],

data/spec/eeepub/ocf_spec.rb

@@ -40,4 +40,10 @@ describe "EeePub::OCF" do
     @ocf.save(output_path)
     File.exists?(output_path)
   end
+
+  it 'should stream epub' do
+    output = @ocf.render
+    output.size.should == 370
+    output.is_binary_data?.should be_true
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
 require 'eeepub'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'nokogiri'
 require 'rr'
+require 'simplecov'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :rr
 end
+
+SimpleCov.start
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: eeepub
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - jugyo
@@ -14,63 +10,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +09:00
+date: 2011-05-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: zipruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: "0.3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: builder
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+        version: "3.0"
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.4"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
+  type: :development
+  version_requirements: *id006
 description: EeePub is a Ruby ePub generator.
-email: jugyo.org@gmail.com
+email: 
+- jugyo.org@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
+- eeepub.gemspec
 - examples/files/bar.html
 - examples/files/foo.html
 - examples/simple_epub.rb
@@ -93,8 +117,8 @@ homepage: http://github.com/jugyo/eeepub
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,21 +126,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: ePub generator
@@ -128,4 +148,3 @@ test_files:
 - spec/eeepub/opf_spec.rb
 - spec/eeepub_spec.rb
 - spec/spec_helper.rb
-- examples/simple_epub.rb

data/VERSION

@@ -1 +0,0 @@
-0.6.1