readability_importer 0.1.2 → 0.1.3

data/lib/readability_importer/command.rb

@@ -18,6 +18,11 @@ module ReadabilityImporter
       :aliases => "-c",
       :desc => "Number of concurrency in parallel."
     })
+    method_option(:retry, {
+      :type => :boolean,
+      :aliases => "-r",
+      :desc => "Retry when failed."
+    })
     method_option(:verbose, {
       :type => :boolean,
       :aliases => "-v",
@@ -35,6 +40,7 @@ module ReadabilityImporter
         :verbose => options[:verbose],
         :from => options[:from],
         :max_concurrency => options[:concurrency],
+        :retry => options[:retry],
 
         :on_importing => proc do |urls|
           puts "Importing #{urls.size} url(s)..."

data/lib/readability_importer/importer.rb

@@ -11,6 +11,7 @@ module ReadabilityImporter
       @from = options[:from] || "foo@bar"
       @max_concurrency = options[:max_concurrency] || 4
       @verbose = !!options[:verbose]
+      @retry = !!options[:retry]
 
       @on_importing = options[:on_importing]
       @on_imported = options[:on_imported]
@@ -23,7 +24,7 @@ module ReadabilityImporter
 
       EventMachine.run do
         iterator = EventMachine::Iterator.new(urls_set, @max_concurrency)
-        iterator.each(proc do |urls, iterator|
+        iterator.each(proc do |urls, it|
           @on_importing.call(urls) if @on_importing
           EventMachine::Protocols::SmtpClient.send({
             :verbose => @verbose,
@@ -36,11 +37,14 @@ module ReadabilityImporter
           }).tap do |job|
             job.callback do
               @on_imported.call(urls) if @on_imported
-              iterator.next
+              it.next
             end
-            job.errback do
+            job.errback do |*args|
               @on_failed.call(urls) if @on_failed
-              iterator.next
+              if @retry
+                iterator.instance_variable_get(:@list).unshift(urls)
+              end
+              it.next
             end
           end
         end, proc do

data/lib/readability_importer/loader.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'uri'
 
 module ReadabilityImporter
   module Loader
@@ -51,6 +52,8 @@ module ReadabilityImporter
     end
 
     class InstapaperCsvLoader < Base
+      NON_ASCII_REGEXP = /[^\x00-\x7f]/u
+
       def self.desc
         "Path to CSV file"
       end
@@ -61,7 +64,7 @@ module ReadabilityImporter
 
       def load
         CSV.read(@path).map do |line|
-          line[0]
+          URI.escape(line[0], NON_ASCII_REGEXP)
         end.reverse
       end
     end

data/lib/readability_importer/version.rb

@@ -1,3 +1,3 @@
 module ReadabilityImporter
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: readability_importer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70152667209520 !ruby/object:Gem::Requirement
+  requirement: &70103673529860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70152667209520
+  version_requirements: *70103673529860
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70152667208940 !ruby/object:Gem::Requirement
+  requirement: &70103673529400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152667208940
+  version_requirements: *70103673529400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70152667208340 !ruby/object:Gem::Requirement
+  requirement: &70103673528920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152667208340
+  version_requirements: *70103673528920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152667207840 !ruby/object:Gem::Requirement
+  requirement: &70103673528380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152667207840
+  version_requirements: *70103673528380
 description: Import many URLs to Readability.
 email:
 - niw@niw.at