epuber 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcf06496b9fa4f3dc3e979ff764a8ef40dcd2c925a8f6100d96b07d785d86b2
-  data.tar.gz: 7b92cc896492d689f5b69095ab608098e91dd9595e7ae1993327907a4bd925d5
+  metadata.gz: 36b3de5a7595e7eb07e7604f51fe0e57f2610c9d4e65bd4efed8bf34a3f5d79a
+  data.tar.gz: 7b3413db0823660dee8cd28ac1e820c8cfd10b557e5be1e2c82afce72335a194
 SHA512:
-  metadata.gz: b805dabd18ad6c8bf2f2f3a44b391726bf3a9766abb7668dd8fd7fb83b0173b076a04f765b041e8d405cf13ffba8e88a043c8ef39ee30e2b65197d8671f7eba2
-  data.tar.gz: 14cd6edfca175231d53f3883bd5dc18e178e02a1703907897492c9918b305e7826cb7a8b35fabb4d3b05aa943ab44b1370dfa837d97ee171c261bc23f2751d29
+  metadata.gz: 0df514b965ad7e809d7c447556bd256f4d4329914b871d165f975ebb1673fda40f95c5957ba4867855b959e529269859cfc30e6b9ff62b86770c2432351b8e1d
+  data.tar.gz: 7d4e411ce744dfb5e61bc43c9a77e3b00866756f9a6dfd625cdf5adec2163d76b73ff9bd58453b3f3e737dc2e40b2eac192334efd4bf69244ab173f40697ca30

data/lib/epuber/command/build.rb

@@ -44,6 +44,8 @@ module Epuber
         super
         verify_one_bookspec_exists!
         verify_all_targets_exists!
+
+        Config.instance.warn_for_outdated_versions!
       end
 
       def run

data/lib/epuber/command/server.rb

@@ -29,6 +29,8 @@ module Epuber
       def validate!
         super
         verify_one_bookspec_exists!
+
+        Config.instance.warn_for_outdated_versions!
       end
 
       def run

data/lib/epuber/compiler/xhtml_processor.rb

@@ -34,7 +34,7 @@ module Epuber
         end
 
         doctypes = []
-        while /(\n|\?>|\A)?(<![^>]*>\n*)/ =~ text
+        while /(\n|\?>|\A)?(<!DOCTYPE [^>]*>\n*)/ =~ text
           doctypes << $2.strip
 
           match = Regexp.last_match
@@ -103,6 +103,12 @@ module Epuber
 
           html.children.first.before(head)
         end
+
+        # https://github.com/IDPF/epubcheck/issues/631
+        if epub_version < 3.0
+          xhtml_doc.internal_subset.remove unless xhtml_doc.internal_subset.nil?
+          xhtml_doc.create_internal_subset('html', "-//W3C//DTD XHTML 1.1//EN", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd")
+        end
       end
 
       # Method for adding style sheets with links, method will not add duplicate items

data/lib/epuber/config.rb

@@ -67,16 +67,15 @@ module Epuber
     # @return [Epuber::Lockfile]
     #
     def bookspec_lockfile
-      @bookspec_lockfile ||= (
-        lockfile = Lockfile.from_file(bookspec_lockfile_path)
-        lockfile.version = Epuber::VERSION
-        lockfile
-      )
+      @bookspec_lockfile ||= Lockfile.from_file(bookspec_lockfile_path)
     end
 
     # @return nil
     #
     def save_lockfile
+      bookspec_lockfile.epuber_version = Epuber::VERSION
+      bookspec_lockfile.bade_version = Bade::VERSION
+
       bookspec_lockfile.write_to_file
     end
 
@@ -118,6 +117,16 @@ module Epuber
       File.join(working_path, 'metadata', 'target_stats', target.name.to_s, 'file_stats.yml')
     end
 
+    def warn_for_outdated_versions!
+      if bookspec_lockfile.epuber_version > Epuber::VERSION
+        UI.warning('Warning: the running version of Epuber is older than the version that created the lockfile. We suggest you upgrade to the latest version of Epuber by running `gem install epuber`')
+      end
+
+      if bookspec_lockfile.bade_version && bookspec_lockfile.bade_version > Bade::VERSION
+        UI.warning('Warning: the running version of Bade is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bade by running `gem install bade`')
+      end
+    end
+
     # ---------------------------------------------------------------------------------------------------------------- #
 
     class << self

data/lib/epuber/lockfile.rb

@@ -17,11 +17,16 @@ module Epuber
     #
     def self.from_file(file_path)
       if File.exists?(file_path)
-        hash = YAML.load(File.read(file_path))
+        hash = YAML.safe_load(File.read(file_path))
       else
         hash = {}
       end
 
+      # backward compatibility for version 0.5 and older
+      if hash.include?('version')
+        hash['epuber_version'] = hash.delete('version')
+      end
+
       inst = self.new(hash)
       inst.defined_from_file = file_path
       inst
@@ -32,24 +37,33 @@ module Epuber
     def write_to_file
       return if defined_from_file.nil?
 
-      File.open(defined_from_file, 'w') do |f|
-        f.write(YAML.dump(@internal_data))
-      end
+      File.write(defined_from_file, @internal_data.to_yaml)
     end
 
-
     # @return [Epuber::Version]
     #
-    def version
-      @internal_data['version']
+    def epuber_version
+      Version.new(@internal_data['epuber_version'])
     end
 
     # @param [Epuber::Version] new_version
     #
+    def epuber_version=(new_version)
+      @internal_data['epuber_version'] = new_version.to_s
+    end
+
     # @return [Epuber::Version]
     #
-    def version=(new_version)
-      @internal_data['version'] = new_version
+    def bade_version
+      value = @internal_data['bade_version']
+      value = Version.new(value) unless value.nil?
+      value
+    end
+
+    # @param [Epuber::Version] new_version
+    #
+    def bade_version=(new_version)
+      @internal_data['bade_version'] = new_version
     end
   end
 end

data/lib/epuber/version.rb

@@ -1,6 +1,6 @@
 
 module Epuber
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 
   HOME_URL = 'https://github.com/epuber-io/epuber'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport