wordsmith 0.0.2 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3ba51f5ebeeeb48a9dfc57e523b20bdfc349c7f3
+  data.tar.gz: 085af8ce32876d4a1d6bac36d4db1779482b349d
+SHA512:
+  metadata.gz: 64a3a77b9047716d9c88add36d9f417e155a01326c8069e4bed55d9f1cf922f81ecfa54429e8d24652f7750e6c45884220f5abd023adab6318a600d09da9af10
+  data.tar.gz: a53b78251c9acd1f669bb483514d5e06dec48f3b1b7ccc9a3599e19591ee4ec48efa69e1d1f08d25a6f6fd9a1eb9f25d57bdbc1f30d023b0a73b44400e7828ea

data/Gemfile.lock

@@ -1,20 +1,24 @@
 PATH
   remote: .
   specs:
-    wordsmith (0.0.1)
+    wordsmith (0.0.6)
       git
-      kindlegen (>= 2.3.1)
-      nokogiri (>= 1.5.2)
+      kindlegen (~> 2.3)
+      nokogiri (~> 1.5)
+      sass (~> 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
+    git (1.2.6)
     kindlegen (2.8.0)
       systemu
-    nokogiri (1.5.9)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     rake (0.9.2.2)
-    systemu (2.5.2)
+    sass (3.2.13)
+    systemu (2.6.0)
     test-unit (2.4.8)
 
 PLATFORMS

data/README.md

@@ -50,8 +50,10 @@ need to start creating your own content without worrying about anything else.
         images/
           cover.jpg
         stylesheets/
-          default.css
-          book.css
+          master.scss
+          _partial.scss
+          other.css
+          epub.css
       content/
         01_chapter_one.md
         02_chapter_two.md
@@ -69,15 +71,23 @@ You can edit your book metadata inside the **.wordsmith** file:
     ---
     edition:    0.1
     language:   en
-    author:     Your Name
+    author:     Your Name; Additional author
     title:      Your Book Title
     cover:      assets/images/cover.jpg
-    stylesheet: assets/stylesheets/default.css
+
+    # Other configuration options
+    # font:       YOUR_FONT_FAMILY
+
+If you are publishing in a language like Chinese, you should specify a `font`
+with Chinese glyphs.
+
+You can specify additional authors by separating them with a `;`
 
 The **layout** directory contains the header and footer for an
 online version of your book.
 
-The **assets** directory contains images and stylesheets.
+The **assets** directory contains images and stylesheets. Wordsmith has
+built-in support for [Sass](http://sass-lang.com/).
 
 In the **content** directory you can:
 
@@ -107,27 +117,30 @@ This will be available in a site like http://jassa.github.com/wordsmith-demo/
 Git is an important part of this tool, a typical workflow should look like this:
 
     $ wordsmith new ruby_guide
-    # this command will also create a git repository
-    # and the first commit, but IT WILL NOT BE PUSHED YET
-    # since you haven't provided a remote ref
+    // this command will also create a git repository
+    // and the first commit, but IT WILL NOT BE PUSHED YET
+    // since you haven't provided a remote ref
 
     $ cd ruby_guide
-    # Here you edit your 'content' directory with your own chapters
+    // Here you edit your 'content' directory with your own chapters
 
-    # then when you are ready to commit you do it normally:
+    // Generate your output files..
     $ wordsmith generate
+
+    // ..and when you are ready to commit, do it normally:
     $ git commit -am "finished chapter one"
 
-    # if you're not ready to publish to github pages, add a ref to a new repo
+    // Add a ref to your (newly created) remote repo
     $ git add remote origin git@github.com:jassa/wordsmith-demo.git
     $ git push origin master
 
-    # and if you are ready, you could do instead:
+    // Note that if you want to publish to github pages,
+    // you can do this instead:
     $ wordsmith publish git@github.com:jassa/wordsmith-demo.git
 
-    # This will create a branch called 'gh-pages' as github requires,
-    # you'll still need to run $ git push origin master
-    # to push your book editables
+    // This command will create a branch called 'gh-pages' (as github requires),
+    // just remember that you'll still need to run `git push origin master`
+    // to push your book editables
 
 ## License
 

data/Rakefile

@@ -1,9 +1,10 @@
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => :test
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
+
+task :default => :test

data/bin/wordsmith

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+# encoding: UTF-8
 
 begin
   # resolve bin path, ignoring symlinks
@@ -10,11 +9,10 @@ begin
   # add self to libpath
   $:.unshift File.expand_path("../../lib", bin_file)
 
-  require 'wordsmith'
-
   # start up the CLI
+  require 'wordsmith'
   require 'wordsmith/cli'
   Wordsmith.new.run
 rescue Interrupt
   puts("\n !    Command cancelled.")
-end
+end

data/lib/wordsmith.rb

@@ -1,40 +1,40 @@
 require 'rubygems'
+require 'bundler/setup'
+
 require 'nokogiri'
 require 'kindlegen'
 require 'yaml'
 require 'git'
 
+require 'fileutils'
+require 'pp'
+
 require 'wordsmith/init'
 require 'wordsmith/generate'
 require 'wordsmith/publish'
 
-require 'fileutils'
-require 'pp'
-
-class Wordsmith  
+class Wordsmith
   include Init
   include Generate
   include Publish
-  
+
   attr_accessor :subcommand, :args, :options, :name, :files, :stylesheet
   attr_reader :info
-  
+
   OUTPUT_TYPES = ['html', 'epub', 'mobi', 'pdf']
   WORDSMITH_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  
+
   def initialize
     @subcommand = nil
     @args = []
     @options = {}
-    @config = YAML::parse(File.open(local('.wordsmith'))).transform rescue {}
-    @name = File.basename(local('.'))
   end
 
   def info(message)
     @info ||= []
     @info << message
   end
-  
+
   def local(file)
     File.expand_path(File.join(Dir.pwd, file))
   end

data/lib/wordsmith/cli.rb

@@ -43,7 +43,7 @@ class Wordsmith
       end
 
       command :init, :new, :n do |opts|
-        opts.banner = "Usage: wordsmith new (directory)"
+        opts.banner = "Usage: wordsmith new [directory]"
         opts.description = "initialize a new book layout"
       end
 

data/lib/wordsmith/generate.rb

@@ -1,131 +1,219 @@
+require 'sass/plugin'
+
 class Wordsmith
   module Generate
-    
-    attr_reader :files, :output
-    
-    # generate the new media
-    def generate(args = [])
-      @output = local(File.join('final', @name))
-      
-      content_dir = local(File.join('content'))
-      @files = Dir.glob(content_dir + '/**/*.*').sort.join(" \\\n")
-      
-      if @files.empty?
-        raise "Exiting.. Nothing to generate in #{content_dir}.\nHave you run 'wordsmith new'?"
-      end
-      
-      build_metadata_xml
-      
-      @stylesheet = if @config["stylesheet"] && File.exists?(local(@config["stylesheet"]))
-        local(@config["stylesheet"])
+    attr_reader :config, :files, :name, :output
+
+    def setup
+      @name = File.basename(local("."))
+      @config = YAML::parse(File.open(local(".wordsmith"))).
+        transform rescue {}
+
+      run_callback("before_all")
+      content_dir = local(File.join("content"))
+      @files = Dir.glob(content_dir + "/**/*.*").sort.join(" \\\n")
+
+      if files.empty?
+        raise "Exiting.. Nothing to generate in #{content_dir}." +
+          "\nHave you run 'wordsmith new'?"
       end
-      
-      Dir.mkdir(local('final')) unless File.exists?(local('final'))
-      
+
+      Dir.mkdir(local("final")) unless File.exists?(local("final"))
+      @output = local(File.join("final", name))
+    end
+
+    def generate(args = [])
+      setup
+
       formats = args.empty? ? OUTPUT_TYPES : args
+
       formats.each do |format|
-        if respond_to?("to_#{format}")
-          if format == 'mobi'
-            out = to_mobi
-          else
-            out = run_command(send("to_#{format}"))
-          end
-          if $?.exitstatus == 0 && out == '' || $?.exitstatus == 1 && format == 'mobi'
-            if format == 'html'
-              info "Created #{@output}/index.html"
-            else
-              info "Created #{@output}.#{format}"
-            end
-          else
-            raise "#{format} generator failed"
-          end
+        raise "No generator found for #{format}" unless respond_to?("to_#{format}")
+
+        run_callback("before_#{format}")
+        out = if format == "mobi"
+          send("to_#{format}")
         else
-          raise "No generator found for #{format}"
+          run_command(send("to_#{format}"))
+        end
+        run_callback("after_#{format}")
+
+        if $?.exitstatus == 0 && out.empty? || format == "mobi" && $?.exitstatus == 1
+          info "Created #{output}" +
+            (format == "html" ? "/index.html" : ".#{format}")
+        else
+          raise "#{format} generator failed"
         end
       end
+      run_callback("after_all")
     end
-    
-    def build_metadata_xml
-      metadata = local(File.join('metadata.xml'))
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.metadata('xmlns:dc' => 'http://purl.org/dc/elements/1.1/') {
-          xml['dc'].title { xml.text @config["title"] }
-          xml['dc'].creator { xml.text @config["author"] }
-          xml['dc'].language { xml.text @config["language"] }
-        }
-      end
-      frg = Nokogiri::XML.fragment(builder.to_xml)
-      nodes = frg.search('.//metadata/*')
-      File.open(metadata, 'w') { |f| f.write(nodes.to_xml) }
+
+    def run_callback(meth)
+      run_command(config[meth]) if config[meth]
     end
-    
+
     def to_html
       info "Generating html..."
-      html_dir = local(File.join('final', @name))
-      Dir.mkdir(html_dir) unless File.exists?(html_dir)
-      header = if File.exists?(local(File.join('layout', 'header.html')))
-        local(File.join('layout', 'header.html'))
-      end
-      footer = if File.exists?(local(File.join('layout', 'footer.html')))
-        local(File.join('layout', 'footer.html'))
-      end
-      `cp -r #{base(File.join('template', 'assets'))} #{html_dir}`
-      cmd = "pandoc -s -S --toc -o #{File.join(html_dir, 'index.html')} -t html"
-      puts @config['stylesheet']
-      cmd += " -c #{@config['stylesheet']}" if @stylesheet
+
+      compile_stylesheets
+      copy_assets
+
+      cmd = "pandoc -f markdown_mmd -s -S --toc -o #{File.join(output, "index.html")} -t html"
+      stylesheets.each { |stylesheet| cmd += " -c #{stylesheet}" }
       cmd += " -B #{header}" if header
       cmd += " -A #{footer}" if footer
-      cmd += " \\\n#{@files}"
+      cmd += " \\\n#{files}"
+      cmd
     end
-    
+
     def to_epub
       info "Generating epub..."
-      metadata = if File.exists?(local(File.join('metadata.xml')))
-        local(File.join('metadata.xml'))
-      end
-      cover = if @config["cover"] && File.exists?(local(File.join(@config["cover"])))
-        local(File.join(@config["cover"]))
-      end
-      cmd = "pandoc -S -o #{@output}.epub -t epub"
-      cmd += " \\\n--epub-metadata=#{metadata}"
+
+      build_metadata_xml
+
+      cmd = "pandoc -f markdown_mmd -S -o #{output}.epub -t epub"
+      cmd += " \\\n--epub-metadata=#{metadata}" if metadata
       cmd += " \\\n--epub-cover-image=#{cover}" if cover
-      cmd += " \\\n--epub-stylesheet=#{@stylesheet}" if @stylesheet
-      cmd += " \\\n#{@files}"
+      cmd += " \\\n--epub-stylesheet=#{epub_stylesheet}" if epub_stylesheet
+      cmd += " \\\n#{files}"
+      cmd
     end
-    
+
     def to_mobi
-      if File.exists?(@output + '.epub')
+      if File.exists?(output + ".epub")
         info "Generating mobi..."
-        Kindlegen.run("#{@output}.epub", "-o", "#{@name}.mobi")
+        Kindlegen.run("#{output}.epub", "-o", "#{name}.mobi")
       else
-        info "Skipping .mobi (#{@name}.epub doesn't exist)"
+        info "Skipping .mobi (#{name}.epub doesn't exist)"
       end
     end
-    
+
     def to_pdf
       info "Generating pdf..."
-      engine = ''
-      [['pdftex', 'pdflatex'], ['xetex', 'xelatex'], 'lualatex'].each do |e|
+
+      engine = ""
+
+      [["xetex", "xelatex"], ["pdftex", "pdflatex"], "lualatex"].each do |e|
         if e.is_a? Array
           cmd, name = e
         else
           cmd = name = e
         end
-        if can_run?(cmd + ' -v')
+        if can_run?(cmd + " -v")
           engine = name
-          break 
+          break
         end
       end
-      cmd = "pandoc -N --toc -o #{@output}.pdf #{@files}"
-      cmd += " --latex-engine=#{engine}" unless engine == ''
+
+      cmd = "pandoc -f markdown_mmd -N --toc -o #{output}.pdf #{files}"
+      cmd += " --latex-engine=#{engine}" unless engine.empty?
+      cmd += " -V mainfont='#{config['font']}'" unless (config.fetch('font', '')).empty?
+      cmd
+    end
+
+    private
+
+    def build_metadata_xml
+      metadata = local(File.join("metadata.xml"))
+
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.metadata("xmlns:dc" => "http://purl.org/dc/elements/1.1/") {
+          xml["dc"].title { xml.text config["title"] }
+          config["author"].split(/\s*;\s*/).each do |creator|
+            xml["dc"].creator { xml.text creator }
+          end if config["author"]
+          xml["dc"].language { xml.text config["language"] }
+        }
+      end
+
+      frg = Nokogiri::XML.fragment(builder.to_xml)
+      nodes = frg.search(".//metadata/*")
+      File.open(metadata, "w") { |f| f.write(nodes.to_xml) }
+    end
+
+    def compile_stylesheets
+      unless defined?(SASS_LOADED)
+        Sass::Plugin.reset!
+
+        css_location = File.join(output, "assets", "stylesheets")
+        sass_location = File.join(local("assets"), "stylesheets")
+
+        Sass::Plugin.options.merge!(:template_location => sass_location,
+          :css_location  => css_location,
+          :always_update => false,
+          :always_check  => true)
+      end
+
+      Sass::Plugin.on_updated_stylesheet do |template, css|
+        info "Compiling #{template} to #{css}"
+      end
+
+      Sass::Plugin.update_stylesheets
+    end
+
+    def copy_assets
+      assets = Dir.glob(File.join("assets", "**", "*"))
+      sass = Dir.glob(File.join("assets", "stylesheets", "**", "*.scss"))
+
+      copies = assets - sass - [epub_stylesheet_location]
+      copies.each do |entry|
+        dest = File.join(output, File.dirname(entry))
+        FileUtils.mkdir_p dest
+        FileUtils.cp entry, dest unless File.directory?(entry)
+      end
+    end
+
+    def cover
+      @cover ||= if config["cover"] && File.exists?(local(File.join(config["cover"])))
+        local(File.join(config["cover"]))
+      end
+    end
+
+    def epub_stylesheet
+      @epub_stylesheet ||= if File.exists?(epub_stylesheet_location)
+        local(epub_stylesheet_location)
+      end
+    end
+
+    def epub_stylesheet_location
+      File.join("assets", "stylesheets", "epub.css")
+    end
+
+    def footer
+      @footer ||= if File.exists?(local(File.join("layout", "footer.html")))
+        local(File.join("layout", "footer.html"))
+      end
+    end
+
+    def header
+      @header ||= if File.exists?(local(File.join("layout", "header.html")))
+        local(File.join("layout", "header.html"))
+      end
+    end
+
+    def metadata
+      @metadata ||= if File.exists?(local(File.join("metadata.xml")))
+        local(File.join("metadata.xml"))
+      end
+    end
+
+    def stylesheets
+      @stylesheet ||= begin
+        styles = Dir.glob(File.join(output, "assets", "stylesheets", "**", "*.css"))
+        partials = Dir.glob(File.join(output, "assets", "stylesheets", "**", "_*.css"))
+        all = styles - partials - [epub_stylesheet_location]
+
+        all.map { |css| css.gsub(output + "/", "") }
+      end
     end
-    
+
     def run_command(cmd)
       `#{cmd}`.strip
     end
-    
+
     def can_run?(cmd)
-      `#{cmd} 2>&1`
+      out = `#{cmd} 2>&1`
+      info out
       $?.success?
     end
   end

data/lib/wordsmith/init.rb

@@ -1,6 +1,6 @@
 class Wordsmith
   module Init
-    
+
     # start a new wordsmith directory with skeleton structure
     def init(args = [])
       name = Array(args).shift
@@ -11,7 +11,7 @@ class Wordsmith
       template_dir = File.join(WORDSMITH_ROOT, 'template')
       ign = Dir.glob(template_dir + '/.[a-z]*')
       FileUtils.cp_r template_dir, name
-      
+
       # also copy files that start with .
       FileUtils.cp_r ign, name
       if Git.init(local(name))
@@ -24,4 +24,4 @@ class Wordsmith
       end
     end
   end
-end
+end

data/lib/wordsmith/version.rb

@@ -1,3 +1,3 @@
-module Wordsmith
-  VERSION = "0.0.2"
+class Wordsmith
+  VERSION = "0.0.6"
 end

data/template/.wordsmith

@@ -4,4 +4,7 @@ language:   en
 author:     Your Name
 title:      Your Book Title
 cover:      assets/images/cover.jpg
-stylesheet: assets/stylesheets/default.css
+
+# Other configuration options
+# If you need to specify the font to use non-unicode characters (e.g. Chinese)
+# font:       HanaMinA

data/template/assets/stylesheets/{default.css → _partial.scss}

@@ -3,6 +3,7 @@ html {
 	padding: 40px;
 	background: #DFE1E5;
 }
+
 body {
 	margin: 0;
 	padding: 30px;
@@ -18,27 +19,12 @@ body {
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
-	
 }
+
 a {
 	color: #1A4882;
 }
+
 h1, h2, h3 {
 	margin: 30px 0 10px 0;
 }
-body {
-	display: inline-block;
-}
-div#TOC {
-	border: 1px solid #C7C7C7;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-}
-div#cover {
-	text-align: center;
-	padding: 0 0 30px 0;
-}
-div#cover img {
-	max-height: 400px;
-}

data/template/assets/stylesheets/_with_sass.scss

@@ -0,0 +1,8 @@
+div#cover {
+	text-align: center;
+	padding: 0 0 30px 0;
+
+  img {
+	  max-height: 400px;
+  }
+}

data/template/assets/stylesheets/epub.css

@@ -0,0 +1,44 @@
+html {
+  margin: 0;
+  padding: 40px;
+  background: #DFE1E5;
+}
+body {
+  margin: 0;
+  padding: 30px;
+  font-family: "Lucida Grande",verdana,arial,helvetica,sans-serif;
+  font-size: 14px;
+  color: #373737;
+  width: 800px;
+  background:  rgba(255, 255, 255, 0.8);
+  -webkit-box-shadow: 2px 2px 6px rgba(0,0,0,.30);
+  -moz-box-shadow: 2px 2px 6px rgba(0,0,0,.30);
+  box-shadow: 2px 2px 6px rgba(0,0,0,.30);
+  border: 1px solid #C7C7C7;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+
+}
+a {
+  color: #1A4882;
+}
+h1, h2, h3 {
+  margin: 30px 0 10px 0;
+}
+body {
+  display: inline-block;
+}
+div#TOC {
+  border: 1px solid #C7C7C7;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+div#cover {
+  text-align: center;
+  padding: 0 0 30px 0;
+}
+div#cover img {
+  max-height: 400px;
+}

data/template/assets/stylesheets/master.scss

@@ -0,0 +1,2 @@
+@import "_partial";
+@import "_with_sass";

data/template/assets/stylesheets/other.css

@@ -0,0 +1,10 @@
+body {
+	display: inline-block;
+}
+
+div#TOC {
+	border: 1px solid #C7C7C7;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}

data/test/css_test.rb

@@ -0,0 +1,60 @@
+require File.expand_path "../test_helper", __FILE__
+
+context "wordsmith css tests" do
+
+  def wordsmith
+    Wordsmith.new
+  end
+
+  test "copies all css files into final assets directory" do
+    in_temp_dir do
+      wordsmith.init('w')
+
+      File.rename "w/assets/stylesheets/master.scss",
+        "w/assets/stylesheets/_a_css_partial.css"
+
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+      files = Dir.glob('w/final/**/*')
+
+      assert files.include? "w/final/w/assets/stylesheets/other.css"
+      assert files.include? "w/final/w/assets/stylesheets/_a_css_partial.css"
+    end
+  end
+
+  test "includes all final css files inside output html" do
+    in_temp_dir do
+      wordsmith.init('w')
+
+      File.rename "w/assets/stylesheets/master.scss",
+        "w/assets/stylesheets/master.css"
+
+      FileUtils.cp "w/assets/stylesheets/master.css",
+        "w/assets/stylesheets/_a_css_partial.css"
+
+      assert File.exists?("w/assets/stylesheets/other.css")
+
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+      html_content = File.read("w/final/w/index.html")
+
+      assert html_content =~ /="assets\/stylesheets\/master\.css"/
+      assert html_content =~ /other\.css/
+      assert !(html_content =~ /_a_css_partial\.css/)
+    end
+  end
+
+  test "ignores epub.css in html" do
+    in_temp_dir do
+      wordsmith.init('w')
+      assert File.exists?("w/assets/stylesheets/epub.css")
+
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+
+      html_content = File.read("w/final/w/index.html")
+      files = Dir.glob('w/final/**/*')
+
+      assert !files.include?("w/final/w/assets/stylesheets/epub.css")
+      assert !(html_content =~ /epub\.css/)
+    end
+  end
+
+end

data/test/generate_test.rb

@@ -1,7 +1,39 @@
 require File.expand_path "../test_helper", __FILE__
 
 context "wordsmith generate tests" do
-  setup do
-    @wordsmith = Wordsmith.new
+
+  def wordsmith
+    Wordsmith.new
+  end
+
+  test "fails without files" do
+    assert_raise RuntimeError do
+      wordsmith.generate
+    end
+  end
+
+  %w(epub html pdf).each do |format|
+    test "generates book.#{format}" do
+      in_temp_dir do
+        wordsmith.init "book"
+        Dir.chdir("book") { wordsmith.generate [format] }
+      end
+    end
   end
-end
+
+  # mobi requires epub
+  test "generates book.mobi" do
+    in_temp_dir do
+      wordsmith.init "book"
+      Dir.chdir("book") { wordsmith.generate ["epub", "mobi"] }
+    end
+  end
+
+  test "generates all" do
+    in_temp_dir do
+      wordsmith.init "book"
+      Dir.chdir("book") { wordsmith.generate }
+    end
+  end
+
+end

data/test/init_test.rb

@@ -31,4 +31,12 @@ context "wordsmith init tests" do
       assert files.include? "w/.gitignore"
     end
   end
-end
+
+  test "creates git repo" do
+    in_temp_dir do
+      @wordsmith.init('w')
+      files = Dir.glob('w/**/*', File::FNM_DOTMATCH)
+      assert files.include? "w/.git"
+    end
+  end
+end

