gepub 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1db2d11c67936c89488f52ae496b80b127c8807b98c4f3f571c107a8bcfda32
-  data.tar.gz: ef0bf9c479ad9ef13625794702a0a7bd40e9d13a1b482c45e4c173612eef109b
+  metadata.gz: 6279f47052dbbe90014ca6653faf663043872dabd364f3cabadc9c2e82ae8262
+  data.tar.gz: 79e0d32c97a46879c7b6597c48bbeb1253e96bd89c3d5f2c04d307d35c544118
 SHA512:
-  metadata.gz: db24109e27da25d65c5e9bab5b69d827f4d2952787fda9cf75ba01d71e09360c48662442d4c95dff0f981157e3f14b6388d3057f297c1504af78b7deec805cab
-  data.tar.gz: 1d673c6b9c30ce5136b224ae746b2ef4ed4d76813b04180a3bb7fd934bd09a97047b7cb949ff14df11453b60bd136736c7525a79b44592d06ae6507e5febdaf7
+  metadata.gz: bdb6373fc9a484abfd0c041fc989313b6c3033d6c192fd0688b80597fefc1f64aa49cecd56539c67aed9669f1b623ad2c500d046d47bda02853ffb3f6d3dd525
+  data.tar.gz: 2cf23f8b402e491e4dff1b3a6b69a6e9ca6130139716a991d447e0b670bd04249dc0d030b247936a070bbaf7cdd8aa58f6ebb64313cd549a2879d5f0c1ccafdd

data/.github/workflows/test.yml

@@ -1,18 +1,23 @@
 name: Test
-on: push
+on: [push, pull_request]
 jobs:
   test:
-    name: test
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5.x, 2.6.x]
+        ruby: [2.4, 2.5, 2.6, 2.7, jruby]
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+        exclude:
+          # TODO: https://github.com/sparklemotion/nokogiri/issues/1961
+          # exclude windows with ruby 2.7 ; nokogiri is not supported for the present
+          - ruby: 2.7
+            platform: windows-latest
+    runs-on: ${{ matrix.platform }}
     env:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
     - uses: actions/checkout@master
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: eregon/use-ruby-action@master
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: setup gems
@@ -20,9 +25,12 @@ jobs:
         gem install bundler
         bundle install
     - name: run test and publish code coverage
+      if: runner.os == 'Linux' && matrix.ruby == '2.7' && env.CC_TEST_REPORTER_ID != ''
       uses: paambaati/codeclimate-action@v2.3.0
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       with:
         coverageCommand: bundle exec rake spec
-        
+    - name: run test
+      if: runner.os != 'Linux' || matrix.ruby != '2.7' || env.CC_TEST_REPORTER_ID == ''
+      run: bundle exec rake spec

data/Gemfile

@@ -2,4 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in gepub.gemspec
 gemspec
-gem 'simplecov', require: false
+
+# workarond : simplecov 0.18 with cc-reporter is broken
+# https://github.com/codeclimate/test-reporter/issues/418
+gem 'simplecov', '~> 0.10', '< 0.18', require: false

data/gepub.gemspec

@@ -10,13 +10,14 @@ Gem::Specification.new do |s|
   s.homepage    = %q{http://github.com/skoji/gepub}
   s.summary     = %q{a generic EPUB library for Ruby.}
   s.description = %q{gepub is a generic EPUB parser/generator. Generates and parse EPUB2 and EPUB3}
+  s.license     = "BSD-3-Clause"
 
   s.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^spec/}) }
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "nokogiri", ">= 1.8.2", "< 1.11"
-  s.add_runtime_dependency "rubyzip", "> 1.1.1", "< 2.1"
+  s.add_runtime_dependency "rubyzip", "> 1.1.1", "< 2.3"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
 end

data/lib/gepub/book.rb

@@ -68,7 +68,7 @@ module GEPUB
   # returns contributors list by display-seq or defined order.
   # the contributors without display-seq is appear after contributors with display-seq.
   # === Book#lastmodified(date) (delegated to Metadata#lastmodified)
