rufus-sixjo 0.1.3 → 0.1.4

data/lib/rufus/sixjo.rb

@@ -65,7 +65,22 @@ module Rufus
 
   module Sixjo
 
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
+
+    class << self
+      # View path (defaults to +views+, in the current working directory)
+      @@view_path = './views'
+
+      # Return the path to the views folder
+      def view_path
+        @@view_path
+      end
+
+      # Set the base path to the views folder
+      def view_path=( path )
+        @@view_path = path
+      end
+    end
 
     #
     # Sixjo's Rack app
@@ -204,7 +219,7 @@ module Rufus
 
       def erb (template, options = {})
 
-        content = File.read("views/#{template}.erb")
+        content = File.read( Sixjo.view_path + "/#{template}.erb")
           #
           # TODO : make views/ configurable
 
@@ -314,23 +329,26 @@ module Rufus
       #
       def set_last_modified (t)
 
-        t = Time.local(*t.to_a) # flatten milliseconds
+        #t = Time.local(*t.to_a) # flatten milliseconds
+        #@response.header['Last-Modified'] = t.httpdate
 
-        @response.header['Last-Modified'] = t.httpdate
+        t = t.httpdate
+        @response.header['Last-Modified'] = t
 
         sin = @request.env['HTTP_IF_MODIFIED_SINCE']
 
         return unless sin
 
-        # taken from the "Ruby Cookbook" by
-        # Lucas Carlson and Leonard Richardson
-        #
-        sin = DateTime.parse(sin)
-        sin = sin.new_offset(DateTime.now.offset - sin.offset)
-        sin = Time.local(
-          sin.year, sin.month, sin.day, sin.hour, sin.min, sin.sec, 0)
+        ## taken from the "Ruby Cookbook" by
+        ## Lucas Carlson and Leonard Richardson
+        ##
+        #sin = DateTime.parse(sin)
+        #sin = sin.new_offset(DateTime.now.offset - sin.offset)
+        #sin = Time.local(
+        #  sin.year, sin.month, sin.day, sin.hour, sin.min, sin.sec, 0)
 
-        if sin >= t
+        #if sin >= t
+        if sin == t
           throw(:done, 304) if @request.get? or @request.head?
           throw(:done, 412) # precondition failed
         end

data/test/ft_0_simple.rb

@@ -17,12 +17,16 @@ module Simple
   extend Rufus::Sixjo
 
   get '/toto' do
-    "toto"
+    'toto'
   end
 
   get '/toto/:id' do
     "toto with id #{params[:id]} .#{request.env['_FORMAT']}"
   end
+
+  #get '/(momo|dodo)/:id' do
+  #  "modo with id #{params[:id]}"
+  #end
 end
 
 class SimpleTest < Test::Unit::TestCase
@@ -37,16 +41,21 @@ class SimpleTest < Test::Unit::TestCase
     assert_equal 404, get('/nada').status
 
     assert_equal 200, get('/toto').status
-    assert_equal "toto", @response.body
+    assert_equal 'toto', @response.body
 
     assert_equal 200, get('/toto/3').status
-    assert_equal "toto with id 3 .", @response.body
+    assert_equal 'toto with id 3 .', @response.body
 
     assert_equal 200, get('/toto/3.json').status
-    assert_equal "toto with id 3 .json", @response.body
+    assert_equal 'toto with id 3 .json', @response.body
 
     assert_equal 200, get('/toto/3.json?q=nada').status
-    assert_equal "toto with id 3 .json", @response.body
+    assert_equal 'toto with id 3 .json', @response.body
   end
+
+  #def test_1
+  #  assert_equal 200, get('/momo/2').status
+  #  assert_equal 'modo with id 2', @response.body
+  #end
 end
 

data/test/ft_3_erb.rb

@@ -36,6 +36,10 @@ module ErbApp
   get '/good3' do
     erb :view0, :whatever => true, :locals => { :life => nil }
   end
+
+  get '/nested' do
+    erb :nested0
+  end
 end
 
 class ErbTest < Test::Unit::TestCase
@@ -47,6 +51,7 @@ class ErbTest < Test::Unit::TestCase
 
     save_view('views/view0.erb', 'this is view0, life is <%= life %>')
     save_view('views/view1.erb', '<%= request.path_info %>')
+    save_view('views/nested/nested0.erb', 'this is nested0, obviously')
   end
 
   def test_0
@@ -68,5 +73,18 @@ class ErbTest < Test::Unit::TestCase
     assert_equal 200, get('/good3').status
     assert_equal 'this is view0, life is ', @response.body
   end
+
+  def test_2
+
+    assert_equal 500, get('/nested').status
+
+    old_view_path = Rufus::Sixjo.view_path
+    Rufus::Sixjo.view_path = 'views/nested'
+
+    assert_equal 200, get('/nested').status
+    assert_equal 'this is nested0, obviously', @response.body
+
+    Rufus::Sixjo.view_path = old_view_path
+  end
 end
 

data/test/testmixins.rb

@@ -32,9 +32,8 @@ module SixjoTestMixin
   [ :post, :get, :put, :delete, :head ].each do |v|
     module_eval <<-EOS
       def #{v} (path, options={})
-        @response = \
-          Rack::MockRequest.new(@app).request('#{v}'.upcase, path, options)
-        @response
+        @request = Rack::MockRequest.new(@app)
+        @response = @request.request('#{v}'.upcase, path, options)
       end
     EOS
   end
@@ -55,7 +54,7 @@ module SixjoTestMixin
 
   def save_view (filename, content)
 
-    FileUtils.mkdir('views') unless File.exist?('views')
+    FileUtils.mkdir_p( File.dirname( filename ) ) unless File.exists?( File.dirname( filename ) )
 
     FileUtils.rm(filename) if File.exist?(filename)
     File.open(filename, 'w') { |f| f.write(content) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-sixjo
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +09:00
+date: 2008-12-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - rack
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: a rack application