asciidoctor-epub3 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27a405770a51e0bc06e16b4a484203d25cfeb704
-  data.tar.gz: 63fdd03371885ea40a82575db6e241ec64c75d00
+  metadata.gz: 42287b2fbdd7ae40dd5bf304f7f0de9c93b129d1
+  data.tar.gz: 652d4d643f63278e41c72bb65f1eb09b104570a2
 SHA512:
-  metadata.gz: 1db122ccbf5baccd60a59e1e482b98132ed5fb3b0097c2d00311e460da24d44a6ab8be76a7202ae49a4c8f112535ba4d9b32d8b7b41f382b492f297ef00a34e9
-  data.tar.gz: 0f960257b627d5b7441045585ab267e60ab3292126a0cd7fd4929f2402c5d08bc3ffa1dee46d16ca76b86f21e5154487ba0e5f817d707a83a5e3eca57ae3ef55
+  metadata.gz: 1bbcf4a13d6e720b2ce38fce363d872bf14b8a26f988de0b05bf6395757f35d6d15433a7d535362700b723ec0b239ecbbe6db8350a1131bb2826c8f852295303
+  data.tar.gz: e2e539fd7951d0dae04cbb4c9458d85dbfe644072c05492a3999d7d27d178a860e2540da83d00bfdcde3a72de97a2f3ae2e2f2d97f8ab34c347a57d029936e5d

data/lib/asciidoctor-epub3/converter.rb

@@ -6,7 +6,7 @@ module Asciidoctor
 module Epub3
 # tried 8288, but it didn't work in older readers
 WordJoiner = [65279].pack 'U*'
-WordJoinerRx = RUBY_ENGINE_JRUBY ? /uFEFF/ : WordJoiner
+WordJoinerRx = RUBY_ENGINE_JRUBY ? /\uFEFF/ : WordJoiner
 
 # Public: The main converter for the epub3 backend that handles packaging the
 # EPUB3 or KF8 publication file.

data/lib/asciidoctor-epub3/packager.rb

@@ -34,24 +34,34 @@ module GepubBuilderMixin
     builder = self
     format = @format
     workdir = if doc.attr? 'epub3-stylesdir'
-      ::File.join doc.attr('docdir'), doc.attr('epub3-stylesdir')
+      stylesdir = doc.attr 'epub3-stylesdir'
+      # FIXME make this work for Windows paths!!
+      if stylesdir.start_with? '/'
+        stylesdir
+      else
+        docdir = doc.attr 'docdir', '.'
+        docdir = '.' if docdir.empty?
+        ::File.join docdir, stylesdir
+      end
     else
       ::File.join DATA_DIR, 'styles'
     end
 
     # TODO improve design/UX of custom theme functionality, including custom fonts
-    resources workdir: workdir do
-      file 'styles/epub3.css' => (builder.postprocess_css_file 'epub3.css', format)
-      file 'styles/epub3-css3-only.css' => (builder.postprocess_css_file 'epub3-css3-only.css', format)
+    resources do
+      file 'styles/epub3.css' => (builder.postprocess_css_file ::File.join(workdir, 'epub3.css'), format)
+      file 'styles/epub3-css3-only.css' => (builder.postprocess_css_file ::File.join(workdir, 'epub3-css3-only.css'), format)
     end
 
-    resources workdir: DATA_DIR do
+    resources do
       #file 'styles/epub3.css' => (builder.postprocess_css_file 'styles/epub3.css', format)
       #file 'styles/epub3-css3-only.css' => (builder.postprocess_css_file 'styles/epub3-css3-only.css', format)
-      font_list, font_css = builder.select_fonts 'styles/epub3-fonts.css', (doc.attr 'scripts', 'latin')
+      font_files, font_css = builder.select_fonts ::File.join(DATA_DIR, 'styles/epub3-fonts.css'), (doc.attr 'scripts', 'latin')
       file 'styles/epub3-fonts.css' => font_css
       with_media_type 'application/x-font-ttf' do
-        files(*font_list)
+        font_files.each do |font_file|
+          file font_file => ::File.join(DATA_DIR, font_file)
+        end
       end
     end
   end
@@ -64,14 +74,15 @@ module GepubBuilderMixin
       if front_cover_image =~ InlineImageMacroRx
         front_cover_image = %(#{imagesdir}#{$1})
       end
-      workdir = doc.attr 'docdir'
+      workdir = doc.attr 'docdir', '.'
+      workdir = '.' if workdir.empty?
     else
       front_cover_image = DefaultCoverImage
       workdir = DATA_DIR
     end
 
-    resources workdir: workdir do
-      cover_image %(#{imagesdir}jacket/cover#{::File.extname front_cover_image}) => front_cover_image
+    resources do
+      cover_image %(#{imagesdir}jacket/cover#{::File.extname front_cover_image}) => ::File.join(workdir, front_cover_image)
     end
   end
 
@@ -151,7 +162,9 @@ body > svg {
     docimagesdir = (doc.attr 'imagesdir', '.').chomp '/'
     docimagesdir = (docimagesdir == '.' ? nil : %(#{docimagesdir}/))
 
-    resources(workdir: (doc.attr 'docdir')) do
+    workdir = doc.attr 'docdir', '.'
+    workdir = '.' if workdir.empty?
+    resources workdir: workdir do
       images.each do |image|
         imagesdir = (image.document.attr 'imagesdir', '.').chomp '/'
         imagesdir = (imagesdir == '.' ? nil : %(#{imagesdir}/))
@@ -172,29 +185,29 @@ body > svg {
     imagesdir = (doc.attr 'imagesdir', '.').chomp '/'
     imagesdir = (imagesdir == '.' ? nil : %(#{imagesdir}/))
 
-    resources workdir: DATA_DIR do
-      file %(#{imagesdir}avatars/default.jpg) => %(images/default-avatar.jpg)
-      file %(#{imagesdir}headshots/default.jpg) => %(images/default-headshot.jpg)
+    resources do
+      file %(#{imagesdir}avatars/default.jpg) => ::File.join(DATA_DIR, 'images/default-avatar.jpg')
+      file %(#{imagesdir}headshots/default.jpg) => ::File.join(DATA_DIR, 'images/default-headshot.jpg')
     end
 
-    resources(workdir: (doc.attr 'docdir')) do
+    workdir = doc.attr 'docdir', '.'
+    workdir = '.' if workdir.empty?
+    resources do
       usernames.each do |username|
-        if ::File.readable?(avatar = %(#{imagesdir}avatars/#{username}.jpg))
-          file avatar
+        avatar = %(#{imagesdir}avatars/#{username}.jpg)
+        if ::File.readable?(resolved_avatar = ::File.join(workdir, avatar))
+          file avatar => resolved_avatar
         else
           warn %(Avatar #{avatar} not found or readable. Falling back to default avatar for #{username}.)
-          ::Dir.chdir DATA_DIR do
-            file avatar => %(images/default-avatar.jpg)
-          end
+          file avatar => ::File.join(DATA_DIR, 'images/default-avatar.jpg')
         end
 
-        if ::File.readable? (headshot = %(#{imagesdir}headshots/#{username}.jpg))
-          file headshot
-        else
+        headshot = %(#{imagesdir}headshots/#{username}.jpg)
+        if ::File.readable?(resolved_headshot = ::File.join(workdir, headshot))
+          file headshot => resolved_headshot
+        elsif doc.attr? 'builder', 'editions'
           warn %(Headshot #{headshot} not found or readable. Falling back to default headshot for #{username}.)
-          ::Dir.chdir DATA_DIR do
-            file headshot => %(images/default-headshot.jpg)
-          end
+          file headshot => ::File.join(DATA_DIR, 'images/default-headshot.jpg')
         end
       end
 =begin
@@ -222,7 +235,9 @@ body > svg {
     builder = self
     spine = @spine
     format = @format
-    resources(workdir: (doc.attr 'docdir')) do
+    workdir = doc.attr 'docdir', '.'
+    workdir = '.' if workdir.empty?
+    resources workdir: workdir do
       builder.add_images_from_front_matter
       # QUESTION should we move navigation_document to the Packager class? seems to make sense
       #nav 'nav.xhtml' => (builder.postprocess_xhtml doc.converter.navigation_document(doc, spine), format)

data/lib/asciidoctor-epub3/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Epub3
-  VERSION = '1.0.0.alpha.2'
+  VERSION = '1.0.0.alpha.3'
 end
 end

metadata

@@ -1,76 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Dan Allen
 - Sarah White
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
-  type: :runtime
+  name: asciidoctor
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: gepub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.9.2
-  type: :runtime
+  name: gepub
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.9.2
 - !ruby/object:Gem::Dependency
-  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.4
-  type: :runtime
+  name: thread_safe
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.4
 description: |
@@ -138,9 +138,9 @@ files:
 - data/samples/asciidoctor-js-introduction.adoc
 - data/samples/i18n.adoc
 - data/samples/images/asciidoctor-js-chrome-extension.png
-- data/samples/images/avatars/graphitefriction.png
-- data/samples/images/avatars/mogztter.png
-- data/samples/images/avatars/mojavelinux.png
+- data/samples/images/avatars/graphitefriction.jpg
+- data/samples/images/avatars/mogztter.jpg
+- data/samples/images/avatars/mojavelinux.jpg
 - data/samples/images/correct-text-justification.png
 - data/samples/images/incorrect-text-justification.png
 - data/samples/images/screenshots/chapter-title-day.png
@@ -168,25 +168,25 @@ homepage: https://github.com/asciidoctor/asciidoctor-epub3
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - --charset=UTF-8 --title="Asciidoctor EPUB3" --main=README.adoc -ri
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats
 test_files: []