publishr 0.5.3 → 0.5.4

data/lib/document_skeleton/.gitignore

@@ -0,0 +1,3 @@
+latex
+epub
+*~

data/lib/epub_skeleton/epub.css

@@ -3,6 +3,11 @@ p {
   font-size: medium;
 }
 
+blockquote p {
+  margin-left: 1em;
+  font-size: small;
+}
+
 .blockquote_transcript_1 {
   margin-left: 1em;
   font-size: small;

data/lib/publishr/epub_renderer.rb

@@ -17,12 +17,13 @@
 
 module Publishr
   class EpubRenderer
-    def initialize(name,inpath,outpath,metadata)
+    def initialize(name,inpath,outpath,metadata,rails_resources_url='')
       @name = name
       @inpath = inpath
       @outpath = outpath
       @metadata = metadata
       @gempath = Publishr::gempath
+      @rails_resources_url = rails_resources_url
 
       @html_files = []
       @image_files = []
@@ -53,7 +54,7 @@ module Publishr
       Dir[File.join(@inpath,'*.txt')].each do |infilepath|
         kramdown = File.open(infilepath, 'r').read
         html = Kramdown::Document.new(kramdown, kramdown_options).to_html
-        degraded_html = HtmlProcessor.new(html,@inpath,@metadata,'').degrade
+        degraded_html = HtmlProcessor.new(html,@inpath,@metadata,@rails_resources_url).degrade
         outfilepath = File.join(@outpath, File.basename(infilepath).gsub(/(.*).txt/, '\1.html'))
         File.open(outfilepath, 'w'){ |f| f.write degraded_html }
       end

data/lib/publishr/html_processor.rb

@@ -44,7 +44,8 @@ module Publishr
       improve_typography
       make_uppercase
       change_footnote_references
-      change_resources_url_for_rails unless @rails_resources_url.empty?
+      mark_merge_conflicts
+      change_resources_url_for_rails unless @rails_resources_url.to_s.empty?
       process_footnotes if @process_footnotes == true
       add_footnote if @add_footnote == true and @line.include?('<p>')
     end
@@ -104,5 +105,11 @@ module Publishr
      @line.gsub!(/href="(.*?.css)/){ "href=\"#{ @rails_resources_url }#{ $1 }" }
      @line.gsub!(/src="(.*?.jpg)/){ "src=\"#{ @rails_resources_url }#{ $1 }" }
    end
+
+   def mark_merge_conflicts
+     @line.gsub! /«««.*$/, '<span style="color:red;">'
+     @line.gsub! '=======', '</span></p><p><span style="color:orange;">'
+     @line.gsub! /»»».*$/, '</span></p>'
+   end
   end
 end

data/lib/publishr/project.rb

@@ -21,17 +21,18 @@ module Publishr
   @@gempath = File.expand_path('../../../', __FILE__)
 
   class Project
-    def initialize(name,absolutepath,absoluteconverterspath)
+    def initialize(name,absolutepath,absoluteconverterspath,rails_resources_url='')
       @name = name
       @inpath = absolutepath
       @converterspath = absoluteconverterspath
+      @rails_resources_url = rails_resources_url
 
       @metadata = YAML::load(File.open(File.join(@inpath,'metadata.yml'), 'r').read)
     end
 
     def make_kindle
       outpath = File.join(@inpath,'epub')
-      epub = EpubRenderer.new(@name,@inpath,outpath,@metadata)
+      epub = EpubRenderer.new(@name,@inpath,outpath,@metadata, @rails_resources_url)
       epub.render
       binaryfile = File.join(@converterspath,'kindlegen')
       epubfile = File.join(@inpath,"#{ @name }.epub")
@@ -42,8 +43,8 @@ module Publishr
           lines << line
         end
       end
-      FileUtils.rm_r outpath
-      #FileUtils.cp File.join(@inpath,"#{ @name }.mobi"), '/media/Kindle/documents'
+      # FileUtils.rm_r outpath
+      # FileUtils.cp File.join(@inpath,"#{ @name }.mobi"), '/media/Kindle/documents'
       lines.join('<br />')
     end
 

data/lib/publishr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publishr
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &23549760 !ruby/object:Gem::Requirement
+  requirement: &9112700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23549760
+  version_requirements: *9112700
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &23549120 !ruby/object:Gem::Requirement
+  requirement: &9111420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23549120
+  version_requirements: *9111420
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &23546200 !ruby/object:Gem::Requirement
+  requirement: &9110300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23546200
+  version_requirements: *9110300
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &23545780 !ruby/object:Gem::Requirement
+  requirement: &9095620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23545780
+  version_requirements: *9095620
 description: Fast publishing for ebooks and paper
 email:
 - michael@billgastro.com
@@ -68,6 +68,7 @@ files:
 - README
 - Rakefile
 - bin/publishr
+- lib/document_skeleton/.gitignore
 - lib/document_skeleton/cover.jpg
 - lib/document_skeleton/covertext.txt
 - lib/document_skeleton/frontmatter.txt
@@ -92,12 +93,6 @@ files:
 - 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: 

data/publishr/.gitignore

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

data/publishr/Gemfile

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

data/publishr/Rakefile

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

data/publishr/lib/publishr.rb

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

data/publishr/lib/publishr/version.rb

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

data/publishr/publishr.gemspec

@@ -1,24 +0,0 @@
-# -*- 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