rufus-sixjo 0.1.0 → 0.1.1

data/README.txt

@@ -8,7 +8,7 @@ A 'Rack application' for
 
 == features
 
-not many.
+Does the conditional GET thing.
 
 
 == getting it

data/lib/rufus/sixjo.rb

@@ -29,12 +29,25 @@
 require 'erb'
 require 'rack'
 
+require 'time'
+require 'date'
+
 
 class Rack::Request
 
+  #
+  # not sure about this one, might vanish soon
+  #
   def content
     @env['rack.request.form_vars']
   end
+
+  #
+  # returns an array of ETags
+  #
+  def etags
+    (@env['HTTP_IF_NONE_MATCH'] || '').split(/\s*,\s*/)
+  end
 end
 
 class Rack::Response
@@ -52,7 +65,7 @@ module Rufus
 
   module Sixjo
 
-    VERSION = "0.1.0"
+    VERSION = '0.1.1'
 
     #
     # Sixjo's Rack app
@@ -186,7 +199,7 @@ module Rufus
 
       def erb (template, options = {})
 
-        content = File.open("views/#{template}.erb").read
+        content = File.read("views/#{template}.erb")
 
         l = options[:locals]
         l = Local.new(self, l || {}) unless l.is_a?(Local)
@@ -237,7 +250,7 @@ module Rufus
           end
 
           if caught
-            #puts caught.inspect
+            caught = Array(caught)
             r.response.status = caught[0]
             r.response.body = caught[1]
           end
@@ -256,12 +269,61 @@ module Rufus
         @params
       end
 
+      def h (text)
+        Rack::Utils.escape_html(text)
+      end
+
       def redirect (path, status=303, body=nil)
         @response.status = status
         @response.location = path
         @response.body = body || "#{status} redirecting to #{path}"
         throw :done
       end
+
+      #
+      # throws 304 as needed
+      #
+      def set_etag (t, weak=false)
+
+        t = '"%s"' % t
+        t = weak ? "W/#{t}" : t
+
+        @response.header['ETag'] = t
+
+        etags = @request.etags
+
+        if etags.include?(t) or etags.include?('*')
+          throw(:done, 304) if @request.get? or @request.head?
+          throw(:done, 412) # precondition failed
+        end
+      end
+
+      #
+      # throws 304 as needed
+      #
+      def set_last_modified (t)
+
+        t = Time.local(*t.to_a) # flatten milliseconds
+
+        @response.header['Last-Modified'] = t.httpdate
+
+        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)
+
+        if sin >= t
+          throw(:done, 304) if @request.get? or @request.head?
+          throw(:done, 412) # precondition failed
+        end
+      end
     end
 
     #

data/test/ft_3_erb.rb

@@ -41,17 +41,8 @@ class ErbTest < Test::Unit::TestCase
 
     @app = ErbApp.new_sixjo_rack_app(nil, :environment => 'test')
 
-    FileUtils.mkdir('views') unless File.exist?('views')
-
-    fn = 'views/view0.erb'
-
-    FileUtils.rm(fn) if File.exist?(fn)
-    File.open(fn, 'w') { |f| f.write "this is view0, life is <%= life %>" }
-
-    fn = 'views/view1.erb'
-
-    FileUtils.rm(fn) if File.exist?(fn)
-    File.open(fn, 'w') { |f| f.write "<%= request.path_info %>" }
+    save_view('views/view0.erb', 'this is view0, life is <%= life %>')
+    save_view('views/view1.erb', '<%= request.path_info %>')
   end
 
   def test_0

data/test/ft_5_put.rb

@@ -19,11 +19,15 @@ module PutApp
   post '/' do
     #puts request.inspect
     #request.env['rack.input'].read
-    request.content
+    request.env['rack.request.form_vars']
   end
 
   put '/car' do
-    "put : #{request.content || params[:brand]}"
+    #"put : #{request.content || params[:brand]}"
+    answer = request.body.read
+    answer = params[:brand] if answer.empty?
+    answer = request.env['rack.request.form_vars'] if answer.empty?
+    "put : #{answer}"
   end
 
   delete '/car/:id' do
@@ -93,5 +97,21 @@ class PutTest < Test::Unit::TestCase
         }).status)
     assert_equal 'put : ford', @response.body
   end
+
+  def test_3
+
+    data = "<brand>mitsubishi</brand>"
+
+    assert_equal(
+      200,
+      put(
+        '/car',
+        {
+          :input => data,
+          'CONTENT_LENGTH' => data.length.to_s,
+          'CONTENT_TYPE' => 'application/xml'
+        }).status)
+    assert_equal "put : #{data}", @response.body
+  end
 end
 

data/test/ft_6_h.rb

@@ -0,0 +1,63 @@
+
+#
+# Testing rufus-sixjo
+#
+# jmettraux at gmail.org
+#
+# Mon Aug 25 09:09:34 JST 2008
+#
+
+require 'test/unit'
+require 'testmixins'
+
+#
+# the "test" app
+#
+module HachiHelper
+  extend Rufus::Sixjo
+
+  get '/hello' do
+    hello
+  end
+
+  get '/bundi' do
+    h('<bundi>')
+  end
+
+  get '/bondzoi' do
+    erb :ft6, :locals => { :life => '>good<' }
+  end
+
+  helpers do
+    def hello
+      h("hello #{params[:target]}")
+    end
+  end
+end
+
+class HachiTest < Test::Unit::TestCase
+  include SixjoTestMixin
+
+  def setup
+
+    @app = HachiHelper.new_sixjo_rack_app(nil, :environment => 'test')
+
+    save_view('views/ft6.erb', 'ft6, life is <%= h(life) %>')
+  end
+
+  def test_0
+
+    assert_equal 200, get('/hello?target=maam').status
+    assert_equal 'hello maam', @response.body
+
+    assert_equal 200, get('/bundi').status
+    assert_equal '&lt;bundi&gt;', @response.body
+  end
+
+  def test_1
+
+    assert_equal 200, get('/bondzoi').status
+    assert_equal 'ft6, life is &gt;good&lt;', @response.body
+  end
+end
+

data/test/ft_7_etag.rb

@@ -0,0 +1,72 @@
+
+#
+# Testing rufus-sixjo
+#
+# jmettraux at gmail.org
+#
+# Wed Aug 27 11:12:17 JST 2008
+#
+
+require 'test/unit'
+require 'testmixins'
+
+NOW = Time.now
+
+#
+# the "test" app
+#
+module EtagApp
+  extend Rufus::Sixjo
+
+  get '/hello' do
+    set_etag('wienerli')
+    'hello'
+  end
+
+  get '/sayonara' do
+    set_last_modified(NOW)
+    'sayonara'
+  end
+end
+
+class EtagTest < Test::Unit::TestCase
+  include SixjoTestMixin
+
+  def setup
+
+    @app = EtagApp.new_sixjo_rack_app(nil, :environment => 'test')
+  end
+
+  def test_0_etag
+
+    assert_equal 200, get('/hello').status
+    assert_equal '"wienerli"', @response.headers['ETag']
+    assert_equal 'hello', @response.body
+
+    assert_equal 304, get('/hello', 'HTTP_IF_NONE_MATCH' => '"wienerli"').status
+    assert_equal '"wienerli"', @response.headers['ETag']
+    assert_equal '', @response.body
+  end
+
+  def test_1_last_modified
+
+    assert_equal 200, get('/sayonara').status
+    assert_not_nil @response.headers['Last-Modified']
+    assert_equal 'sayonara', @response.body
+
+    get(
+      '/sayonara',
+      'HTTP_IF_MODIFIED_SINCE' => @response.headers['Last-Modified'])
+    assert_equal 304, @response.status
+    assert_equal '', @response.body
+
+    assert_equal(
+      200,
+      get(
+        '/sayonara',
+        'HTTP_IF_MODIFIED_SINCE' => (Time.now - 3601).httpdate
+      ).status)
+  end
+
+end
+

data/test/test.rb

@@ -5,4 +5,6 @@ require 'ft_2_redirect'
 require 'ft_3_erb'
 require 'ft_4_configure'
 require 'ft_5_put'
+require 'ft_6_h'
+require 'ft_7_etag'
 

data/test/testmixins.rb

@@ -10,6 +10,22 @@
 require 'rubygems'
 require 'rufus/sixjo'
 
+#class Rack::MockResponse
+#  alias :old_init :initialize
+#  def initialize (s, h, b, errors=nil)
+#    puts
+#    p [ :status, s ]
+#    p [ :headers, h ]
+#    p [ :body, b ]
+#    old_init(s, h, b, errors)
+#  end
+#end
+
+class NilClass
+  def empty?
+    true
+  end
+end
 
 module SixjoTestMixin
 
@@ -36,5 +52,13 @@ module SixjoTestMixin
     end
     ret << "--#{MFD_BOUNDARY}--\r\n"
   end
+
+  def save_view (filename, content)
+
+    FileUtils.mkdir('views') unless File.exist?('views')
+
+    FileUtils.rm(filename) if File.exist?(filename)
+    File.open(filename, 'w') { |f| f.write(content) }
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-sixjo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-15 00:00:00 +09:00
+date: 2008-08-28 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,8 @@ files:
 - test/ft_3_erb.rb
 - test/ft_4_configure.rb
 - test/ft_5_put.rb
+- test/ft_6_h.rb
+- test/ft_7_etag.rb
 - test/test.rb
 - test/testmixins.rb
 - README.txt