@@ -68,13 +68,9 @@ require 'blackbook/exporter/base' Dir.glob(File.join(File.dirname(__FILE__), 'blackbook/importer/*.rb')).each {|f| require f } Dir.glob(File.join(File.dirname(__FILE__), 'blackbook/exporter/*.rb')).each {|f| require f } -class String - alias :blank? :empty? -end class NilClass - alias :blank? :nil? -end -class Array - alias :blank? :empty? + def empty? + true + end end lib/blackbook.rb @@ -33,7 +33,7 @@ END:VCARD # exports contacts as Vcards def export( contacts = [] ) - return if contacts.blank? + return if contacts.empty? contacts.uniq.compact.collect do |contact| first_name, last_name = contact[:name].split(' ', 2) lib/blackbook/exporter/vcf.rb @@ -52,7 +52,7 @@ class Blackbook::Importer::Gmail < Blackbook::Importer::PageScraper email = columns[2].inner_html.gsub( /(\n|&nbsp;)/, '' ) # email clean_email = email[/[a-zA-Z0-9._%+-]+@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,4}/] - unless clean_email.blank? + unless clean_email.empty? columns = row/"td" { :name => ( columns[1] / "b" ).inner_html, # name lib/blackbook/importer/gmail.rb @@ -23,7 +23,7 @@ class Blackbook::Importer::Hotmail < Blackbook::Importer::PageScraper def =~(options) return false unless options && options[:username] domain = username_domain(options[:username].downcase) - !domain.blank? && DOMAINS.keys.include?( domain ) ? true : false + !domain.empty? && DOMAINS.keys.include?( domain ) ? true : false end ## lib/blackbook/importer/hotmail.rb @@ -49,7 +49,7 @@ class Blackbook::Importer::Yahoo < Blackbook::Importer::PageScraper contact_rows = FasterCSV.parse(csv.body) labels = contact_rows.shift # TODO: Actually use the labels to find the indexes of the data we want contact_rows.collect do |row| - next if !row[7].blank? && options[:username] =~ /^#{row[7]}/ # Don't collect self + next if !row[7].empty? && options[:username] =~ /^#{row[7]}/ # Don't collect self { :name => "#{row[0]} #{row[2]}".to_s, :email => (row[4] || "#{row[7]}@yahoo.com") # email is a field in the data, but will be blank for Yahoo users so we create their email address lib/blackbook/importer/yahoo.rb 67741f61c990578b61b8a058fb357faa78c1948d Jeff Jolma jeff@animoto.com http://github.com/purzelrakete/blackbook/commit/837bc908894e8d679f7c6ac7b8c1901878de04da 837bc908894e8d679f7c6ac7b8c1901878de04da 2008-12-16T16:29:46-08:00 2008-12-09T16:12:00-08:00 tame monkey patching It used to add a blank? method to Nil, Array, String. Unfortunately, the String implementation was slightly different than the Rails implementation. This prevented using blackbook as a plugin. Instead of using blank?, use empty? Ruby supports this for everything but Nil. I left a Nil implementation of empty? Signed-off-by: Rany Keddo <rany@playtype.net> ec5b05cc9e484225385984acea658756267bf4d0 Rany Keddo rany@playtype.net