maveric 0.3.1 → 0.4.0

data/lib/maveric/extensions.rb

@@ -1,13 +1,11 @@
 class Module
   ## Build a string akin to the absolute path of the nesting structure.
-  def nesting_path 
-    ('::'+self.to_s). # '::' prepended for absolute path semantic
-      gsub(/([a-z])([A-Z])/, '\1_\2').
-      gsub(/(::)+/, '/').
-      downcase
+  def to_path flatten=false
+    path = '/'+self.to_s.gsub(/::+/, '/') # '^/' as absolute path.
+    path = path.gsub(/([a-z])([A-Z])/,'\1_\2').sub(/\/Index$/,'/').downcase if flatten
+    path
   end
 
-  # ::nodoc::
   # Still deving this.
   def self.nesting_path_to_constant path
     dig = proc{|c,n| c.const_get(n) }
@@ -45,31 +43,36 @@ end
 
 ##
 # Extensions to StandardError to enable their usage in Maveric as responses.
+# The default response is 500 and content-type of text/plain.
 class StandardError
   DEFAULT_STATUS = 500
   DEFAULT_HEADERS = {'Content-Type'=>'text/plain'}
-  attr_writer :status, :headers, :body
+
+  ## Returns @status or DEFAULT_STATUS if unset.
   def status
-    @status or DEFAULT_STATUS
+    defined?(@status)? @status : DEFAULT_STATUS
   end
 
+  ## Returns @headers or DEFAULT_HEADERS if unset.
   def headers
-    @headers or DEFAULT_HEADERS
+    defined?(@headers)? @headers : DEFAULT_HEADERS
   end
   
   ## Unless @body is defined, a self inspect and backtrace is output.
   def body
-    @body or [inspect, *backtrace]*"\n"
+    defined?(@body)? @body : [inspect, *backtrace]*"\n"
   end
   
-  ## See ::Maveric::Controller#to_http
-  def to_http
-    response = "Status: #{status}"+::Maveric::EOL
-    response << headers.map{|(k,v)| "#{k}: #{v}" }*::Maveric::EOL
-    response << ::Maveric::EOL*2 + body
+  ## See Maveric::Controller#to_http
+  def to_http(raw=true)
+    response = if not raw then 'Status:'
+      elsif defined? @env and @env.key? 'HTTP_VERSION' then @env['HTTP_VERSION']
+      else 'HTTP/1.1'end
+    response += " #{self.status}" + ::Maveric::EOL # Status message? :/
+    response << self.headers.map{|k,v| "#{k}: #{v}" }*::Maveric::EOL
+    response << ::Maveric::EOL*2 + self.body
   end
   
-  alias_method :old_init, :initialize
   ##
   # After a bit of experimenting with Exception and raise I determined a fun
   # and simple way to generate fast HTTP response error thingies. As long as
@@ -103,6 +106,6 @@ class StandardError
       @body << "\n\n#{data.compact.map{|e|e.inspect}*"\n"}" unless data.empty?
       data = msg
     end
-    old_init data
+    super data
   end
 end

data/lib/maveric/fastcgi.rb

@@ -1,14 +1,18 @@
 %w~fcgi~.each{|m|require m}
-
-class Maveric::FCGI
-  def initialize maveric, *opts
-    @maveric = maveric.new *opts
-    ::FCGI.each do |req|
-      req_body = ::StringIO.new( req.in.read || '' )
-      result = @maveric.dispatch req_body, req.env
-      req.out << "Status: 200 OK\r\n\r\n"
-      req.out << result.to_s
-      req.finish
+##
+# Opening arguments are a Maveric class and options. Plz, don't pass a Maveric
+# instance. The options of +opts+ are passed to the Maveric on instantiation.
+#
+#   Maveric::FCGI(MyMaveric.new)
+def Maveric.FCGI maveric, opts={}
+  ::FCGI.each do |req|
+    req.out << "Status: 200 OK" + ::Maveric::EOL*2 if $DEBUG
+    req.out << response = begin
+      maveric.dispatch(req.in, req.env).to_http
+    rescue
+      "Status: 500 Server Error omgwtf!"+::Maveric::EOL*2+
+      "#{$!}\n#{$!.backtrace*"\n"}"
     end
+    req.finish
   end
 end

data/lib/maveric/mongrel.rb

@@ -1,44 +1,24 @@
 %w~mongrel~.each{|m|require m}
 
-class Maveric::MongrelHandler < Mongrel::HttpHandler
-  def initialize maveric, opts={}
-    ::Maveric.type_check :maveric, maveric do |k| k <= ::Maveric end
-    ::Maveric.type_check :opts, opts, Hash
-    super()
-    @request_notify = true
-    @maveric = maveric.new opts
-  end
+##
+# Includes Mongrel::HttpHandlerPlugin into Maveric, allowing the use of Maveric
+# subclasses as HttpHandlers in the context of Mongrel.
+class Maveric
+  include Mongrel::HttpHandlerPlugin
 
   ##
-  # NOTE: Update doc.
+  # Runs #dispatch on the request and filters the resulting Controller instance
+  # to the +response+ object.
   def process request, response
-    Maveric.log.info "Mongrel+#{self.class}#process"
-    reply = @maveric.process request.body, request.params
-    # output the result
+    reply = dispatch request.body, request.params
     response.start reply.status do |head,out|
       reply.headers.each {|k,v| head[k] = v }
       out.write reply.body
     end
   end
 
-  ## Prepares by loading session and reflection data into the request params.
+  ## Runs #prepare_enviroment on the env to get things moving.
   def request_begins params
