markview 0.1.0 → 0.1.1

data/lib/markview.rb

@@ -4,24 +4,21 @@ require 'sinatra'
 require 'rdiscount'
 
 module Markview
-  class Application < Sinatra::Base
+  class Application < Sinatra::Base    
+    dir = File.dirname(File.expand_path(__FILE__))
 
-    set :views, File.expand_path(File.dirname(__FILE__)) + '/views'
-    set :public, File.expand_path(File.dirname(__FILE__)) + '/static'
+    set :views,  "#{dir}/markview/views"
+    set :public, "#{dir}/markview/public"
+    set :static, true
     
+    # Renders the html using RDiscount
     def self.markdown_me
-      ARGV[0] ||= Dir.glob("*.{md,markdown}")[0]; mdown=""
+      ARGV[0] ||= Dir.glob("*.{md,markdown}")[0];
       begin
-        File.open("#{ARGV[0]}", "r") { |f|
-          f.each_line do |line|
-            mdown += line
-          end
-        }
+        RDiscount.new( File.open("#{ARGV[0]}", 'r').read ).to_html
       rescue Errno::ENOENT
-        raise "Failed to load README. Please specify a file."
-        exit
+        raise LoadError, "Failed open document. Please specify a file."; exit
       end
-      RDiscount.new(mdown).to_html
     end
 
     get '/' do

data/test/render_test.rb

@@ -14,6 +14,13 @@ class RenderTest < Test::Unit::TestCase
     assert_equal RDiscount.new(File.read(ARGV[0])).to_html, Markview::Application.markdown_me    
   end
   
+  test "no markdown file given or found raises error" do
+    ARGV[0] = "bad_file_name"
+    assert_raises LoadError do
+      Markview::Application.markdown_me
+    end
+  end
+  
   test "Vegas runs application" do
     pid = fork { Vegas::Runner.new(Markview::Application, 'markview', :foreground => true, :skip_launch => true, :debug => true) }
     sleep(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markview
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mark Sands
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 -06:00
+date: 2010-02-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.0
     version: 
-description: A markdown viewer that renders on the fly.
+description: Conveniently launches markdown formatted files in a browser, rendering on the fly.
 email: marksands07@gmail.com
 executables: 
 - markview
@@ -73,8 +73,8 @@ extra_rdoc_files: []
 files: 
 - bin/markview
 - lib/markview.rb
-- lib/static/style.css
-- lib/views/base.erb
+- lib/markview/public/style.css
+- lib/markview/views/base.erb
 - README.md
 - test/render_test.rb
 has_rdoc: true