nitro 0.20.0 → 0.21.0

data/test/nitro/tc_context.rb

@@ -6,12 +6,12 @@ require 'ostruct'
 require 'nitro/context'
 
 class TC_Context < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	
-	def test_context
-		conf = OpenStruct.new
-		conf.dispatcher = nil
-		c = Context.new(conf)
-		assert_equal 200, c.status
-	end
+  include Nitro
+  
+  def test_context
+    conf = OpenStruct.new
+    conf.dispatcher = nil
+    c = Context.new(conf)
+    assert_equal 200, c.status
+  end
 end

data/test/nitro/tc_controller.rb

@@ -10,53 +10,53 @@ require 'nitro/dispatcher'
 require 'nitro/controller'
 
 class TC_Controller < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	
-	class Blog2Controller < Controller
-		attr_reader :aflag, :tflag
-
-		@template_root = File.expand_path(Nitro::LibPath + '../../test/public/blog')
-
-		def list
-			@aflag = true 
-		end
-	end
-	
-	def setup
-		@disp = Dispatcher.new({
-			'/blog' => Blog2Controller,
-		})
-		@conf = OpenStruct.new
-		@conf.dispatcher = @disp
-	end
-	
-	def test_render
-		ctx = Context.new(@conf)
-		ctx.headers = {}
-		ctx.params = {}
-		ctx.headers['REQUEST_URI'] = '/blog/list'
-		ctx.instance_eval '@session = {}'
-		klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
-		c = klass.new(ctx)
-
-		begin
-			c.send(action)
-		rescue RenderExit
-			# drink
-		end
-
-		assert_equal true, c.aflag
-		assert_equal true, $include1
-		assert_equal true, $include2
-
-		# the template is compiled
-		assert_equal true, c.tflag
-	end
-
-	def test_action_methods
-		# aflag/tflag are counted too!
-		assert_equal 3, Blog2Controller.action_methods.size
-		assert Blog2Controller.action_methods.include?('list')
-	end
+  include Nitro
+  
+  class Blog2Controller < Controller
+    attr_reader :aflag, :tflag
+
+    @template_root = File.expand_path(Nitro::LibPath + '../../test/public/blog')
+
+    def list
+      @aflag = true 
+    end
+  end
+  
+  def setup
+    @disp = Dispatcher.new({
+      '/blog' => Blog2Controller,
+    })
+    @conf = OpenStruct.new
+    @conf.dispatcher = @disp
+  end
+  
+  def test_render
+    ctx = Context.new(@conf)
+    ctx.headers = {}
+    ctx.params = {}
+    ctx.headers['REQUEST_URI'] = '/blog/list'
+    ctx.instance_eval '@session = {}'
+    klass, action = ctx.dispatcher.dispatch(ctx.path, ctx)
+    c = klass.new(ctx)
+
+    begin
+      c.send(action)
+    rescue RenderExit
+      # drink
+    end
+
+    assert_equal true, c.aflag
+    assert_equal true, $include1
+    assert_equal true, $include2
+
+    # the template is compiled
+    assert_equal true, c.tflag
+  end
+
+  def test_action_methods
+    # aflag/tflag are counted too!
+    assert_equal 3, Blog2Controller.action_methods.size
+    assert Blog2Controller.action_methods.include?('list')
+  end
 
 end

data/test/nitro/tc_cookie.rb

@@ -5,10 +5,10 @@ require 'test/unit'
 require 'nitro/cookie'
 
 class TC_Cookie < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	
-	def test_init
-		c = Cookie.new('hello', 'world')
-		assert_equal '/', c.path
-	end
+  include Nitro
+  
+  def test_init
+    c = Cookie.new('hello', 'world')
+    assert_equal '/', c.path
+  end
 end

data/test/nitro/tc_dispatcher.rb

@@ -4,78 +4,78 @@ require 'test/unit'
 require 'nitro/dispatcher'
 
 class TC_Dispatcher < Test::Unit::TestCase # :nodoc: all
-	include Nitro
+  include Nitro
 
-	class MainController < Controller
-	end
+  class MainController < Controller
+  end
 
