epub-maker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0bd5ce3c4ef3e3461c4148891ec762164f635b7
-  data.tar.gz: a102f5e8bfb4743d2e585127d7174dae326abb7b
+  metadata.gz: 6317049b8e2e449885ad8eb99584c4d50b926250
+  data.tar.gz: c5418890d270746471835b7bba2a83fc1ece45a8
 SHA512:
-  metadata.gz: 33e8be24da60d5eafb31c24784d0cf51440c3660e9ce6e86047d2c4a89b83e5dbed14efff60ff4148ed1224b2a3eb7c1008d17d99eba5a98466a70b302962987
-  data.tar.gz: 1a2272a5ad1f6a09e2e353fc7dc0c65bad265e2921c63cac2a9c8ddf14e2e3344e0a30661de2570be8823f8988350d0d1a8048a0a58ffba86a3476068d60a04b
+  metadata.gz: c897619e13826f2f3eab0d170bb499f3a55005b519f7892dba768825ea2bf62e9ffdd0340726ea033d7498ff88fea109f1517b4ea2e7c41008b3641aca578116
+  data.tar.gz: 80b88d8cbdf531bee5c5d8ce1f5352c85a69d449076711dea1882d3a4070073f1a5698e4a1d7d099f45dc184cc7fd3d5f347d7fdbd12ae35bf1d8857cbbd53d3

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+0.0.4
+-----
+
+* API change: #save -> #write for PhysicalContainer classes
+* Bump required EPUB Parser version: 0.2.0 -> 0.2.6
+* Deprecate `EPUB::OCF::PhysicalContainer.save`
+
 0.0.3
 -----
 

data/README.markdown

@@ -145,6 +145,11 @@ Todo
 
 Recent Changes
 --------------
+### 0.0.4
+* API change: #save -> #write for PhysicalContainer classes
+* Bump required EPUB Parser version: 0.2.0 -> 0.2.6
+* Deprecate `EPUB::OCF::PhysicalContainer.save`
+
 ### 0.0.3
 * Bump up required Ruby version: >= 2.0.0 -> >= 2.1.0
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake/testtask'
 require 'rake/clean'
 require 'yard'
-require "bundler/gem_tasks"
+require "rubygems/tasks"
 
 task :default => :test
 
@@ -9,3 +9,4 @@ CLEAN.include 'README.html'
 
 Rake::TestTask.new
 YARD::Rake::YardocTask.new
+Gem::Tasks.new

data/epub-maker.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_runtime_dependency 'epub-parser', '>= 0.2.0'
+  gem.add_runtime_dependency 'epub-parser', '>= 0.2.6'
   gem.add_runtime_dependency 'pathname-common_prefix'
   gem.add_runtime_dependency 'mimemagic'
   gem.add_runtime_dependency 'ruby-uuid'
@@ -37,4 +37,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pry-doc'
   gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'rubygems-tasks'
 end

data/lib/epub/maker.rb

@@ -56,7 +56,9 @@ module EPUB
                   error.message,
                   "[#{self}]Working directory remained at: #{dir}"
                 ].join($RS))
-        backtrace.unshift("#{__FILE__}:#{__LINE__}:in `rescue in #{__method__}'"); error.set_backtrace backtrace; raise error
+        backtrace.unshift("#{__FILE__}:#{__LINE__}:in `rescue in #{__method__}'")
+        error.set_backtrace backtrace
+        raise error
       end
     end
   end
@@ -71,10 +73,13 @@ module EPUB
     end
 
     def make_package
-      self.package = Publication::Package.new
+      package = Publication::Package.new
+      package.book = self
       package.make do |package|
         yield package if block_given?
       end
+      no_package_rootfile = rootfiles.find {|rf| rf.package.nil?}
+      no_package_rootfile.package = package if no_package_rootfile
       package
     end
 

data/lib/epub/maker/ocf.rb

@@ -12,7 +12,7 @@ module EPUB
     end
 
     def save
-      book.container_adapter.save book.epub_file, File.join(DIRECTORY, Container::FILE), self.container.to_xml if self.container
+      book.container_adapter.write book.epub_file, File.join(DIRECTORY, Container::FILE), self.container.to_xml if self.container
     end
 
     # @overload make_container

data/lib/epub/maker/ocf/physical_container.rb

@@ -13,11 +13,16 @@ module EPUB
   class OCF
     class PhysicalContainer
       class << self
-        def save(container_path, path_name, content)
+        def write(container_path, path_name, content)
           open(container_path) {|container|
-            container.save(path_name, content)
+            container.write(path_name, content)
           }
         end
+
+        def save(container_path, path_name, content)
+          warn "EPUB::OCF::PhysicalContainer.#{__method__} is deprecated. Use .write instead"
+          write(container_path, path_name, content)
+        end
       end
     end
   end

data/lib/epub/maker/ocf/physical_container/archive_zip.rb

@@ -4,11 +4,34 @@ module EPUB
   class OCF
     class PhysicalContainer
       class ArchiveZip < self
-        def save(path_name, content)
+        # @todo Write multiple files at once
+        def write(path_name, content)
           ::Dir.mktmpdir do |dir|
-            path = ::File.join(dir, ::File.basename(path_name))
-            ::File.write path, content
-            Archive::Zip.archive @container_path, path, path_prefix: ::File.dirname(path_name)
+            tmp_archive_path = ::File.join(dir, ::File.basename(@container_path) + '.tmp')
+            ::File.open @container_path do |archive_in|
+              ::File.open tmp_archive_path, 'w' do |archive_out|
+                archive_out.binmode
+                Archive::Zip.open archive_in, :r do |z_in|
+                  Archive::Zip.open archive_out, :w do |z_out|
+                    updated = false
+                    z_in.each do |entry|
+                      if entry.zip_path == path_name
+                        entry.file_data = StringIO.new(content)
+                        updated = true
+                      end
+                      z_out << entry
+                    end
+                    unless updated
+                      entry = Archive::Zip::Entry::File.new(path_name)
+                      entry.file_data = StringIO.new(content)
+                      z_out << entry
+                    end
+                  end
+                end
+              end
+            end
+            ::File.chmod 0666 & ~::File.umask, tmp_archive_path
+            ::File.rename tmp_archive_path, @container_path
           end
         end
       end

data/lib/epub/maker/ocf/physical_container/zipruby.rb

@@ -4,7 +4,7 @@ module EPUB
   class OCF
     class PhysicalContainer
       class Zipruby < self
-        def save(path_name, content)
+        def write(path_name, content)
           if @archive
             @archive.add_or_replace_buffer path_name, content
           else

data/lib/epub/maker/publication.rb

@@ -78,7 +78,7 @@ module EPUB
       end
 
       def save
-        book.container_adapter.save book.epub_file, book.rootfile_path, to_xml
+        book.container_adapter.write book.epub_file, book.rootfile_path, to_xml
       end
 
       module ContentModel
@@ -261,7 +261,7 @@ module EPUB
                 raise 'no content nor content_file'
               end
             book = manifest.package.book
-            book.container_adapter.save book.epub_file, entry_name, content_to_save
+            book.container_adapter.write book.epub_file, entry_name, content_to_save
           end
 
           # Save document into EPUB archive when block ended

data/lib/epub/maker/task.rb

@@ -59,6 +59,8 @@ module EPUB
 
             if make_rootfiles
               book.make_package do |package|
+                book.ocf.container.rootfile.package = package
+
                 package.dir = package_direction
 
                 package.make_metadata do |metadata|
@@ -109,7 +111,7 @@ module EPUB
             else
               raise 'No rootfile set' if @rootfiles.empty?
               rf = rootfiles.first
-              book.package = EPUB::Parser::Publication.new(File.read(rf), file_map[rf]).parse
+              book.package = EPUB::Parser::Publication.new(File.read(rf)).parse
             end
           end
         end

data/lib/epub/maker/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Maker
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/test_maker_publication.rb

@@ -7,7 +7,7 @@ class TestMakerPublication < Test::Unit::TestCase
   def setup
     rootfile = 'OPS/ルートファイル.opf'
     @opf = File.read(File.expand_path("../fixtures/book/#{rootfile}", __FILE__))
-    @package = EPUB::Parser::Publication.new(@opf, rootfile).parse
+    @package = EPUB::Parser::Publication.new(@opf).parse
   end
 
   def test_to_xml_attribute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: pathname-common_prefix
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This library supports making and editing EPUB books
 email:
 - KitaitiMakoto@gmail.com
@@ -317,4 +331,3 @@ test_files:
 - test/test_maker_ocf.rb
 - test/test_maker_publication.rb
 - test/test_task.rb
-has_rdoc: