epub-maker 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f250e5cc73d83a35515e972227758e4e88c59618
-  data.tar.gz: fc4216bf1cf1545bd71bea448bb3f169249748c6
+SHA256:
+  metadata.gz: 04b8ee2d64a54dd23bec18326e15a6c96e04464f8d698dfbd18a74cee90248de
+  data.tar.gz: 3bdd14a9a4a5b17a0695ff2fac52f7ed17e6bbc4096284a74f1830a0e3b13c53
 SHA512:
-  metadata.gz: ba5876149cefd97d006862eeaab9d2da9bc5d5092758337e902cac4f30ac0ce533ea986c66ae2caf901aa4b41d9c2849747f6c7090cbfd95118a36b1a58a6374
-  data.tar.gz: 325024a2a6ffb822dfad650a4bea36fb74b309593a63d184173607f9b980f13a5d113f9737ad6e4a3032b0ef638e1df4e291eaeaf3bd985551518921e0b1221a
+  metadata.gz: b9cc2017c9901f49174488a01b688372e0bd0ec54ec024a21a439f4cb73eaa18ce23c6014924c437a7f31e1b9097ac8e647a1cf2d39dbfdaf1bbc31ab301f9d9
+  data.tar.gz: 8372907e92fd884e207d33e2e60ea6bca97d5e2a54aff59c2c3b7a2a5716b8856e90220019929746f76113ecfad987bd646f20c947d6c73467360f4f78098595

data/.gitlab-ci.yml

@@ -5,20 +5,34 @@ before_script:
   - apt -qq install -y default-jre
   - gem install bundler --no-document
   - bundle install --jobs=$(nproc) --path=deps --quiet
-
-cache:
-  paths:
-    - deps/
-
-test:2.2:
-  image: ruby:2.2
-  script:
-    - bundle exec rake test
+  - bundle clean
 
 test:2.3:
   image: ruby:2.3
   script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    key: ruby:2.3
+    paths:
+      - deps
 
 test:2.4:
   image: ruby:2.4
   script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    key: ruby:2.4
+    paths:
+      - deps
+
+test:2.5:
+  image: ruby:2.5
+  script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    key: ruby:2.5
+    paths:
+      - deps

data/CHANGELOG.markdown

@@ -1,3 +1,10 @@
+0.0.9
+-----
+
+* Remove [ruby-uuid][] gem from dependencies
+* [BUG FIX]Convert Set to Array before writing into XML
+* Follow change of EPUB Parser v0.3.6
+
 0.0.8
 -----
 

data/README.markdown

@@ -178,7 +178,16 @@ Todo
 
 Recent Changes
 --------------
+### 0.0.9
+
+* Remove [ruby-uuid][] gem from dependencies
+* [BUG FIX]Convert Set to Array before writing into XML
+* Follow change of EPUB Parser v0.3.6
+
+[ruby-uuid]: https://github.com/shyouhei/ruby-uuid
+
 ### 0.0.8
+
 * Use default temporary directory for `EPUB::Maker.archive`
 
 ### 0.0.7

data/epub-maker.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.required_ruby_version = '>= 2.1.0'
+  gem.required_ruby_version = '>= 2.2.0'
 
   gem.add_runtime_dependency 'epub-parser', '>= 0.2.6'
   gem.add_runtime_dependency 'mimemagic'
-  gem.add_runtime_dependency 'ruby-uuid'
   gem.add_runtime_dependency 'archive-zip'
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'addressable', '>= 2.3.5'

data/lib/epub/maker.rb

@@ -4,7 +4,6 @@ require 'fileutils'
 require 'tempfile'
 require 'tmpdir'
 require 'time'
-require 'uuid'
 require 'archive/zip'
 require 'epub'
 require 'epub/constants'
@@ -114,11 +113,11 @@ module EPUB
     def make_package
       package = Publication::Package.new
       package.book = self
+      no_package_rootfile = rootfiles.find {|rf| rf.package.nil?}
+      no_package_rootfile.package = package if no_package_rootfile
       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/publication.rb

@@ -1,3 +1,4 @@
+require 'securerandom'
 require 'epub/publication/package'
 
 module EPUB
@@ -102,7 +103,7 @@ module EPUB
             if identifiers.empty?
               identifier = DCMES.new
               identifier.id = 'pub-id'
-              identifier.content = UUID.create.to_s
+              identifier.content = SecureRandom.uuid
               self.dc_identifiers << identifier
               self.unique_identifier = identifier
             else
@@ -315,7 +316,7 @@ module EPUB
               itemref_node = xml.itemref
               to_xml_attribute itemref_node, itemref, [:idref, :id]
               itemref_node['linear'] = 'no' unless itemref.linear?
-              itemref_node['properties'] = itemref.properties.join(' ') unless itemref.properties.empty?
+              itemref_node['properties'] = itemref.properties.to_a.join(' ') unless itemref.properties.empty?
             end
           }
           to_xml_attribute node, self, [:id, :toc, :page_progression_direction]

data/lib/epub/maker/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Maker
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/test/helper.rb

@@ -5,8 +5,6 @@ end
 
 require 'test/unit'
 require 'test/unit/notify'
-require 'open3'
-require 'shellwords'
 require 'pry'
 require 'epubcheck/ruby/cli'
 class Test::Unit::TestCase

data/test/test_maker.rb

@@ -76,4 +76,21 @@ class TestMaker < Test::Unit::TestCase
 
     assert_path_exist dirname
   end
+
+  def test_archive_default
+    epub_path = EPUB::Maker.archive(@fixture_dir)
+
+    assert_nothing_raised do
+      EPUB::Parser.parse epub_path
+    end
+  end
+
+  def test_archive_explit_epub_path
+    epub_path = EPUB::Maker.archive(@fixture_dir, @dir/"specified-path.epub")
+
+    assert_nothing_raised do
+      EPUB::Parser.parse epub_path
+    end
+    assert_equal (@dir/"specified-path.epub"), epub_path
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -283,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: EPUB Maker