-    begin
-      Maveric.log.info "Mongrel+#{self.class}#request_begins"
-      @maveric.prepare_environment params
-    rescue
-      Maveric.log.fatal "#{$!.inspect}\n#{$@[0..5]*"\n"}"
-    end
-  end
-
-  ## Does nothing yet. Yet.
-  def request_progess params, clen, total
-    begin
-      Maveric.log.info "Mongrel+#{self.class}#request_progess"+
-        ": #{clen}/#{total}"
-      Maveric.log.debug params
-    rescue
-      Maveric.log.fatal "#{$!.inspect}\n#{$@[0..5]*"\n"}"
-    end
+    prepare_environment params
   end
 end

data/lib/maveric/sessions.rb

@@ -4,7 +4,10 @@ class Maveric
   ##
   # Contains session data and provides conveniance in generating an appropriate
   # cookie.
-  class Sessions < Set
+  #
+  # This is a simple session implementation. Data is kept in a self maintaining
+  # Set persisting in memory. Noot good if yoou're dealing with oodles of sets.
+  class SimpleSessions < Set
     COOKIE_NAME = 'SESSIONID'
 
     ##
@@ -12,17 +15,18 @@ class Maveric
     # a hex number. (num.to_s(16) If id is not found a new Session is created
     # and its Session#id is returned.
     def session id #wants stringed hex num
-      ::Maveric.type_check :id, id, String
 
       #ensure crusty old sessions don't linger
-      @__i += 1 rescue @__i = 1
-      reject!{|s| s.expire < Time.now-3 } if (@__i%=10) == 0 # 3 second grace
+      @__i = 0 unless defined? @__i
+      @__i += 1
+      reject!{|s| s.expires < Time.now-3 } if (@__i%=10) == 0 # 3 second grace
       
-      # now get the session
-      session = find{|s| s.id == id } and return session
-      
-      # there isn't one? then make a new one!
-      add (session=Session.new) and return session
+      if id # now get the session if we have something to search for
+        session = find{|s| id.casecmp(s.id)==0 }
+      else # there isn't one? then make a new one!
+        add session=Session.new
+      end
+      return session
     end
 
     ##
@@ -33,10 +37,8 @@ class Maveric
       DURATION = 15*60
       ## The default session length is 15 minutes. Simple to change.
       def initialize duration=DURATION
-        ::Maveric.type_check :duration, duration, Integer
         @duration, @data = duration, {}
         touch
-        ::Maveric.log.debug self
       end
 
       attr_reader :expires, :data, :duration
@@ -63,7 +65,7 @@ class Maveric
       ## Perhaps better named as #to_cookie for clarity?
       def to_s env=nil
         touch
-        c = "#{::Maveric::Sessions::COOKIE_NAME}=#{id}" #required
+        c = "#{::Maveric::SimpleSessions::COOKIE_NAME}=#{id}" #required
         c << "; expires=#{expires.httpdate}"
         return c unless env
         c << "; domain=#{env['SERVER_NAME']};"
@@ -75,7 +77,7 @@ class Maveric
     end
   end
   
-  @sessions = Sessions.new
+  @sessions = SimpleSessions.new
   
   ## Return the standard session set.
   def self.sessions
@@ -88,18 +90,19 @@ class Maveric
   end
 
   ##
-  # Uses env[:cookie] to find the session_id, and retrives the data to set the
+  # Uses env[:cookies] to find the session_id, and retrives the data to set the
   # values or env[:session].
   def set_session env
-    session_id = env[:cookies][::Maveric::Sessions::COOKIE_NAME].first
+    session_id = env[:cookies][::Maveric::SimpleSessions::COOKIE_NAME].first
     env[:session] = ::Maveric.session session_id 
   end
 
-  adjust_env :set_session
+  prepare_env :set_session
 
   class Controller
     ## Touches the session and includes it into the http headers.
     def session_cleanup controller
+      return unless @env[:session]
       @env[:session].touch
       @headers['Set-Cookie'] = [@env[:session].to_s(@env)]
     end

data/lib/maveric/webrick.rb

@@ -8,7 +8,6 @@ class Maveric::WEBrickServlet < WEBrick::HTTPServlet::AbstractServlet
   # initialization. The Maveric (not an instance) is expected as the first 
   # option.
   def initialize server, maveric, *opts
-    ::Maveric.type_check :maveric, maveric do |k| k <= ::Maveric end
     @maveric = maveric.new *@options
     super server, *opts
   end
@@ -16,8 +15,6 @@ class Maveric::WEBrickServlet < WEBrick::HTTPServlet::AbstractServlet
   ## We don't need no stinkin' do_* methods.
   def service req, res
     begin
-      ::Maveric.log.warn req.inspect
-      req_body = StringIO.new(req.body || '')
       env = req.meta_vars
       env['REQUEST_URI'] = req.unparsed_uri
       result = @maveric.dispatch req_body, env, req

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: maveric
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2007-01-28 00:00:00 -07:00
+  version: 0.4.0
+date: 2007-02-13 00:00:00 -08:00
 summary: A simple, non-magical, framework.
 require_paths: 
 - lib/
@@ -30,11 +30,11 @@ authors:
 - blink
 files: 
 - lib/maveric.rb
-- lib/maveric/mongrel.rb
 - lib/maveric/fastcgi.rb
+- lib/maveric/extensions.rb
 - lib/maveric/webrick.rb
+- lib/maveric/mongrel.rb
 - lib/maveric/sessions.rb
-- lib/maveric/extensions.rb
 test_files: []
 
 rdoc_options: []
@@ -47,13 +47,5 @@ extensions: []
 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: log4r
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+dependencies: []
+