-	class BlogController < Controller
-	end
-	
-	def setup
-		@d = Dispatcher.new({
-			'/' => MainController,
-			'/blog' => BlogController
-		})
+  class BlogController < Controller
+  end
+  
+  def setup
+    @d = Dispatcher.new({
+      '/' => MainController,
+      '/blog' => BlogController
+    })
 
-		@dxml = Dispatcher.new({
-			'/' => MainController,
-			'/blog' => BlogController,
-			# FIXME: this is a hack!
-			'xml:blog' => BlogController
-		})
-	end
-	
-	def teardown
-		@d = @dxml = nil
-	end
+    @dxml = Dispatcher.new({
+      '/' => MainController,
+      '/blog' => BlogController,
+      # FIXME: this is a hack!
+      'xml:blog' => BlogController
+    })
+  end
+  
+  def teardown
+    @d = @dxml = nil
+  end
 
-	def test_initialize
-		d = Dispatcher.new(BlogController)
-		assert_equal BlogController, d.controllers['/']
-	end
-	
-	def test_dispatch
-		klass, action = @d.dispatch('/blog/list')
-		assert_equal BlogController, klass
-		assert_equal 'list_action', action
-		
-		klass, action = @d.dispatch('/blog/another/very_litle/list')
-		assert_equal BlogController, klass
-		assert_equal 'another__very_litle__list_action', action
-		
-		klass, action = @d.dispatch('/another/litle/list')
-		assert_equal MainController, klass
-		assert_equal 'another__litle__list_action', action
-		
-		klass, action = @d.dispatch('/blog')
-		assert_equal BlogController, klass
-		assert_equal 'index_action', action
-		
-		klass, action, ctype = @d.dispatch('/login')
-		assert_equal MainController, klass
-		assert_equal 'login_action', action
-		
-		klass, action = @d.dispatch('/')
-		assert_equal MainController, klass
-		assert_equal 'index_action', action
+  def test_initialize
+    d = Dispatcher.new(BlogController)
+    assert_equal BlogController, d.controllers['/']
+  end
+  
+  def test_dispatch
+    klass, action = @d.dispatch('/blog/list')
+    assert_equal BlogController, klass
+    assert_equal 'list_action', action
+    
+    klass, action = @d.dispatch('/blog/another/very_litle/list')
+    assert_equal BlogController, klass
+    assert_equal 'another__very_litle__list_action', action
+    
+    klass, action = @d.dispatch('/another/litle/list')
+    assert_equal MainController, klass
+    assert_equal 'another__litle__list_action', action
+    
+    klass, action = @d.dispatch('/blog')
+    assert_equal BlogController, klass
+    assert_equal 'index_action', action
+    
+    klass, action, ctype = @d.dispatch('/login')
+    assert_equal MainController, klass
+    assert_equal 'login_action', action
+    
+    klass, action = @d.dispatch('/')
+    assert_equal MainController, klass
+    assert_equal 'index_action', action
 
 =begin
-		# gmosx: this functionality is deprecated. Use multiple
-		# controller to define multiple apis.
-			
-		# multi-api dispatcher. 
+    # gmosx: this functionality is deprecated. Use multiple
+    # controller to define multiple apis.
+      
+    # multi-api dispatcher. 
 
-		# no xml prefix, use xhtml api.
-		klass, action = @dxml.dispatch('/blog/list')
-		assert_equal BlogController, klass
-		assert_equal 'list_action', action
+    # no xml prefix, use xhtml api.
+    klass, action = @dxml.dispatch('/blog/list')
+    assert_equal BlogController, klass
+    assert_equal 'list_action', action
 
-		# xml prefix, use xml api.
-		klass, action = @dxml.dispatch('/xml:blog/list')
-		assert_equal BlogController, klass
-		assert_equal 'list_action', action
+    # xml prefix, use xml api.
+    klass, action = @dxml.dispatch('/xml:blog/list')
+    assert_equal BlogController, klass
+    assert_equal 'list_action', action
 =end
-	end
+  end
 
 end

data/test/nitro/tc_element.rb

@@ -8,38 +8,38 @@ include Nitro
 
 $source = %{
 <html>
-	<?r a = 5 ?>
-	Here is some text
-	<body style="hidden" name="1">
-		Some more
-		<Box color="#f00">
-			Hello World
-			<Box color="#ff0">
-				<b>nice</b>
-				<i>stuff</i>
-				<Box color="#fff">
-					It works
-				</Box>
-			</Box>
-			Text
-		</Box>
-		The End
-	</body>
+  <?r a = 5 ?>
+  Here is some text
+  <body style="hidden" name="1">
+    Some more
+    <Box color="#f00">
+      Hello World
+      <Box color="#ff0">
+        <b>nice</b>
+        <i>stuff</i>
+        <Box color="#fff">
+          It works
+        </Box>
+      </Box>
+      Text
+    </Box>
+    The End
+  </body>
 </html>
 }
 
 class Box < Nitro::Element
-	def open
-		%|<div style="color: #@color">|
-	end
-	
-	def close
-		"</div>"
-	end
+  def open
+    %|<div style="color: #@color">|
+  end
+  
+  def close
+    "</div>"
+  end
 end
 
 class TC_Element < Test::Unit::TestCase # :nodoc: all
-	def test_all
-		res = ElementProcessor.render($source)
-	end
+  def test_all
+    res = ElementProcessor.transform($source)
+  end
 end

data/test/nitro/tc_flash.rb

@@ -8,38 +8,38 @@ require 'nitro/controller'
 require 'nitro/flash'
 
 class TC_Flash < Test::Unit::TestCase # :nodoc: all
-	include Nitro
+  include Nitro
 
-	class MyController < Controller
-		attr_accessor :flag
-		
-		def action1
-			flash[:msg] = 'Hello world!'
-		end
-		
-		def action2
-			@flag = flash[:msg]
-		end
-	end
+  class MyController < Controller
+    attr_accessor :flag
+    
+    def action1
+      flash[:msg] = 'Hello world!'
+    end
+    
+    def action2
+      @flag = flash[:msg]
+    end
+  end
 
-	def setup
-		@conf = OpenStruct.new
-	end
+  def setup
+    @conf = OpenStruct.new
+  end
 
-	def teardown
-		@conf = nil
-	end
-	
-	def test_all
-		ctx = Context.new(@conf)
-		ctx.headers = {}
-		ctx.params = {}
-		ctx.instance_eval '@session = {}'
-		c = MyController.new(ctx)	
-		c.action1
-		c.action2
-		assert_equal 'Hello world!', c.flag
-		c.action2
-		assert_equal 'Hello world!', c.flag
-	end	
+  def teardown
+    @conf = nil
+  end
+  
+  def test_all
+    ctx = Context.new(@conf)
+    ctx.headers = {}
+    ctx.params = {}
+    ctx.instance_eval '@session = {}'
+    c = MyController.new(ctx)  
+    c.action1
+    c.action2
+    assert_equal 'Hello world!', c.flag
+    c.action2
+    assert_equal 'Hello world!', c.flag
+  end  
 end

data/test/nitro/tc_mail.rb

@@ -9,74 +9,74 @@ require 'nitro'
 require 'nitro/mail'
 
 class TestCaseMail < Test::Unit::TestCase # :nodoc: all