-  # set last modified date.
+  # set last modified date. date is a Time, DateTime or string that can be parsed by DateTime#parse.
   # === Book#modified_now (delegated to Metadata#modified_now)
   # set last modified date to current time.
   # === Book#lastmodified (delegated to Metadata#lastmodified)
@@ -299,7 +299,6 @@ EOF
             |landmark|
             id = landmark[:id].nil? ? "" : "##{x[:id]}"
             landmark_title = landmark[:title]
-            type = landmark[:type]
             xml_doc.li {
               xml_doc.a({'href' => landmark[:item].href + id, 'epub:type' => landmark[:type]}, landmark_title)
             }
@@ -390,6 +389,7 @@ EOF
       end
       return package, package_path
     end
+    private_class_method :parse_container
 
     def self.check_consistency_of_package(package, package_path)
       if package.nil?
@@ -397,9 +397,11 @@ EOF
       end
 
       if package_path != package.path
-        warn 'inconsistend EPUB file: container says opf is #{package_path}, but actually #{package.path}'
+        warn "inconsistend EPUB file: container says opf is #{package_path}, but actually #{package.path}"
       end
     end
+    private_class_method :check_consistency_of_package
+    
     def self.parse_files_into_package(files, package)
       files.each {
         |k, content|
@@ -410,6 +412,8 @@ EOF
         end
       }
     end
+    private_class_method :parse_files_into_package
+    
     def  cleanup_for_epub2
       if version.to_f < 3.0 || @package.epub_backward_compat
         if @package.manifest.item_list.select {
@@ -425,7 +429,7 @@ EOF
     end
     def cleanup_for_epub3
       if version.to_f >=3.0
-        @package.metadata.modified_now
+        @package.metadata.modified_now unless @package.metadata.lastmodified_updated?
         
         if @package.manifest.item_list.select {
           |_href, item|

data/lib/gepub/metadata.rb

@@ -54,6 +54,7 @@ module GEPUB
 
           }
         }
+        # do not set @lastmodified_updated here
       }
     end
     
@@ -73,9 +74,14 @@ module GEPUB
       @spread = NilContent
       @ibooks_version = NilContent
       @ibooks_scroll_axis = NilContent
+      @lastmodified_updated = false
       yield self if block_given?
     end
 
+    def lastmodified_updated?
+      @lastmodified_updated
+    end
+
     def to_xml(builder) 
       builder.metadata(@namespaces) {
         @content_nodes.each {
@@ -186,14 +192,16 @@ module GEPUB
         }
         ret.size == 0 ? nil : ret[0]
       else
+        @lastmodified_updated = true
         date ||= Time.now
+        date = DateTime.parse(date) if date.is_a? String
         (@content_nodes['meta'] ||= []).each {
           |meta|
           if (meta['property'] == 'dcterms:modified')
             @content_nodes['meta'].delete meta
           end
         }
-        add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), itemclass: DateMeta)['property'] = 'dcterms:modified'
+        add_metadata('meta', date.to_time.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), itemclass: DateMeta)['property'] = 'dcterms:modified'
       end
     end
 
@@ -207,14 +215,7 @@ module GEPUB
     
     def set_lastmodified(date=nil)
       warn "obsolete : set_lastmodified. use lastmodified instead."
-      date ||= Time.now
-      (@content_nodes['meta'] ||= []).each {
-        |meta|
-        if (meta['property'] == 'dcterms:modified')
-          @content_nodes['meta'].delete meta
-        end
-      }
-      add_metadata('meta', date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'), itemclass: DateMeta)['property'] = 'dcterms:modified'
+      lastmodified(date)
     end
 
     def add_oldstyle_meta(content, attributes = {})

data/lib/gepub/version.rb

@@ -1,4 +1,4 @@
 module GEPUB
   # GEPUB gem version
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gepub
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - KOJIMA Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,7 +39,7 @@ dependencies:
         version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,8 @@ files:
 - lib/gepub/xml_util.rb
 - tools/generate_function.rb
 homepage: http://github.com/skoji/gepub
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []