wbzyl-sinatra-rdiscount 0.1.0 → 0.1.1

data/VERSION.yml

@@ -0,0 +1,4 @@
+---
+:major: 0
+:minor: 1
+:patch: 1

data/examples/mapp.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'sinatra/base'
+require 'sinatra/rdiscount'
+
+require 'rack'
+
+class MApp < Sinatra::Base
+  helpers Sinatra::RDiscount
+
+  get '/' do
+    rdiscount "## hello form modular app"
+  end
+end
+
+Rack::Handler::Thin.run MApp.new, :Port => 4567

data/test/sinatra_rdiscount_test.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class SinatraRDiscountTest < Test::Unit::TestCase
-  include Sinatra::Test
+  include Rack::Test::Methods
   
   def rdiscount_app(&block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'      
-      helpers Sinatra::RDiscountTemplate
+      helpers Sinatra::RDiscount
       set :show_exceptions, false
       get '/', &block
     }
@@ -15,20 +15,20 @@ class SinatraRDiscountTest < Test::Unit::TestCase
   
   def test_renders_inline_strings
     rdiscount_app { rdiscount 'hello world' }
-    assert ok?
-    assert_equal "<p>hello world</p>\n", body
+    assert last_response.ok?
+    assert_equal "<p>hello world</p>\n", last_response.body
   end
   
   def test_renders_inline_erb_string
     rdiscount_app { rdiscount '{%= 1 + 1 %}' }
-    assert ok?
-    assert_equal "<p>2</p>\n", body
+    assert last_response.ok?
+    assert_equal "<p>2</p>\n", last_response.body
   end
 
   def test_renders_files_in_views_path
     rdiscount_app { rdiscount :hello }
-    assert ok?
-    assert_equal "<h1>hello world</h1>\n", body
+    assert last_response.ok?
+    assert_equal "<h1>hello world</h1>\n", last_response.body
   end
   
   def test_takes_locals_option
@@ -36,30 +36,30 @@ class SinatraRDiscountTest < Test::Unit::TestCase
       locals = {:foo => 'Bar'}
       rdiscount "{%= foo %}", :locals => locals
     }
-    assert ok?
-    assert_equal "<p>Bar</p>\n", body
+    assert last_response.ok?
+    assert_equal "<p>Bar</p>\n", last_response.body
   end
 
   def test_renders_with_inline_layouts
     rdiscount_app {
       rdiscount 'Sparta', :layout => 'THIS. IS. <%= yield.upcase %>' 
     }
-    assert ok?
-    assert_equal "THIS. IS. <P>SPARTA</P>\n", body
+    assert last_response.ok?
+    assert_equal "THIS. IS. <P>SPARTA</P>\n", last_response.body
   end
 
   def test_renders_with_file_layouts
     rdiscount_app {
       rdiscount 'hello world', :layout => :layout2
     }
-    assert ok?
-    assert_equal "erb layout\n<p>hello world</p>\n\n", body
+    assert last_response.ok?
+    assert_equal "erb layout\n<p>hello world</p>\n\n", last_response.body
   end
 
   def test_renders_erb_with_blocks
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'      
-      helpers Sinatra::RDiscountTemplate
+      helpers Sinatra::RDiscount
       
       def container
         yield
@@ -74,14 +74,14 @@ class SinatraRDiscountTest < Test::Unit::TestCase
     }
     
     get '/'
-    assert ok?
-    assert_equal "<p> THIS. IS. SPARTA! </p>\n", body
+    assert last_response.ok?
+    assert_equal "<p> THIS. IS. SPARTA! </p>\n", last_response.body
   end
   
   def test_raises_error_if_template_not_found
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'      
-      helpers Sinatra::RDiscountTemplate
+      helpers Sinatra::RDiscount
       set :show_exceptions, false
       
       get('/') { rdiscount :no_such_template }

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'test/unit'
-require 'sinatra/test'
+require 'rack/test'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sinatra/rdiscount'
@@ -8,7 +8,9 @@ require 'sinatra/rdiscount'
 require 'rdiscount'
 
 class Test::Unit::TestCase
-  include Sinatra::Test
+  include Rack::Test::Methods
+  
+  attr_reader :app
 
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wbzyl-sinatra-rdiscount
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "W\xC5\x82odek Bzyl"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,36 +22,37 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.4
     version: 
-description: ""
+description: An extension providing RDiscount templates for Sinatra applications.
 email: matwb@univ.gda.pl
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
-files: 
-- .gitignore
-- sinatra-rdiscount.gemspec
-- Rakefile
+extra_rdoc_files: 
+- LICENSE
 - README.markdown
+files: 
 - LICENSE
+- README.markdown
+- Rakefile
+- VERSION.yml
+- examples/app.rb
+- examples/config.ru
+- examples/mapp.rb
+- examples/public/stylesheets/application.css
+- examples/views/hello.rdiscount
+- examples/views/hello2.rdiscount
+- examples/views/layout2.rdiscount
 - lib/sinatra/rdiscount.rb
-- test/test_helper.rb
 - test/sinatra_rdiscount_test.rb
+- test/test_helper.rb
 - test/views/hello.rdiscount
 - test/views/layout2.rdiscount
-- examples/app.rb
-- examples/config.ru
-- examples/views/layout2.rdiscount
-- examples/views/hello2.rdiscount
-- examples/views/hello.rdiscount
-- examples/public/stylesheets/application.css
 has_rdoc: false
 homepage: http://github.com/wbzyl/sinatra-rdiscount
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,7 +72,10 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: RDiscount templates for Sinatra applications
-test_files: []
-
+specification_version: 3
+summary: An extension providing RDiscount templates for Sinatra applications.
+test_files: 
+- test/test_helper.rb
+- test/sinatra_rdiscount_test.rb
+- examples/mapp.rb
+- examples/app.rb

data/.gitignore

@@ -1,2 +0,0 @@
-pkg/*
-*.gem

data/sinatra-rdiscount.gemspec

@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "sinatra-rdiscount"
-  s.version = '0.1.0'
-  s.date = '2009-05-01'
-  
-  s.summary = "RDiscount templates for Sinatra applications"
-  s.email = "matwb@univ.gda.pl"
-  s.homepage = "http://github.com/wbzyl/sinatra-rdiscount"
-  s.description = ""
-  s.authors = ["Włodek Bzyl"]
-  s.files = %w{.gitignore
-               sinatra-rdiscount.gemspec
-               Rakefile
-               README.markdown
-               LICENSE
-               lib/sinatra/rdiscount.rb
-               test/test_helper.rb
-               test/sinatra_rdiscount_test.rb
-               test/views/hello.rdiscount
-               test/views/layout2.rdiscount
-               examples/app.rb
-               examples/config.ru
-               examples/views/layout2.rdiscount
-               examples/views/hello2.rdiscount
-               examples/views/hello.rdiscount
-               examples/public/stylesheets/application.css}
-
-  s.add_dependency 'erubis', '>=2.6.4'  
-  
-  s.rubygems_version = '1.3.1'
-end