Pistos-ramaze 2009.04.08 → 2009.06.12

data/lib/proto/app.rb

@@ -0,0 +1,14 @@
+# This file contains your application, it requires dependencies and necessary
+# parts of the application.
+#
+# It will be required from either `config.ru` or `start.rb`
+
+require 'rubygems'
+require 'ramaze'
+
+# Make sure that Ramaze knows where you are
+Ramaze.options.roots = [__DIR__]
+
+# Initialize controllers and models
+require __DIR__('model/init')
+require __DIR__('controller/init')

data/lib/proto/config.ru

@@ -8,10 +8,13 @@
 # Rack::Builder DSL to configure middleware and build up applications easily.
 #
 # rackup automatically figures out the environment it is run in, and runs your
-# application as FastCGI, CGI, or standalone with Mongrel or WEBrick—all from
+# application as FastCGI, CGI, or standalone with Mongrel or WEBrick -- all from
 # the same configuration.
+#
+# Do not set the adapter.handler in here, it will be ignored.
+# You can choose the adapter like `ramaze start -s mongrel` or set it in the
+# 'start.rb' and use `ruby start.rb` instead.
 
-cwd = File.dirname(__FILE__)
-require "#{cwd}/start"
-Ramaze.start(:started => true)
-run Innate
+require ::File.expand_path('../app', __FILE__)
+Ramaze.start(:root => __DIR__, :started => true)
+run Ramaze

data/lib/proto/controller/init.rb

@@ -2,10 +2,10 @@
 # controllers
 
 class Controller < Ramaze::Controller
-  layout 'default'
+  layout :default
   helper :xhtml
-  engine :Nagoro
+  engine :Etanni
 end
 
 # Here go your requires for subclasses of Controller:
-require 'controller/main'
+require __DIR__('main')

data/lib/proto/spec/main.rb

@@ -1,22 +1,20 @@
 require 'ramaze'
-require 'ramaze/spec'
+require 'ramaze/spec/bacon'
 
-require __DIR__('../start')
+require __DIR__('../app')
 
 describe MainController do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'show start page' do
-    got = get('/')
-    got.status.should == 200
-    got['Content-Type'].should == 'text/html'
-    got.body.should =~ /<h1>Welcome to Ramaze!<\/h1>/
+    get('/').status.should == 200
+    last_response['Content-Type'].should == 'text/html'
+    last_response.should =~ /<h1>Welcome to Ramaze!<\/h1>/
   end
 
   should 'show /notemplate' do
-    got = get('/notemplate')
-    got.status.should == 200
-    got['Content-Type'].should == 'text/html'
-    got.body.should =~ /there is no 'notemplate.xhtml' associated with this action/
+    get('/notemplate').status.should == 200
+    last_response['Content-Type'].should == 'text/html'
+    last_response.should =~ /there is no 'notemplate\.xhtml' associated with this action/
   end
 end

data/lib/proto/start.rb

@@ -1,12 +1,8 @@
-require 'rubygems'
-require 'ramaze'
+# Use this file directly like `ruby start.rb` if you don't want to use the
+# `ramaze start` command.
+# All application related things should go into `app.rb`, this file is simply
+# for options related to running the application locally.
 
-# Add the directory this file resides in to the load path, so you can run the
-# app from any other working directory
-$LOAD_PATH.unshift(__DIR__)
+require File.expand_path('app', File.dirname(__FILE__))
 
-# Initialize controllers and models
-require 'controller/init'
-require 'model/init'
-
-Ramaze.start(:adapter => :webrick, :port => 7000) if __FILE__ == $0
+Ramaze.start(:adapter => :webrick, :port => 7000, :file => __FILE__)

data/lib/ramaze.rb

@@ -62,25 +62,24 @@ module Ramaze
 
   middleware! :dev do |m|
     m.use Rack::Lint
-    m.use Rack::CommonLogger
-    m.use Ramaze::Reloader
+    m.use Rack::CommonLogger, Ramaze::Log
+    m.use Rack::ShowExceptions
     m.use Rack::ShowStatus
     m.use Rack::RouteExceptions
-    m.use Rack::ShowExceptions
-    m.use Rack::Head
-    m.use Rack::ETag
     m.use Rack::ConditionalGet
+    m.use Rack::ETag
+    m.use Rack::Head
+    m.use Ramaze::Reloader
     m.run Ramaze::AppMap
   end
 
   middleware! :live do |m|
-    m.use Rack::CommonLogger
+    m.use Rack::CommonLogger, Ramaze::Log
     m.use Rack::RouteExceptions
     m.use Rack::ShowStatus
-    m.use Rack::ShowExceptions
-    m.use Rack::Head
-    m.use Rack::ETag
     m.use Rack::ConditionalGet
+    m.use Rack::ETag
+    m.use Rack::Head
     m.run Ramaze::AppMap
   end
 end

data/lib/ramaze/app.rb

@@ -70,10 +70,10 @@ module Ramaze
 
     attr_reader :name, :location, :url_map, :options
 
-    def initialize(name, location)
+    def initialize(name, location = nil)
       @name = name.to_sym
       @url_map = Innate::URLMap.new
-      self.location = location
+      self.location = location if location
 
       APP_LIST[@name] = self
 
@@ -113,7 +113,8 @@ module Ramaze
       roots.map{|root| publics.map{|public| ::File.join(root, public) }}.flatten
     end
 
-    def self.find_or_create(name, location = '/')
+    def self.find_or_create(name, location = nil)
+      location = '/' if location.nil? && name == :pristine
       self[name] || new(name, location)
     end
 

data/lib/ramaze/cache/localmemcache.rb

@@ -31,11 +31,11 @@ module Ramaze
 
       # Wipe out _all_ data in localmemcached, use with care.
       def cache_clear
-        ::LocalMemCache.clear_namespace(@namespace)
+        @store.clear
       end
 
       def cache_delete(*args)
-        super{|key| @store.delete(key.to_s) }
+        super{|key| @store.delete(key.to_s); nil }
       end
 
       # NOTE:

data/lib/ramaze/cache/memcache.rb

@@ -13,7 +13,20 @@ module Ramaze
     #
     # It is highly recommended to install memcache-client_extensions for
     # a bit of speedup and more functionality
+    #
+    # NOTE: There is a big issue with persisting sessions in memcache, not only
+    #       can they be dropped at any time, essentially logging the user out
+    #       without them noticing, but there is also a low limit to the maximum
+    #       time-to-live. After 30 days, your session will be dropped, no
+    #       matter what.
+    #       Please remember that memcache is, first of all, a cache, not a
+    #       persistence mechanism.
+    #
+    # NOTE: If you try to set a higher ttl than allowed, your stored key/value
+    #       will be expired immediately.
     class MemCache
+      MAX_TTL = 2592000
+
       include Cache::API
 
       # +:multithread+: May be turned off at your own risk.
@@ -34,6 +47,7 @@ module Ramaze
         options = {:namespace => @namespace}.merge(OPTIONS)
         servers = options.delete(:servers)
         @store = ::MemCache.new(servers, options)
+        @warned = false
       end
 
       # Wipe out _all_ data in memcached, use with care.
@@ -46,7 +60,7 @@ module Ramaze
 
       #
       def cache_delete(*keys)
-        super{|key| @store.delete(key) }
+        super{|key| @store.delete(key); nil }
       rescue ::MemCache::MemCacheError => e
         Log.error(e)
         nil
@@ -65,6 +79,17 @@ module Ramaze
 
       def cache_store(key, value, options = {})
         ttl = options[:ttl] || 0
+
+        if ttl > MAX_TTL
+          unless @warned
+            Log.warn('MemCache cannot set a ttl greater than 2592000 seconds.')
+            Log.warn('Modify Ramaze.options.session.ttl to a value <= of that.')
+            @warned = true
+          end
+
+          ttl = MAX_TTL
+        end
+
         @store.set(key, value, ttl)
         value
       rescue ::MemCache::MemCacheError => e

data/lib/ramaze/cache/sequel.rb

@@ -1,38 +1,53 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+require 'sequel'
+
 module Ramaze
   class Cache
 
     # Cache based on a Sequel model using relational databases.
+    #
+    # Please note that this cache might not work perfectly with Sequel 3.0.0,
+    # as the #[] and #[]= methods do not respect serialization.
+    # I'll lobby for a change in that direction.
     class Sequel
       include Cache::API
 
       class Table < ::Sequel::Model(:ramaze_cache)
+        plugin :schema
+        plugin :serialization
+
+        serialize_attributes :marshal, :value
+
         set_schema do
           primary_key :id
-          string :key
-          string :value
-          time :expires
           index :key, :unique => true
+
+          String :key
+          String :value
+          Time :expires
         end
 
-        transform :value => [
-          lambda{|value| ::Marshal.load(value.unpack('m*')[0]) },
-          lambda{|value| [::Marshal.dump(value)].pack('m*') }
-        ]
+        def [](column)
+          if column == :value
+            deserialized_values[column] = deserialize_value(column, @values[column])
+          else
+            super
+          end
+        end
       end
 
       # Setup the table, not suitable for multiple apps yet.
       def cache_setup(host, user, app, name)
         @namespace = [host, user, app, name].compact.join(':')
-        Table.create_table unless Table.table_exists?
+        Table.create_table?
         @store = Table
       end
 
       # Wipe out _all_ data in the table, use with care.
       def cache_clear
-        Table.delete_all
+        Table.delete
       end
 
       # Delete records for given +keys+

data/lib/ramaze/contrib/addressable_route.rb