data/test/sass_test.rb

@@ -0,0 +1,49 @@
+require File.expand_path "../test_helper", __FILE__
+
+context "wordsmith sass tests" do
+
+  def wordsmith
+    Wordsmith.new
+  end
+
+  test "compiles sass files" do
+    in_temp_dir do
+      wordsmith.init('w')
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+
+      sass1 = File.read("w/assets/stylesheets/_partial.scss")
+      sass2 = File.read("w/assets/stylesheets/_with_sass.scss")
+      compiled_css = File.read("w/final/w/assets/stylesheets/master.css")
+
+      assert compiled_css =~ /#{sass1.split("\n").first}/
+      assert compiled_css =~ /#{sass2.split("\n").first}/
+    end
+  end
+
+  test "doesn't copy sass assets to final" do
+    in_temp_dir do
+      wordsmith.init('w')
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+
+      files = Dir.glob('w/final/**/*')
+
+      assert files.include?("w/final/w/assets/stylesheets/master.css")
+      assert files.include?("w/final/w/assets/stylesheets/other.css")
+
+      assert files.grep(/.scss$/).empty?
+    end
+  end
+
+  test "includes compiled css files inside final html" do
+    in_temp_dir do
+      wordsmith.init('w')
+      assert File.exists?("w/assets/stylesheets/master.scss")
+
+      Dir.chdir("w") { wordsmith.generate ["html"] }
+      html_content = File.read("w/final/w/index.html")
+
+      assert html_content =~ /master.css/
+    end
+  end
+
+end

data/wordsmith.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |gem|
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.add_dependency "nokogiri",  ">= 1.5.2"
-  gem.add_dependency "kindlegen", ">= 2.3.1"
   gem.add_dependency "git"
+  gem.add_dependency "kindlegen", "~> 2.3"
+  gem.add_dependency "nokogiri",  "~> 1.5"
+  gem.add_dependency "sass", "~> 3.1"
+
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordsmith
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Amed Rodriguez
@@ -11,86 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kindlegen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Create, collaborate and publish ebooks easily.
@@ -103,7 +106,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -120,45 +123,52 @@ files:
 - template/.wordsmith
 - template/README.md
 - template/assets/images/cover.jpg
-- template/assets/stylesheets/default.css
+- template/assets/stylesheets/_partial.scss
+- template/assets/stylesheets/_with_sass.scss
+- template/assets/stylesheets/epub.css
+- template/assets/stylesheets/master.scss
+- template/assets/stylesheets/other.css
 - template/content/01_manifesto.md
 - template/content/02_read_read_read.md
 - template/content/03_pay_special_attention/01_intro.md
 - template/content/03_pay_special_attention/02_conclusion.md
 - template/layout/footer.html
 - template/layout/header.html
+- test/css_test.rb
 - test/generate_test.rb
 - test/init_test.rb
 - test/publish_test.rb
+- test/sass_test.rb
 - test/test_helper.rb
 - wordsmith.gemspec
 homepage: https://github.com/tractical/wordsmith
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The best way to publish ebooks. No, really.
 test_files:
+- test/css_test.rb
 - test/generate_test.rb
 - test/init_test.rb
 - test/publish_test.rb
+- test/sass_test.rb
 - test/test_helper.rb