rackful 0.1.4 → 0.2.0

data/lib/rackful/middleware/relative_location.rb

@@ -1,71 +0,0 @@
-# Copyright ©2011-2012 Pieter van Beek <pieterb@sara.nl>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'rackful'
-require 'rack/request'
-
-=begin markdown
-Rack middleware, inspired by {Rack::RelativeRedirect}.
-
-This middleware allows you to return a relative or absolute path your +Location:+
-response header.
-This was common practice in HTTP/1.0, but HTTP/1.1 requires a full URI in the
-+Location:+ header.
-This middleware automatically translates your path to a full URI.
-
-Differences with {Rack::RelativeRedirect}:
-
--   uses Rack::Request::base_url for creating absolute URIs.
--   the `Location:` header, if present, is always rectified, independent of the
-    HTTP status code.
-=end
-class Rackful::RelativeLocation
-
-def initialize(app)
-  @app = app
-end
-
-def call_old(env)
-  res = @app.call(env)
-  if ( location = res[1]['Location'] ) and
-     ! %r{\A[a-z]+://}.match(location)
-    request = Rack::Request.new env
-    unless '/' == location[0, 1]
-      path = ( res[1]['Content-Location'] || request.path ).dup
-      path[ %r{[^/]*\z} ] = ''
-      location = File.expand_path( location, path )
-    end
-    if '/' == location[0, 1]
-      location = request.base_url + location
-    end
-    res[1]['Location'] = location
-  end
-  res
-end
-
-def call(env)
-  res = @app.call(env)
-  request = nil
-  ['Location', 'Content-Location'].each do
-    |header|
-    if  ( location = res[1][header] ) and
-        '/' == location[0,1]
-      request ||= Rack::Request.new env
-      res[1][header] = request.base_url + location
-    end
-  end
-  res
-end
-
-end # Rackful::RelativeLocation

data/lib/rackful/path.rb

@@ -1,179 +0,0 @@
-# Required for parsing:
-
-# Required for running:
-require 'rack/utils'
-
-
-# A String monkeypatch
-# @private
-class String
-
-  # @return [Rackful::Path]
-  def to_path; Rackful::Path.new(self); end
-
-end
-
-
-module Rackful
-
-
-# Relative URI (a path)
-class Path < String
-
-
-  # @return [self]
-  def to_path; self; end
-
-
-  # @return [Path] a copy of `self`, with a trailing slash.
-  def slashify
-    r = self.dup
-    r << '/' if '/' != r[-1,1]
-    r
-  end
-
-
-  # Adds a trailing slash to `self` if necessary.
-  # @return [self]
-  def slashify!
-    if '/' != self[-1,1]
-      self << '/'
-    else
-      nil
-    end
-    self
-  end
-
-
-  # @return [Path]a copy of `self` without a trailing slash.
-  def unslashify
-    r = self.dup
-    r = r.chomp( '/' ) if '/' == r[-1,1]
-    r
-  end
-
-  
-  # Removes a trailing slash from `self`.
-  # @return [self]
-  def unslashify!
-    if '/' == self[-1,1]
-      self.chomp! '/'
-    else
-      nil
-    end
-    self
-  end
-
-
-  # @param [Encoding] encoding the character encoding to presume for `self`
-  # @return [String] the unescaped version of `self`
-  def unescape( encoding = Encoding::UTF_8 ); Rack::Utils.unescape(self, encoding); end
-  
-
-  # @return [Array<String>] Unencoded segments
-  def segments( encoding = Encoding::UTF_8 )
-    r = self.split('/').collect { |s| Rack::Utils.unescape( s, encoding ) }
-    r.shift
-    r
-  end
-
-
-  # Turns a relative URI (starting with `/`) into a relative path (starting with `./`)
-  # @param path [Path]
-  # @return [String] a relative URI
-  def relative base_path = Request.current.base_path
-    case self
-    when base_path
-      # RFC2396, Section 4.2
-      return ''
-    when %r{(?:\A|/)\.\.?(?:/|\z)}
-      # self has abnormal absolute path,
-      # like "/./", "/../", "/x/../", ...
-      return self.dup
-    end
-
-    src_path = base_path.scan(%r{(?:\A|[^/]+)/})
-    dst_path = self.scan(%r{(?:\A|[^/]+)/?})
-
-    # discard same parts
-    while !dst_path.empty? && dst_path.first == src_path.first
-      src_path.shift
-      dst_path.shift
-    end
-
-    tmp = dst_path.join
-
-    # calculate
-    if src_path.empty?
-      if tmp.empty?
-        return './'
-      elsif dst_path.first.include?(':') # (see RFC2396 Section 5)
-        return './' + tmp
-      else
-        return tmp
-      end
-    end
-
-    return '../' * src_path.size + tmp
-  end
-
-
-end # class Path
-
-
-end # module Rackful
-
-
-#~ # Monkeypatch to this stdlib class.
-#~ class URI::Generic
-#~ 
-  #~ # @see http://www.w3.org/TR/html401/struct/links.html#adef-rel the HTML `rel` attribute.
-  #~ attr_accessor :rel
-#~ 
-  #~ # @see http://www.w3.org/TR/html401/struct/links.html#adef-rev the HTML `rev` attribute.
-  #~ attr_accessor :rev
-#~ 
-  #~ def to_xhtml base_path, encoding = Encoding::UTF_8
-    #~ retval = "<a href=\"#{self.route_from(base_path)}\"".encode encoding
-    #~ retval << " rel=\"#{self.rel}\"" if self.rel
-    #~ retval << " rev=\"#{self.rev}\"" if self.rev
-    #~ retval << '>'
-    #~ if self.relative? && ! self.query && ! self.fragment
-      #~ retval << Rack::Utils.escape_html(
-                  #~ Rack::Utils.unescape( self.route_from(base_path).to_s, encoding )
-                #~ )
-    #~ else
-      #~ retval << self.to_s
-    #~ end
-    #~ retval << '</a>'
-    #~ retval
-  #~ end
-#~ 
-  #~ # @return [URI::Generic]
-  #~ def slashify
-    #~ r = self.dup
-    #~ r.path = r.path.unslashify
-    #~ r
-  #~ end
-#~ 
-  #~ # @return [self, nil]
-  #~ def slashify!
-    #~ self.path.slashify! && self
-  #~ end
-#~ 
-  #~ # @return [URI::Generic]
-  #~ def unslashify
-    #~ r = self.dup
-    #~ r.path = r.path.unslashify
-    #~ r
-  #~ end
-#~ 
-  #~ # @return [self, nil]
-  #~ def unslashify!
-    #~ self.path.unslashify! && self
-  #~ end
-#~ 
-#~ end # class ::URI::Generic
-
-
-