ramaze 0.2.0 → 0.2.1

data/lib/ramaze/contrib/auto_params.rb

@@ -4,10 +4,10 @@
 # using ruby2ruby and ParseTree
 #
 # Usage:
-#   require 'ramaze/contrib'
+#
 #   Ramaze.contrib :auto_params
 #
-# For example,
+# Then, for example,
 #
 #   def search(query) end
 #
@@ -86,7 +86,7 @@ module Ramaze
     # use Method#get_args to insert values from request.params into Action#params
 
     def self.resolve_method(name, *params)
-      if method = action_methods.delete(name)
+      if method = [ name, name.gsub('__','/') ].find{|n| action_methods.delete(n) }
         meth = instance_method(method)
         arity = meth.arity
 

data/lib/ramaze/contrib/gzip_filter.rb

@@ -6,11 +6,10 @@
 # Use this to compress "large" pages with gzip.  All major browsers support gzipped pages.
 # This filter brought to you by your friends in #ramaze: Pistos, manveru, rikur and Kashia.
 #
-# Usage:
-# in start.rb:
+# Usage, in start.rb:
 #
-# require 'path/to/gzip-filter'
-# Ramaze::Dispatcher::Action::FILTER << Ramaze::Filter::Gzip
+#   require 'ramaze/contrib/gzip_filter'
+#   Ramaze::Dispatcher::Action::FILTER << Ramaze::Filter::Gzip
 
 require 'zlib'
 

data/lib/ramaze/contrib/route.rb

@@ -1,6 +1,11 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Usage:
+#
+#   Ramaze.contrib :route
+#   Ramaze::Contrib::Route[ %r!^/(\d+\.\d{2})$! ] = "/price/%.2f"
+
 module Ramaze
   module Contrib
     class Route

data/lib/ramaze/controller/resolve.rb

@@ -126,7 +126,7 @@ module Ramaze
 
       # Based on methodname and arity, tries to find the right method on current controller.
       def resolve_method(name, *params)
-        if method = action_methods.delete(name)
+        if method = [ name, name.gsub('__','/') ].find{|n| action_methods.delete(n) }
           arity = instance_method(method).arity
           if params.size == arity or arity < 0
             return method, params

data/lib/ramaze/dispatcher/action.rb

@@ -23,7 +23,7 @@ module Ramaze
         # post-processing.
 
         def process(path)
-          Inform.info("Dynamic request from #{request.remote_addr}: #{path}")
+          Inform.info("Dynamic request from #{request.ip}: #{request.request_uri}")
           body = Controller.handle(path)
           response = Response.current.build(body)
           FILTER.inject(response){|r,f| f.call(r) }

data/lib/ramaze/dispatcher/error.rb

@@ -40,11 +40,14 @@ module Ramaze
           status ||= 500
 
           if controller = metainfo[:controller]
-            begin
-              action = Controller.resolve(controller.mapping + path)
-              return response.build(action.render, status)
-            rescue Ramaze::Error => e
+            newpath = (controller.mapping + path).squeeze('/')
+            action_response = Dispatcher::Action.process(newpath)
+            case action_response
+            when Ramaze::Error
               Inform.debug("No custom error page found on #{controller}, going to #{path}")
+            else
+              action_response.status = status
+              return action_response
             end
           end
 

data/lib/ramaze/gestalt.rb

@@ -8,8 +8,7 @@ Example:
   require 'ramaze/gestalt'
 
   def random_color
-    r = lambda{|n| rand(n).to_s(16) }
-    '#' + [255, 255, 255].map{r[255] + r[255] + r[255]
+    ('#' << '%02x' * 3) % (1..3).map{ rand(255) }
   end
 
   puts Ramaze::Gestalt.build{

data/lib/ramaze/helper.rb

@@ -23,10 +23,14 @@ module Ramaze
     def helper *syms
       syms.each do |sym|
         mod_name = sym.to_s.capitalize + 'Helper'
-        glob = "{helper,#{BASEDIR/:ramaze/:helper}}/#{sym}.{rb,so}"
-        require Dir[glob].first
-        include ::Ramaze.const_get(mod_name)
-        extend ::Ramaze.const_get(mod_name)
+        begin
+          include ::Ramaze.const_get(mod_name)
+          extend ::Ramaze.const_get(mod_name)
+        rescue NameError
+          files = Dir["{helper,#{BASEDIR/:ramaze/:helper}}/#{sym}.{rb,so}"]
+          raise LoadError, "#{mod_name} not found" unless files.any?
+          require(files.first) ? retry : raise
+        end
       end
     end
   end

data/lib/ramaze/helper/auth.rb

@@ -29,7 +29,7 @@ module Ramaze
       if check_auth(username, password)
         session[:logged_in] = true
         session[:username] = username
-        inside_stack? ? answer : redirect( R(self) )
+        inside_stack? ? answer : redirect_referrer
       else
         if AUTH_ELEMENT and AUTH_ELEMENT.to_s.split.any?
           open_element = "<#{AUTH_ELEMENT}>"

data/lib/ramaze/helper/cache.rb

@@ -37,8 +37,12 @@ module Ramaze
     #       "hi #{request['name']}"
     #     end
     #   end
+    #
+    # cache acts as a wrapper for value_cache if no args are given
 
     def cache *args
+      return value_cache if args.size == 0
+
       if args.last.is_a? Hash
         opts = args.pop
       end

data/lib/ramaze/helper/identity.rb

@@ -20,11 +20,11 @@ module Ramaze
     # Simple form for use or overwriting.
     # Has to provide the same functionality when overwritten or directly
     # embedded into a page.
-    def openid_login_form
+    def openid_login_form(caption="login")
       %{
 <form method="GET" action="#{Rs(:openid_begin)}">
   Identity URL: <input type="text" name="url" />
-  <input type="submit" />
+  <input type="submit" value="#{caption}"/>
 </form>
       }
     end

data/lib/ramaze/snippets/{string/DIVIDE.rb → divide.rb}

@@ -1,17 +1,20 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-# Extensions for String
+# A convenient way to do File.join
+#
+# Example:
+#   'a' / 'b'                      # -> 'a/b'
+#   File.dirname(__FILE__) / 'bar' # -> "ramaze/snippets/string/bar"
 
 class String
-
-  # A convenient way to do File.join
-  #
-  # Example:
-  #   'a' / 'b'                      # -> 'a/b'
-  #   File.dirname(__FILE__) / 'bar' # -> "ramaze/snippets/string/bar"
-
   def / obj
     File.join(self, obj.to_s)
   end
 end
+
+class Symbol
+  def / obj
+    self.to_s / obj
+  end
+end

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

@@ -0,0 +1,7 @@
+class String
+  def unindent
+    space = self.split("\n")[1].to_s[/^(\s+)/, 1]
+    strip.gsub(/^#{space}/, '')
+  end
+  alias ui unindent
+end

data/lib/ramaze/snippets/thread/into.rb

@@ -6,20 +6,13 @@ class Thread
   #   :action, :response, :request, :session,
   #   :task, :adapter, :controller, :exception
 
-  def self.into
-    Thread.new(Thread.current) do |thread|
-      current = Thread.current
-
-      vars = Dir["#{Ramaze::BASEDIR}/**/*.rb"].
-        map{|f| File.readlines(f).
-          map{|l| l[/Thread\.current\[:([^\]]*)\]/, 1] } }
-
-      vars.flatten.compact.uniq.each do |var|
-        var = var.to_sym
-        current[var] = thread[var]
+  def self.into *args
+    Thread.new(Thread.current, *args) do |thread, *args|
+      thread.keys.each do |k|
+        Thread.current[k] = thread[k] unless k.to_s =~ /^__/
       end
 
-      yield
+      yield *args
     end
   end
 end

data/lib/ramaze/spec/helper/wrap.rb

@@ -164,7 +164,7 @@ class SpecFile
     puts "[ #@name ]".center(80, '-')
     puts "ExitStatus:".yellow, PP.pp(@status)
     puts "StdOut:".yellow, @stdout
-    puts "StdErr:".yellow, PP.pp(@stderr, '')
+    puts "StdErr:".yellow, @stderr
   end
 
   def parse

data/lib/ramaze/template/haml.rb

@@ -11,32 +11,22 @@ module Ramaze
 
     class Haml < Template
 
-      # Custom HAML-options for your controller to be merged.
-
-      trait :haml_options => {
-        :locals => {}
-      }
-
       ENGINES[self] = %w[ haml ]
 
       class << self
 
-        # Transform any String via Haml, takes optionally an hash with the
-        # haml_options that you can set also by
-        #   trait :haml_options => {}
-        # if you pass the options it will merge the trait with them. (your
-        # options override the defaults from trait[:haml_options]
+        # Transform via Haml templating engine
 
         def transform action
           haml = wrap_compile(action)
           haml.to_html(action.instance)
         end
 
-        # Instantiates Haml::Engine with the template and haml_options from
-        # the trait.
+        # Instantiates Haml::Engine with the template and haml_options trait from
+        # the controller.
 
         def compile(action, template)
-          ::Haml::Engine.new(template, ancestral_trait[:haml_options])
+          ::Haml::Engine.new(template, action.controller.trait[:haml_options] || {})
         end
       end
     end

data/lib/ramaze/template/sass.rb

@@ -11,21 +11,11 @@ module Ramaze
 
     class Sass < Template
 
-      # Custom SASS-options for your controller to be merged.
-
-      trait :sass_options => {
-        :locals => {}
-      }
-
       ENGINES[self] = %w[ sass ]
 
       class << self
 
-        # Transform any String via Sass, takes optionally an hash with the
-        # sass_options that you can set also by
-        #   trait :sass_options => {}
-        # if you pass the options it will merge the trait with them. (your
-        # options override the defaults from trait[:sass_options]
+        # Transform via Sass templating engine
 
         def transform action
           Response.current['Content-Type'] = "text/css"
@@ -33,11 +23,11 @@ module Ramaze
           sass.to_css()
         end
 
-        # Instantiates Sass::Engine with the template and sass_options from
-        # the trait.
+        # Instantiates Sass::Engine with the template and sass_options trait from
+        # the controller.
 
         def compile(action, template)
-          ::Sass::Engine.new(template, ancestral_trait[:sass_options])
+          ::Sass::Engine.new(template, action.controller.trait[:sass_options] || {})
         end
       end
     end

data/lib/ramaze/trinity/request.rb

@@ -4,6 +4,7 @@
 require 'cgi'
 require 'tmpdir'
 require 'digest/md5'
+require 'ipaddr'
 require 'rack'
 require 'rack/request'
 
@@ -34,7 +35,39 @@ module Ramaze
       super
     end
 
-    unless defined?(rack_params)
+    def request_uri
+      env['REQUEST_URI'] || path_info
+    end
+
+    def ip
+      env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR']
+    end
+
+    # Request is from a local network?
+    # Checks both IPv4 and IPv6
+
+    ipv4 = %w[ 127.0.0.1/32 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 169.254.0.0/16 ]
+    ipv6 = %w[ fc00::/7 fe80::/10 fec0::/10 ::1 ]
+    LOCAL = (ipv4 + ipv6).map{|a| IPAddr.new(a)}
+
+    # --
+    # Mongrel somehow puts together multiple IPs when proxy is involved.
+    # ++
+
+    def local_net?(address = ip)
+      address = address.to_s.split(',').first
+      addr = IPAddr.new(address)
+      LOCAL.find{|range| range.include?(addr) }
+    end
+
+    def [](key, *rest)
+      value = params[key.to_s]
+      return value if rest.empty?
+      keys = rest.flatten.map{|k| k.to_s}
+      Array[value, *params.values_at(*keys)]
+    end
+
+    unless method_defined?(:rack_params)
       alias rack_params params
 
       # Wrapping Request#params to support a one-level hash notation.

data/lib/ramaze/version.rb

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

data/rake_tasks/coverage.rake

@@ -0,0 +1,46 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'rake'
+require 'lib/ramaze/snippets/divide'
+
+spec_base = File.expand_path('spec/ramaze/')
+example_base = File.expand_path('examples')
+snippets_base = File.expand_path('spec/snippets')
+# ignore files with these paths
+ignores = [ './*', './helper/*', './ramaze/adapter.rb', './ramaze/request.rb', ]
+
+files = Dir[spec_base/'**'/'*.rb'] +
+        Dir[example_base/'**/spec'/'*.rb']
+ignores.each do |ignore|
+  ignore_files = Dir[spec_base/ignore]
+  ignore_files.each do |ignore_file|
+    files.delete File.expand_path(ignore_file)
+  end
+end
+
+files.sort!
+
+last = files.pop
+
+COV_CMD = "rcov --aggregate coverage.data --%shtml -%s -x gem -x rack %s"
+
+def sys(cmd)
+ puts cmd
+ system(cmd)
+end
+
+task :coverage => :clean do
+  # these are the tests that can be run in parallel.
+  # IMHO, ideally we should have
+  # * 100% coverage of ramaze with pure tests
+  # * 100% coverage with non-pure functional tests
+  pure_specs =  Dir[snippets_base/'**/*.rb'].entries
+  sys(COV_CMD % ["no-","t", pure_specs.join(' ')])
+
+  files.each do |file|
+    sys(COV_CMD % ["no-","t", file])
+  end
+  sys(COV_CMD % ["", "t", last] )
+
+end

data/rake_tasks/spec.rake

@@ -3,7 +3,7 @@
 
 require 'rake'
 require 'ramaze/spec/helper/layout'
-require 'lib/ramaze/snippets/string/DIVIDE'
+require 'lib/ramaze/snippets/divide'
 
 SPEC_BASE = File.expand_path('spec')
 EXAMPLE_BASE = File.expand_path('examples')

data/spec/contrib/auto_params.rb

@@ -1,13 +1,14 @@
 require 'spec/helper'
 testcase_requires 'ruby2ruby'
 
-require 'ramaze/contrib'
 Ramaze.contrib :auto_params
 
 module AnotherController
   def another_page
     'another page'
   end
+
+  define_method(:css/'style.css') { 'style.css' }
 end
 
 class MainController < Ramaze::Controller
@@ -94,4 +95,8 @@ describe 'Normal behavior' do
   it 'should work with included actions' do
     get('/another_page').body.should == 'another page'
   end
+
+  it 'should work with /' do
+    get('/css/style.css').body.should == 'style.css'
+  end
 end