softcover 1.0.beta15 → 1.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10659515786ab1d7b7cf6ef524e9627541552882
-  data.tar.gz: d47c64674835297c856e4df0d8cac9c789766dbd
+  metadata.gz: b8137c81992908717396867abb601cd2848c9b51
+  data.tar.gz: 9eab005f7c11be7b6891e6155a184297ac68298c
 SHA512:
-  metadata.gz: 2a2d0d335d51b75da5d4d8c137148f8a1e13022376d95ddfe3184b9fdb5c1cbc5ad45b64f786229848e51c5aec75922760f53d2edab6d4a071b10e5468021b26
-  data.tar.gz: d9968d17c255ad40eb49c6906686c94cf5576fc89a4850cd39e4a7d77afe506621178ac46f23cbe8441ce9b4b2ca42ad0540185f1fa33b45e0490f1fc17964c1
+  metadata.gz: 887cd0da96df9dd87cd932fef09a4c2531bf2b6388fe1962269cefbb1e0026065807b20d6524e88d8ac504b62f2a3cf58a979836f32ea96fea958d830964ffba
+  data.tar.gz: eda12cf4e9470df7ec1d42a1cd03c4794d47019066636f3e8954423bc4a6c5642fd78c1b43c07d427c6a9a7242fd98e9a8f45da85cd33b664875039ecaaeb90d

data/lib/softcover/book.rb

@@ -58,7 +58,8 @@ class Softcover::Book
 
   # get array of paths and checksums
   def files
-    paths = %W{html/#{slug}.html html/*_fragment.html images/**/* config/*}
+    paths = %W{html/#{slug}.html html/*_fragment.html images/**/* config/*
+               html/stylesheets/custom.css}
     Dir[*paths].map do |path|
       BookFile.new(path) unless File.directory?(path)
     end.compact

data/lib/softcover/builders/mobi.rb

@@ -23,12 +23,15 @@ module Softcover
 
       # Returns the command for making a MOBI, based on the options.
       def mobi_command(filename, options={})
+        silent = options[:silent] || Softcover.test?
         if options[:kindlegen]
-          "#{kindlegen} ebooks/#{filename}.epub"
+          cmd = "#{kindlegen} ebooks/#{filename}.epub"
         else
-          "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.mobi" +
-          " #{calibre_options}"
+          cmd = "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.mobi" +
+                " #{calibre_options}"
         end
+        puts cmd unless (options[:quiet] || silent)
+        cmd
       end
 
       private

data/lib/softcover/sanitizer.rb

@@ -35,6 +35,9 @@ module Softcover
           'tr'   => %w{id class},
           'td'   => %w{id class colspan}
         },
+        css: {
+          properties: %w{color height width}
+        },
         protocols: {
           'a'   => {'href' => [:relative, 'http', 'https', 'mailto']},
           'img' => {'src'  => [:relative, 'http', 'https']}
@@ -45,4 +48,4 @@ module Softcover
       Sanitize.clean(html.force_encoding("UTF-8"), sanitize_options)
     end
   end
-end
+end

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.0.beta15"
+  VERSION = "1.0.beta16"
 end

data/softcover.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'coffee-script', '~> 2.2.0'
   gem.add_dependency 'listen', '~> 1.3.1'
   gem.add_dependency 'rb-fsevent', '~> 0.9.3'
-  gem.add_dependency 'sanitize', '~> 2.0.6'
+  gem.add_dependency 'sanitize', '~> 3.0.3'
 end

data/spec/book_spec.rb

@@ -14,6 +14,7 @@ describe Softcover::Book do
         its(:filenames) { should include "html/#{subject.slug}.html"}
 
         its(:filenames) { should include "config/marketing.yml"}
+        its(:filenames) { should include "html/stylesheets/custom.css"}
 
         its(:slug) { should eq "book" }
         its(:url) { should match /\/books\/(.*?)\/redirect/ }

data/spec/sanitizer_spec.rb

@@ -11,23 +11,24 @@ describe Softcover::Sanitizer do
   end
 
   context "safe html" do
-    let(:html) do Nokogiri::HTML.fragment(<<-EOS
+    let(:html) do <<-EOS
         <div id="a" class="b"></div>
         <div data-tralics-id="c" data-number="d" data-chapter="e"></div>
-        <a id="a" class="b" href="c"></a>
-        <span id="a" class="b" style="c"></span>
-        <ol id="a" class="b"></ol>
-        <ul id="a" class="b"></ul>
-        <li id="a" class="b"></li>
-        <sup id="a" class="b"></sup>
-        <h1 id="a" class="b"></h1>
-        <h2 id="a" class="b"></h2>
-        <h3 id="a" class="b"></h3>
-        <h4 id="a" class="b"></h4>
-        <img id="a" class="b" src="c" alt="d" />
-        <em id="a" class="b"></em>
+        <a id="b" class="b" href="c"></a>
+        <span id="c" class="b" style="color:white"></span>
+        <ol id="d" class="b"></ol>
+        <ul id="e" class="b">
+        <li id="f" class="b">
+        </li>
+        </ul>
+        <sup id="g" class="b"></sup>
+        <h1 id="h" class="b"></h1>
+        <h2 id="i" class="b"></h2>
+        <h3 id="j" class="b"></h3>
+        <h4 id="k" class="b"></h4>
+        <img id="l" class="b" src="c" alt="d">
+        <em id="m" class="b"></em>
       EOS
-      ).to_xhtml
     end
 
     it "allows class and id" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.0.beta15
+  version: 1.0.beta16
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -283,14 +283,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 3.0.3
 description: CLI interface for softcover.io
 email:
 - michael@softcover.io
@@ -1071,7 +1071,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A typesetting system for technical authors