DRMacIver-gourmand 0.0.3 → 0.0.9

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'spec/rake/spectask'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -13,5 +14,10 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency("json_pure")
   gem.add_dependency("mechanize")
   gem.add_dependency("httparty")
-  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+end
+
+Spec::Rake::SpecTask.new do |t|
+  t.rcov = false
+  t.spec_files = FileList["spec/**/*_spec.rb"]
+  t.libs << "./lib"
 end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.9

data/bin/gourmand

@@ -9,7 +9,7 @@ def usage
   gourmand update           # Update a gourmand instance, posting the new bookmarks to delicious"
   gourmand undo [site]      # deletes all imported posts (from specific site, or all if not specified)
   USAGE
-  Reddilicious.site_names.each do  |site|
+  Gourmand.site_names.each do  |site|
     STDERR.puts "  gourmand #{site}     # set your #{site} user" 
   end  
 
@@ -17,11 +17,10 @@ def usage
 end
 
 dir=ENV["GOURMAND_HOME"] || File.join(ENV["HOME"], ".gourmand")
-gourmand = Reddilicious.new(dir)
+gourmand = Gourmand.new(dir)
 
-if !File.directory?(dir)
+if !gourmand.exists?
   puts "no such directory #{dir}. Creating..."
-  Dir.mkdir(dir)
 
   puts "Delicious user name:" 
   delicious = STDIN.gets.strip
@@ -29,6 +28,16 @@ if !File.directory?(dir)
   puts "Delicious password:"
   delicious_password = STDIN.gets.strip
   gourmand.create!(delicious, delicious_password)
+elsif gourmand.needs_update? 
+  puts "Your gourmand instance needs updating to use with this version. Do you want to update now? y/n"
+  if STDIN.gets =~ /y/i
+    gourmand.update!
+  else  
+    exit(1)
+  end
+elsif gourmand.from_the_future?
+  puts "This gourmand instance is more recent than the version of gourmand you are running. Please update in order to use it"  
+  exit(1)
 end
 
 case ARGV[0]
@@ -39,10 +48,10 @@ case ARGV[0]
       $stderr = log
       gourmand.transfer_to_delicious 
     end
-  when *Reddilicious.site_names:
+  when *Gourmand.site_names:
     gourmand.site_for(ARGV[0]).ask_for_credentials
   when "undo"    
-    sites = ARGV[1..-1].empty? ? Reddilicious.site_names : ARGV[1..-1]
+    sites = ARGV[1..-1].empty? ? Gourmand.site_names : ARGV[1..-1]
     puts "undo import for sites #{sites.inspect}: are you sure? (y/n)"
     if STDIN.gets.strip.downcase == 'y'           
       sites.each { |s|  gourmand.site_for(s).undo_import! }

data/gourmand.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gourmand}
-  s.version = "0.0.3"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David R. MacIver"]
-  s.date = %q{2009-07-17}
+  s.date = %q{2009-08-15}
   s.default_executable = %q{gourmand}
   s.email = %q{david.maciver@gmail.com}
   s.executables = ["gourmand"]
@@ -15,26 +15,35 @@ Gem::Specification.new do |s|
      "README.markdown"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "LICENSE",
      "README.markdown",
      "Rakefile",
      "VERSION",
      "bin/gourmand",
      "gourmand.gemspec",
-     "lib/blacklist.rb",
      "lib/delicious.rb",
      "lib/gourmand.rb",
      "lib/post.rb",
      "lib/reddit.rb",
      "lib/site.rb",
      "lib/stumbleupon.rb",
