rutt 0.3.2 → 0.3.3

data/Rakefile

@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/abhiyerra/rutt"
   gem.license = "BSD"
   gem.summary = %Q{The Mutt of RSS/Atom feeds.}
-  gem.description = %Q{Read RSS feeds from the commandline }
+  gem.description = %Q{The Mutt of RSS/Atom feeds.}
   gem.email = "abhi@berkeley.edu"
   gem.authors = ["Abhi Yerra"]
 end

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/bin/rutt

@@ -13,46 +13,63 @@ require 'sqlite3'
 require 'feedparser'
 require 'parallel'
 require 'instapaper'
+require 'oauth'
 
 require 'rutt'
-require 'instapaper'
 
 $db = SQLite3::Database.new('rutt.db')
 $db.results_as_hash = true
 
+def start_screen
+  stdscr = Ncurses.initscr()
+
+  Ncurses.start_color();
+  Ncurses.cbreak();
+  Ncurses.noecho();
+  Ncurses.keypad(stdscr, true);
+
+  stdscr.clear
+
+  feed_screen = Rutt::FeedScreen.new(stdscr)
+  feed_screen.loop
+ensure
+  Ncurses.endwin()
+end
+
+
 def main
 
-  Config::make_table!
-  Feed::make_table!
-  Item::make_table!
+  Rutt::Config.make_table!
+  Rutt::Feed.make_table!
+  Rutt::Item.make_table!
 
   options = {}
   OptionParser.new do |opts|
     opts.banner = "Usage: rutt.rb [options]"
 
     opts.on('-a', '--add FEED', "Add a feed") do |url|
-      Feed::add(url)
+      Rutt::Feed::add(url)
       exit
     end
 
     opts.on('-r', '--refresh', "Refresh feeds.") do
-      Feed::refresh
+      Rutt::Feed::refresh
       exit
     end
 
     opts.on('-o', '--import-opml FILE', "Import opml") do |file|
-      urls = Opml::get_urls(file)
+      urls = Rutt::Opml::get_urls(file)
 
       urls.each do |url|
         puts "Adding #{url}"
-        Feed::add(url, false)
+        Rutt::Feed::add(url, false)
       end
 
       exit
     end
 
     opts.on('-s', '--set-key', "Set config") do |key, value|
-      Config.set(ARGV[0], ARGV[1])
+      Rutt::Config.set(ARGV[0], ARGV[1])
       exit
     end
 
@@ -60,12 +77,12 @@ def main
 
   end.parse!
 
-  consumer_key    = Config.get("instapaper.consumer-key")
-  consumer_secret = Config.get("instapaper.consumer-secret")
-  username        = Config.get("instapaper.username")
-  password        = Config.get("instapaper.password")
+  consumer_key    = Rutt::Config.get("instapaper.consumer-key")
+  consumer_secret = Rutt::Config.get("instapaper.consumer-secret")
+  username        = Rutt::Config.get("instapaper.username")
+  password        = Rutt::Config.get("instapaper.password")
 
-  $instapaper = Instapaper::API.new(consumer_key, consumer_secret)
+  $instapaper = Rutt::Instapaper::API.new(consumer_key, consumer_secret)
   $instapaper.authorize(username, password)
 
   start_screen

data/lib/rutt.rb

@@ -1,477 +1,9 @@
-module Config
-  extend self
-
-  def make_table!
-    $db.execute(%{
-         create table if not exists config (
-                      id integer PRIMARY KEY,
-                      key text,
-                      value text,
-                      UNIQUE(key))
-      })
-  end
-
-  def get(key)
-    $db.get_first_value("select value from config where key = ?", key)
-  end
-
-  def set(key, value)
-    $db.execute("insert or replace into config(key, value) values (?, ?)", key, value)
-  end
-end
-
-module Opml
-  def self.get_urls(file)
-    doc = Nokogiri::XML(open(file))
-
-    urls = []
-
-    doc.xpath('opml/body/outline').each do |outline|
-      if outline['xmlUrl']
-        urls << outline['xmlUrl']
-      else
-        (outline/'outline').each do |outline2|
-          urls << outline2['xmlUrl']
-        end
-      end
-    end
-
-    return urls
-  end
-end
-
-module Feed
-  extend self
-
-  def make_table!
-    $db.execute(%{
-         create table if not exists feeds (
-                      id integer PRIMARY KEY,
-                      title text,
-                      url text,
-                      update_interval integer default 3600,
-                      created_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                      updated_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                      UNIQUE(url))
-      })
-  end
-
-  def add(url, refresh=true)
-    $db.execute("insert or ignore into feeds (url) values ('#{url}')")
-    $db.execute("select * from feeds where id = (select last_insert_rowid())") do |feed|
-      refresh_for(feed)
-    end if refresh
-  end
-
-  def get(id)
-
-  end
-
-  def delete(feed)
-    $db.execute("delete from items where feed_id = ?", feed['id'])
-    $db.execute("delete from feeds where id = ?", feed['id'])
-  end
-
-  def all(min_limit=0, max_limit=-1)
-    $db.execute(%{
-       select f.*,
-              (select count(*) from items iu where iu.feed_id = f.id) as num_items,
-              (select count(*) from items ir where ir.read = 0 and ir.feed_id = f.id) as unread
-       from feeds f where unread > 0 order by id desc limit #{min_limit},#{max_limit}
-    })
-  end
-
-  def refresh
-    feeds = $db.execute("select * from feeds")
-    results = Parallel.map(feeds, :in_threads => 8) do |feed|
-      refresh_for(feed)
-    end
-  end
-
-  def refresh_for(feed)
-    content = open(feed['url']).read
-    rss = FeedParser::Feed::new(content)
-
-    puts rss.title
-
-    $db.execute("update feeds set title = ? where id = ?", rss.title, feed['id'])
-
-    rss.items.each do |item|
-      $db.execute("insert or ignore into items (feed_id, title, url, published_at) values (?, ?, ?, ?)", feed['id'], item.title, item.link, item.date.to_i)
-    end
-  rescue Exception => e
-    # no-op
-  end
-
-  def unread(feed_id)
-    $db.execute("select * from items where feed_id = ? and read = 0", feed)
-  end
-
-  def mark_as_read(feed)
-    $db.execute("update items set read = 1 where feed_id = ?", feed['id'])
-  end
-end
-
-
-module Item
-
-  extend self
-
-  def make_table!
-    $db.execute(%{
-      create table if not exists items (
-                      id integer PRIMARY KEY,
-                      feed_id integer,
-                      title text,
-                      url text,
-                      description text,
-                      read int default 0,
-                      prioritize int default 0,
-                      published_at DATE NOT NULL DEFAULT (datetime('now','localtime')),
-                      created_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                      updated_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                      UNIQUE(url),
-                      FOREIGN KEY(feed_id) REFERENCES feeds(id))
-    })
-  end
-
-  def all(feed, min_limit=0, max_limit=-1)
-    $db.execute("select * from items where feed_id = ? order by published_at desc limit #{min_limit},#{max_limit}", feed['id'])
-  end
-
-  def mark_as_unread(item)
-    $db.execute("update items set read = 0 where id = #{item['id']}")
-  end
-
-  def mark_as_read(item)
-    $db.execute("update items set read = 1 where id = #{item['id']}")
-  end
-
-  def sent_to_instapaper(item)
-    $db.execute("update items set read = 2 where id = #{item['id']}")
-  end
-end
-
-class Screen
-  def initialize(stdscr)
-    @stdscr = stdscr
-
-    @min_y = 1
-    @max_y = @stdscr.getmaxy
-
-    @min_limit = @min_y - 1
-    @max_limit = @max_y - 5
-
-    @cur_y = 1
-    @cur_x = 0
-  end
-
-  def incr_page
-    @min_limit =  @max_limit
-    @max_limit += (@max_y - 5)
-  end
-
-  def decr_page
-    @max_limit =  @min_limit
-    @min_limit -= (@max_y - 5)
-
-    if @max_limit <= 0
-      @min_limit = @min_y - 1
-      @max_limit = @max_y - 5
-    end
-  end
-
-  def display_menu
-    @stdscr.clear
-    @stdscr.move(0, 0)
-    @stdscr.addstr(" rutt #{@menu}\n")
-  end
-
-  def move_pointer(pos, move_to=false)
-    @stdscr.move(@cur_y, 0)
-    @stdscr.addstr(" ")
-
-    if move_to == true
-      @cur_y = pos
-    else
-      @cur_y += pos
-    end
-
-    @stdscr.move(@cur_y, 0)
-    @stdscr.addstr(">")
-  end
-end
-
-
-class FeedScreen < Screen
-  def initialize(stdscr)
-    @menu = "q:Quit d:delete r:refresh all"
-
-    super(stdscr)
-  end
-
-  def display_feeds
-    @cur_y = @min_y
-
-    @feeds = Feed::all(@min_limit, @max_limit)
-    @feeds.each do |feed|
- #     next if feed['unread'] == 0  # This should be configurable: feed.showread
-
-      @stdscr.move(@cur_y, 0)
-      @stdscr.addstr("  #{feed['unread']}/#{feed['num_items']}\t\t#{feed['title']}\n")
-
-      @cur_y += 1
-    end
-
-    @cur_y = @min_y
-    @stdscr.refresh
-  end
-
-  def window
-    @stdscr.clear
-
-    display_menu
-    display_feeds
-    move_pointer(0)
-  end
-
-  def loop
-    window
-
-    while true do
-      c = @stdscr.getch
-
-      if c > 0 && c < 255
-        case c.chr
-        when /q/i
-          break
-        when /a/i
-          # no-op
-        when /r/i
-          cur_y = @cur_y
-
-          Feed::refresh
-
-          window
-          move_pointer(cur_y, move_to=true)
-        when /d/i
-          cur_y = @cur_y - 1
-
-          @stdscr.clear
-          display_menu
-          feed = @feeds[cur_y]
-          @stdscr.move(2, 0)
-          @stdscr.addstr("Are you sure you want to delete #{feed['title']}? ")
-          d = @stdscr.getch
-          if d.chr =~ /y/i
-            Feed::delete(feed)
-          end
-          window
-          move_pointer(cur_y, move_to=true)
-        when /p/i
-          decr_page
-          window
-        when /n/i
-          incr_page
-          window
-        when / /
-          cur_y = @cur_y
-          @stdscr.addstr("#{@feeds[cur_y]}")
-          item_screen = ItemScreen.new(@stdscr, @feeds[cur_y - 1])
-          item_screen.loop
-
-          window
-          move_pointer(cur_y, move_to=true)
-        end
-      else
-        case c
-        when Ncurses::KEY_UP
-          move_pointer(-1)
-        when Ncurses::KEY_DOWN
-          move_pointer(1)
-        end
-      end
-    end
-  end
-end
-
-class ItemScreen < Screen
-  def initialize(stdscr, feed)
-    @feed = feed
-    @menu = " i:quit r:refresh m:mark as read u:mark as unread a:mark all as read b:open in browser"
-
-    super(stdscr)
-  end
-
-  def display_items
-    @cur_y = @min_y
-
-    @items = Item::all(@feed, @min_limit, @max_limit)
-    @items.each do |item|
-      item_status = case item['read'].to_i
-                    when 0 then 'N'
-                    when 1 then ' '
-                    when 2 then 'I'
-                    else ' '
-                    end
-      @stdscr.addstr("  #{item_status}\t#{Time.at(item['published_at']).strftime("%b %d, %Y %R:%M")}\t#{item['title']}\n")
-      @cur_y += 1
-    end
-
-    @cur_y = @min_y
-    @stdscr.refresh
-  end
-
-  def window
-    @stdscr.clear
-
-    display_menu
-    display_items
-    move_pointer(0)
-  end
-
-  def loop
-    window
-
-    while true do
-      c = @stdscr.getch
-
-      if c > 0 && c < 255
-        case c.chr
-        when /[iq]/i
-          break
-        when /s/i
-          cur_y = @cur_y - 1
-          $instapaper.request('/api/1/bookmarks/add', {
-              'url'   => @items[cur_y]['url'],
-              'title' => @items[cur_y]['title'],
-            })
-          Item::sent_to_instapaper(@items[cur_y])
-          window
-          move_pointer(@cur_y, move_to=true)
-        when /a/i
-          Feed::mark_as_read(@feed)
-          window
-          move_pointer(@cur_y, move_to=true)
-        when /p/i
-          decr_page
-          window
-        when /n/i
-          incr_page
-          window
-        when /b/i
-          cur_y = @cur_y - 1
-          Item::mark_as_read(@items[cur_y])
-          Launchy.open(@items[cur_y]['url'])
-          window
-          move_pointer(@cur_y, move_to=true)
-        when /m/i
-          cur_y = @cur_y - 1
-          Item::mark_as_read(@items[cur_y])
-          window
-          move_pointer(cur_y + 1, move_to=true)
-        when /u/i
-          cur_y = @cur_y - 1
-          Item::mark_as_unread(@items[cur_y])
-          window
-          move_pointer(cur_y + 1, move_to=true)
-        when /r/i
-          Feed::refresh_for(@feed)
-          window
-        when / /
-          content_screen = ContentScreen.new(@stdscr, @items[@cur_y - 1])
-          content_screen.loop
-
-          window
-          move_pointer(@cur_y, move_to=true)
-        end
-      else
-        case c
-        when Ncurses::KEY_UP
-          move_pointer(-1)
-        when Ncurses::KEY_DOWN
-          move_pointer(1)
-        end
-      end
-    end
-  end
-end
-
-
-
-
-
-class ContentScreen < Screen
-  def initialize(stdscr, item)
-    @item = item
-    @menu = "i:back b:open in browser"
-
-    super(stdscr)
-  end
-
-  def display_content
-    @content = `elinks -dump -dump-charset ascii -force-html #{@item['url']}`
-    @content = @content.split("\n")
-
-    @stdscr.addstr(" #{@item['title']} (#{@item['url']})\n\n")
-
-    lines = @content[@min_limit..@max_limit]
-    lines.each { |line| @stdscr.addstr("  #{line}\n") } if lines
-
-    @stdscr.refresh
-  end
-
-  def window
-    @stdscr.clear
-    display_menu
-    display_content
-  end
-
-  def loop
-    @cur_line = 0
-
-    window
-
-    while true do
-      c = @stdscr.getch
-      if c > 0 && c < 255
-        case c.chr
-        when /[iq]/i
-          Item::mark_as_read(@item)
-          break
-        when /b/i
-          Launchy.open(@item['url'])
-        end
-      else
-        case c
-        when Ncurses::KEY_UP
-          decr_page
-          window
-        when Ncurses::KEY_DOWN
-          incr_page
-          window
-        end
-      end
-    end
-
-  end
-end
-
-
-
-def start_screen
-  stdscr = Ncurses.initscr()
-
-  Ncurses.start_color();
-  Ncurses.cbreak();
-  Ncurses.noecho();
-  Ncurses.keypad(stdscr, true);
-
-  stdscr.clear
-
-  feed_screen = FeedScreen.new(stdscr)
-  feed_screen.loop
-ensure
-  Ncurses.endwin()
-end
-
+require 'rutt/config'
+require 'rutt/opml'
+require 'rutt/instapaper'
+require 'rutt/feed'
+require 'rutt/item'
+require 'rutt/screen'
+require 'rutt/feed_screen'
+require 'rutt/item_screen'
+require 'rutt/content_screen'

