publishr 0.5.2 → 0.5.3

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in publishr.gemspec
 gemspec
+
+gem 'sanitize'
+gem 'kramdown'

data/bin/publishr

@@ -45,7 +45,7 @@ if ARGV[0].nil?
   Process.exit
 end
 
-project = Publishr::Project.new(ARGV[0], ARGV[1], ARGV[3])
+project = Publishr::Project.new(ARGV[0], File.join(Dir.pwd,ARGV[1]), File.join(Dir.pwd,ARGV[3]))
 
 case ARGV[2]
   when 'kindle' then project.make_kindle

data/lib/epub_skeleton/epub.css

@@ -89,13 +89,13 @@ h3 {
   text-indent: 0;
 }
 
-.diff_correction {
+.diff_correction, .DIFF_CORRECTION {
   color: red;
   background-color: #FFEEEE;
   text-decoration: line-through;
 }
 
-.diff_insertation {
+.diff_insertation, .DIFF_INSERTATION {
   color: green;
   background-color: #EEFFEE;
 }

data/lib/publishr/epub_renderer.rb

@@ -37,7 +37,6 @@ module Publishr
     def make_epub_directory_structure
       FileUtils.rm_rf @outpath
       FileUtils.cp_r File.join(@gempath,'lib','epub_skeleton'), @outpath
-      FileUtils.cp Dir[File.join(@inpath,'..','images','*.jpg')], @outpath
       FileUtils.cp Dir[File.join(@inpath,'images','*.jpg')], @outpath
       FileUtils.cp File.join(@inpath,'cover.jpg'), @outpath
       @image_files = Dir[File.join(@outpath,'*.jpg')]

data/lib/publishr/html_processor.rb

@@ -10,7 +10,6 @@ module Publishr
       @rails_resources_url = rails_resources_url
 
       @custom_fixes = File.open(File.join(@inpath,'html_postprocessing.rb'), 'r').read if File.exists?(File.join(@inpath,'html_postprocessing.rb'))
-      @global_fixes = File.open(File.join(@inpath,'..','html_postprocessing.rb'), 'r').read if File.exists?(File.join(@inpath,'..','html_postprocessing.rb'))
 
       @depth = 0
       @quotetype = nil
@@ -21,7 +20,7 @@ module Publishr
     end
 
     def self.sanitize(html)
-      Sanitize.clean(html, Sanitize::Config::BASIC)
+      Sanitize.clean(html, :elements => ['b','i','code'])
     end
 
     def degrade
@@ -40,7 +39,6 @@ module Publishr
       @add_footnote = true and @footnote_number += 1 if @line.include?('<li id="fn')
 
       eval(@custom_fixes, binding) if @custom_fixes
-      eval(@global_fixes, binding) if @global_fixes
 
       annotate_blockquote
       improve_typography

data/lib/publishr/latex_processor.rb

@@ -25,7 +25,6 @@ module Publishr
       @inpath = inpath
 
       @custom_fixes = File.open(File.join(@inpath,'latex_postprocessing.rb'), 'r').read if File.exists?(File.join(@inpath,'latex_postprocessing.rb'))
-      @global_fixes = File.open(File.join(@inpath,'..','latex_postprocessing.rb'), 'r').read if File.exists?(File.join(@inpath,'..','latex_postprocessing.rb'))
     end
 
     def fix
@@ -72,7 +71,6 @@ module Publishr
       @line.gsub! '°',  '\\textdegree'
 
       eval(@custom_fixes, binding) if @custom_fixes
-      eval(@global_fixes, binding) if @global_fixes
 
       # use correct hyphen code for better automatic hyphenation
       @line.gsub! /(\w)-(\w)/, '\1\\hyp{}\2'

data/lib/publishr/latex_renderer.rb

@@ -31,9 +31,9 @@ module Publishr
 
     def make_tex_directory_structure
       FileUtils.mkdir_p @outpath
-      FileUtils.cp Dir[File.join(@inpath,'..','images','*.jpg')], @outpath
       FileUtils.cp Dir[File.join(@inpath,'images','*.jpg')], @outpath
       FileUtils.cp_r File.join(@gempath,'lib','tex_templates','book.tex'), @outpath
+      FileUtils.cp_r File.join(@inpath,'book.tex'), @outpath if File.exists?(File.join(@inpath,'book.tex'))
       FileUtils.cp_r File.join(@inpath,'preamble.tex'), @outpath
     end
 

data/lib/publishr/project.rb

@@ -21,10 +21,10 @@ module Publishr
   @@gempath = File.expand_path('../../../', __FILE__)
 
   class Project
-    def initialize(name,relativepath,converterspath)
+    def initialize(name,absolutepath,absoluteconverterspath)
       @name = name
-      @inpath = File.join(Dir.pwd,relativepath)
-      @converterspath = File.join(Dir.pwd,converterspath)
+      @inpath = absolutepath
+      @converterspath = absoluteconverterspath
 
       @metadata = YAML::load(File.open(File.join(@inpath,'metadata.yml'), 'r').read)
     end
@@ -35,13 +35,16 @@ module Publishr
       epub.render
       binaryfile = File.join(@converterspath,'kindlegen')
       epubfile = File.join(@inpath,"#{ @name }.epub")
+      lines = []
       IO.popen("#{ binaryfile } -verbose #{ epubfile  }") do |io|
         while (line = io.gets) do
           puts line
+          lines << line
         end
       end
       FileUtils.rm_r outpath
-      FileUtils.cp File.join(@inpath,"#{ @name }.mobi"), '/media/Kindle/documents'
+      #FileUtils.cp File.join(@inpath,"#{ @name }.mobi"), '/media/Kindle/documents'
+      lines.join('<br />')
     end
 
     def make_pdf
@@ -49,21 +52,23 @@ module Publishr
       pdf.render
 
       outpath = File.join(@inpath,'latex')
-      binaryfile = File.join(@converterspath,'jpeg2ps')
+      binaryfile = File.join(@converterspath,'jpeg2ps 2>&1')
       Dir[File.join(outpath,'*.jpg')].each do |infilepath|
         outfilepath = File.join(outpath, File.basename(infilepath).gsub(/(.*).jpg/, '\1.eps'))
         `#{ binaryfile } -r 0 -o #{ outfilepath } #{ infilepath }`
       end
 
       Dir.chdir outpath
-      IO.popen('pdflatex preamble.tex') do |io|
+      lines = []
+      IO.popen('pdflatex preamble.tex 2>&1') do |io|
         while (line = io.gets) do
           puts line
+          lines << line
         end
       end
 
       FileUtils.mv File.join(outpath,'preamble.pdf'), File.join(@inpath,"#{ @name }.pdf")
-      #FileUtils.rm_r outpath
+      lines.join('<br />')
      end
 
   end

data/lib/publishr/version.rb

@@ -1,3 +1,3 @@
 module Publishr
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/tex_templates/book.tex

@@ -0,0 +1,65 @@
+\documentclass[11pt,a5paper,dvips,pdflatex,DIV25,BCOR13mm,headinclude,footinclude,chapterprefix=false]{scrbook}
+
+\pagenumbering{arabic}
+
+% ------- PAGE HEADER SETTINGS -----------
+\usepackage{scrpage2}
+\pagestyle{scrheadings}
+\manualmark
+\clearscrheadfoot
+\ofoot[]{}                 %Seitenzahl unten außen erst spaeter einschalten
+% ----------------------------------------
+
+
+% -------------- PACKAGES ----------------
+\usepackage[ngerman]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{times}  %try also charter, cm, helvet, bookman, venturis, [sc]{mathpazo}, cmr, [adobe-utopia]{mathdesign}, gfsdidot
+\usepackage[force,almostfull]{textcomp}
+\usepackage{xspace}
+\usepackage{longtable}
+\usepackage{graphicx}
+\usepackage{hyphenat}
+\usepackage[margin=0pt,font={small,sf},labelfont={bf,sf,small},labelformat=empty,justification=centering]{caption}
+\usepackage[spacing=true,protrusion=true,expansion=true]{microtype}
+\usepackage{makeidx}
+\makeindex
+%\usepackage[german,portrait]{draftcopy}
+%\draftcopySetGrey 0
+
+% ----------------------------------------
+
+
+% -------------- CUSTOMIZATIONS ----------------
+\renewcommand{\sfdefault}{cmbr}  % use prettier sans serif font
+\renewcommand{\ttdefault}{lmtt}  % use prettier typewriter font
+\renewcommand{\emph}[1]{\textbf{#1}}
+
+\newenvironment{quotenormal}{ \begin{quote}\small}{ \end{quote} }
+\newenvironment{quotationnormal}{ \begin{quotation}\small}{ \end{quotation} }
+
+\newenvironment{quoteemail}{ \begin{flushleft}\begin{quote} \footnotesize\sffamily}{ \end{quote}\end{flushleft} }
+\newenvironment{quotationemail}{ \begin{flushleft}\begin{quote} \footnotesize\sffamily}{ \end{quote}\end{flushleft} }
+
+\newenvironment{quotetranscript}{ \begin{quote}\small\normalfont }{ \end{quote} }
+\newenvironment{quotationtranscript}{ \begin{quote}\small\normalfont }{ \end{quote} }
+
+\newenvironment{quotelyrics}{ \begin{quote}\small\normalfont }{ \end{quote} }
+\newenvironment{quotationlyrics}{ \begin{quote}\small\normalfont }{ \end{quote} }
+
+\newcommand{\zB}{\mbox{z.\,B.}\xspace}
+\newcommand{\dH}{\mbox{d.\,h.}\xspace}
+\newcommand{\ua}{\mbox{u.\,a.}\xspace}
+\newcommand{\omission}{\mbox{[\dots\hspace{-1,5pt}]}}
+\newcommand{\sessiondate}[1]{\hspace{-5mm}\textit{\scriptsize{#1}}\nopagebreak[4]}
+\newcommand{\object}[1]{\textit{#1}}
+\newcommand{\book}[1]{\textsf{#1}}
+\newcommand{\name}[1]{\textsc{#1}}
+\newcommand{\iron}[1]{\glq#1\grq{}}
+% ----------------------------------------
+
+% -------------- OTHER GENERAL SETTINGS ----------------
+\makeindex
+\makeglossary
+

data/publishr/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/publishr/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in publishr.gemspec
+gemspec

data/publishr/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/publishr/lib/publishr.rb

@@ -0,0 +1,5 @@
+require "publishr/version"
+
+module Publishr
+  # Your code goes here...
+end

data/publishr/lib/publishr/version.rb

@@ -0,0 +1,3 @@
+module Publishr
+  VERSION = "0.0.1"
+end

data/publishr/publishr.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "publishr/version"
+
+Gem::Specification.new do |s|
+  s.name        = "publishr"
+  s.version     = Publishr::VERSION
+  s.authors     = ["Michael Franzl"]
+  s.email       = ["michael@billgastro.com"]
+  s.homepage    = ""
+  s.summary     = %q{TODO: Write a gem summary}
+  s.description = %q{TODO: Write a gem description}
+
+  s.rubyforge_project = "publishr"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publishr
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000Z
+date: 2012-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &20535880 !ruby/object:Gem::Requirement
+  requirement: &23549760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20535880
+  version_requirements: *23549760
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &20533660 !ruby/object:Gem::Requirement
+  requirement: &23549120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20533660
+  version_requirements: *23549120
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &20532720 !ruby/object:Gem::Requirement
+  requirement: &23546200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20532720
+  version_requirements: *23546200
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &20530100 !ruby/object:Gem::Requirement
+  requirement: &23545780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20530100
+  version_requirements: *23545780
 description: Fast publishing for ebooks and paper
 email:
 - michael@billgastro.com
@@ -90,7 +90,14 @@ files:
 - lib/publishr/latex_renderer.rb
 - lib/publishr/project.rb
 - lib/publishr/version.rb
+- lib/tex_templates/book.tex
 - publishr.gemspec
+- publishr/.gitignore
+- publishr/Gemfile
+- publishr/Rakefile
+- publishr/lib/publishr.rb
+- publishr/lib/publishr/version.rb
+- publishr/publishr.gemspec
 homepage: ''
 licenses: []
 post_install_message: