kindler 0.2.0 → 0.2.1

data/.gitignore

@@ -15,5 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-kindler_generated*
 .DS_Store
+__*

data/lib/kindler/version.rb

@@ -1,3 +1,3 @@
 module Kindler
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/kindler.rb

@@ -261,30 +261,51 @@ module Kindler
       @opf = contents
     end
 
+    def get_image_extname(image_data,url)
+      ext = File.extname('url')
+      if ext == ''
+        ext = case image_data.content_type
+        when /jpeg/i
+          '.jpg'
+        when /png/i
+          '.png'
+        when /gif/i
+          '.gif'
+        else
+          '.jpg'
+        end
+      end
+      ext
+    end
+
     def localize_images
       images_count = 1
       pages.each do |page|
         article = Nokogiri::HTML(page[:content])
         article.css('img').each do |img|
           begin
+            # get remote address
             image_remote_address = img.attr('src')
             unless image_remote_address.start_with?('http')
               image_remote_address = "http://#{URI(page[:url]).host}#{image_remote_address}"
             end
-            image_local_address = File.join(tmp_dir,"#{images_count}#{File.extname(image_remote_address)}")
+            # get local address
+            image_data = open(image_remote_address)
+            image_extname = get_image_extname(image_data,image_remote_address)
+            image_local_address = File.join(tmp_dir,"#{images_count}#{image_extname}")
             # download images
             debug "begin fetch image #{image_remote_address}"
             debug "save to #{image_local_address}"
-            `curl #{image_remote_address} > #{image_local_address}`
-            # File.open(image_local_address,'wb') do |f|
-            #   f.write open(image_remote_address).read
-            # end
+            #`curl #{image_remote_address} > #{image_local_address}`
+            File.open(image_local_address,'wb') do |f|
+              f.write image_data.read
+            end
             debug 'Image saved'
             # replace local url address
-            img.attributes['src'].value = "#{images_count}#{File.extname(image_remote_address)}"
+            img.attributes['src'].value = "#{image_local_address}"
             page[:content] = article.inner_html
             # add to manifest
-            local_images << "#{images_count}#{File.extname(image_remote_address)}"
+            local_images << "#{image_local_address}"
             images_count += 1 
           rescue Exception => e
             debug "got error when fetch and save image: #{e}"

data/spec/cases/generator_spec.rb

@@ -3,7 +3,7 @@ describe "Mobi book file generator" do
 
   after :all do
     puts '==== clear tmp files ==='
-    `rm -rf ./__*`
+    #`rm -rf ./__*`
   end
 
   it "should have the title,author property" do
@@ -58,7 +58,7 @@ describe "Mobi book file generator" do
     book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true
     book.add_page :title=>'page1',:author=>'mike1',:content=>'this is the page 1',:wrap=>true
     book.add_page :title=>'page2',:author=>'mike1',:content=>'this is the page 2',:wrap=>true
-    book.add_page :title=>'page3',:author=>'mike1',:content=>'<img src="http://media2.glamour-sales.com.cn/media/catalog/category/Stroili_banner_02.jpg"></img>this is the page 3',:wrap=>true
+    book.add_page :title=>'page3',:author=>'mike1',:content=>'<img src="http://media2.glamour-sales.com.cn/media/catalog/category/Stroili_banner_02.jpg"/>this is the page 3',:wrap=>true
     book.generate 
     book.should be_generated
     File.should be_exist("./#{Kindler::Book::TMP_DIR_PREFIX}#{title}/1.jpg")
@@ -110,7 +110,7 @@ describe "Mobi book file generator" do
     book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true
     book.add_page :title=>'page1',:author=>'mike1',:content=>'this is the page 1',:wrap=>true
     book.add_page :title=>'page2',:author=>'mike1',:content=>'this is the page 2',:wrap=>true
-    book.add_page :title=>'page3',:author=>'mike1',:url => 'http://media2.glamour-sales.com.cn/media/some_url',:content=>'<img src="/media/catalog/category/Stroili_banner_02.jpg"></img>this is the page 3',:wrap=>true
+    book.add_page :title=>'page3',:author=>'mike1',:url => 'http://media2.glamour-sales.com.cn/media/some_url',:content=>'<img src="/media/catalog/category/Stroili_banner_02.jpg"/>this is the page 3',:wrap=>true
     book.generate 
     book.should be_generated
     File.should be_exist("./#{Kindler::Book::TMP_DIR_PREFIX}#{title}/1.jpg")
@@ -138,4 +138,15 @@ describe "Mobi book file generator" do
     File.should be_exist(File.expand_path(custom_dir))
   end
 
+  it "should get correct image type when no extname found" do
+    title = "no_extname_found_book"
+    book = Kindler::Book.new :title=>title,:author=>'mike',:debug=>true
+    image_url = "https://lh3.googleusercontent.com/Lpu3TQdWzvnJKkx4U4uyjJzQxvXSFTbwbb_Ni3XJp8stydrlKpI_VHbY2rAcphMMcrkq-wev2zKkSpbGSQr_T5BfrRuHYqlLQ-NTPmPk--mS2PYu_Rk"
+    book.add_page :title=>'page1',:author=>'mike1',:content=>'this is the page 1',:wrap=>true
+    book.add_page :title=>'page2',:author=>'mike1',:content=>'this is the page 2',:wrap=>true
+    book.add_page :title=>'page3',:author=>'mike1',:content=>"<img src='#{image_url}'/>this is the page 3",:wrap=>true
+    book.generate 
+    book.should be_generated
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kindler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000Z
+date: 2012-04-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154641200 !ruby/object:Gem::Requirement
+  requirement: &2153362980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154641200
+  version_requirements: *2153362980
 description: kindler is a rubygem allow you to generate kindle mobi book very easily
 email:
 - mike.d.1984@gmail.com