data/lib/rutt/config.rb

@@ -0,0 +1,23 @@
+module Rutt
+  module Config
+    extend self
+
+    def make_table!
+      $db.execute(%{
+         create table if not exists config (
+                      id integer PRIMARY KEY,
+                      key text,
+                      value text,
+                      UNIQUE(key))
+      })
+    end
+
+    def get(key)
+      $db.get_first_value("select value from config where key = ?", key)
+    end
+
+    def set(key, value)
+      $db.execute("insert or replace into config(key, value) values (?, ?)", key, value)
+    end
+  end
+end

data/lib/rutt/content_screen.rb

@@ -0,0 +1,57 @@
+module Rutt
+  class ContentScreen < Screen
+    def initialize(stdscr, item)
+      @item = item
+      @menu = "i:back b:open in browser"
+
+      super(stdscr)
+    end
+
+    def display_content
+      @content = `elinks -dump -dump-charset ascii -force-html #{@item['url']}`
+      @content = @content.split("\n")
+
+      @stdscr.addstr(" #{@item['title']} (#{@item['url']})\n\n")
+
+      lines = @content[@min_limit..@max_limit]
+      lines.each { |line| @stdscr.addstr("  #{line}\n") } if lines
+
+      @stdscr.refresh
+    end
+
+    def window
+      @stdscr.clear
+      display_menu
+      display_content
+    end
+
+    def loop
+      @cur_line = 0
+
+      window
+
+      while true do
+        c = @stdscr.getch
+        if c > 0 && c < 255
+          case c.chr
+          when /[iq]/i
+            Item::mark_as_read(@item)
+            break
+          when /b/i
+            Launchy.open(@item['url'])
+          end
+        else
+          case c
+          when Ncurses::KEY_UP
+            decr_page
+            window
+          when Ncurses::KEY_DOWN
+            incr_page
+            window
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/rutt/feed.rb

@@ -0,0 +1,74 @@
+module Rutt
+
+  module Feed
+    extend self
+
+    def make_table!
+      $db.execute(%{
+         create table if not exists feeds (
+                      id integer PRIMARY KEY,
+                      title text,
+                      url text,
+                      update_interval integer default 3600,
+                      created_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                      updated_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                      UNIQUE(url))
+      })
+    end
+
+    def add(url, refresh=true)
+      $db.execute("insert or ignore into feeds (url) values ('#{url}')")
+      $db.execute("select * from feeds where id = (select last_insert_rowid())") do |feed|
+        refresh_for(feed)
+      end if refresh
+    end
+
+    def get(id)
+
+    end
+
+    def delete(feed)
+      $db.execute("delete from items where feed_id = ?", feed['id'])
+      $db.execute("delete from feeds where id = ?", feed['id'])
+    end
+
+    def all(min_limit=0, max_limit=-1)
+      $db.execute(%{
+       select f.*,
+              (select count(*) from items iu where iu.feed_id = f.id) as num_items,
+              (select count(*) from items ir where ir.read = 0 and ir.feed_id = f.id) as unread
+       from feeds f where unread > 0 order by id desc limit #{min_limit},#{max_limit}
+    })
+    end
+
+    def refresh
+      feeds = $db.execute("select * from feeds")
+      results = Parallel.map(feeds, :in_threads => 8) do |feed|
+        refresh_for(feed)
+      end
+    end
+
+    def refresh_for(feed)
+      content = open(feed['url']).read
+      rss = FeedParser::Feed::new(content)
+
+      puts rss.title
+
+      $db.execute("update feeds set title = ? where id = ?", rss.title, feed['id'])
+
+      rss.items.each do |item|
+        $db.execute("insert or ignore into items (feed_id, title, url, published_at) values (?, ?, ?, ?)", feed['id'], item.title, item.link, item.date.to_i)
+      end
+    rescue Exception => e
+      # no-op
+    end
+
+    def unread(feed_id)
+      $db.execute("select * from items where feed_id = ? and read = 0", feed)
+    end
+
+    def mark_as_read(feed)
+      $db.execute("update items set read = 1 where feed_id = ?", feed['id'])
+    end
+  end
+end

data/lib/rutt/feed_screen.rb

@@ -0,0 +1,93 @@
+module Rutt
+  class FeedScreen < Screen
+    def initialize(stdscr)
+      @menu = "q:Quit d:delete r:refresh all"
+
+      super(stdscr)
+    end
+
+    def display_feeds
+      @cur_y = @min_y
+
+      @feeds = Feed::all(@min_limit, @max_limit)
+      @feeds.each do |feed|
+        #     next if feed['unread'] == 0  # This should be configurable: feed.showread
+
+        @stdscr.move(@cur_y, 0)
+        @stdscr.addstr("  #{feed['unread']}/#{feed['num_items']}\t\t#{feed['title']}\n")
+
+        @cur_y += 1
+      end
+
+      @cur_y = @min_y
+      @stdscr.refresh
+    end
+
+    def window
+      @stdscr.clear
+
+      display_menu
+      display_feeds
+      move_pointer(0)
+    end
+
+    def loop
+      window
+
+      while true do
+        c = @stdscr.getch
+
+        if c > 0 && c < 255
+          case c.chr
+          when /q/i
+            break
+          when /a/i
+            # no-op
+          when /r/i
+            cur_y = @cur_y
+
+            Feed::refresh
+
+            window
+            move_pointer(cur_y, move_to=true)
+          when /d/i
+            cur_y = @cur_y - 1
+
+            @stdscr.clear
+            display_menu
+            feed = @feeds[cur_y]
+            @stdscr.move(2, 0)
+            @stdscr.addstr("Are you sure you want to delete #{feed['title']}? ")
+            d = @stdscr.getch
+            if d.chr =~ /y/i
+              Feed::delete(feed)
+            end
+            window
+            move_pointer(cur_y, move_to=true)
+          when /p/i
+            decr_page
+            window
+          when /n/i
+            incr_page
+            window
+          when / /
+            cur_y = @cur_y
+            @stdscr.addstr("#{@feeds[cur_y]}")
+            item_screen = ItemScreen.new(@stdscr, @feeds[cur_y - 1])
+            item_screen.loop
+
+            window
+            move_pointer(cur_y, move_to=true)
+          end
+        else
+          case c
+          when Ncurses::KEY_UP
+            move_pointer(-1)
+          when Ncurses::KEY_DOWN
+            move_pointer(1)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rutt/instapaper.rb

