rutt 0.3.3 → 0.4.0

data/Gemfile

@@ -7,6 +7,7 @@ gem "parallel"
 gem "ruby-feedparser"
 gem "sqlite3"
 gem "oauth"
+gem "ruby-readability", :require => 'readability'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -26,6 +26,8 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     ruby-feedparser (0.7)
+    ruby-readability (0.2.3)
+      nokogiri (>= 1.4.2)
     sqlite3 (1.3.3)
 
 PLATFORMS
@@ -42,4 +44,5 @@ DEPENDENCIES
   rcov
   rspec (~> 2.3.0)
   ruby-feedparser
+  ruby-readability
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/bin/rutt

@@ -14,6 +14,8 @@ require 'feedparser'
 require 'parallel'
 require 'instapaper'
 require 'oauth'
+require 'readability'
+require 'open-uri'
 
 require 'rutt'
 
@@ -30,7 +32,7 @@ def start_screen
 
   stdscr.clear
 
-  feed_screen = Rutt::FeedScreen.new(stdscr)
+  feed_screen = Rutt::Screen::Feed.new(stdscr)
   feed_screen.loop
 ensure
   Ncurses.endwin()
@@ -39,21 +41,21 @@ end
 
 def main
 
-  Rutt::Config.make_table!
-  Rutt::Feed.make_table!
-  Rutt::Item.make_table!
+  Rutt::DB::Config.make_table!
+  Rutt::DB::Feed.make_table!
+  Rutt::DB::Item.make_table!
 
   options = {}
   OptionParser.new do |opts|
     opts.banner = "Usage: rutt.rb [options]"
 
     opts.on('-a', '--add FEED', "Add a feed") do |url|
-      Rutt::Feed::add(url)
+      Rutt::DB::Feed::add(url)
       exit
     end
 
     opts.on('-r', '--refresh', "Refresh feeds.") do
-      Rutt::Feed::refresh
+      Rutt::DB::Feed::refresh
       exit
     end
 
@@ -62,14 +64,14 @@ def main
 
       urls.each do |url|
         puts "Adding #{url}"
-        Rutt::Feed::add(url, false)
+        Rutt::DB::Feed::add(url, false)
       end
 
       exit
     end
 
     opts.on('-s', '--set-key', "Set config") do |key, value|
-      Rutt::Config.set(ARGV[0], ARGV[1])
+      Rutt::DB::Config.set(ARGV[0], ARGV[1])
       exit
     end
 
@@ -77,10 +79,10 @@ def main
 
   end.parse!
 
-  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")
+  consumer_key    = Rutt::DB::Config.get("instapaper.consumer-key")
+  consumer_secret = Rutt::DB::Config.get("instapaper.consumer-secret")
+  username        = Rutt::DB::Config.get("instapaper.username")
+  password        = Rutt::DB::Config.get("instapaper.password")
 
   $instapaper = Rutt::Instapaper::API.new(consumer_key, consumer_secret)
   $instapaper.authorize(username, password)

data/lib/rutt.rb

@@ -1,9 +1,10 @@
-require 'rutt/config'
-require 'rutt/opml'
-require 'rutt/instapaper'
-require 'rutt/feed'
-require 'rutt/item'
+require 'rutt/db/config'
+require 'rutt/db/feed'
+require 'rutt/db/item'
 require 'rutt/screen'
-require 'rutt/feed_screen'
-require 'rutt/item_screen'
-require 'rutt/content_screen'
+require 'rutt/screen/feed'
+require 'rutt/screen/item'
+require 'rutt/screen/content'
+require 'rutt/share/instapaper'
+require 'rutt/opml'
+

data/lib/rutt/db/config.rb

@@ -0,0 +1,25 @@
+module Rutt
+  module DB
+    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
+end

data/lib/rutt/db/feed.rb

@@ -0,0 +1,75 @@
+module Rutt
+  module DB
+    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
+end

data/lib/rutt/db/item.rb

@@ -0,0 +1,43 @@
+module Rutt
+  module DB
+    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
+
+      # Weak abstraction.
+      def sent_to_instapaper(item)
+        $db.execute("update items set read = 2 where id = #{item['id']}")
+      end
+    end
+  end
+end

data/lib/rutt/screen.rb

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

data/lib/rutt/screen/content.rb

