epuber 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe25adb1dac4b43021c459313ae9f98e1c4ac0e
-  data.tar.gz: 7148acde09046a3b21e3c16fc5ad28cbc9964574
+  metadata.gz: aeafa25a224668d8a2921e09e38b2cccf3ef5304
+  data.tar.gz: ace5b8bd2c4433cc0f3e1332bf908643c8d2e64d
 SHA512:
-  metadata.gz: b6164ca50abb2a098b27ab32dc71b0476f2bfbf297f07a5b63a2853f6a9d40659677c950f01ed93c74cc97125147e01a1de8d36f9d509bf2083e567069b99757
-  data.tar.gz: 9a9d083ce64cfd677c471adf6138f3a4a9f6a784a69f981228df89ef1ac1a8fa40f63da7332bd21b43980ec49d97cf0793e6c77ff4478e1ef560ee01a7b55d98
+  metadata.gz: 8ff682097d6ca7ff9a2a92a98d9c47aacfaf7ab9666a3ab2257a5f0cd86c99fa8670e806f9e88a93419a4b624306039e383df9a2a791458db57e57960ff40f53
+  data.tar.gz: e66dda4964520cd025f27c9f3140186df77d9d68a08b14313bb1ffc778125764eabe9ac0d496e4810b2af87ea8ea0f6dc0ae377a6362077e8bc9926aec49c6ed

data/epuber.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.summary  = 'Epuber is simple tool to compile and pack source files into EPUB format.'
   spec.homepage = 'https://github.com/epuber-io/epuber'
   spec.license  = 'MIT'
+  spec.required_ruby_version = '>= 2.0'
 
   spec.files         = Dir['bin/**/*'] + Dir['lib/**/*'] + %w(epuber.gemspec Gemfile LICENSE.txt README.md)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/epuber/command/compile.rb

@@ -82,6 +82,8 @@ module Epuber
             convert_epub_to_mobi(archive_path, ::File.basename(archive_path, '.epub') + '.mobi') if target.create_mobi
           end
         end
+
+        write_lockfile
       end
 
       private

data/lib/epuber/command/server.rb

@@ -44,14 +44,19 @@ module Epuber
 
         help!('Not existing target') if target.nil?
 
-        Epuber::Server.run!(book, target, verbose: verbose?) do |uri|
-          if OS.osx?
-            if @open_web_browser
-              system "open #{uri}"
-            else
-              puts 'Web browser can be automatically opened by adding --open flag, see --help'
+        begin
+          Epuber::Server.run!(book, target, verbose: verbose?) do |uri|
+            if OS.osx?
+              if @open_web_browser
+                system "open #{uri}"
+              else
+                puts 'Web browser can be automatically opened by adding --open flag, see --help'
+              end
             end
           end
+        rescue Interrupt
+          write_lockfile
+          raise
         end
       end
     end

data/lib/epuber/command.rb

@@ -28,6 +28,8 @@ module Epuber
         super
         UI.current_command = nil
 
+      rescue Interrupt
+        UI.error('[!] Cancelled')
       rescue => e
         UI.error!(e)
 
@@ -61,5 +63,11 @@ module Epuber
       raise PlainInformative, "No `.bookspec' found in the project directory." if bookspec_files.empty?
       raise PlainInformative, "Multiple `.bookspec' found in current directory" if bookspec_files.count > 1
     end
+
+    def write_lockfile
+      unless Epuber::Config.test?
+        Epuber::Config.instance.save_lockfile
+      end
+    end
   end
 end

data/lib/epuber/compiler/file_finders/abstract.rb

@@ -43,20 +43,20 @@ module Epuber
         attr_reader :context_path
 
         # @param [String] pattern  original pattern for searching
-        # @param [Symbol] groups  list of groups
+        # @param [Array<Symbol> | Symbol] groups  list of groups
         # @param [String] context_path  context path of current searching
         # @param [Array<String>] files_paths  list of founded files
         #
         def initialize(pattern, groups, context_path, files_paths)
           @pattern = pattern
-          @groups = groups
+          @groups = Array(groups)
           @context_path = context_path
           @files_paths = files_paths
         end
 
         def to_s
           str = "Found too many files for pattern `#{pattern}` from context path #{context_path}"
-          str += ", file groups #{groups.map(:inspect)}" unless groups.nil?
+          str += ", file groups #{groups.map(&:inspect)}" if !groups.nil? && !groups.empty?
           str + ", founded files #{files_paths}"
         end
       end
@@ -98,6 +98,8 @@ module Epuber
         end
 
 
+        # @param [Array<Symbol> | Symbol] groups
+        #
         def assert_one_file(files, pattern: nil, groups: nil, context_path: nil)
           raise FileNotFoundError.new(pattern, context_path) if files.empty?
           raise MultipleFilesFoundError.new(pattern, groups, context_path, files) if files.count >= 2
@@ -109,7 +111,7 @@ module Epuber
         # When it founds too many (more than two) it will raise MultipleFilesFoundError
         #
         # @param [String] pattern  pattern of the desired files
-        # @param [Symbol] groups  list of group names, nil or empty array for all groups, for valid values see GROUP_EXTENSIONS
+        # @param [Array<Symbol> | Symbol] groups  list of group names, nil or empty array for all groups, for valid values see GROUP_EXTENSIONS
         # @param [String] context_path  path for root of searching, it is also defines start folder of relative path
         #
         # @return [Array<String>] list of founded files

data/lib/epuber/compiler/file_finders/imaginary.rb

@@ -86,7 +86,9 @@ module Epuber
 
         def __core_find_files_from_pattern(pattern)
           parts = self.class.path_parts(pattern)
-          find_recurser(root, parts).flatten.map do |item|
+          found_entries = find_recurser(root, parts).flatten
+          file_entries = found_entries.reject { |entry| entry.is_a?(DirEntry) }
+          file_entries.map do |item|
             item.absolute_path
           end
         end
@@ -112,6 +114,8 @@ module Epuber
           return [] unless dir.respond_to? :[]
 
           pattern, *parts = parts
+          return [] if pattern.nil?
+
           matches         = case pattern
                               when '**'
                                 case parts
@@ -125,20 +129,12 @@ module Epuber
                                     end.flatten.uniq
                                   when []
                                     parts = [] # end recursion
-                                    dir.entries.flatten.uniq
+                                    dir.entries.values.flatten.uniq
                                   else
                                     directories_under(dir)
                                 end
                               else
-                                regex_body = pattern.gsub('.', '\.')
-                                               .gsub('?', '.')
-                                               .gsub('*', '.*')
-                                               .gsub('(', '\(')
-                                               .gsub(')', '\)')
-                                               .gsub(/\{(.*?)\}/) do
-                                  "(#{Regexp.last_match[1].gsub(',', '|')})"
-                                end
-                                               .gsub(/\A\./, '(?!\.).')
+                                regex_body = pattern_to_regex(pattern)
                                 dir.entries.reject { |k, _v| /\A#{regex_body}\Z/ !~ k }.values
                             end
 
@@ -151,12 +147,24 @@ module Epuber
 
         # @param [DirEntry] dir
         #
-        # @return [Hash<String, DirEntry>]
+        # @return [Array<DirEntry>]
         #
         def directories_under(dir)
           children = dir.entries.values.select { |f| f.is_a?(DirEntry) }
           (Array(dir) + children + children.map { |c| directories_under(c) }).flatten.uniq
         end
+
+        def pattern_to_regex(pattern)
+          pattern.gsub('.', '\.')
+            .gsub('?', '.')
+            .gsub('*', '.*')
+            .gsub('(', '\(')
+            .gsub(')', '\)')
+            .gsub(/\{(.*?)\}/) do
+              "(#{Regexp.last_match[1].gsub(',', '|')})"
+            end
+            .gsub(/\A\./, '(?!\.).')
+        end
       end
     end
   end

data/lib/epuber/compiler/file_types/xhtml_file.rb

@@ -70,6 +70,7 @@ module Epuber
 
           XHTMLProcessor.add_viewport(xhtml_doc, target.default_viewport) unless target.default_viewport.nil?
           self.properties << :scripted if XHTMLProcessor.using_javascript?(xhtml_doc)
+          self.properties << :remote_resources if XHTMLProcessor.using_remote_resources?(xhtml_doc)
 
           XHTMLProcessor.resolve_links(xhtml_doc, destination_path, file_resolver.dest_finder)
           XHTMLProcessor.resolve_images(xhtml_doc, destination_path, file_resolver)

data/lib/epuber/compiler/opf_generator.rb

@@ -58,6 +58,7 @@ module Epuber
         cover_image: 'cover-image',
         navigation:  'nav',
         scripted:    'scripted',
+        remote_resources: 'remote-resources',
       }.freeze
 
       OPF_UNIQUE_ID = 'bookid'

data/lib/epuber/compiler/xhtml_processor.rb

@@ -213,6 +213,15 @@ module Epuber
         !xhtml_doc.at_css('script').nil?
       end
 
+      def self.using_remote_resources?(xhtml_doc)
+        regexp = %r{^[^:/?#]+://.*}
+
+        result = false
+        result ||= xhtml_doc.css('[src]').any? { |node| node['src'] =~ regexp }
+        result ||= xhtml_doc.css('link[href]').any? { |node| node['href'] =~ regexp }
+        result
+      end
+
       # @param [Nokogiri::XML::Document] xhtml_doc
       # @param [String] file_path path of referring file
       # @param [FileResolver] file_resolver

data/lib/epuber/config.rb

@@ -124,11 +124,3 @@ module Epuber
     self.test = false
   end
 end
-
-# HACK: this should be done with nicer way
-#
-at_exit do
-  unless Epuber::Config.test?
-    Epuber::Config.instance.save_lockfile
-  end
-end

data/lib/epuber/user_interface.rb

@@ -36,7 +36,7 @@ module Epuber
       $stdout.puts unless @last_processing_file_line.nil?
 
       $stdout.puts(_format_message(:error, message, location: location))
-      _print_backtrace(location.try(:backtrace_locations) || message.try(:backtrace_locations) || caller_locations, location: location) if current_command.verbose?
+      _print_backtrace(location.try(:backtrace_locations) || message.try(:backtrace_locations) || caller_locations, location: location) if current_command && current_command.verbose?
     end
 
     # @param [String] message message of the error

data/lib/epuber/version.rb

@@ -1,4 +1,4 @@
 
 module Epuber
-  VERSION = '0.3.7'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epuber
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -541,7 +541,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="