@@ -0,0 +1,32 @@
+module Rutt
+  module Instapaper
+    class API
+      Url = "http://www.instapaper.com"
+
+      def initialize(consumer_key, consumer_secret)
+        @consumer_key    = consumer_key
+        @consumer_secret = consumer_secret
+      end
+
+      def authorize(username, password)
+        @consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {
+            :site              => "https://www.instapaper.com",
+            :access_token_path => "/api/1/oauth/access_token",
+            :http_method => :post
+          })
+
+        access_token = @consumer.get_access_token(nil, {}, {
+            :x_auth_username => username,
+            :x_auth_password => password,
+            :x_auth_mode     => "client_auth",
+          })
+
+        @access_token = OAuth::AccessToken.new(@consumer, access_token.token, access_token.secret)
+      end
+
+      def request(path, params={})
+        @access_token.request(:post, "#{Url}#{path}", params)
+      end
+    end
+  end
+end

data/lib/rutt/item.rb

@@ -0,0 +1,40 @@
+module Rutt
+  module Item
+
+    extend self
+
+    def make_table!
+      $db.execute(%{
+      create table if not exists items (
+                      id integer PRIMARY KEY,
+                      feed_id integer,
+                      title text,
+                      url text,
+                      description text,
+                      read int default 0,
+                      prioritize int default 0,
+                      published_at DATE NOT NULL DEFAULT (datetime('now','localtime')),
+                      created_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                      updated_at NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                      UNIQUE(url),
+                      FOREIGN KEY(feed_id) REFERENCES feeds(id))
+    })
+    end
+
+    def all(feed, min_limit=0, max_limit=-1)
+      $db.execute("select * from items where feed_id = ? order by published_at desc limit #{min_limit},#{max_limit}", feed['id'])
+    end
+
+    def mark_as_unread(item)
+      $db.execute("update items set read = 0 where id = #{item['id']}")
+    end
+
+    def mark_as_read(item)
+      $db.execute("update items set read = 1 where id = #{item['id']}")
+    end
+
+    def sent_to_instapaper(item)
+      $db.execute("update items set read = 2 where id = #{item['id']}")
+    end
+  end
+end

data/lib/rutt/item_screen.rb

@@ -0,0 +1,103 @@
+module Rutt
+  class ItemScreen < Screen
+    def initialize(stdscr, feed)
+      @feed = feed
+      @menu = " i:quit r:refresh m:mark as read u:mark as unread a:mark all as read b:open in browser"
+
+      super(stdscr)
+    end
+
+    def display_items
+      @cur_y = @min_y
+
+      @items = Item::all(@feed, @min_limit, @max_limit)
+      @items.each do |item|
+        item_status = case item['read'].to_i
+                      when 0 then 'N'
+                      when 1 then ' '
+                      when 2 then 'I'
+                      else ' '
+                      end
+        @stdscr.addstr("  #{item_status}\t#{Time.at(item['published_at']).strftime("%b %d, %Y %R:%M")}\t#{item['title']}\n")
+        @cur_y += 1
+      end
+
+      @cur_y = @min_y
+      @stdscr.refresh
+    end
+
+    def window
+      @stdscr.clear
+
+      display_menu
+      display_items
+      move_pointer(0)
+    end
+
+    def loop
+      window
+
+      while true do
+        c = @stdscr.getch
+
+        if c > 0 && c < 255
+          case c.chr
+          when /[iq]/i
+            break
+          when /s/i
+            cur_y = @cur_y - 1
+            $instapaper.request('/api/1/bookmarks/add', {
+                'url'   => @items[cur_y]['url'],
+                'title' => @items[cur_y]['title'],
+              })
+            Item::sent_to_instapaper(@items[cur_y])
+            window
+            move_pointer(@cur_y, move_to=true)
+          when /a/i
+            Feed::mark_as_read(@feed)
+            window
+            move_pointer(@cur_y, move_to=true)
+          when /p/i
+            decr_page
+            window
+          when /n/i
+            incr_page
+            window
+          when /b/i
+            cur_y = @cur_y - 1
+            Item::mark_as_read(@items[cur_y])
+            Launchy.open(@items[cur_y]['url'])
+            window
+            move_pointer(@cur_y, move_to=true)
+          when /m/i
+            cur_y = @cur_y - 1
+            Item::mark_as_read(@items[cur_y])
+            window
+            move_pointer(cur_y + 1, move_to=true)
+          when /u/i
+            cur_y = @cur_y - 1
+            Item::mark_as_unread(@items[cur_y])
+            window
+            move_pointer(cur_y + 1, move_to=true)
+          when /r/i
+            Feed::refresh_for(@feed)
+            window
+          when / /
+            content_screen = ContentScreen.new(@stdscr, @items[@cur_y - 1])
+            content_screen.loop
+
+            window
+            move_pointer(@cur_y, move_to=true)
+          end
+        else
+          case c
+          when Ncurses::KEY_UP
+            move_pointer(-1)
+          when Ncurses::KEY_DOWN
+            move_pointer(1)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rutt/opml.rb

@@ -0,0 +1,21 @@
+module Rutt
+  module Opml
+    def self.get_urls(file)
+      doc = Nokogiri::XML(open(file))
+
+      urls = []
+
+      doc.xpath('opml/body/outline').each do |outline|
+        if outline['xmlUrl']
+          urls << outline['xmlUrl']
+        else
+          (outline/'outline').each do |outline2|
+            urls << outline2['xmlUrl']
+          end
+        end
+      end
+
+      return urls
+    end
+  end
+end

data/lib/rutt/screen.rb

