pat-maddox-twinkies 0.1.4 → 0.1.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :minor: 1

data/bin/twinkies

@@ -11,7 +11,7 @@ def run_app(base_dir)
     config.tweet_db = File.expand_path(config.tweet_db)
   end
   require 'twinkies/server'
-  Sinatra::Application.default_options[:env] = :production
+  Sinatra::Application.set :env, :production
   Twinkies::Server.new(config).run
 end
 

data/lib/twinkies.rb

@@ -3,6 +3,8 @@ require 'dm-core'
 require 'twitter'
 require 'ext/date_time'
 require 'guid'
+require 'builder'
 require 'twinkies/friend_searcher'
 require 'twinkies/url_list'
 require 'twinkies/item'
+require 'twinkies/rss_writer'

data/lib/twinkies/friend_searcher.rb

@@ -6,8 +6,14 @@ module Twinkies
     end
 
     def search(term)
-      Twitter::Base.new(@username, @password).timeline.select do |tweet|
-        tweet.text.include?('http')
+      begin
+        Twitter::Base.new(@username, @password).timeline.select do |tweet|
+          tweet.text.include?('http')
+        end
+      rescue Twitter::CantConnect => e
+        # twitter's down, who'da thunk?!
+        $stderr.puts e
+        []
       end
     end
   end

data/lib/twinkies/item.rb

@@ -16,7 +16,7 @@ module Twinkies
       self.created_at = tweet.created_at
     end
 
-    def save
+    def save(context=:default)
       @existing = Item.first(:twitter_id => twitter_id)
       if @existing && @existing.link == link
         self.id = @existing.id
@@ -35,7 +35,9 @@ module Twinkies
 
       tweets = FriendSearcher.new(username, password).search('http')
       UrlList.new(tweets) {|t| t.text}.each do |item|
-        create :link => item[:url], :tweet => item[:item]
+        new_item = new :link => item[:url], :tweet => item[:item]
+        yield(new_item) if block_given?
+        new_item.save
       end
     end
   end

data/lib/twinkies/rss_writer.rb

@@ -0,0 +1,35 @@
+module Twinkies
+  class RssWriter
+    def initialize(username, request_path, items)
+      @username = username
+      @request_path = request_path
+      @items = items
+    end
+
+    def rss
+      username = @username
+      request_path = @request_path
+      items = @items
+
+      xml = Builder::XmlMarkup.new :indent => 2
+      xml.instruct!
+      xml.rss :version => '2.0', "xmlns:atom" => "http://www.w3.org/2005/Atom" do
+        xml.channel do
+          xml.title "#{username}'s twitter URL feed"
+          xml.description "#{username}'s twitter URL feed"
+          xml.link "http://twitter.com/#{username}"
+          xml.tag! "atom:link", :rel => "self", :href => request_path
+
+          @items.each do |tweet|
+            xml.item do
+              xml.title "#{tweet.user} - #{tweet.text}"
+              xml.link tweet.link
+              xml.pubDate tweet.created_at.rfc822
+              xml.guid tweet.guid, :isPermaLink => false
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twinkies/server.rb

@@ -12,6 +12,7 @@ module Twinkies
       setup_db
       start_tweet_refresher
       handle_request
+      Sinatra::Base.run!
     end
 
     def setup_db
@@ -31,34 +32,13 @@ module Twinkies
     end
 
     def handle_request
-      username = @username # builder must instance_eval?
-
-      get '/feed.xml' do
+      username = @username # instance_eval..
+      Sinatra::Base.get '/feed.xml' do
         pieces = ['http://', request.env['SERVER_NAME']]
         pieces << ":#{request.env['SERVER_PORT']}" unless request.env['SERVER_PORT'].to_i == 80
         pieces << request.env['REQUEST_PATH']
         request_path = pieces.join
-
-        builder do |xml|
-          xml.instruct!
-          xml.rss :version => '2.0', "xmlns:atom" => "http://www.w3.org/2005/Atom" do
-            xml.channel do
-              xml.title "#{username}'s twitter URL feed"
-              xml.description "#{username}'s twitter URL feed"
-              xml.link "http://twitter.com/#{username}"
-              xml.tag! "atom:link", :rel => "self", :href => request_path
-
-              Item.latest.each do |tweet|
-                xml.item do
-                  xml.title "#{tweet.user} - #{tweet.text}"
-                  xml.link tweet.link
-                  xml.pubDate tweet.created_at.rfc822
-                  xml.guid tweet.guid, :isPermaLink => false
-                end
-              end
-            end
-          end
-        end
+        RssWriter.new(username, request_path, Item.latest).rss
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pat-maddox-twinkies
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Pat Maddox
@@ -13,7 +13,7 @@ date: 2009-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: bmizerany-sinatra
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -48,6 +48,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: twitter
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: TODO
 email: pat.maddox@gmail.com
 executables: 
@@ -66,6 +75,7 @@ files:
 - lib/twinkies/friend_searcher.rb
 - lib/twinkies/server.rb
 - lib/twinkies/url_list.rb
+- lib/twinkies/rss_writer.rb
 - lib/twinkies/item.rb
 - spec/spec_helper.rb
 - spec/url_list_spec.rb