manveru-ramaze 2009.04 → 2009.04.01

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

@@ -0,0 +1,12 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+module Sequel
+  class Model
+    class << self
+      def fill request_object = Ramaze::Request.current
+        create(request_object.params)
+      end
+    end
+  end
+end

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: (%p : %p)" % [db_type || hint, field])
+        raise "Unsupported type: (#{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 many_to_one, will create relation and foreign key
+#       # specifies belongs_to, 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_many_to_one  = args[:many_to_one] ||    args[:owner].to_s.downcase.to_sym
+    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
 
     # Define schema
     model.set_schema do
@@ -68,19 +68,21 @@ module SequelImage
     end
 
     # Define Relations
-    model.many_to_one set_many_to_one
+    model.belongs_to set_belongs_to
 
     # Define Hooks
-    model.before_create :generate_thumbnails do
+    model.send(:hooks).clear
+
+    model.before_create do
       generate_thumbnails
       self.created_at = Time.now
     end
 
-    model.before_save :update_time do
+    model.before_save do
       self.updated_at = Time.now
     end
 
-    model.before_destroy :cleanup do
+    model.before_destroy do
       cleanup if conf[:cleanup]
     end
 
@@ -108,7 +110,7 @@ module SequelImage
       tempfile = file[:tempfile]
       raise ArgumentError, 'Empty tempfile' if tempfile.size == 0
 
-      ext         = Rack::Mime::MIME_TYPES.invert[type]
+      ext         = Ramaze::Tool::MIME.ext_for(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)
@@ -148,7 +150,7 @@ module SequelImage
     end
 
     def public_root
-      Ramaze.options.roots.first
+      Ramaze::Global.public_root
     end
 
     def filename(size)

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

@@ -65,34 +65,20 @@ module SequelRelation
     end
 
     def belongs_to(model)
-      todo :many_to_one, singular_sym(model), :class => model
+      todo :belongs_to, model.to_s.downcase.to_sym
     end
 
     def has_many(model)
       todo :create_join, model
-      todo :many_to_many, plural_sym(model), :class => model
+      todo :many_to_many, model.to_s.downcase.pluralize.to_sym
     end
 
     def has_one(model)
-      todo :many_to_one, singular_sym(model), :class => model
+      todo :belongs_to, model.to_s.downcase.to_sym
     end
 
     def todo(method, *args)
       TODO[@left] << [method, *args]
     end
-
-    private
-
-    def plural_sym(obj)
-      basename(obj).pluralize.to_sym
-    end
-
-    def singular_sym(obj)
-      basename(obj).to_sym
-    end
-
-    def basename(obj)
-      obj.to_s.split('::').last.downcase
-    end
   end
 end

data/lib/ramaze/controller/default.rb

@@ -3,10 +3,5 @@ module Ramaze
 
   class DefaultController < Ramaze::Controller
     map '/'
-
-    def lobster
-      require 'rack/lobster'
-      respond Rack::Lobster::LobsterString
-    end
   end
 end

data/lib/ramaze/helper/cache.rb

@@ -28,30 +28,17 @@ module Ramaze
         cache = Innate::Cache.action
 
         ancestral_trait[:cache_action].each do |cache_action|
-          temp  = cache_action.dup
-          block = temp.delete(:key)
-          ttl   = temp.delete(:ttl)
+          temp = cache_action.dup
+          ttl = temp.delete(:ttl)
 
           if temp.all?{|key, value| action[key] == value }
-            cache_key = action.full_path
-            cache_key << "_#{action.instance.instance_eval(&block).to_s}" if block
-
-            if cached = cache[cache_key]
-              action.options[:content_type] = cached[:type]
+            if cached = cache[temp]
+              return cached
+            elsif ttl
+              return cache.store(temp, yield, :ttl => ttl)
             else
-              cached = {
-                :body => catch(:respond) { yield },
-                :type => response['Content-Type']
-              }
-
-              if ttl
-                cache.store(cache_key, cached, :ttl => ttl)
-              else
-                cache.store(cache_key, cached)
-              end
+              return cache.store(temp, yield)
             end
-
-            return cached[:body]
           end
         end
 
@@ -80,8 +67,7 @@ module Ramaze
           cache_action(hash.merge(:method => name))
         end
 
-        def cache_action(hash, &block)
-          hash[:key] = block if block_given?
+        def cache_action(hash)
           hash[:method] = hash[:method].to_s
           trait[:cache_action] << hash
         end

data/lib/ramaze/helper/formatting.rb

@@ -3,8 +3,6 @@
 
 module Ramaze
   module Helper::Formatting
-    module_function
-
     FORMATTING_NUMBER_COUNTER = { 0 => 'no', 2 => 'two', 3 => 'three',
       4 => 'four', 5 => 'five', 6 => 'six', 7 => 'seven', 8 => 'eight',
       9 => 'nine', 10 => 'ten' }

data/lib/ramaze/helper/httpdigest.rb

@@ -83,7 +83,7 @@ module Ramaze
         httpdigest_failure unless nonce == session_nonce and opaque == session_opaque
 
         ha1 = httpdigest_lookup(username, realm, &block)
-        a2 = [request.request_method,request.request_uri]
+        a2 = [request.request_method,request.fullpath]
         a2 << Digest::MD5.hexdigest(request.body.read) if qop == "auth-int"
         ha2 = Digest::MD5.hexdigest( a2.join(':') )
         md5 = Digest::MD5.hexdigest([ha1, nonce, nc, cnonce, qop, ha2].join(':'))

data/lib/ramaze/helper/link.rb

@@ -5,10 +5,13 @@ require 'innate/helper/link'
 
 module Ramaze
   module Helper
-    # This is a modification of Innate::Helper::Link to respect the routing of
-    # Ramaze
     # NOTE: The A/R/Rs methods have been deprecated.
     module Link
+      include Innate::Helper::Link
+
+      def self.included(into)
+        into.extend(self)
+      end
 
       # @return [String]
       # @see Innate::Helper#anchor

data/lib/ramaze/helper/localize.rb

@@ -19,12 +19,7 @@ module Ramaze
       end
 
       def locales
-        locales = request.env['localize.locales']
-        return locales if locales
-
-        fallback = ancestral_trait[:localize_locale]
-        locales = Parser.new(request).locales(fallback)
-        request.env['localize.locales'] = locales
+        Parser.new(request).locales(ancestral_trait[:localize_locale])
       end
 
       class Dictionary
@@ -110,7 +105,7 @@ module Ramaze
         end
 
         def parse
-          parse_params || parse_session || parse_cookie || parse_header
+          parse_params || parse_cookie || parse_header
         end
 
         def parse_params(key = 'lang')
@@ -118,18 +113,13 @@ module Ramaze
           ::Locale::Tag.parse(lang)
         end
 
-        def parse_session(key = :lang)
-          return unless lang = Current.session[key]
-          ::Locale::Tag.parse(lang)
-        end
-
         def parse_cookie(key = 'lang')
           return unless lang = request.cookies[key]
           ::Locale::Tag.parse(lang)
         end
 
         def parse_header
-          request.accept_language.map{|lang|
+          request.accept_language_with_weight.map{|lang|
             ::Locale::Tag.parse(lang) }
         end
       end

data/lib/ramaze/helper/paginate.rb

@@ -154,7 +154,6 @@ module Ramaze
         def last_page; @pager.last_page; end
         def last_page?; @pager.last_page?; end
         def next_page; @pager.next_page; end
-        def empty?; @pager.empty?; end
 
         private
 

data/lib/ramaze/helper/partial.rb

@@ -1,99 +1,24 @@
-#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
-# All files in this distribution are subject to the terms of the Ruby license.
+require 'innate/helper/partial'
 
 module Ramaze
   module Helper
-
-    # = Helper::Partial
-    #
-    # Please note that this helper is deprecated in favor of # Helper::Render,
-    # it has been removed from Innate and remains in Ramaze until 2009.05.
-    #
-    # === Example Usage
-    #
-    #   class MyController
-    #     def index
-    #     end
-    #
-    #     def list
-    #       plain = request['plain']
-    #       "Hello World from List!  Plain List == #{plain}"
-    #     end
-    #   end
-    #
-    #
-    #   <html>
-    #     <head><title>Partial Render Index</title></head>
-    #     <body>
-    #       #{render_partial(Rs(:list), 'plain' => true)}
-    #     </body>
-    #   </html>
     module Partial
-      module_function
-
-      # Renders a url 'inline'.
-      #
-      # +url+      normal URL, like you'd use for redirecting.
-      # +options+  optional, will be used as request parameters.
-      #
-      # Issues a mock request to the given +url+ with +options+ turned into
-      # query arguments.
-      def render_partial(url, options = {})
-        Ramaze.deprecated('Helper::Partial#render_partial', 'Helper::Render#render_full')
-
-        uri = URI(url)
-        query = options # Innate::Current.request.params.merge(options)
-        uri.query = Rack::Utils.build_query(query)
-
-        body = nil
-
-        Innate::Mock.session do |session|
-          cookie = Innate::Current.session.cookie
-          session.cookie = cookie
-          body = session.get(uri.to_s, options).body
-        end
+      include Innate::Helper::Partial
 
-        body
+      def self.included(into)
+        into.extend(self)
+        into.extend(Innate::Helper::Partial)
       end
 
-      # Render the template file in view_root of the
-      # current controller.
-      #
-      # TODO:
-      # * Doesn't work for absolute paths, but there are no specs for that yet.
-      # * the local variable hack isn't working because innate allocates a new
-      #   binding.
-      #   For now one can simply use instance variables, which I prefer anyway.
-      #
-      # the local binding hack:
-      #
-      #   variables.each do |key, value|
-      #     value = "ObjectSpace._id2ref(#{value.object_id})"
-      #     eval "#{key} = #{value}", action.binding
-      #   end
+      def partial_content(name, variables = {})
+        action = resolve(name.to_s)
 
-      def render_template(path, variables = {})
-        Ramaze.deprecated('Helper::Partial#render_template')
-        path = path.to_s
-
-        ext = File.extname(path)
-        basename = File.basename(path, ext)
-
-        action = Innate::Current.action.dup
-        action.layout    = nil
-        action.view      = action.node.find_view(basename, 'html')
-        action.method    = action.node.find_method(basename, action.params)
+        action.layout = nil
 
+        action.instance = action.node.new
         action.variables = action.variables.merge(variables)
-        action.sync_variables(action)
-
-        return action.call if action.valid?
-        raise(ArgumentError, "cannot render %p" % path)
-      end
 
-      def render_action(method, *params)
-        Ramaze.deprecated('Helper::Partial#render_action', 'Helper::Render#render_full')
-        render_partial(r(method), *params)
+        action.render if action.valid?
       end
     end
   end

data/lib/ramaze/helper.rb

@@ -1,12 +1,22 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'innate/helper'
-
 module Ramaze
-  Helper = Innate::Helper
-  Innate::HelpersHelper.options.paths << File.dirname(__FILE__)
+  module Helper
+    EXPOSE = LOOKUP = Innate::Helper::EXPOSE
+
+    def self.included(into)
+      into.extend(HelperAccess)
+      into.__send__(:include, Trinity)
+    end
+
+    # assign some of the default helpers that have no overrides
+    Innate::HelpersHelper.each(:cgi, :aspect, :redirect, :send_file) do |mod|
+      Helper.const_set(mod.name.split('::').last, mod)
+    end
+  end
 
-  require 'ramaze/helper/flash'
-  require 'ramaze/helper/link'
+  Innate::HelpersHelper.add_path(File.dirname(__FILE__))
+  Innate::HelpersHelper.add_path('')
+  Innate::HelpersHelper.add_pool(Ramaze::Helper)
 end

data/lib/ramaze/request.rb

@@ -27,14 +27,13 @@ module Ramaze
     #   @name # => 'manveru'
     #   @lang # => nil
 
-    def to_instance_variables(*args)
+    def to_ivs(*args)
       instance = Action.current.instance
       args.each do |arg|
         next unless value = self[arg]
         instance.instance_variable_set("@#{arg}", value)
       end
     end
-    alias to_ivs to_instance_variables
 
     def accept_charset(default = 'UTF-8')
       return default unless charsets = env['HTTP_ACCEPT_CHARSET']
@@ -94,25 +93,5 @@ module Ramaze
       env.reject{|key, value| key.to_s !~ INTERESTING_HTTP_VARIABLES }
     end
     alias http_vars http_variables
-
-    REQUEST_STRING_FORMAT = "#<%s params=%p cookies=%p env=%p>"
-
-    def to_s
-      REQUEST_STRING_FORMAT % [self.class, params, cookies, http_variables]
-    end
-    alias inspect to_s
-
-    # Pretty prints current action with parameters, cookies and enviroment
-    # variables.
-    def pretty_print(pp)
-      pp.object_group(self){
-        group = { 'params' => params, 'cookies' => cookies, 'env' => http_variables }
-        group.each do |name, hash|
-          pp.breakable
-          pp.text " @#{name}="
-          pp.nest(name.size + 3){ pp.pp_hash(hash) }
-        end
-      }
-    end
   end
 end

data/lib/ramaze/snippets/ramaze/deprecated.rb

@@ -1,5 +1,6 @@
 module Ramaze
   DEPRECATED_CONSTANTS = {
+    :ThreadAccessor => :StateAccessor,
     :BASEDIR        => :ROOT,
     :Template       => :View,
     :Optional       => :Optioned,

data/lib/ramaze/snippets/string/each.rb

@@ -0,0 +1,19 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+module Ramaze
+  module CoreExtensions
+
+    # Extensions for String
+
+    module String
+      # 1.9 Compatibility with 1.8
+
+      unless ''.respond_to?(:each)
+        def each(*args, &block)
+          each_line(*args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/spec.rb

@@ -1,6 +1,6 @@
-begin; require 'rubygems'; rescue LoadError; end
+require 'ramaze'
+require 'bacon'
 
-require(File.expand_path("#{__FILE__}/../")) unless defined?(Ramaze)
 require 'innate/spec'
 
 def spec_requires(*libs)
@@ -25,10 +25,3 @@ module Ramaze
 
   middleware!(:spec){|m| m.run(AppMap) }
 end
-
-shared :mock do
-  Ramaze.setup_dependencies
-  extend Rack::Test::Methods
-
-  def app; Ramaze.middleware; end
-end

data/lib/ramaze/version.rb

@@ -1,3 +1,3 @@
 module Ramaze
-  VERSION = "2009.04"
+  VERSION = "2009.04.01"
 end

data/lib/ramaze/view/haml.rb

@@ -1,4 +1,3 @@
-require 'haml/util'
 require 'haml/engine'
 
 module Ramaze

data/lib/ramaze/view/liquid.rb

@@ -5,56 +5,22 @@ require 'liquid'
 
 module Ramaze
   module View
-    # Liquid is a smarty-style templating engine that restricts the usage of
-    # code inside templates. This is mostly helpful if you want to let users
-    # submit templates but prevent them from running arbitrary code.
-    #
-    # Liquid offers a pipe-like syntax for chaining operations on objects.
-    # Any instance variable from your Controller is available as a variable
-    # inside Liquid, so be sensitive about what data you provide.
-    #
-    # If you want to allow partials you can provide a kind of virtual
-    # filesystem that contains partials. These can be rendered using the
-    # Liquid `{% include 'name' %}` tag. The include tag has no relation to the
-    # Ramaze::Helper::Render, it simply inlines the file.
-    #
-    # To tell Liquid where to find partials, you have to set the file_system.
-    # The naming-convention for liquid-partials is to use a '_' prefix to the
-    # filename and the '.liquid' filename extension. The names of partials
-    # are restricted to ASCII alpha-numeric characters and underscores. You
-    # can also use '/' to use templates located in deeper directories.
-    # The partial has access to the same variables as the template including
-    # it.
-    #
-    # @example setting file_system
-    #   template_path = './partials/'
-    #   Liquid::Template.file_system = Liquid::LocalFileSystem.new(template_path)
-    #
-    # @example using include
-    #   {% include 'foo' %}
-    #   {% include 'bar/foo' %}
-    #
-    # This will include the files located at './partials/_foo.liquid' and
-    # './partials/bar/_foo.liquid'.
-    #
-    # This functionality gets even more interesting if you customize it with
-    # your own virtual file-system, you can use anything that responds to
-    # `#read_template_file(path)`.
-    # That way you can even fetch templates from a database or instruct Liquid
-    # to allow you access to your own templates in the '/views' directory.
     module Liquid
-
-      # Liquid requires the variable keys to be strings, most likely for
-      # security resons (don't allow arbitrary symbols).
       def self.call(action, string)
-        action.sync_variables(action)
-        variables = {}
-        action.variables.each{|k,v| variables[k.to_s] = v }
+        instance_variables = {}
+        instance = action.instance
+
+        instance.instance_variables.each do |iv|
+          instance_variables[iv.to_s[1..-1]] = instance.instance_variable_get(iv)
+        end
 
-        template = ::Liquid::Template.parse(string.to_s)
-        html = template.render(variables)
+        template = ::Liquid::Template.parse(string)
+        html = template.render(instance_variables)
 
         return html, 'text/html'
+
+        # data = action.variables[:data] || {}
+        # template.render(data, options)
       end
 
       class Tag < ::Liquid::Tag

data/lib/ramaze/view/nagoro/render_partial.rb

@@ -1,24 +1,24 @@
-require 'innate/helper/render'
+require 'innate/helper/partial'
 
 module Nagoro
   module Pipe
     # Pipe that transforms <render /> tags.
     #
     # the src parameter in the render tag will be used as first parameter to
-    # render_partial, all other paramters are passed on as +variables+.
+    # render_partial, all other paramters are passed on as +options+.
     #
-    # Example calling render_partial('hello'):
-    #   <render src="hello" />
+    # Example calling render_partial('/hello'):
+    #   <render src="/hello" />
     #
-    # Example calling render_partial('hello', 'tail' => 'foo'):
-    #   <render src="hello" tail="foo" />
+    # Example calling render_partial('/hello', 'tail' => 'foo'):
+    #   <render src="/hello" tail="foo" />
     #
     class RenderPartial < Base
-      include Innate::Helper::Render
+      include Innate::Helper::Partial
 
       def tag_start(tag, attrs)
-        if tag == 'render' and action_name = attrs.delete('src')
-          append(render_partial(action_name, attrs))
+        if tag == 'render' and src = attrs.delete('src')
+          append(render_partial(src, attrs))
         else
           super
         end

data/lib/ramaze/view.rb

@@ -9,10 +9,6 @@ module Ramaze
   module View
     extend Innate::View
 
-    def self.get(*args)
-      Innate::View.get(*args)
-    end
-
     # Combine Kernel#autoload and Innate::View::register
 
     def self.auto_register(name, *exts)

data/lib/ramaze.rb

@@ -70,7 +70,6 @@ module Ramaze
     m.use Rack::Head
     m.use Rack::ETag
     m.use Rack::ConditionalGet
-    m.use Rack::ContentLength
     m.run Ramaze::AppMap
   end
 
@@ -82,7 +81,6 @@ module Ramaze
     m.use Rack::Head
     m.use Rack::ETag
     m.use Rack::ConditionalGet
-    m.use Rack::ContentLength
     m.run Ramaze::AppMap
   end
 end