-     "lib/twitter.rb"
+     "lib/twitter.rb",
+     "lib/version.rb",
+     "spec/post_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/twitter_spec.rb"
   ]
   s.homepage = %q{http://github.com/DRMacIver/gourmand}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{gourmand is a tool for automatically importing links into delicious}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/post_spec.rb",
+     "spec/twitter_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/gourmand.rb

@@ -4,9 +4,43 @@ require "delicious"
 require "json"
 require 'net/http'
 require 'uri'
-require "blacklist"
+require 'version'
+require "fileutils"
+
+class Gourmand
+  def self.version
+    Version.new(IO.read(File.join(File.dirname(__FILE__), "..", "VERSION")))
+  end
+
+  def version_file
+    File.join(@dir, "VERSION")
+  end
+
+  def version
+    if File.exists? version_file
+      Version.new(IO.read(version_file))
+    else
+      # the version right before this feature was added
+      Version.new("0.0.5") 
+    end
+  end
+
+  def needs_update?
+    version < Gourmand.version
+  end
+
+  def from_the_future?
+    version > Gourmand.version
+  end
+
+  def update!
+    Migrations.new(self).migrate!
+  end
+
+  def exists?
+    File.exists?(@dir)
+  end
 
-class Reddilicious
   # lambdas to get lazy loading
   SitesToClasses = {
     "reddit" => lambda{
@@ -25,9 +59,8 @@ class Reddilicious
   }
 
   attr_accessor :dir
-  def initialize(dir)
+  def initialize(dir=File.join(ENV["HOME"], ".gourmand"))
     @dir = dir
-    @blacklist = Blacklist.from_file(File.join(dir, "blacklist"))
     @untiny_cache = if File.exists?(untiny_cache_file)
       JSON.parse(IO.read(untiny_cache_file))
     else
@@ -49,6 +82,8 @@ class Reddilicious
   end
 
   def create!(delicious, delicious_password)
+    Dir.mkdir(dir)
+    File.open(version_file, "w"){|o| o.puts Gourmand.version}
     File.open(details_file, "w"){|o|
       o.puts({:delicious_user => delicious, :delicious_password => delicious_password}.to_json)
     }
@@ -86,11 +121,9 @@ class Reddilicious
     end          
   end
 
-  def bookmark_for(url, suggest_tags=true)    
+  def bookmark_for(url)    
     url = untiny_url(url)
-    Post.new do |post|
-      post.url = url      
-    end
+    Post.new(:url=>url)
   end
 
   def delicious_posts
@@ -151,23 +184,16 @@ class Reddilicious
     puts "#{new_updates.length} urls after merging"
 
     new_updates.each do |update|
+      puts "importing #{update.description} (#{update.url})"
       
-      blacklisted = @blacklist && @blacklist.blacklisted?(update.tags)
+      update.fetch_metadata!
 
-      if blacklisted
-        puts "ignoring #{update.description} due to (#{update.url}) is blacklisting (tags #{update.tags})"
-      else
-        puts "importing #{update.description} (#{update.url})"
-        
-        update.fetch_metadata!(false)
-
-        res = Delicious.post("/posts/add", :query => update.to_h)
-        if !res['result'] || res['result']['code'] != 'done'
-          puts "error importing post: #{res.inspect}"
-        end
-        
-        sleep(1)      
+      res = Delicious.post("/posts/add", :query => update.to_h)
+      if !res['result'] || res['result']['code'] != 'done'
+        puts "error importing post: #{res.inspect}"
       end
+      
+      sleep(1)      
     end
     puts "Saving data to storage"
     sites.each{|x| x.save!}
@@ -193,3 +219,39 @@ class Reddilicious
   end
     
 end
+
+class Migrations
+  Migrations = []
+
+
+  def initialize(gourmand)
+    @gourmand = gourmand
+  end
+
+  def self.migration(version, &migration)
+    Migrations << [Version.new(version), migration]
+  end
+
+  migration("0.0.6"){|gourmand|
+    # This version does nothing except introduce version information
+    # into the gourmand directory. It is covered by the normal migration
+    # behaviour of adding a version file at the end.
+  }
+
+  migration("0.0.8"){|gourmand|
+    old_tweets = File.join(gourmand.dir, "twitter", "posts.json")
+
+    if File.exists? old_tweets
+      FileUtils.mv(old_tweets, File.join(gourmand.dir, "twitter", "friends.json"))
+    end
+  }
+
+  def migrate!
+    Migrations.
+      sort{|x, y| x[0] <=> y[0]}.
+      reject{|x| (x[0] <= @gourmand.version) || (x[0] > Gourmand.version)}.each{|version, mig|
+        mig.call(@gourmand)
+      }
+    File.open(@gourmand.version_file, "w"){|o| o.puts Gourmand.version}
+  end 
+end

data/lib/post.rb

@@ -15,7 +15,7 @@ class Post
     yield self if block_given?        
     if hash
       hash.each do |key, value|
-        instance_variable_set("@" + key, value)
+        instance_variable_set("@" + key.to_s, value)
       end
     end        
     raise "all posts must have a URL" if !self.url  
@@ -35,7 +35,7 @@ class Post
     if !self.tags then Set.new else Set[*self.tags.split] end
   end
   
-  def fetch_metadata!(suggest_tags=true)        
+  def fetch_metadata!()        
     self.description ||= begin      
       Nokogiri::HTML(open(url)).xpath("//title").text.gsub("\n", " ").gsub(/ +/, " ").strip 
     rescue Exception => e
@@ -44,19 +44,23 @@ class Post
     end
     
     self.description = url if description.empty?
-    
-    if suggest_tags
-      suggest = Delicious.get("/posts/suggest", :query => {:url => url} )      
-      if suggest['suggest']               
-        suggested_tags = suggest["suggest"]["popular"] || []
-        self.tags = suggested_tags.is_a? Array ? suggested_tags.join(" ") : suggested_tags
-      end
-      sleep 1
-    end    
+  end
+
+  def ==(that)
+    (that.is_a?(Post) && 
+    (self.url == that.url) &&
+    (self.description == that.description) &&
+    (self.extended == that.extended) &&
+    (self.dt == that.dt) && 
+    (self.tag_set == that.tag_set)) || false
+  end
+
+  def dup
+    Post.new(self.to_h)
   end
   
   def merge(that)
-    return self if !that
+    return self if that.nil?
     raise "cannot merge posts with different URLS: #{self.url} != #{that.url}" if self.url != that.url
 
     result = Post.new{|p| 
@@ -84,7 +88,7 @@ class Post
       p.dt = [self.dt, that.dt].compact.min  
     }
     
-    result = nil if result == that  # FIXME    
+    result = nil if result == that 
     result
   end
 end

data/lib/reddit.rb

@@ -20,7 +20,10 @@ module Reddit
       new_results = nil
       after = nil
       i = 0
-      while !(new_results = merge_results(Reddit.get("/user/#{credentials["user"].strip}/liked/.json", :query => {"after" => after})["data"]["children"].map{|x| x["data"]})).empty? 
+
+      url = "/user/#{(credentials["username"] || credentials["user"]).strip}/liked/.json"
+      puts "fetching data from #{url}"
+      while !(new_results = merge_results(Reddit.get(url, :query => {"after" => after})["data"]["children"].map{|x| x["data"]})).empty? 
         puts "fetching reddit page #{i}"
         results += new_results
         after = new_results[-1]["name"]

data/lib/twitter.rb

@@ -1,11 +1,18 @@
 require "rubygems"
 require "httparty"
 require "gourmand"
+require "time"
 
 module Twitter
   include HTTParty
   base_uri "http://twitter.com"
   format :json
+
+  class Timeline < Site
+    def initialize(timeline)
+      @timeline = timeline
+    end 
+  end
  
   class FriendsTimeline < Site
     def name
@@ -16,9 +23,7 @@ module Twitter
       puts "Updating twitter"
       balance
 
-      last_post_id = posts[0] && posts[0]["id"]
-
-      results = []
+      results = {}
     
       new_tweets = nil
 
@@ -26,46 +31,49 @@ module Twitter
 
       query = {:count => 200 }
 
-      query[:since_id] = last_post_id if last_post_id
-    
       while !(new_tweets = get_tweets(query)).empty?
-        results += new_tweets
+        new_tweets.reject!{|t| @ids.include? identifier(t) }
+        break if new_tweets.empty?
+        new_tweets.each { |t| results[identifier(t)] = t }
         puts "importing twitter page #{query[:page] || 0}"
         query[:page] = (query[:page] || 0) + 1
       end 
-      
-      @posts += results
 
-      results.map do |res|              
-        urls = res["text"].scan(/(http:\/\/[^,()" ]+)/).flatten
-        ats = res["text"].scan(/@([[:alnum:]]+)/).flatten
-        hashtags = res["text"].scan(/#([[:alnum:]]+)/).flatten
-        retweet = res["text"] =~ /RT[^a-zA-Z]/ || res["text"] =~ /\(via @[^)]+\)/
+      @posts += results.values
 
-        urls.map do |url|
-          post = @gourmand.bookmark_for(url)
-          post.tags = [
-            "via:twitter",
-            Post::NEW_MARKER,
-            ats.map{|a| "to:" + a}.sort,
-            "from:#{res["user"]["screen_name"]}",
-            hashtags,        
-            ("retweet" if retweet),
-            post.tags
-          ].compact.flatten.join(" ").strip
-
-          post.extended = "@#{res["user"]["screen_name"]}: \"#{res["text"]}\" \n (from http://twitter.com/#{res["user"]["screen_name"]}/status/#{res["id"]})"
-          post.dt = date(res).strftime("%Y-%m-%dT%H:%M:%SZ")
-
-          post
-        end
+      results.values.map do |res|              
+        to_posts(res)      
       end.flatten
     end
+    
+    def to_posts(res)
+      urls = res["text"].scan(/(http:\/\/[^,()" ]+)/).flatten.map { |u| u.gsub(/[\.:]+\Z/, '') }.uniq
+      ats = res["text"].scan(/@([[:alnum:]]+)/).flatten
+      hashtags = res["text"].scan(/#([[:alnum:]]+)/).flatten
+      retweet = res["text"] =~ /RT[^a-zA-Z]/ || res["text"] =~ /\(via @[^)]+\)/
 
+      urls.map do |url|
+        post = @gourmand.bookmark_for(url)
+        post.tags = [
+          "via:twitter",
+          Post::NEW_MARKER,
+          ats.map{|a| "to:" + a}.sort,
+          "from:#{res["user"]["screen_name"]}",
+          hashtags,        
+          ("retweet" if retweet),
+          post.tags
+        ].compact.flatten.join(" ").strip
+
+        post.extended = "@#{res["user"]["screen_name"]}: \"#{res["text"]}\" \n (from http://twitter.com/#{res["user"]["screen_name"]}/status/#{res["id"]})"
+        post.dt = date(res).strftime("%Y-%m-%dT%H:%M:%SZ")
+
+        post
+      end
+    end
 
     def get_tweets(query)
       begin
-        res = Twitter.get("/statuses/friends_timeline.json", :query => query, :basic_auth => {:username => credentials["username"], :password => credentials["password"]})         
+        res = Twitter.get("/favorites.json", :query => query, :basic_auth => {:username => credentials["username"], :password => credentials["password"]})         
         raise "Error fetching timeline: '#{res['error']}'" if res.is_a?(Hash) && res['error']
         res
       rescue Crack::ParseError
@@ -73,16 +81,15 @@ module Twitter
       end
     end
     
-    
     def identifier(post)
       post["id"]
     end
 
     def date(post)
-      DateTime.parse(post["created_at"])
+      @date_cache ||= Hash.new { |h,k| h[k] = Time.parse(k) }
+      @date_cache[post['created_at']]
     end
     
-    
     def ask_for_credentials
       puts "#{name} user name:"
       user = STDIN.gets.strip

data/lib/version.rb

@@ -0,0 +1,14 @@
+class Version
+  include Comparable
+  attr_accessor :to_s, :parts
+
+  def initialize(string)
+    string.strip!
+    @to_s = string
+    @parts = string.split(".").map{|x| x.to_i}
+  end
+
+  def <=>(that)
+    self.parts <=> that.parts
+  end
+end

data/spec/post_spec.rb

@@ -0,0 +1,80 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require "post"
+
+describe Post do
+  post = Post.new do |p|
+    p.url = "http://www.google.com"
+    p.description = "Google"
+    p.tags = "search"      
+  end
+
+  post2 = Post.new do |p|
+    p.url = "http://www.google.com"
+    p.description = "Google"
+    p.tags = "search"      
+  end
+
+  
+  post3 = Post.new do |p|
+    p.url = "http://www.cuteoverload.com"
+    p.description = "Cute Overload"
+    p.tags = "cute kittens"      
+  end
+
+  describe "equality" do 
+    it "should treat things with the same properties as equal" do
+      post.should == post
+      post.should == post2
+    end
+
+    it "should treat things with different properties as unequal" do
+      post.should_not == post3
+    end
+
+    it "should not be equal to nil" do
+      post.should_not == nil
+    end
+  end
+
+
+  describe "merging" do
+    later = post.dup
+    earlier = post.dup
+
+    later.dt = Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
+    earlier.dt = (Time.now - 3600 * 24).strftime("%Y-%m-%dT%H:%M:%SZ")
+
+
+    it "should return nil when merging equal posts" do 
+      post.merge(post2).should be(nil)  
+    end
+
+    it "should return a post with the minimum time stamp of the two" do
+      z = earlier.merge(later)
+    
+      z.should_not == nil
+      z.dt.should == earlier.dt
+    end
+
+    it "should return self when merging with nil" do
+      post.merge(nil).should ==(post)
+    end
+
+  end
+
+  describe "dup" do 
+    it "should produce an equal post" do
+      post.dup.should == post
+    end
+
+
+    it "should produce an independent post" do
+      p = post.dup
+      p.url = "http://www.google.co.uk"
+
+      post.url.should == "http://www.google.com"
+    end
+  end
+  
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'spec'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+Spec::Runner.configure do |config|
+end

data/spec/twitter_spec.rb

@@ -0,0 +1,98 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require "twitter"
+require "tmpdir"
+
+describe Twitter::FriendsTimeline do
+    
+  before do
+    gourmand = mock('Gourmand')
+    gourmand.stub!(:dir).and_return(Dir::tmpdir)
+    gourmand.stub!(:bookmark_for).and_return { |url| Post.new :url=>url }
+    @twitter = Twitter::FriendsTimeline.new(gourmand)
+    @tweets = [{
+        'id'   => '12345',
+        'text' => '@foo @bar kittens http://kittens.com http://morekittens.com http://kittens.com #cute #kittens',
+        'created_at' => '1984-09-01T14:21:31Z',
+        'user' => { 'screen_name' => 'baz', 'id' => 'baz_id' }        
+      }, {
+        'id'  => '12346',
+        'text'=> 'RT: check out this awesum link: http://awesome.com/awesome-story',
+        'created_at' => '1984-09-01T14:21:31Z',                
+        'user' => { 'screen_name' => 'mongo', 'id' => 'mongo_id' }
+      }, {
+        'id'  => '12347',
+        'text'=> 'this is a tweetie-style retweet: http://awesome.com/awesome-story (via @someone)',
+        'created_at' => '1984-09-01T14:21:31Z',                
+        'user' => { 'screen_name' => 'mongo', 'id' => 'mongo_id' }
+      }, {
+        'id'  => '12348',
+        'text'=> 'this is a tweet with punctuation after the link: http://bit.ly/das232...',
+        'created_at' => '1984-09-01T14:21:31Z',                
+        'user' => { 'screen_name' => 'mongo', 'id' => 'mongo_id' }
+      }]
+  end
+  
+  
+  
+  describe "to_posts" do
+    
+    before do          
+      @posts = @tweets.map { |t| @twitter.to_posts(t) }      
+    end
+    
+    it "should convert a tweet to one or more posts, one for each unique url" do
+      @posts[0].size.should == 2
+      @posts[0].map { |p| p.url }.sort.should == ["http://kittens.com", "http://morekittens.com"]
+    end
+    
+    it "should correctly set the timestamp" do
+      @posts[0][0].dt.should == '1984-09-01T14:21:31Z'
+    end
+    
+    it "should convert hashtags into delicious tags" do
+      @posts[0][0].tag_set.should include('kittens')
+      @posts[0][0].tag_set.should include('cute')
+    end
+    
+    it "should add tags for all at's" do
+      ['to:foo', 'to:bar'].each { |t| @posts[0][0].tag_set.should include(t) }
+    end
+    
+    it "should add tags for sender" do 
+      @posts[0][0].tag_set.should include('from:baz')
+    end
+    
+    it "should add a retweet tag if it's a retweet" do
+      @posts[0][0].tag_set.should_not include('retweet')
+      @posts[1][0].tag_set.should include('retweet')   
+      @posts[2][0].tag_set.should include('retweet')          
+    end
+    
+    it "should deal with punctuation after urls" do
+      @posts[3][0].url.should == 'http://bit.ly/das232'
+    end
+    
+    it "should be tagged as new post by default" do
+      @posts.flatten.all? {|p| p.tag_set.should include(Post::NEW_MARKER) }.should be_true
+    end
+    
+    it "should be tagged as imported via twitter" do
+      @posts.flatten.all? {|p| p.tag_set.should include('via:twitter') }.should be_true
+    end
+    
+    it "should have an extended info with context" do
+      @posts[0][0].extended.should include(@tweets[0]['text'])
+      @posts[0][0].extended.should include("(from http://twitter.com/baz/status/12345)")
+    end
+  end
+  
+  describe "update!" do
+    it "should ignore duplicates" do
+      @twitter.stub!(:get_tweets).and_return { |query|
+        query[:page].to_i > 0 ? [] : (@tweets * 2)
+      }
+      posts = @twitter.update!
+      posts.size.should ==@tweets.size + 1 
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DRMacIver-gourmand
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.9
 platform: ruby
 authors: 
 - David R. MacIver
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -07:00
+date: 2009-08-15 00:00:00 -07:00
 default_executable: gourmand
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,13 +62,13 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - bin/gourmand
 - gourmand.gemspec
-- lib/blacklist.rb
 - lib/delicious.rb
 - lib/gourmand.rb
 - lib/post.rb
@@ -76,8 +76,13 @@ files:
 - lib/site.rb
 - lib/stumbleupon.rb
 - lib/twitter.rb
+- lib/version.rb
+- spec/post_spec.rb
+- spec/spec_helper.rb
+- spec/twitter_spec.rb
 has_rdoc: false
 homepage: http://github.com/DRMacIver/gourmand
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -98,9 +103,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: gourmand is a tool for automatically importing links into delicious
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/post_spec.rb
+- spec/twitter_spec.rb

data/lib/blacklist.rb

@@ -1,44 +0,0 @@
-class Blacklist
-  def initialize(blacklist)
-    @blacklist = Hash.new{|h, k| h[k] = [] }
-
-    blacklist.each { |list|
-      list.each { |tag|
-        @blacklist[tag] << list
-      }
-    }
-  end
-
-  def self.from_file(file)
-    return nil if !File.exists?(file) 
-    Blacklist.new(IO.read(file).split("\n").map{|l| l.split})
-  end
-
-  def blacklisted?(tags)
-    if tags.is_a? String
-      tags = tags.split
-    end
-
-    if !tags.is_a? Array
-      raise "unrecognised argument #{tags.inspect}"
-    end
-
-   shallow_flatten(tags.
-      map{|t| @blacklist[t]}.
-      compact).
-      any?{|set|
-        !set.empty? && set.all?{|t|
-          tags.include?(t)
-        }
-      } 
-  end
-
-  private 
-   
-  def shallow_flatten(enum)
-    it = []
-    enum.each{|x| it += x }
-    it
-  end
-  
-end