ramaze 0.0.9 → 0.1.0

data/lib/ramaze/trinity/request.rb

@@ -4,13 +4,15 @@
 require 'cgi'
 require 'tmpdir'
 require 'digest/md5'
+require 'rack'
+require 'rack/request'
 
 module Ramaze
 
   # The purpose of this class is to act as a simple wrapper for Rack::Request
   # and provide some convinient methods for our own use.
 
-  class Request
+  module Request
     class << self
 
       # get the current request out of Thread.current[:request]
@@ -22,23 +24,16 @@ module Ramaze
       end
     end
 
-    # create a new instance of Request, takes the original Rack::Request
-    # instance
-
-    def initialize request = {}
-      @request = request
-    end
-
     # shortcut for request.params[key]
 
     def [](key)
-      params[key]
+      params[key.to_s]
     end
 
     # shortcut for request.params[key] = value
 
     def []=(key, value)
-      params[key] = value
+      params[key.to_s] = value
     end
 
     # like Hash#values_at
@@ -47,6 +42,7 @@ module Ramaze
       keys.map{|key| params[key] }
     end
 
+
     # the referer of the client or '/'
 
     def referer
@@ -55,24 +51,46 @@ module Ramaze
 
     alias referrer referer
 
-    def fullpath
-      path = script_name + path_info
-      path << "?" << query_string  unless query_string.empty?
-      path
-    end
-
-    def env
-      @request.env
-    end
-
     # you can access the original @request via this method_missing,
     # first it tries to match your method with any of the HTTP parameters
     # then, in case that fails, it will relay to @request
 
     def method_missing meth, *args, &block
-      @request.send(meth, *args, &block)
-    rescue
-      env[meth.to_s.upcase]
+      key = meth.to_s.upcase
+      return env[key] if env.has_key?(key)
+      super
+    end
+
+    def self.included(klass)
+      klass.class_eval do
+        unless defined?(fullpath)
+          def fullpath
+            path = script_name + path_info
+            path << "?" << query_string  unless query_string.empty?
+            path
+          end
+        end
+
+        unless defined?(rack_params)
+          alias rack_params params
+
+          def params
+            ps = rack_params
+            temp = Hash.new{|h,k| h[k] = {}}
+
+            ps.each do |key, value|
+              outer_key, inner_key = key.scan(/^(.+)\[(.*?)\]$/).first
+              if outer_key and inner_key
+                temp[outer_key][inner_key] = value
+              else
+                temp[key] = value
+              end
+            end
+
+            temp
+          end
+        end
+      end
     end
   end
 end

data/lib/ramaze/trinity/response.rb

@@ -2,11 +2,16 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  # get the current response out of Thread.current[:response]
-  #
-  # You can call this from everywhere with Ramaze::Response.current
+  module Response
+    class << self
 
-  def self.Response
-    Thread.current[:response]
+      # get the current response out of Thread.current[:response]
+      #
+      # You can call this from everywhere with Ramaze::Response.current
+
+      def current
+        Thread.current[:response]
+      end
+    end
   end
 end

data/lib/ramaze/trinity/session.rb

@@ -55,6 +55,10 @@ module Ramaze
 
     trait :finalize => [:finalize_flash]
 
+    trait :ip_cache => Hash.new{|h,k| h[k] = []}
+
+    trait :ip_cache_limit => 1000
+
     class << self
 
       # answers with Thread.current[:session] which holds the current session
@@ -75,6 +79,14 @@ module Ramaze
 
     def initialize request
       @session_id = (request.cookies[SESSION_KEY] || random_key)
+      ip_cache = ancestral_trait[:ip_cache]
+      ip = request.remote_addr
+      ip_cache[ip] << @session_id
+
+      if ip_cache[ip].size >= ancestral_trait[:ip_cache_limit]
+        sessions.delete(ip_cache[ip].shift)
+      end
+
       @flash = Ramaze::SessionFlash.new
 
       unless sessions
@@ -120,7 +132,7 @@ module Ramaze
 
     def random_key
       h = [
-        Time.now.to_f.to_s.reverse, rand,
+        Time.now.to_f.to_s, rand,
         Thread.current[:request].hash, rand,
         Process.pid, rand,
         object_id, rand
@@ -191,7 +203,9 @@ module Ramaze
     end
 
     def []=(key, value)
-      current[key] = value
+      prev = session[:FLASH] || {}
+      prev[key] = value
+      session[:FLASH] = prev
     end
 
     def inspect
@@ -201,7 +215,7 @@ module Ramaze
     private
 
     def session
-      Ramaze::Session.current
+      Ramaze::Session.current || {}
     end
   end
 end

data/lib/ramaze/version.rb

@@ -4,8 +4,8 @@
 module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 9
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rake_tasks/conf.rake

@@ -0,0 +1,56 @@
+AUTHOR = "manveru"
+EMAIL = "m.fellinger@gmail.com"
+DESCRIPTION = "Ramaze tries to be a very simple Webframework without the voodoo"
+HOMEPATH = 'http://ramaze.rubyforge.org'
+BIN_FILES = %w( ramaze )
+
+BASEDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+NAME = "ramaze"
+REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
+VERS = ENV['VERSION'] || (Ramaze::VERSION + (REV ? ".#{REV}" : ""))
+COPYRIGHT = [
+  "#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com",
+  "# All files in this distribution are subject to the terms of the Ruby license."
+]
+CLEAN.include %w[
+  **/.*.sw?
+  *.gem
+  .config
+  **/*~
+  **/{data.db,cache.yaml}
+  *.yaml
+  pkg
+  rdoc
+]
+RDOC_OPTS = %w[
+  --all
+  --quiet
+  --op rdoc
+  --line-numbers
+  --inline-source
+  --main doc/README
+  --opname index.html
+  --title "Ramaze\ documentation"
+  --exclude "^(_darcs|spec|examples|bin|pkg)/"
+  --exclude "lib/proto"
+  --include "doc"
+  --accessor "trait"
+]
+RDOC_FILES = %w[
+  lib doc doc/README doc/FAQ doc/CHANGELOG
+]
+POST_INSTALL_MESSAGE = %{
+#{'=' * 60}
+
+Thank you for installing Ramaze!
+You can now do following:
+
+* Create a new project using the `ramaze' command:
+    ramaze --create yourproject
+
+* Browse and try the Examples in
+    #{File.join(Gem.path, 'gems', 'ramaze-' + VERS, 'examples')}
+
+#{'=' * 60}
+}.strip

data/rake_tasks/gem.rake

@@ -0,0 +1,44 @@
+spec =
+    Gem::Specification.new do |s|
+        s.name = NAME
+        s.version = VERS
+        s.platform = Gem::Platform::RUBY
+        s.has_rdoc = true
+        s.extra_rdoc_files = RDOC_FILES
+        s.rdoc_options += RDOC_OPTS
+        s.summary = DESCRIPTION
+        s.description = DESCRIPTION
+        s.author = AUTHOR
+        s.email = EMAIL
+        s.homepage = HOMEPATH
+        s.executables = BIN_FILES
+        s.bindir = "bin"
+        s.require_path = "lib"
+        s.post_install_message = POST_INSTALL_MESSAGE
+
+        s.add_dependency('rake', '>=0.7.3')
+        s.add_dependency('rspec', '>=0.9.1')
+        s.add_dependency('rack', '>=0.1.0')
+        # s.required_ruby_version = '>= 1.8.5'
+
+        s.files = (RDOC_FILES + %w[Rakefile] + Dir["{examples,bin,doc,spec,lib,rake_tasks}/**/*"]).uniq
+
+        # s.extensions = FileList["ext/**/extconf.rb"].to_a
+    end
+
+Rake::GemPackageTask.new(spec) do |p|
+    p.need_tar = true
+    p.gem_spec = spec
+end
+
+desc "package and install ramaze"
+task :install do
+  name = "#{NAME}-#{VERS}.gem"
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{name}}
+end
+
+desc "uninstall the ramaze gem"
+task :uninstall => [:clean] do
+  sh %{sudo gem uninstall #{NAME}}
+end

data/rake_tasks/maintaince.rake

@@ -0,0 +1,187 @@
+desc "add copyright to all .rb files in the distribution"
+task 'add-copyright' do
+  puts "adding copyright to files that don't have it currently"
+  Dir['{lib,test}/**/*{.rb}'].each do |file|
+    next if file =~ /_darcs/
+    lines = File.readlines(file).map{|l| l.chomp}
+    unless lines.first(COPYRIGHT.size) == COPYRIGHT
+      puts "fixing #{file}"
+      File.open(file, 'w+') do |f|
+        (COPYRIGHT + ["\n"] + lines).each do |line|
+          f.puts(line)
+        end
+      end
+    end
+  end
+end
+
+desc "doc/README to html"
+Rake::RDocTask.new('readme2html-build') do |rd|
+  rd.options = %w[
+    --quiet
+    --opname readme.html
+  ]
+
+  rd.rdoc_dir = 'readme'
+  rd.rdoc_files = ['doc/README']
+  rd.main = 'doc/README'
+  rd.title = "Ramaze documentation"
+end
+
+desc "doc/README to doc/README.html"
+task 'readme2html' => ['readme-build', 'readme2html-build'] do
+  cp('readme/files/doc/README.html', 'doc/README.html')
+  rm_rf('readme')
+end
+
+desc "generate doc/TODO from the TODO tags in the source"
+task 'todolist' do
+  list = `rake todo`
+  tasks = {}
+  current = nil
+
+  list.split("\n")[2..-1].each do |line|
+    if line =~ /TODO/ or line.empty?
+    elsif line =~ /^vim/
+      current = line.split[1]
+      tasks[current] = []
+    else
+      tasks[current] << line
+    end
+  end
+
+  lines = tasks.map{ |name, items| [name, items, ''] }.flatten
+  lines.pop
+
+  File.open(File.join('doc', 'TODO'), 'w+') do |f|
+    f.puts "This list is programmaticly generated by `rake todolist`"
+    f.puts "If you want to add/remove items from the list, change them at the"
+    f.puts "position specified in the list."
+    f.puts
+    f.puts(lines)
+  end
+end
+
+desc "remove those annoying spaces at the end of lines"
+task 'fix-end-spaces' do
+  Dir['{lib,spec}/**/*.rb'].each do |file|
+    next if file =~ /_darcs/
+    lines = File.readlines(file)
+    new = lines.dup
+    lines.each_with_index do |line, i|
+      if line =~ /\s+\n/
+        puts "fixing #{file}:#{i + 1}"
+        p line
+        new[i] = line.rstrip
+      end
+    end
+
+    unless new == lines
+      File.open(file, 'w+') do |f|
+        new.each do |line|
+          f.puts(line)
+        end
+      end
+    end
+  end
+end
+
+desc "Compile the doc/README from the parts of doc/readme"
+task 'readme-build' do
+  require 'enumerator'
+
+  chapters = [
+    'About Ramaze',         'introduction',
+    'Features Overview',    'features',
+    'Basic Principles',     'principles',
+    'Installation',         'installing',
+    'Getting Started',      'getting_started',
+    'A couple of Examples', 'examples',
+    'How to find Help',     'getting_help',
+    'Appendix',             'appendix',
+    'And thanks to...',     'thanks',
+  ]
+
+  File.open('doc/README', 'w+') do |readme|
+    readme.puts COPYRIGHT.map{|l| l[1..-1]}, ''
+
+    chapters.each_slice(2) do |title, file|
+      file = File.join('doc', 'readme_chunks', "#{file}.txt")
+      chapter = File.read(file)
+      readme.puts "= #{title}", '', chapter
+      readme.puts '', '' unless title == chapters[-2]
+    end
+  end
+end
+
+task 'tutorial2html' do
+  require 'bluecloth'
+
+  basefile = File.join('doc', 'tutorial', 'todolist')
+
+  content = File.read(basefile + '.txt')
+
+  html = BlueCloth.new(content).to_html
+
+  wrap = %{
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html>
+    <head>
+      <title>Ramaze Tutorial: Todolist</title>
+      <style>
+        body {
+          background: #eee;
+        }
+        code {
+          background: #ddd;
+        }
+        pre code {
+          background: #ddd;
+          width: 70%;
+          display: block;
+          margin: 1em;
+          padding: 0.7em;
+          overflow: auto;
+        }
+      </style>
+      <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+    </head>
+    <body>
+      #{html}
+    </body>
+  </html>
+  }.strip
+
+  File.open(basefile + '.html', 'w+'){|f| f.puts(wrap) }
+end
+
+task 'authors' do
+  changes = `darcs changes`
+  authors = []
+  mapping = {}
+  author_map = {
+    'm.fellinger@gmail.com' => 'Michael Fellinger',
+    'manveru@weez-int.com'  => 'Michael Fellinger',
+    'clive@crous.co.za'     => 'Clive Crous'
+  }
+  changes.split("\n").grep(/^\w/).each do |line|
+    splat  = line.split
+    author = splat[6..-1]
+    email  = author.pop
+    email.gsub!(/<(.*?)>/, '\1')
+    name   = author.join(' ')
+    name   = author_map[email] if name.empty?
+    mapping[name] = email
+  end
+
+  max = mapping.map{|k,v| k.size}.max
+
+  File.open('doc/AUTHORS', 'w+') do |fp|
+    fp.puts("Following persons have contributed to Ramaze:")
+    fp.puts
+    mapping.sort_by{|k,v| v}.each do |name, email|
+      fp.puts("#{name.ljust(max)} - #{email}")
+    end
+  end
+end