@@ -0,0 +1,56 @@
+require "addressable/template"
+
+module Ramaze
+  # This is a simple prototype-implementation of how we could do routing
+  # supported by URI templates.
+  #
+  # Please see the spec for example usage as it's not integrated yet in any way.
+  #
+  # What it does is basically that you can give it any URI template and a final
+  # mapping, and it will extract the variables from the URI and merge them into
+  # the QUERY_STRING, which is parsed again in Ramaze if you issue
+  # Request#params.
+  #
+  # @example given mapping like:
+  #
+  #     map('/customer/{customer_id}/order/{order_id}', '/order/show')
+  #
+  # @example output of request.params at '/order/show'
+  #
+  #     {'customer_id => '12', 'order_id' => '15'}
+  #
+  # I haven't explored the full capabilities of the templates yet, but the
+  # specs of Addressable::Template suggest that there is a lot to be
+  # discovered.
+  class AddressableRoute
+    def initialize(app, routes = {})
+      @app = app
+      @routes = {}
+
+      routes.each{|from, to| map(from, to) }
+    end
+
+    def call(env)
+      path_info = env['PATH_INFO']
+
+      @routes.each do |template, target|
+        extracted = template.extract(path_info)
+        return dispatch(env, target, extracted) if extracted
+      end
+
+      @app.call(env)
+    end
+
+    def map(from, to)
+      @routes[Addressable::Template.new(from)] = to
+    end
+
+    def dispatch(env, target, extracted)
+      env['PATH_INFO'] = target
+      original = Rack::Utils.parse_query(env['QUERY_STRING'])
+      env['QUERY_STRING'] = Rack::Utils.build_query(original.merge(extracted))
+
+      @app.call(env)
+    end
+  end
+end

data/lib/ramaze/contrib/email.rb

@@ -30,6 +30,8 @@ require 'net/smtp'
 
 module Ramaze
   class EmailHelper
+    include Innate::Traited
+
     # Required to be set
     trait :smtp_server => 'smtp.your-isp.com'
     trait :smtp_helo_domain => 'your.helo.domain.com'

data/lib/ramaze/contrib/facebook/facebook.rb

@@ -59,9 +59,9 @@ module Facebook
       end while ret.empty? and @server = connect
 
       ret = case
-            when ret == 'true':    true
-            when ret == 'false':   false
-            when ret[0..0] == '"': ret[1..-2]
+            when ret == 'true';    true
+            when ret == 'false';   false
+            when ret[0..0] == '"'; ret[1..-2]
             else
               begin
                 JSON::parse(ret)
@@ -168,4 +168,4 @@ module Facebook
       buf
     end
   end
-end
+end

data/lib/ramaze/contrib/sequel/create_join.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'sequel/extensions/inflector'
 
 module Sequel
   class Model

data/lib/ramaze/contrib/sequel/form_field.rb

@@ -94,14 +94,14 @@ class FormField
       select(gestalt)
     else
       case db_type
-      when 'varchar', 'integer'
+      when /varchar|integer/
         input(gestalt)
-      when 'boolean'
+      when /boolean/
         checkbox(gestalt)
-      when 'string'
+      when /string/
         textarea(gestalt)
       else
-        raise "Unsupported type: (#{db_type || hint} : #{field})"
+        raise("Unsupported type: (%p : %p)" % [db_type || hint, field])
       end
     end
   end

data/lib/ramaze/contrib/sequel/image.rb

@@ -7,7 +7,7 @@
 # Usage:
 #   class Avatar < Sequel::Model
 #     IMAGE = {
-#       # specifies belongs_to, will create relation and foreign key
+#       # specifies many_to_one, will create relation and foreign key
 #
 #       :owner => :User,
 #
@@ -51,8 +51,8 @@
 module SequelImage
   def self.included(model)
     args = model::IMAGE
-    set_foreign_key = args[:foreign_key] || "#{args[:owner]}_id".downcase.to_sym
-    set_belongs_to  = args[:belongs_to]  ||    args[:owner].to_s.downcase.to_sym
+    set_foreign_key = args[:foreign_key]  || "#{args[:owner]}_id".downcase.to_sym
+    set_many_to_one  = args[:many_to_one] ||    args[:owner].to_s.downcase.to_sym
 
     # Define schema
     model.set_schema do
@@ -68,21 +68,19 @@ module SequelImage
     end
 
     # Define Relations
-    model.belongs_to set_belongs_to
+    model.many_to_one set_many_to_one
 
     # Define Hooks
-    model.send(:hooks).clear
-
-    model.before_create do
+    model.before_create :generate_thumbnails do
       generate_thumbnails
       self.created_at = Time.now
     end
 
-    model.before_save do
+    model.before_save :update_time do
       self.updated_at = Time.now
     end
 
-    model.before_destroy do
+    model.before_destroy :cleanup do
       cleanup if conf[:cleanup]
     end
 
@@ -110,7 +108,7 @@ module SequelImage
       tempfile = file[:tempfile]
       raise ArgumentError, 'Empty tempfile' if tempfile.size == 0
 
-      ext         = Ramaze::Tool::MIME.ext_for(type)
+      ext         = Rack::Mime::MIME_TYPES.invert[type]
       image.mime  = type
       target_name = image.next_name(File.basename(filename, File.extname(filename)), ext)
       target_path = File.join(image.public_root, image.path, target_name)
@@ -150,7 +148,7 @@ module SequelImage
     end
 
     def public_root
-      Ramaze::Global.public_root
+      Ramaze.options.roots.first
     end
 
     def filename(size)