kindler 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c7c145fec387913b4c7932e17191afaecfd8d600
+  data.tar.gz: bc3c783ced0c32f0fbec6b4200d81343b71d1960
+SHA512:
+  metadata.gz: 34ab7c1aba8e3ce22b5b6f01e8d6d40ddae6f1b888d8aa08bb1907d1b84875111cbe4f278214fdbdd7e35225b69dbc391a59f8eef3e466ea923251445565b0f4
+  data.tar.gz: 65c96edbee7af171a2bcc0bc3fdaa6acb94042725f4166e234fcd33bcb0f61b7e6c3adbff70d398f04fee8bbac81ce1f76815460b613ed11576cd3cf3dd88c24

data/lib/kindler.rb

@@ -6,6 +6,7 @@ require "cgi"
 require "erb"
 require "shellwords"
 require "fileutils"
+require 'thread'
 # require 'mini_magick'
 require_relative 'kindler/railtie' if defined?(Rails)
 require_relative "kindler/version"
@@ -152,37 +153,48 @@ module Kindler
     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 = URI.join(page[:url], image_remote_address).to_s
-            end
-            # 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 image_data.read
-            end
-            debug 'Image saved'
-            # replace local url address
-            img.attributes['src'].value = "#{image_local_address}"
-            page[:content] = article.inner_html
-            # add to manifest
-            local_images << "#{image_local_address}"
-            images_count += 1
-          rescue Exception => e
-            debug "got error when fetch and save image: #{e}"
+      threads = []
+      mutex = Mutex.new
+      pages.each_with_index do |page|
+        threads << Thread.new do
+          download_image_of_article(page, mutex)
+        end
+      end
+
+      # join the threads
+      threads.map(&:join)
+    end
+
+
+    def download_image_of_article(page, mutex)
+      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 = URI.join(page[:url], image_remote_address).to_s
+          end
+          # get local address
+          image_data = open(image_remote_address)
+          image_extname = get_image_extname(image_data,image_remote_address)
+          image_name = (0...10).map{(65+rand(26)).chr}.join
+          image_local_address = File.join(tmp_dir,"#{image_name}#{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 image_data.read
           end
+          debug 'Image saved'
+          # replace local url address
+          img.attributes['src'].value = "#{image_local_address}"
+          page[:content] = article.inner_html
+          # add to manifest
+          mutex.synchronize { local_images << "#{image_local_address}" }
+        rescue Exception => e
+          debug "got error when fetch and save image: #{e}"
         end
       end
     end

data/lib/kindler/version.rb

@@ -1,3 +1,3 @@
 module Kindler
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/spec/cases/generator_spec.rb

@@ -61,7 +61,7 @@ describe "Mobi book file generator" do
     book.add_page :title=>'page3',:author=>'mike1',:content=>'<img src="http://images.fanpop.com/images/image_uploads/widescreen-season-4-wallpaper-lost-661159_1680_1050.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")
+    Dir.glob("./#{Kindler::Book::TMP_DIR_PREFIX}#{title}/*.jpg").length.should == 2
   end
 
   it "can access pages information before generate" do
@@ -105,7 +105,7 @@ describe "Mobi book file generator" do
     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")
+    Dir.glob("./#{Kindler::Book::TMP_DIR_PREFIX}#{title}/*.jpg").length.should == 2
   end
 
   it "should generate mobi books on specify output_dir " do

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: kindler
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - dongbin.li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: kindler is a rubygem allow you to generate kindle mobi book very easily
@@ -57,27 +54,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/29decibel/kindler
 licenses: []
+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: kindler
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: kindler is a rubygem allow you to generate kindle mobi book very easily
 test_files:
 - features/basic.feature