eeepub_ext 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ac6e610d8a21b64cd16c3b6f7a909aa9fc453c
-  data.tar.gz: 6722b01dcc35cf8aec238a52f2fa37a191f3e9ae
+  metadata.gz: 60ad21cac40fc06f39008ec1d59742d785280f2a
+  data.tar.gz: b013f31313fc0d73bdf3ee9fa10b3061fe647be6
 SHA512:
-  metadata.gz: 537891429ef5cbf7cd8e2cc6602a39fbe259b9458be236d1f46e92849f58e5c6e25972efc7124cffb881dcb701d4cffc02ce625666ae427035b35949960a7e1b
-  data.tar.gz: 48a7309bf507d1331c704e25f9f78e21753b9ec706095adcb197c1768ab05a2cc24927ece9c65f916e96a1292008778fb65cf73b4ecc9aaf3ee3761085329f31
+  metadata.gz: af7d451601842be93f3d41b413d50267f303c39d66fb890b594ee777bc38082afc7a6c366fc59619d41b3f1c5fda5f19ac30142d6de3a5dfaa5c40b8454e90f4
+  data.tar.gz: 5fc21232757a8cc1203c57aa7bca8c70707151677c1d3c67313e7d0ff962cdb960daee15af7823ab72038509f4a6b7c4ec1e22b2625835398d5e322a2e337ee1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Changelog
 
+### 0.8.4
+
+- Add some code from the [PR#14](https://github.com/jugyo/eeepub/pull/34)
+- Fix the failing tests
+- Minor code cleanup
+
 ### 0.8.3
 
 - Provide link to the right location for the source

data/eeepub.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "eeepub_ext"
-  s.version     = "0.8.3"
+  s.version     = "0.8.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["jugyo"]
   s.email       = ["agilecreativity@gmail.com"]
   # NOTE: the original location of the gem
-  # s.homepage    = "http://github.com/jugyo/eeepub"
+  # s.homepage  = "http://github.com/jugyo/eeepub"
   # NOTE: the current location of the modified gem
   s.homepage    = "https://github.com/agilecreativity/eeepub"
   s.summary     = %q{ePub generator - with rubyzip bug fix (unofficial fork version)}
@@ -15,16 +15,17 @@ Gem::Specification.new do |s|
                     I added the bug fix to rubyzip to make it work with my own gem (source2epub).
                     This gem will be deprecated as soon as the original author (jugyo) merge
                     the pull request from the community with this change and many others fixes.}
+  s.required_ruby_version = ">= 2.0.0"
   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_dependency "builder", "~> 3.2.2"
-  s.add_dependency "rubyzip", "~> 1.1.6"
-  s.add_development_dependency "rspec", "~> 3.1.0"
-  s.add_development_dependency "nokogiri", "~> 1.6.3.1"
-  s.add_development_dependency "rr", "~> 1.1.2"
-  s.add_development_dependency "simplecov", "~> 0.9.0"
-  s.add_development_dependency "pry", "~> 0.10.1"
-  s.add_development_dependency "pry-byebug", "~> 2.0.0" if RUBY_VERSION >= "2.0.0"
+  s.add_dependency "builder", "~> 3.2"
+  s.add_dependency "rubyzip", "~> 1.2"
+  s.add_development_dependency "rspec", "~> 3.1"
+  s.add_development_dependency "nokogiri", "~> 1.6"
+  s.add_development_dependency "rr", "~> 1.1"
+  s.add_development_dependency "simplecov", "~> 0.9"
+  s.add_development_dependency "pry", "~> 0.10"
+  s.add_development_dependency "pry-byebug", '~> 3.3'
 end

data/lib/eeepub/container_item.rb

@@ -89,6 +89,8 @@ module EeePub
         'application/x-dtbncx+xml'
       when /.*\.opf$/i
         'application/oebps-package+xml'
+      when /.*\.otf$/i
+        'application/x-font-otf'
       end
     end
 

data/lib/eeepub/ocf.rb

@@ -91,7 +91,7 @@ module EeePub
       output_path = File.expand_path(output_path)
       create_epub do
         mimetype = Zip::OutputStream::open(output_path) do |os|
-          os.put_next_entry("mimetype", nil, nil, Zip::Entry::STORED, Zlib::NO_COMPRESSION)
+          os.put_next_entry("mimetype")
           os << "application/epub+zip"
         end
         zipfile = Zip::File.open(output_path)
@@ -115,15 +115,30 @@ module EeePub
     end
 
     private
+
     def create_epub
       FileUtils.chdir(dir) do
         meta_inf = 'META-INF'
         FileUtils.mkdir_p(meta_inf)
 
         container.save(File.join(meta_inf, 'container.xml'))
+        write_ibook_font_file(meta_inf)
         yield
       end
+    end
 
+    def write_ibook_font_file(meta_inf)
+      content = %Q|
+        <?xml version="1.0" encoding="UTF-8"?>
+        <display_options>
+          <platform name="*">
+            <option name="specified-fonts">true</option>
+          </platform>
+        </display_options>
+      |
+      File.open(File.join(meta_inf,'com.apple.ibooks.display-options.xml'),'w') do |file|
+        file.write(content.strip)
+      end
     end
   end
 end

data/spec/eeepub/easy_spec.rb

@@ -1,5 +1,3 @@
-# TODO: for debugging only
-require 'pry'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "EeePub::Easy" do
@@ -45,7 +43,6 @@ HTML
   end
 
   it 'spec for prepare' do
-    pending "TODO: this result in error, disable for now"
     Dir.mktmpdir do |dir|
       mock(FileUtils).cp('image.png', dir)
 
@@ -54,8 +51,8 @@ HTML
       file1 = File.join(dir, 'section_0.html')
       file2 = File.join(dir, 'section_1.html')
 
-      File.exists?(file1).should be_true
-      File.exists?(file2).should be_true
+      expect(File.exists?(file1)).to be_truthy
+      expect(File.exists?(file2)).to be_truthy
 
       File.read(file1).should == @easy.sections[0][1]
       File.read(file2).should == @easy.sections[1][1]

data/spec/eeepub/maker_spec.rb

@@ -17,6 +17,7 @@ describe "EeePub::Maker" do
       ncx_file 'toc.ncx'
       opf_file 'content.opf'
       cover 'cover.jpg'
+      guide 'xxx'
       files ['foo.html', 'bar.html']
       nav [
         {:label => '1. foo', :content => 'foo.html'},
@@ -43,7 +44,6 @@ describe "EeePub::Maker" do
   }
 
   it 'should save' do
-    pending "TODO: this result in error, disable for now"
     stub(FileUtils).cp.with_any_args
     mock(Dir).mktmpdir { '/tmp' }
     mock(EeePub::NCX).new(
@@ -54,21 +54,23 @@ describe "EeePub::Maker" do
       ],
       :uid=>{:value=>"http://example.com/book/foo", :scheme=>"URL", :id=>"http://example.com/book/foo"}
     ) { stub!.save }
+
     mock(EeePub::OPF).new(
       :title => ["sample"],
+      :unique_identifier=>"http://example.com/book/foo",
+      :identifier => [{:value => "http://example.com/book/foo", :scheme => "URL", :id => "http://example.com/book/foo"}],
       :creator => ["jugyo"],
+      :publisher => ["jugyo.org"],
       :date => ["2010-05-06"],
       :language => ['en'],
       :subject => ['epub sample'],
       :description => ['this is epub sample'],
       :rights => ['xxx'],
+      :cover => 'cover.jpg',
       :relation => ['xxx'],
+      :manifest => ['foo.html', 'bar.html'],
       :ncx => "toc.ncx",
-      :cover => 'cover.jpg',
-      :publisher => ["jugyo.org"],
-      :unique_identifier=>"http://example.com/book/foo",
-      :identifier => [{:value => "http://example.com/book/foo", :scheme => "URL", :id => "http://example.com/book/foo"}],
-      :manifest => ['foo.html', 'bar.html']
+      :guide => 'xxx'
     ) { stub!.save }
     mock(EeePub::OCF).new(
       :container => "content.opf",
@@ -90,6 +92,7 @@ describe "EeePub::Maker" do
         description 'this is epub sample'
         rights 'xxx'
         relation 'xxx'
+        guide 'xxx'
         identifier 'http://example.com/book/foo', :scheme => 'URL'
         uid 'http://example.com/book/foo'
         ncx_file 'toc.ncx'
@@ -104,7 +107,6 @@ describe "EeePub::Maker" do
     end
 
     it 'should save' do
-      pending "TODO: this result in error, disable for now"
       stub(FileUtils).cp.with_any_args
       stub(FileUtils).mkdir_p.with_any_args
       mock(Dir).mktmpdir { '/tmp' }
@@ -119,6 +121,7 @@ describe "EeePub::Maker" do
         :rights => ['xxx'],
         :relation => ['xxx'],
         :ncx => "toc.ncx",
+        :guide => 'xxx',
         :cover => 'cover.jpg',
         :publisher => ["jugyo.org"],
         :unique_identifier=>"http://example.com/book/foo",
@@ -126,6 +129,7 @@ describe "EeePub::Maker" do
         :manifest => ["foo/bar/foo.html", "foo/bar/baz/bar.html"]
       ) { stub!.save }
       mock(EeePub::OCF).new.with_any_args { stub!.save }
+
       @maker.save('test.epub')
     end
   end

data/spec/eeepub/ocf_spec.rb

@@ -42,9 +42,7 @@ describe "EeePub::OCF" do
   end
 
   it 'should stream epub' do
-    pending "TODO: this result in error, disable for now"
     output = @ocf.render
-    output.size.should == 134
-    output.is_binary_data?.should be_true
+    expect(output.size).to eq 135
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eeepub_ext
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - jugyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -16,112 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3.1
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3.1
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.3'
 description: |-
   EeePub is a Ruby ePub generator.
                       This code is baded on the original eeepub version 0.8.1.
@@ -170,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: ePub generator - with rubyzip bug fix (unofficial fork version)