wbzyl-sinatra-rdiscount 0.0.6 → 0.0.8

data/.gitignore

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

data/README.markdown

@@ -1,17 +1,18 @@
-# RDiscount Templates for Sinatra
+# Extension providing RDiscount templates for Sinatra
 
-The *sinatra-rdiscount* gem is an extension for Sinatra.
-It provides a request-helper method named *rdiscount*
+The *sinatra-rdiscount* gem is an extension for Sinatra
+implemented as a gem.
+It provides a request-helper method named `rdiscount`
 for rendering RDiscount templates.
 
-To use this extension, first install the gem on your system:
+To use this extension, first install *sinatra-rdiscount* gem:
 
     git clone git://github.com/wbzyl/sinatra-rdiscount.git
     cd sinatra-rdiscount
     gem build sinatra-rdiscount
     sudo gem install sinatra-rdiscount
 
-Then create simple Sinatra application *app.rb*:
+Then create a simple Sinatra application *app.rb*:
 
     require 'rubygems'
     require 'sinatra'
@@ -30,12 +31,11 @@ The result could be seen here: *http://localhost:4567*.
 Another example could be find in the *examples* directory.   
 
 
-## Views / Templates
+## Template Languages (*update to The Sinatra Book*) 
 
 One important thing to remember is that you always have to reference
 templates and layouts with **symbols**, even if they’re in a subdirectory,
 for example `:'subdir/template'`.
-
 Rendering methods will render any strings passed to them directly.
 
 
@@ -55,17 +55,14 @@ renders template *./views/index.rdiscount*.
 If a layout named *layout.rdiscount* exists, it will be used each time
 a template is rendered.
 
-You can disable layouts by passing:
-
-    :layout => false
-
-For example
+You can disable layouts by passing `:layout => false` 
+to *rdiscount* helper. For example
 
     get '/' do
       rdiscount :index, :layout => false
     end
 
-You can set a different layout from the default with:
+You can set a different layout from the default one with:
 
     get '/' do
       rdiscount :index, :layout => :application

data/Rakefile

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+require 'rake'
+require 'rake/testtask'
+require "rake/clean"
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "sinatra-rdiscount"
+    s.summary = "An extension providing RDiscount templates for Sinatra applications."
+    s.email = "matwb@univ.gda.pl"
+    s.homepage = "http://github.com/wbzyl/sinatra-rdiscount"
+    s.description = "An extension providing RDiscount templates for Sinatra applications."
+    s.authors = ["Włodek Bzyl"]
+
+    s.add_dependency 'rdiscount', '>=1.3.4'
+    s.add_dependency 'erubis', '>=2.6.4'  
+  end
+rescue LoadError
+  puts "Jeweler not available."
+  puts "Install it with:"
+  puts "  sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+desc 'Install the package as a gem.'
+task :install => [:clean, :build] do
+  gem = Dir['pkg/*.gem'].first
+  sh "sudo gem install --no-rdoc --no-ri --local #{gem}"
+end
+
+task :default => :test

data/examples/config.ru

@@ -2,8 +2,6 @@
 
 require 'app'
 
-use Rack::Static,
-    :urls => ["/stylesheets"],
-    :root => "public"
+use Rack::Static, :urls => ["/stylesheets"], :root => "public"
 
 run Sinatra::Application

data/lib/sinatra/rdiscount.rb

@@ -1,11 +1,12 @@
+require 'erubis'
+require 'rdiscount'
+
 require 'sinatra/base'
 
 module Sinatra
   module RDiscountTemplate
 
     def rdiscount(template, options={}, locals={})
-      require 'erubis' unless defined? ::Erubis::Eruby      
-      require 'rdiscount' unless defined? ::RDiscount
       render :rdiscount, template, options, locals
     end
     

data/sinatra-rdiscount.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "sinatra-rdiscount"
-  s.version = '0.0.6'
+  s.version = '0.0.8'
   s.date = '2009-03-31'
   
   s.summary = "RDiscount templates for Sinatra applications"
   s.email = "matwb@univ.gda.pl"
   s.homepage = "http://github.com/wbzyl/sinatra-rdiscount"
-  s.description = "RDiscount templates for Sinatra applications"
+  s.description = ""
   s.authors = ["Włodek Bzyl"]
   s.files = %w{.gitignore
                sinatra-rdiscount.gemspec
@@ -16,7 +16,10 @@ Gem::Specification.new do |s|
                README.markdown
                LICENSE
                lib/sinatra/rdiscount.rb
-               test/spec_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

data/test/sinatra_rdiscount_test.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class SinatraRDiscountTest < Test::Unit::TestCase
+  include Sinatra::Test
+  
+  def rdiscount_app(&block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'      
+      helpers Sinatra::RDiscountTemplate
+      set :show_exceptions, false
+      get '/', &block
+    }
+    get '/'
+  end
+  
+  def test_renders_inline_strings
+    rdiscount_app { rdiscount 'hello world' }
+    assert ok?
+    assert_equal "<p>hello world</p>\n", body
+  end
+  
+  def test_renders_inline_erb_string
+    rdiscount_app { rdiscount '{%= 1 + 1 %}' }
+    assert ok?
+    assert_equal "<p>2</p>\n", body
+  end
+
+  def test_renders_files_in_views_path
+    rdiscount_app { rdiscount :hello }
+    assert ok?
+    assert_equal "<h1>hello world</h1>\n", body
+  end
+  
+  def test_takes_locals_option
+    rdiscount_app {
+      locals = {:foo => 'Bar'}
+      rdiscount "{%= foo %}", :locals => locals
+    }
+    assert ok?
+    assert_equal "<p>Bar</p>\n", 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
+  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
+  end
+
+  def test_renders_erb_with_blocks
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'      
+      helpers Sinatra::RDiscountTemplate
+      
+      def container
+        yield
+      end
+      def is;
+        "THIS. IS. SPARTA!"
+      end
+      
+      get '/' do
+        rdiscount '{% container do %} {%= is %} {% end %}'
+      end
+    }
+    
+    get '/'
+    assert ok?
+    assert_equal "<p> THIS. IS. SPARTA! </p>\n", body
+  end
+  
+  def test_raises_error_if_template_not_found
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'      
+      helpers Sinatra::RDiscountTemplate
+      set :show_exceptions, false
+      
+      get('/') { rdiscount :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'test/unit'
+require 'sinatra/test'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'sinatra/rdiscount'
+
+require 'rdiscount'
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+end

data/test/views/hello.rdiscount

@@ -0,0 +1 @@
+# hello world

data/test/views/layout2.rdiscount

@@ -0,0 +1,2 @@
+erb layout
+<%= yield %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wbzyl-sinatra-rdiscount
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors: 
 - "W\xC5\x82odek Bzyl"
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.4
     version: 
-description: RDiscount templates for Sinatra applications
+description: ""
 email: matwb@univ.gda.pl
 executables: []
 
@@ -57,7 +57,10 @@ files:
 - README.markdown
 - LICENSE
 - lib/sinatra/rdiscount.rb
-- test/spec_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