publishr 0.5.9 → 0.6.0

data/bin/publishr

@@ -31,7 +31,7 @@ if ARGV[0].nil?
   puts ''
   puts "  [name] is an unique string that identifies your project. Rendered files will be named after this."
   puts "  [path_to_source_dir] directory must minimally contain: [cover.jpg, covertext.txt, frontmatter.txt, toc.txt, metadata.yml]"
-  puts "  [format] must be {mobi, epub, pdf}"
+  puts "  [format] must be {kindle, pdf}"
   puts "  [path_to_converters] directory must contain `kindlegen` and `jpg2ps`. They cannot be shipped with this program due to legal reasons."
   puts ''
   puts 'EXAMPLE: publishr mybook1 my/files/mybook epub path/to/converters'
@@ -51,3 +51,5 @@ case ARGV[2]
   when 'kindle' then project.make_kindle
   when 'pdf'    then project.make_pdf
 end
+
+#project.make_images_local("abc ![alt](http://www.sott.net/image/image/s1/33868/medium/sott_6percent_sm.jpg) \n ;lkjsdflk \n xxx ![alt](http://billgastro.com/images/header-en.png)")

data/lib/publishr/epub_renderer.rb

@@ -22,7 +22,7 @@ module Publishr
       @inpath = inpath
       @outpath = outpath
       @metadata = metadata
-      @gempath = Publishr::gempath
+      @gempath = Publishr::Project.gempath
       @rails_resources_url = rails_resources_url
 
       @html_files = []

data/lib/publishr/html_processor.rb

@@ -20,7 +20,7 @@ module Publishr
     end
 
     def self.sanitize(html)
-      Sanitize.clean(html, :elements => ['b','i','code','br','var','p','blockquote'])
+      Sanitize.clean(html, :elements => ['b','i','code','br','var','p','blockquote','img'], :attributes => { 'img' => ['src', 'alt'] })
     end
 
     def degrade

data/lib/publishr/kramdown_processor.rb

@@ -1,15 +1,11 @@
 module Publishr
   class KramdownProcessor
-    def self.convert(html)
+    def self.convert(html,image_url_prefix)
       sanitized_html = HtmlProcessor.sanitize(html)
-      lines = Kramdown::Document.new(sanitized_html, :input => 'html', :line_width => 100000 ).to_kramdown.split("\n")
-      processed_lines = []
-      lines.each do |line|
-        line.gsub! '\"', '"'
-        line.gsub! "\\'", "'"
-        processed_lines << line
-      end
-      processed_lines.join("\n")
+      kramdown = Kramdown::Document.new(sanitized_html, :input => 'html', :line_width => 100000 ).to_kramdown
+      kramdown.gsub!(/\!\[(.*?)\]\((.*?)\)/){ "![#{$1}](#{image_url_prefix}#{$2})" }
+      kramdown.gsub! '\"', '"'
+      kramdown.gsub! "\\'", "'"
     end
   end
 end

data/lib/publishr/latex_renderer.rb

@@ -21,7 +21,7 @@ module Publishr
       @name = name
       @inpath = path
       @outpath = File.join(@inpath,'latex')
-      @gempath = Publishr::gempath
+      @gempath = Publishr::Project.gempath
     end
 
     def render

data/lib/publishr/project.rb

@@ -17,11 +17,11 @@
 
 module Publishr
 
-  mattr_accessor :gempath
-  @@gempath = File.expand_path('../../../', __FILE__)
+  #mattr_accessor :gempath
+  #@@gempath = File.expand_path('../../../', __FILE__)
 
   class Project
-    def initialize(name,absolutepath,absoluteconverterspath,rails_resources_url='')
+    def initialize(name,absolutepath,absoluteconverterspath='',rails_resources_url='')
       @name = name
       @inpath = absolutepath
       @converterspath = absoluteconverterspath
@@ -30,6 +30,10 @@ module Publishr
       @metadata = YAML::load(File.open(File.join(@inpath,'metadata.yml'), 'r').read)
     end
 
+    def self.gempath
+      File.expand_path('../../../', __FILE__)
+    end
+
     def make_kindle
       outpath = File.join(@inpath,'epub')
       epub = EpubRenderer.new(@name,@inpath,outpath,@metadata, @rails_resources_url)
@@ -70,7 +74,26 @@ module Publishr
 
       FileUtils.mv(File.join(outpath,'preamble.pdf'), File.join(@inpath,"#{ @name }.pdf")) if File.exists?(File.join(outpath,'preamble.pdf'))
       lines.join('<br />')
-     end
+    end
+    
+    def make_images_local(kramdown)
+      images = []
+      processed_lines = []
+      kramdown.split("\n").each do |line|
+        match = /\!\[.*?\]\((.*?)\)/.match(line)
+        images << match[1] if match
+        processed_lines << line.gsub(/\!\[(.*?)\]\((.*?)\)/){ "![#{ $1 }](#{ File.basename($2) })" }
+      end
+      FileUtils.mkdir_p File.join(@inpath,'images')
+      FileUtils.chdir File.join(@inpath,'images')
+      output = ["The following files were downloaded into the image folder of your document:\n"]
+      images.each do |image|
+        FileUtils.rm_f File.join(@inpath,'images',File.basename(image))
+        output << `wget -nv #{image} 2>&1`
+      end
+      return processed_lines.join("\n"), output
+    end
+      
 
   end
 end

data/lib/publishr/version.rb

@@ -1,3 +1,3 @@
 module Publishr
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publishr
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &16177980 !ruby/object:Gem::Requirement
+  requirement: &12817760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16177980
+  version_requirements: *12817760
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &16177320 !ruby/object:Gem::Requirement
+  requirement: &12816620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16177320
+  version_requirements: *12816620
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &16176880 !ruby/object:Gem::Requirement
+  requirement: &12814840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16176880
+  version_requirements: *12814840
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &16176400 !ruby/object:Gem::Requirement
+  requirement: &12813740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16176400
+  version_requirements: *12813740
 description: Fast publishing for ebooks and paper
 email:
 - michael@billgastro.com