bulletin 0.0.5 → 0.0.6

data/bulletin

@@ -3,26 +3,31 @@ require 'optparse'
 require File.expand_path('bulletin', File.dirname(__FILE__))
 
 ARGV.options do |o|
-  Bulletin::App.setup_db
+  action = ['run', 1]
   bulletin = Bulletin::App.new(true)
-  bulletin.load_config
   o.set_summary_indent('  ')
   o.banner =    "Usage: #{File.basename($0)} [OPTIONS]"
-  o.define_head 'Personalized news client'
-  o.on('-a', '--all', 'show all links') { bulletin.run(0); exit }
+  o.on('-a', '--all', 'show all links') { action = ['run', 0] }
+  o.on('-e', '--edit', 'edit config') { action = ['edit'] }
   o.on('-f', '--filter uri', 'filter news') { |f| bulletin.filter(f) }
-  o.on('-o', '--open id', 'open link') { |id| bulletin.open_item(id); exit }
-  o.on('-p', '--page page', 'show page') { |page| bulletin.run(page); exit }
-  o.on('-r', '--read id', 'read a link') { |id| bulletin.read(id); exit }
-  o.on('-R', '--refresh', 'refresh and ranks stories') { bulletin.refresh; exit }
-  o.on('-s', '--save id', 'save link') { |id| bulletin.save(id); exit }
-  o.on('-S', '--saved', 'show all saved') { |id| bulletin.saved; exit }
-  o.on('-u', '--unsave id', 'undo save') { |id| bulletin.unsave(id); exit }
+  o.on('-o', '--open id', 'open link') { |id| action = ['open_item', id] }
+  o.on('-p', '--page page', 'show page') { |page| action = ['run', page] }
+  o.on('-r', '--read id', 'read a link') { |id| action = ['read', id] }
+  o.on('-R', '--refresh', 'refresh stories') { action = ['refresh'] }
+  o.on('-s', '--save id', 'save link') { |id| action = ['save', id] }
+  o.on('-S', '--saved', 'show all saved') { action = ['saved'] }
+  o.on('-u', '--unsave id', 'undo save') { |id| action = ['unsave', id] }
   o.on('-v', '--version', 'show version') do
     puts "bulletin version #{Bulletin::VERSION}"
     exit
   end
   o.on('-h', '--help', 'show this help message') { puts o; exit }
   o.parse!
-  ARGV.empty? ? bulletin.run : puts(o)
+  begin
+    bulletin.setup_db
+    bulletin.load_config
+    ARGV.empty? ? bulletin.send(*action) : puts(o)
+  rescue Exception => e
+    puts e
+  end
 end

data/bulletin.rb

@@ -1,14 +1,17 @@
 require 'rubygems'
+require 'feedzirra'
 require 'uri'
 require 'data_mapper'
 require 'dm-types'
 require 'colorize'
-require 'feedzirra'
 require 'nokogiri'
 require 'date'
 
 module Bulletin
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
+  EDITOR = ENV['EDITOR'] || 'vi'
+  BULLETINRC = File.expand_path('~/.bulletinrc')
+  BULLETINDB = File.expand_path('~/.bulletindb')
 
   class App
     attr_reader :options, :feeds
@@ -21,6 +24,10 @@ module Bulletin
       @term_height = `tput lines`.to_i
     end
 
+    def edit
+      `#{EDITOR} #{BULLETINRC} < \`tty\` > \`tty\``
+    end
+
     def filter(site)
       @filter = site
     end
@@ -32,8 +39,8 @@ module Bulletin
       options = {:order => [:rank]}
       if page > -1
         options.merge!(
-          :rank.gt => (per_page * page),
-          :rank.lte => (per_page * (page + 1)))
+          :offset => per_page * page,
+          :limit  => per_page)
       end
       if @filter
         options.merge!(
@@ -114,19 +121,26 @@ module Bulletin
       @feeds << uri
     end
 
+    def setup_db(production = true)
+      DataMapper.setup(:default, production ?
+        "sqlite://#{File.expand_path(BULLETINDB)}" :
+        "sqlite3::memory:")
+      if !DataMapper.repository(:default).adapter.storage_exists?('bulletin_items')
+        DataMapper.auto_migrate! 
+      end
+    end
+
     def load_config
-      config = File.join(ENV['HOME'], '.bulletinrc')
-      if File.exists?(config)
-        app = self
-        Object.class_eval do
-          define_method(:set) { |opt, val| app.set(opt, val) }
-          define_method(:feed) { |uri| app.feed(uri) }
-        end
-        load(config, true)
-        @options[:browser] ||= 'firefox'
-        @options[:per_page] ||= (@term_height - 2)
-        @options[:expire] ||= 30
+      raise "No configuration found at '#{BULLETINRC}'." if !File.exists?(BULLETINRC)
+      app = self
+      Object.class_eval do
+        define_method(:set) { |opt, val| app.set(opt, val) }
+        define_method(:feed) { |uri| app.feed(uri) }
       end
+      load(BULLETINRC, true)
+      @options[:browser] ||= 'firefox'
+      @options[:per_page] ||= (@term_height - 2)
+      @options[:expire] ||= 30
     end
 
     private
@@ -165,7 +179,13 @@ module Bulletin
       lists = %w(li)
       swaps = {'br'=>"\n", 'hr'=>"\n"}
       node = Nokogiri::HTML(html)
-      node.xpath('.//text()').each { |t| t.content = t.text.gsub(/\s+/,' ') }
+      node.xpath('.//text()').each do |t|
+        if t.ancestors('pre').empty?
+          t.content = t.text.gsub(/\s+/,' ')
+        else
+          t.content = t.text + "\n"
+        end
+      end
       node.css(swaps.keys.join(',')).each { |n| n.replace(swaps[n.name]) }
       node.css(blocks.join(',')).each { |n| n.after("\n\n") }
       node.css(lists.join(',')).each { |n| n.after("\n").before("* ") }
@@ -193,15 +213,6 @@ module Bulletin
       end
       buffer.join("\n")
     end
-
-    def self.setup_db(production = true)
-      DataMapper.setup(:default, production ?
-        "sqlite://#{File.expand_path('~/.bulletindb')}" :
-        "sqlite3::memory:")
-      if !DataMapper.repository(:default).adapter.storage_exists?('bulletin_items')
-        DataMapper.auto_migrate! 
-      end
-    end
   end
 
   class Item
@@ -221,7 +232,7 @@ module Bulletin
       Item.new(:published_at => (entry.published || Time.now),
                :title => entry.title.to_s.strip,
                :uri => entry.url,
-               :body => entry.content)
+               :body => entry.content || entry.summary)
     end
 
     def full_title

data/bulletin_test.rb

@@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), 'bulletin')
 require 'minitest/autorun'
 
 class BulletinTest < MiniTest::Unit::TestCase
-  Bulletin::App.setup_db(false)
+  Bulletin::App.new.setup_db(false)
 
   def setup
     @bulletin = Bulletin::App.new(false)
@@ -16,6 +16,7 @@ class BulletinTest < MiniTest::Unit::TestCase
   end
 
   def test_refresh
+    @bulletin.options[:expire] = 30
     assert_equal(0, Bulletin::Item.count)
     @bulletin.feed sample_uri
     @bulletin.refresh
@@ -47,8 +48,15 @@ class BulletinTest < MiniTest::Unit::TestCase
     refute(@bulletin.send(:production?))
   end
 
+  def test_html_to_text
+    text = @bulletin.send(
+      :html_to_text,
+      "<!-- comment -->begin<pre><code>line 1\nline2</code></pre>end")
+    assert_equal("begin\n\nline 1\nline2\nend", text)
+  end
+
   private
   def sample_uri
-    File.join(File.expand_path(File.dirname(__FILE__)), 'sample.xml')
+    "file://#{File.join(File.expand_path(File.dirname(__FILE__)), 'sample.xml')}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulletin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter