markview 0.2.3 → 0.2.4

data/README.md

@@ -1,33 +1,25 @@
-Markview
-========
+# Markview
 
-Markview allows you to view nearly any and all markup formatted files in a slick way. Markview is
-inspired by the python library [restview](http://mg.pov.lt/restview/). As of v0.2.0, I've decided 
-to extend markview to render virtually any and all markup formatted README's or what-have-you using 
-the [github-markup](http://github.com/defunkt/github-markup) library.
+Markview allows you to view nearly any and all markup formatted files in a slick way. Markview is inspired by the python library [restview](http://mg.pov.lt/restview/). As of v0.2.0, I've decided to extend markview to render virtually any and all markup formatted README's or what-have-you using the [github-markup](http://www.github.com/defunkt/github-markup) library.
 
-Install
--------
+## Install
 
 New releases of Markview are published to [gemcutter](http://gemcutter.org/gems/markview)
 
 	$ [sudo] gem install markview
 
-Usage
------
+## Usage
 
 Markview is very simple to use. Run the gem from the command line and specify
-a README or other markup file. Markview defaults to finding a README if you choose not to
+a README or other markdown file. Markview defaults to finding a README if you choose not to
 specify the file.
 
 	$ markview README.md
 	
-Preview
--------
+## Preview
 
 ![Markview Preview](http://img.skitch.com/20100225-gt6h7nqqt281hhx4d1qstu7cqm.png)
 	
-Author
-------
+## Author
 
 [Mark Sands](http://github.com/marksands) :: marksands07@gmail.com

data/lib/markview.rb

@@ -1,5 +1,4 @@
 $:.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
-
 require 'sinatra'
 require 'github/markup'
 
@@ -12,7 +11,7 @@ module Markview
     set :static, true
         
     # Renders the html using GitHub::Markup
-    def self.markdown_me
+    def self.markview_me
       ARGV[0] ||= Dir.glob("README*")[0]
       begin
         GitHub::Markup.render(ARGV[0], File.read(ARGV[0]))
@@ -22,8 +21,8 @@ module Markview
     end
 
     get '/' do
-      @markdown = Application.markdown_me
-      @title = ARGF.filename.gsub(/(.+\/)?/, '') # /path/to/README.txt => README.txt
+      @markdown = Markview::Application.markview_me
+      @title = ARGV[0].gsub(/(.+\/)?/, '') # /path/to/README.txt => README.txt
       erb :base
     end
   end   

data/lib/markview/public/style.css

@@ -14,34 +14,35 @@ blockquote,q { quotes:"" ""; }
 
 .clear:after { clear:both; content:""; display:block; height:0; zoom:1; }
 
-body { background:#fff; font-size:15px; }
+body { background:#fff; font-size:13px; }
 body * { line-height:1.4em; }
-body,input,textarea { font-family:'Helvetica Neue',Helvetica,Arial,sans-serif; color:#333; }
-
-a { color:#2e80d3; text-decoration:none; }
-a:hover { text-decoration:underline; }
+body,input,textarea { font-family: helvetica, arial, freesans, clean, sans-serif; color:#333; }
 
 p#file {font-size:150%;}
 
 div#content {margin:2% auto; position:relative; width:920px; }
 div#content > div { float:left; }
-div#content div#markview-output { border: 1px solid #E9E9E9; background:#F8F8F8; padding:5%; overflow-y:auto; }
+div#content div#markview-output { border: 1px solid #E9E9E9; background:#F8F8F8; padding:10px; overflow-y:auto; min-width:900px;}
 
 .markview * {line-height:1.4em;}
-.markview a {text-decoration:none;}
+.markview a {color:#2e80d3; text-decoration:none;}
+.markview a:hover { text-decoration:underline;}
 .markview em {font-style:italic; padding:0 0.08em;}
 .markview i{font-style:italic}
 .markview strong,.markview b{font-weight:bold}
 .markview abbr{border-bottom:1px dashed;cursor:help}
 .markview small{font-size:0.8em}
 
-.markview h1,.markview h2,.markview h3,.markview h4,.markview h5,.markview h6{margin-bottom:0.5em}
-.markview h1{font-size:170%;font-weight:bold}
-.markview h2{font-size:150%;font-weight:bold}
-.markview h3{color:#555;font-size:110%;font-weight:bold}
-.markview h4{color:#777;font-weight:bold}
-.markview h5{color:#777}
-.markview h6{color:#777;font-size:90%}
+.markview h1,.markview h2,.markview h3,.markview h4,.markview h5,.markview h6{margin-bottom:0.5em; color:black;}
+.markview h1{font-size:170% !important; padding-top:0.5em!important;margin-top:1.5em!important;
+	line-height:1.4em; font-weight:bold; border-top: 4px solid #AAA !important; }
+.markview h1:first-child { margin-top:0!important;padding-top:0.25em!important;border-top:none!important;}
+.markview h2{ border-top: 4px solid #ddd; padding-top: 12px; margin-top:30px; margin-bottom:0.75em;}
+.markview h2{font-size:150% !important; font-weight:bold}
+.markview h3{color:black;line-height:1.3em; font-size:1.17em; font-weight:bold; margin-top:1em !important;}
+.markview h4{color:black;line-height:1.4em; font-weight:bold}
+.markview h5{color:black}
+.markview h6{color:black;font-size:90%}
 
 .markview p{line-height:1.5em;margin:0 0 1em}
 
@@ -59,11 +60,15 @@ div#content div#markview-output { border: 1px solid #E9E9E9; background:#F8F8F8;
 .markview table th{background:#eee;border-bottom:1px solid #bbb;padding:0.2em 1em}
 .markview table td{border-bottom:1px solid #ddd;padding:0.2em 1em}
 
-.markview pre{background-color:#f8f8ff;border:1px solid #dedede;color:#444;font-size:90%;line-height:1.5em;margin:0 0 1em;overflow:auto;padding:0.5em}
-.markview pre code{background-color:#f8f8ff;border:medium none;font-size:100%;padding:0}
-.markview code{font-family: Monaco, 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono';background-color:#f8f8ff;border:1px solid #dedede;color:#444;font-size:90%;padding:0 0.2em}
+.markview pre{font-family: Monaco, 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+	background-color:#f8f8ff !important;border:1px solid #dedede !important;color:#444 !important; font-size:90% !important;
+	line-height:1.5em !important; padding: 0.5em !important; margin:1em 0 !important; overflow:auto !important;}
+.markview pre code{background-color:#f8f8ff !important;border:none !important;font-size:100% !important;padding:0 !important}
+.markview code{font-family: Monaco, 'Courier New', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+	background-color:ghostWhite !important;border:1px solid #dedede !important;color:#444 !important; font-size:90%!important;
+	padding:0 0.2em !important}
 
 .markview pre.console{background-color:#000;color:white;font-size:90%;line-height:1.5em;margin:0 0 1em;padding:0.5em}
 .markview pre.console code{background-color:#000;border:medium none;color:#fff;font-size:100%;padding:0}
 .markview pre.console span{color:#888}
-.markview pre.console span.command{color:yellow};
+.markview pre.console span.command{color:yellow};

data/test/render_test.rb

@@ -1,31 +1,28 @@
-require 'contest'
-require 'vegas'
-require 'markview'
+require 'test/test_helper'
 
-class RenderTest < Test::Unit::TestCase
+class RenderTest
   
   test "renders given file" do
-    ARGV[0] = 'README.md'
-    assert_equal GitHub::Markup.render(ARGV[0], File.read(ARGV[0])), Markview::Application.markdown_me
+    assert_equal GitHub::Markup.render(@argv, File.read(@argv)),
+      Markview::Application.markview_me
   end
-  
+
   test "renders discovered file" do
-    ARGV[0] = Dir.glob("README*")[0]
-    assert_equal GitHub::Markup.render(ARGV[0], File.read(ARGV[0])), Markview::Application.markdown_me    
+    discover_file
+    assert_equal GitHub::Markup.render(@argv, File.read(@argv)),
+      Markview::Application.markview_me
   end
-  
+
   test "no markdown file given or found raises error" do
-    ARGV[0] = "bad_file_name"
+    bad_file
     assert_raises LoadError do
-      Markview::Application.markdown_me
+      Markview::Application.markview_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)
-    Process.detach(pid)
-    Process.kill( 'HUP', pid)
+  test "on GET to root" do
+    get "/"
+    should_respond_with_success
   end
-  
+
 end

data/test/test_helper.rb

@@ -0,0 +1,28 @@
+$LOAD_PATH.unshift File.dirname(File.expand_path(__FILE__)) + '/../lib'
+require File.dirname(File.expand_path(__FILE__)) + '/../lib/markview.rb'
+require 'contest'
+require 'rack/test'
+
+class RenderTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  
+  def app
+    Markview::Application.new
+  end
+  
+  def should_respond_with_success
+    assert last_response.ok?
+  end
+  
+  def setup
+    @argv = ARGV[0] = 'README.md'
+  end
+  
+  def discover_file
+    @argv = ARGV[0] = Dir.glob("README*")[0]
+  end
+  
+  def bad_file
+    @argv = ARGV[0] = "bad_file_name"
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Mark Sands
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 -05:00
+date: 2010-03-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,20 @@ dependencies:
         version: 0.7.0
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
+        version: 0.5.3
+  type: :development
+  version_requirements: *id007
 description: Conveniently launches practically any markup formatted files in a browser, rendering on the fly.
 email: marksands07@gmail.com
 executables: 
@@ -115,6 +129,7 @@ files:
 - lib/markview/public/style.css
 - lib/markview/views/base.erb
 - README.md
+- test/test_helper.rb
 - test/render_test.rb
 has_rdoc: true
 homepage: http://github.com/marksands/markview
@@ -147,4 +162,5 @@ signing_key:
 specification_version: 3
 summary: A markup viewer that renders on the fly.
 test_files: 
+- test/test_helper.rb
 - test/render_test.rb