@@ -0,0 +1,64 @@
+module Rutt
+  module Screen
+    class Content < Base
+      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']}`
+        source = open(@item['url']).read
+        content = Nokogiri::HTML(::Readability::Document.new(source).content).text
+
+        @content = content.split("\n").map do |s|
+          s.gsub(/.{0,74}(?:\s|\Z)/){($& + 5.chr).gsub(/\n\005/,"\n")}.gsub(/((\n|^)[>|\s]*[>|].*?)\005/, "\\1").gsub(/\005/,"\n").split("\n") << "\n"
+        end.flatten
+
+        @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
+              DB::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
+end

data/lib/rutt/screen/feed.rb

@@ -0,0 +1,95 @@
+module Rutt
+  module Screen
+    class Feed < Base
+      def initialize(stdscr)
+        @menu = "q:Quit d:delete r:refresh all"
+
+        super(stdscr)
+      end
+
+      def display_feeds
+        @cur_y = @min_y
+
+        @feeds = DB::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
+
+              DB::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
+                DB::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 = Item.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
+end

data/lib/rutt/screen/item.rb

@@ -0,0 +1,105 @@
+module Rutt
+  module Screen
+    class Item < Base
+      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 = DB::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'],
+                })
+              DB::Item::sent_to_instapaper(@items[cur_y])
+              window
+              move_pointer(@cur_y, move_to=true)
+            when /a/i
+              DB::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
+              DB::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
+              DB::Item::mark_as_read(@items[cur_y])
+              window
+              move_pointer(cur_y + 1, move_to=true)
+            when /u/i
+              cur_y = @cur_y - 1
+              DB::Item::mark_as_unread(@items[cur_y])
+              window
+              move_pointer(cur_y + 1, move_to=true)
+            when /r/i
+              DB::Feed::refresh_for(@feed)
+              window
+            when / /
+              content_screen = Content.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
+end

data/rutt.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutt}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   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.date = %q{2011-05-19}
   s.default_executable = %q{rutt}
   s.description = %q{The Mutt of RSS/Atom feeds.}
   s.email = %q{abhi@berkeley.edu}
@@ -29,15 +29,15 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/rutt",
     "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/db/config.rb",
+    "lib/rutt/db/feed.rb",
+    "lib/rutt/db/item.rb",
     "lib/rutt/opml.rb",
     "lib/rutt/screen.rb",
+    "lib/rutt/screen/content.rb",
+    "lib/rutt/screen/feed.rb",
+    "lib/rutt/screen/item.rb",
+    "lib/rutt/share/instapaper.rb",
     "rutt.gemspec",
     "spec/rutt_spec.rb",
     "spec/spec_helper.rb"
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ruby-feedparser>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<oauth>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-readability>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -75,6 +76,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-feedparser>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
+      s.add_dependency(%q<ruby-readability>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -88,6 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-feedparser>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
+    s.add_dependency(%q<ruby-readability>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutt
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Abhi Yerra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 +00:00
+date: 2011-05-19 00:00:00 +00:00
 default_executable: rutt
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,8 +117,22 @@ dependencies:
   version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: ruby-readability
+  version_requirements: *id008
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,11 +144,11 @@ dependencies:
         - 0
         version: 2.3.0
   name: rspec
-  version_requirements: *id008
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,11 +160,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id009
+  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -162,11 +176,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id010
+  version_requirements: *id011
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,7 +190,7 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id011
+  version_requirements: *id012
   prerelease: false
 description: The Mutt of RSS/Atom feeds.
 email: abhi@berkeley.edu
@@ -198,15 +212,15 @@ files:
 - VERSION
 - bin/rutt
 - 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/db/config.rb
+- lib/rutt/db/feed.rb
+- lib/rutt/db/item.rb
 - lib/rutt/opml.rb
 - lib/rutt/screen.rb
+- lib/rutt/screen/content.rb
+- lib/rutt/screen/feed.rb
+- lib/rutt/screen/item.rb
+- lib/rutt/share/instapaper.rb
 - rutt.gemspec
 - spec/rutt_spec.rb
 - spec/spec_helper.rb

data/lib/rutt/config.rb

@@ -1,23 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,74 +0,0 @@
-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

@@ -1,93 +0,0 @@
-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/item.rb

@@ -1,40 +0,0 @@
-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

@@ -1,103 +0,0 @@
-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