rutt 0.4.1 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/rutt.rb

@@ -1,3 +1,4 @@
+require 'rutt/helper'
 require 'rutt/db/config'
 require 'rutt/db/feed'
 require 'rutt/db/item'

data/lib/rutt/db/feed.rb

@@ -32,12 +32,12 @@ module Rutt
         $db.execute("delete from feeds where id = ?", feed['id'])
       end
 
-      def all(min_limit=0, max_limit=-1)
+      def all
         $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}
+          from feeds f where unread > 0 order by id desc
         })
       end
 

data/lib/rutt/db/item.rb

@@ -22,8 +22,8 @@ module Rutt
         })
       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'])
+      def all(feed)
+        $db.execute("select * from items where feed_id = ? order by published_at desc", feed['id'])
       end
 
       def mark_as_unread(item)

data/lib/rutt/helper.rb

@@ -0,0 +1,10 @@
+class Array
+  def / len
+    a = []
+    each_with_index do |x, i|
+      a << [] if i % len == 0
+      a.last << x
+    end
+    a
+  end
+end

data/lib/rutt/screen.rb

@@ -5,28 +5,24 @@ module Rutt
         @stdscr = stdscr
 
         @min_y = 1
-        @max_y = @stdscr.getmaxy
-
-        @min_limit = @min_y - 1
-        @max_limit = @max_y - 5
+        @max_y = @stdscr.getmaxy - 5
 
         @cur_y = 1
         @cur_x = 0
+
+        @pages = []
+        @cur_page = 0
       end
 
       def incr_page
-        @min_limit =  @max_limit
-        @max_limit += (@max_y - 5)
+        check_page = @cur_page + 1
+        check_page = @cur_page if check_page >= @pages.length
+        @cur_page = check_page
       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
+        @cur_page -= 1
+        @cur_page = 0 if @cur_page < 0
       end
 
       def display_menu

data/lib/rutt/screen/content.rb

@@ -2,14 +2,12 @@ module Rutt
   module Screen
     class Content < Base
       def initialize(stdscr, item)
+        super(stdscr)
+
         @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']}`
+        # Get the content
         source = open(@item['url']).read
         content = Nokogiri::HTML(::Readability::Document.new(source).content).text
 
@@ -17,10 +15,27 @@ module Rutt
           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")
+        @pages = @content / @max_y
+      end
+
+      def display_content
+#        @content = `elinks -dump -dump-charset ascii -force-html #{@item['url']}`
 
-        lines = @content[@min_limit..@max_limit]
-        lines.each { |line| @stdscr.addstr("  #{line}\n") } if lines
+        @cur_y = @min_y
+        @stdscr.move(@cur_y, 0)
+        @stdscr.addstr(" #{@item['title']}\n")
+        @cur_y += 1
+        @stdscr.move(@cur_y, 0)
+        @stdscr.addstr(" #{@item['url']}\n")
+        @cur_y += 1
+
+        @pages[@cur_page].each do |line|
+          @stdscr.move(@cur_y, 0)
+          @stdscr.addstr("  #{line}\n")
+
+          @cur_y += 1
+        end
+        @cur_y = @min_y
 
         @stdscr.refresh
       end

data/lib/rutt/screen/feed.rb

@@ -2,16 +2,18 @@ module Rutt
   module Screen
     class Feed < Base
       def initialize(stdscr)
+        super(stdscr)
+
         @menu = "q:Quit d:delete r:refresh all"
 
-        super(stdscr)
+        @feeds = DB::Feed::all
+        @pages = @feeds / @max_y
       end
 
       def display_feeds
         @cur_y = @min_y
 
-        @feeds = DB::Feed::all(@min_limit, @max_limit)
-        @feeds.each do |feed|
+        @pages[@cur_page].each do |feed|
           #     next if feed['unread'] == 0  # This should be configurable: feed.showread
 
           @stdscr.move(@cur_y, 0)
@@ -60,9 +62,7 @@ module Rutt
               @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
+              DB::Feed::delete(feed) if d.chr =~ /y/i
               window
               move_pointer(cur_y, move_to=true)
             when /p/i
@@ -73,8 +73,8 @@ module Rutt
               window
             when / /
               cur_y = @cur_y
-              @stdscr.addstr("#{@feeds[cur_y]}")
-              item_screen = Item.new(@stdscr, @feeds[cur_y - 1])
+              @stdscr.addstr("#{@pages[@cur_page][cur_y]}")
+              item_screen = Item.new(@stdscr, @pages[@cur_page][cur_y - 1])
               item_screen.loop
 
               window

data/lib/rutt/screen/item.rb

@@ -2,17 +2,19 @@ module Rutt
   module Screen
     class Item < Base
       def initialize(stdscr, feed)
+        super(stdscr)
+
         @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)
+        @items = DB::Item::all(@feed)
+        @pages = @items / @max_y
       end
 
       def display_items
         @cur_y = @min_y
 
-        @items = DB::Item::all(@feed, @min_limit, @max_limit)
-        @items.each do |item|
+        @pages[@cur_page].each do |item|
           item_status = case item['read'].to_i
                         when 0 then 'N'
                         when 1 then ' '

data/rutt.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutt}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Abhi Yerra"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/rutt/db/config.rb",
     "lib/rutt/db/feed.rb",
     "lib/rutt/db/item.rb",
+    "lib/rutt/helper.rb",
     "lib/rutt/opml.rb",
     "lib/rutt/screen.rb",
     "lib/rutt/screen/content.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutt
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Abhi Yerra
@@ -215,6 +215,7 @@ files:
 - lib/rutt/db/config.rb
 - lib/rutt/db/feed.rb
 - lib/rutt/db/item.rb
+- lib/rutt/helper.rb
 - lib/rutt/opml.rb
 - lib/rutt/screen.rb
 - lib/rutt/screen/content.rb