Updated to match new Sequel and Twitter gem APIs, added Procfile

Author: sgerrand

Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup --port $PORT

README.md

@@ -1,7 +1,7 @@
 # Run
 
-I've just updated to make it workable at all with newest versions of all gems and it just runs on:
-	$ ruby application.rb
+I've just updated to make it workable at all with newest versions of all gems and it just runs via:
+	$ bundle exec rackup
 
 But the config.ru lets it deploy to Heroku as is
 

app.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'bundler'
+require 'sequel'
 Bundler.require
 
 # Database setup
@@ -32,30 +33,29 @@
   # get the max id from the database to pass to our search query
   since_id = tweets.max(:twitter_id)
   page = 1
+  page_max = 20
+  curses = %w{shit fuck cunt arse arsehole prick bastard fucking}
 
   # load all the new tweets into the DB
   while true do
-    @search = Twitter::Search.new('"tony abbott" shit OR fuck OR cunt OR arse OR arsehole OR prick OR bastard OR fucking')
+    item_count = 0
     # 20 per page - twitter docs say 100, but seems to be less, so we
     # cover our bases for pagination. this pagination method also leaves
     # a small possibility of duplicates, but it's not a big deal.
-    @search.per_page(20)
-    @search.page(page)
-    @search.since(since_id)
-    item_count = 0
+    options = {count: page_max, result_type: 'recent', since_id: since_id}
 
-    @search.each do |item|
-      tweets.insert(:twitter_id => item["id"].to_i, :content => item["text"])
+    twitter.search(%Q{"tony abbott" #{curses.join(" OR ")} -rt}, options).take(20).each do |item|
+      tweets.insert(:twitter_id => item.id, :content => item.text)
       item_count = item_count + 1
     end
     # if we don't have more than 20 items, we can exit
-    break if item_count < 20
+    break if item_count < page_max
     page = page + 1
   end
 
   @results = []
 
-  @all_results = tweets.order(:twitter_id.desc).each do |item|
+  @all_results = tweets.order(:twitter_id).reverse.each do |item|
     # ignore items in the blacklist file or that start with rt/RT (retweets)
     unless BLACKLISTED_STRINGS.any? {|i| item[:content].downcase.match(i.downcase)} || item[:content].downcase.match(/^rt/)
       @results << '<p id="' + item[:id].to_s + '">' +
@@ -76,7 +76,6 @@
   haml :index, :options => {:format => :html4, :attr_wrapper => '"'}
 end
 
-
 # Configure Block.
 configure do
   BLACKLISTED_STRINGS = []
@@ -87,3 +86,14 @@
     end
   end
 end
+
+def twitter
+  @twitter ||= Twitter::REST::Client.new do |config|
+    config.consumer_key         = ENV['TWITTER_CONSUMER_KEY']
+    config.consumer_secret      = ENV['TWITTER_CONSUMER_SECRET']
+    config.access_token         = ENV['TWITTER_ACCESS_TOKEN']
+    config.access_token_secret  = ENV['TWITTER_ACCESS_TOKEN_SECRET']
+  end
+
+  @twitter
+end

config.ru

@@ -1,4 +1,3 @@
-require "rubygems"
 require "sinatra"
 
 root_dir = File.dirname(__FILE__)