-	include Nitro
-	
-	class DummyMailer < Mailer
-		def initialize 
-			super
-			@bcc = 'gm@navel.gr'
-			@template_root = 'test/public/dummy_mailer'
-		end
-
-		def registration(to, username, token)
-			@to = to 
-			@from = 'system@navel.gr'
-			@subject = 'Nitro.com registration'
-			@cc = 'gm@navel.gr'
-			@body.username = username
-			@body.token = token
-		end
-
-		def greek(to)
-			@to = to 
-			@from = 'system@navel.gr'
-			@subject = 'Ελληνικός Τίτλος'
-			@cc = 'gm@navel.gr'
-			@body = 'Τί έγινε ρε παιδιά;'
-		end
-	end
-
-	class DummyController < Controller
-		# mailer DummyMailer
-
-		def register
-			token = 999
-			deliver_registration('gmosx@navel.gr', 'gmosx', token)
-		end
-	end
-
-	def test_mail
-		m = Mail.new 'gmosx@navel.gr', 'drak@navel.gr', 'A simple test', 'This is the body of the message'
-		expected = %{From: gmosx@navel.gr
+  include Nitro
+  
+  class DummyMailer < Mailer
+    def initialize 
+      super
+      @bcc = 'gm@navel.gr'
+      @template_root = 'test/public/dummy_mailer'
+    end
+
+    def registration(to, username, token)
+      @to = to 
+      @from = 'system@navel.gr'
+      @subject = 'Nitro.com registration'
+      @cc = 'gm@navel.gr'
+      @body.username = username
+      @body.token = token
+    end
+
+    def greek(to)
+      @to = to 
+      @from = 'system@navel.gr'
+      @subject = 'Ελληνικός Τίτλος'
+      @cc = 'gm@navel.gr'
+      @body = 'Τί έγινε ρε παιδιά;'
+    end
+  end
+
+  class DummyController < Controller
+    # mailer DummyMailer
+
+    def register
+      token = 999
+      deliver_registration('gmosx@navel.gr', 'gmosx', token)
+    end
+  end
+
+  def test_mail
+    m = Mail.new 'gmosx@navel.gr', 'drak@navel.gr', 'A simple test', 'This is the body of the message'
+    expected = %{From: gmosx@navel.gr
 To: drak@navel.gr
 Subject: A simple test
 
 This is the body of the message}
-		assert_equal expected, m.encoded
+    assert_equal expected, m.encoded
 
-		m.to = %w{ renos@navel.gr stella@navel.gr }
-		expected = %{From: gmosx@navel.gr
+    m.to = %w{ renos@navel.gr stella@navel.gr }
+    expected = %{From: gmosx@navel.gr
 To: renos@navel.gr, stella@navel.gr
 Subject: A simple test
 
 This is the body of the message}
-		assert_equal expected, m.encoded
-
-	end
-	
-	def test_mailer
-		assert_equal 0, DummyMailer.deliveries.size 
-
-		Mailer.server[:address] = 'mail.navel.gr'
-		assert_equal 'mail.navel.gr', DummyMailer.server[:address]
-
-		DummyMailer.delivery_method = :test
-		DummyMailer.template_root = File.join(File.dirname(__FILE__), '..', 'root', 'dummy_mailer')
-		token = 999
-		DummyMailer.deliver_registration('gm@navel.gr', 'gmosx', token)
-		assert_equal 1, DummyMailer.deliveries.size 
-		
-		expected = %{From: system@navel.gr
+    assert_equal expected, m.encoded
+
+  end
+  
+  def test_mailer
+    assert_equal 0, DummyMailer.deliveries.size 
+
+    Mailer.server[:address] = 'mail.navel.gr'
+    assert_equal 'mail.navel.gr', DummyMailer.server[:address]
+
+    DummyMailer.delivery_method = :test
+    DummyMailer.template_root = File.join(File.dirname(__FILE__), '..', 'root', 'dummy_mailer')
+    token = 999
+    DummyMailer.deliver_registration('gm@navel.gr', 'gmosx', token)
+    assert_equal 1, DummyMailer.deliveries.size 
+    
+    expected = %{From: system@navel.gr
 To: gm@navel.gr
 Cc: gm@navel.gr
 Bcc: gm@navel.gr
@@ -88,10 +88,10 @@ how do you feel?
 
 Here is your <b>Token</b>: 999
 }
-		assert_equal expected, DummyMailer.deliveries[0].encoded
+    assert_equal expected, DummyMailer.deliveries[0].encoded
 
-		DummyMailer.deliver_greek('gm@navel.gr')
-		assert_equal 2, DummyMailer.deliveries.size 
-	end
+    DummyMailer.deliver_greek('gm@navel.gr')
+    assert_equal 2, DummyMailer.deliveries.size 
+  end
 
 end