@@ -0,0 +1,51 @@
+module Rutt
+  class Screen
+    def initialize(stdscr)
+      @stdscr = stdscr
+
+      @min_y = 1
+      @max_y = @stdscr.getmaxy
+
+      @min_limit = @min_y - 1
+      @max_limit = @max_y - 5
+
+      @cur_y = 1
+      @cur_x = 0
+    end
+
+    def incr_page
+      @min_limit =  @max_limit
+      @max_limit += (@max_y - 5)
+    end
+
+    def decr_page
+      @max_limit =  @min_limit
+      @min_limit -= (@max_y - 5)
+
+      if @max_limit <= 0
+        @min_limit = @min_y - 1
+        @max_limit = @max_y - 5
+      end
+    end
+
+    def display_menu
+      @stdscr.clear
+      @stdscr.move(0, 0)
+      @stdscr.addstr(" rutt #{@menu}\n")
+    end
+
+    def move_pointer(pos, move_to=false)
+      @stdscr.move(@cur_y, 0)
+      @stdscr.addstr(" ")
+
+      if move_to == true
+        @cur_y = pos
+      else
+        @cur_y += pos
+      end
+
+      @stdscr.move(@cur_y, 0)
+      @stdscr.addstr(">")
+    end
+  end
+end

data/rutt.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutt}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Abhi Yerra"]
   s.date = %q{2011-04-23}
   s.default_executable = %q{rutt}
-  s.description = %q{Read RSS feeds from the commandline }
+  s.description = %q{The Mutt of RSS/Atom feeds.}
   s.email = %q{abhi@berkeley.edu}
   s.executables = ["rutt"]
   s.extra_rdoc_files = [
@@ -28,8 +28,16 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/rutt",
-    "lib/instapaper.rb",
     "lib/rutt.rb",
+    "lib/rutt/config.rb",
+    "lib/rutt/content_screen.rb",
+    "lib/rutt/feed.rb",
+    "lib/rutt/feed_screen.rb",
+    "lib/rutt/instapaper.rb",
+    "lib/rutt/item.rb",
+    "lib/rutt/item_screen.rb",
+    "lib/rutt/opml.rb",
+    "lib/rutt/screen.rb",
     "rutt.gemspec",
     "spec/rutt_spec.rb",
     "spec/spec_helper.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Abhi Yerra
@@ -178,7 +178,7 @@ dependencies:
   name: rcov
   version_requirements: *id011
   prerelease: false
-description: "Read RSS feeds from the commandline "
+description: The Mutt of RSS/Atom feeds.
 email: abhi@berkeley.edu
 executables: 
 - rutt
@@ -197,8 +197,16 @@ files:
 - Rakefile
 - VERSION
 - bin/rutt
-- lib/instapaper.rb
 - lib/rutt.rb
+- lib/rutt/config.rb
+- lib/rutt/content_screen.rb
+- lib/rutt/feed.rb
+- lib/rutt/feed_screen.rb
+- lib/rutt/instapaper.rb
+- lib/rutt/item.rb
+- lib/rutt/item_screen.rb
+- lib/rutt/opml.rb
+- lib/rutt/screen.rb
 - rutt.gemspec
 - spec/rutt_spec.rb
 - spec/spec_helper.rb

data/lib/instapaper.rb

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'oauth'
-
-module Instapaper
-  class API
-    Url = "http://www.instapaper.com"
-
-    def initialize(consumer_key, consumer_secret)
-      @consumer_key    = consumer_key
-      @consumer_secret = consumer_secret
-    end
-
-    def authorize(username, password)
-      @consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {
-          :site              => "https://www.instapaper.com",
-          :access_token_path => "/api/1/oauth/access_token",
-          :http_method => :post
-        })
-
-      access_token = @consumer.get_access_token(nil, {}, {
-          :x_auth_username => username,
-          :x_auth_password => password,
-          :x_auth_mode     => "client_auth",
-        })
-
-      @access_token = OAuth::AccessToken.new(@consumer, access_token.token, access_token.secret)
-    end
-
-    def request(path, params={})
-      @access_token.request(:post, "#{Url}#{path}", params)
-    end
-  end
-end