ramaze 2012.04.14 → 2012.12.08b

data/lib/ramaze/log/informer.rb

@@ -40,15 +40,15 @@ module Ramaze
       #   Informer.new          # => logs to stdout with all levels being shown.
       #   Informer.new($stderr) # => same, but to stderr
       #
-      #   # same, but logs to the file foo.log (or creates it if it doesn't 
+      #   # same, but logs to the file foo.log (or creates it if it doesn't
       #   # exist yet)
       #   Informer.new("foo.log")
       #
       #   Informer.new($stdout, [:info]) #=> show only #info messages to stdout.
       #
-      # @param [String] out Specifies where the output should go. By default 
+      # @param [String] out Specifies where the output should go. By default
       #  this is set to STDOUT.
-      # @param [Array] log_leves Array containing the levels that should be 
+      # @param [Array] log_levels Array containing the levels that should be
       #  logged.
       #
       def initialize(out = $stdout, log_levels = [:debug, :error, :info, :warn])

data/lib/ramaze/log/logging.rb

@@ -4,7 +4,7 @@
 module Ramaze
   ##
   # This module provides a basic skeleton for your own loggers to be compatible.
-  # 
+  #
   # @example
   #   class MyLogger
   #     include Logging
@@ -22,7 +22,7 @@ module Ramaze
     # If you include this module you have to define #log or it will raise.
     #
     # @param [String] tag The level of the log message.
-    # @param [String] method 
+    # @param [String] meth
     # @param [Array] msgs The data that should be logged.
     #
     def tag_log(tag, meth, *msgs)
@@ -35,7 +35,7 @@ module Ramaze
     ##
     # Converts everything given to strings and passes them on with :info
     #
-    # @param [Array] objects An array of objects that need to be converted to 
+    # @param [Array] objects An array of objects that need to be converted to
     #  strings.
     #
     def info(*objects)
@@ -45,7 +45,7 @@ module Ramaze
     ##
     # Converts everything given to strings and passes them on with :warn
     #
-    # @param [Array] objects An array of objects that need to be converted to 
+    # @param [Array] objects An array of objects that need to be converted to
     #  strings.
     #
     def warn(*objects)

data/lib/ramaze/log/syslog.rb

@@ -38,8 +38,7 @@ module Ramaze
       # Just sends all messages received to ::Syslog
       # We simply return if the log was closed for some reason, this behavior
       # was copied from Informer.  We do not handle levels here. This will
-      # be done by te syslog daemon based on it's configuration.
-      #
+      # be done by the syslog daemon based on it's configuration.
       def log(tag, *messages)
         return if !::Syslog.opened?
         tag = tag.to_sym
@@ -48,6 +47,7 @@ module Ramaze
           tag = ALIASES[tag]
         end
 
+        messages = messages.map {|m| m.gsub(/(%[^m])/,'%\1')}
         ::Syslog.send(tag, *messages)
       end
 

data/lib/ramaze/response.rb

@@ -22,7 +22,7 @@ module Ramaze
     # @param  [Fixnum] status The HTPP status code for the response.
     # @param  [Hash] header A hash containing additional headers and their
     #  values.
-    # @param  [Proc] &block
+    # @param  [Proc] block
     #
     def initialize(body = [], status = 200, header = {}, &block)
       modified_header = Ramaze.options.header.merge(header)

data/lib/ramaze/snippets.rb

@@ -1,35 +1,15 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the MIT license.
 
-require 'ramaze/snippets/array/put_within'
-require 'ramaze/snippets/binding/locals'
 require 'ramaze/snippets/blankslate'
-require 'ramaze/snippets/fiber'
-require 'ramaze/snippets/kernel/pretty_inspect'
-require 'ramaze/snippets/metaid'
-require 'ramaze/snippets/numeric/filesize_format'
-require 'ramaze/snippets/numeric/time'
 require 'ramaze/snippets/object/__dir__'
-require 'ramaze/snippets/object/instance_variable_defined'
-require 'ramaze/snippets/object/pretty'
-require 'ramaze/snippets/object/scope'
-require 'ramaze/snippets/ordered_set'
-require 'ramaze/snippets/proc/locals'
-require 'ramaze/snippets/ramaze/acquire'
 require 'ramaze/snippets/ramaze/deprecated'
-require 'ramaze/snippets/ramaze/dictionary'
-require 'ramaze/snippets/ramaze/fiber'
 require 'ramaze/snippets/ramaze/lru_hash'
-require 'ramaze/snippets/ramaze/struct'
 require 'ramaze/snippets/string/camel_case'
 require 'ramaze/snippets/string/color'
-require 'ramaze/snippets/string/end_with'
 require 'ramaze/snippets/string/esc'
-require 'ramaze/snippets/string/ord'
 require 'ramaze/snippets/string/snake_case'
-require 'ramaze/snippets/string/start_with'
 require 'ramaze/snippets/string/unindent'
-require 'ramaze/snippets/thread/into'
 
 Ramaze::CoreExtensions.constants.each do |const|
   ext = Ramaze::CoreExtensions.const_get(const)

data/lib/ramaze/spec/bacon.rb

@@ -1,13 +1,9 @@
-begin
-  require 'bacon'
-rescue LoadError
-  require 'rubygems'
-  require 'bacon'
-end
-
 require File.expand_path('../../../ramaze', __FILE__)
+require 'bacon'
 require 'innate/spec/bacon'
 
+Ramaze.middleware(:spec) { run Ramaze.core }
+
 def spec_requires(*libs)
   spec_precondition 'require' do
     libs.each { |lib| require(lib) }
@@ -25,16 +21,12 @@ rescue Exception => ex
   exit 0
 end
 
-# minimal middleware, no exception handling
-Ramaze.middleware!(:spec) do |m|
-  m.run(Ramaze::AppMap)
-end
-
 shared :rack_test do
   Ramaze.setup_dependencies
+
   extend Rack::Test::Methods
 
-  def app; Ramaze.middleware; end
+  def app; Ramaze; end
 end
 
 shared :webrat do

data/lib/ramaze/version.rb

@@ -1,3 +1,3 @@
 module Ramaze
-  VERSION = "2012.04.14"
+  VERSION = '2012.12.08b'
 end

data/lib/ramaze/view/erector.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'erector'
-end
+require 'erector'
 
 module Ramaze
   module View

data/lib/ramaze/view/erubis.rb

@@ -1,8 +1,6 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the MIT license.
-Ramaze.setup(:verbose => false) do
-  gem 'erubis'
-end
+require 'erubis'
 
 module Ramaze
   module View

data/lib/ramaze/view/ezamar.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'ezamar'
-end
+require 'ezamar'
 
 module Ramaze
   module View

data/lib/ramaze/view/haml.rb

@@ -1,7 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'haml'
-end
-
+require 'haml'
 require 'haml/util'
 require 'haml/engine'
 

data/lib/ramaze/view/liquid.rb

@@ -1,8 +1,6 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the MIT license.
-Ramaze.setup(:verbose => false) do
-  require 'liquid'
-end
+require 'liquid'
 
 module Ramaze
   module View

data/lib/ramaze/view/lokar.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'lokar'
-end
+require 'lokar'
 
 module Ramaze
   module View

data/lib/ramaze/view/mustache.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'mustache'
-end
+require 'mustache'
 
 module Ramaze
   module View

data/lib/ramaze/view/nagoro.rb

@@ -1,7 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'nagoro'
-end
-
+require 'nagoro'
 require 'ramaze/view/nagoro/render_partial'
 
 module Ramaze

data/lib/ramaze/view/remarkably.rb

@@ -1,7 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'Remarkably', :lib => 'remarkably'
-end
-
+require 'remarkably'
 require 'remarkably/engines/html'
 
 module Ramaze

data/lib/ramaze/view/sass.rb

@@ -1,8 +1,5 @@
-Ramaze.setup(:verbose => false) do
-  gem 'haml'
-  gem 'sass'
-end
-
+require 'haml'
+require 'sass'
 require 'haml/util'
 
 module Ramaze

data/lib/ramaze/view/slim.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'slim'
-end
+require 'slim'
 
 module Innate
   module View

data/lib/ramaze/view/slippers.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'slippers'
-end
+require 'slippers'
 
 module Ramaze
   module View

data/lib/ramaze/view/tagz.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'tagz'
-end
+require 'tagz'
 
 module Ramaze
   module View

data/lib/ramaze/view/tenjin.rb

@@ -1,6 +1,4 @@
-Ramaze.setup(:verbose => false) do
-  gem 'tenjin'
-end
+require 'tenjin'
 
 module Ramaze
   module View

data/ramaze.gemspec

@@ -1,28 +1,57 @@
-require File.expand_path('../lib/ramaze/version'     , __FILE__)
-require File.expand_path('../lib/ramaze/dependencies', __FILE__)
+require File.expand_path('../lib/ramaze/version', __FILE__)
 
-# Get all the files from the manifest
 path = File.expand_path('../', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name                      = 'ramaze'
-  s.version                   = Ramaze::VERSION
-  s.date                      = '2012-04-14'
-  s.authors                   = ['Michael \'manveru\' Fellinger']
-  s.email                     = 'm.fellinger@gmail.com'
-  s.summary                   = 'Ramaze is a simple and modular web framework'
-  s.homepage                  = 'http://ramaze.net/'
-  s.description               = s.summary
+  s.name        = 'ramaze'
+  s.version     = Ramaze::VERSION
+  s.date        = Time.now.strftime('%Y-%m-%d')
+  s.authors     = ['Michael \'manveru\' Fellinger', 'Yorick Peterse']
+  s.email       = ['m.fellinger@gmail.com', 'yorickpeterse@gmail.com']
+  s.summary     = 'Ramaze is a simple and modular web framework'
+  s.homepage    = 'http://ramaze.net/'
+  s.description = s.summary
+
   s.required_rubygems_version = '>= 1.3.5'
   s.files                     = `cd #{path}; git ls-files`.split("\n").sort
   s.has_rdoc                  = 'yard'
   s.executables               = ['ramaze']
 
-  Ramaze::DEPENDENCIES.each do |dep|
-    s.add_dependency(dep[:name], dep[:version])
+  s.add_dependency 'innate', '>= 2012.12'
+  s.add_dependency 'rake'
+
+  s.add_development_dependency 'Remarkably'
+  s.add_development_dependency 'bacon'
+  s.add_development_dependency 'dalli'
+  s.add_development_dependency 'erector'
+  s.add_development_dependency 'erubis'
+  s.add_development_dependency 'ezamar'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'hpricot'
+  s.add_development_dependency 'liquid'
+  s.add_development_dependency 'locale'
+  s.add_development_dependency 'maruku'
+  s.add_development_dependency 'mustache'
+  s.add_development_dependency 'rack-contrib'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'redis'
+  s.add_development_dependency 'sass'
+  s.add_development_dependency 'sequel'
+  s.add_development_dependency 'slim'
+  s.add_development_dependency 'slippers'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'tagz'
+  s.add_development_dependency 'tenjin'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'localmemcache'
+
+  if RUBY_VERSION.to_f >= 1.9
+    s.add_development_dependency 'lokar'
   end
 
-  Ramaze::DEVELOPMENT_DEPENDENCIES.each do |dep|
-    s.add_development_dependency(dep[:name], dep[:version])
+  # Nagoro doesn't seem to work on Rbx
+  if !RUBY_DESCRIPTION.include?('rubinius')
+    s.add_development_dependency 'nagoro'
   end
-end # Gem::Specification.new
+end

data/spec/helper.rb

@@ -5,7 +5,6 @@ if caller_line = caller.grep(%r!spec/ramaze/!).first
 end
 
 require File.expand_path('../../lib/ramaze/spec/bacon', __FILE__)
-require File.expand_path('../../lib/ramaze/dependencies', __FILE__)
 
 Ramaze.options.roots = [caller_root] if caller_root
 

data/spec/ramaze/cache/localmemcache.rb

@@ -3,10 +3,6 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_precondition 'LocalMemcache should be supported' do
-  should.flunk if Ramaze::UNSUPPORTED_GEMS.include?('localmemcache')
-end
-
 spec_require 'localmemcache'
 
 describe Ramaze::Cache::LocalMemCache do

data/spec/ramaze/controller/mapping.rb

@@ -20,6 +20,10 @@ describe 'Controller::generate_mapping' do
     gen('Module::ClassController').should == '/module/class'
   end
 
+  it 'maps Module::MainController to /module/' do
+    gen('Module::MainController').should == '/module/'
+  end
+
   it 'maps Class to /class' do
     gen('Class').should == '/class'
   end
@@ -32,6 +36,10 @@ describe 'Controller::generate_mapping' do
     gen('Module::Module::Class').should == '/module/module/class'
   end
 
+  it 'maps Module::Module::MainController to module/module/' do
+    gen('Module::Module::MainController').should == '/module/module/'
+  end
+
   it "maps MainController to '/'" do
     gen('MainController').should == '/'
   end
@@ -40,7 +48,16 @@ describe 'Controller::generate_mapping' do
     gen('Controller').should == nil
   end
 
+  it "doesn't map Module::Controller" do
+    gen('Module::Controller').should == nil
+  end
+
   it "doesn't map anonymous classes" do
     gen(Class.new.name).should == nil
   end
+
+  it "respects custom irregular mappings" do
+    Ramaze::Controller::IRREGULAR_MAPPING['Snake'] = 'snake_on_a_plane'
+    gen('Some::Snake').should == '/some/snake_on_a_plane'
+  end
 end

data/spec/ramaze/dispatcher/directory.rb

@@ -5,11 +5,11 @@ require File.expand_path('../../../../spec/helper', __FILE__)
 
 spec_require 'hpricot'
 
-module Ramaze
-  # minimal middleware, no exception handling
-  middleware!(:spec){|m|
-    m.run m.directory(__DIR__('public'))
-  }
+Ramaze.middleware(:spec) do
+  run Rack::ETag.new(
+    Rack::ConditionalGet.new(Rack::Directory.new(__DIR__('public'))),
+    'public'
+  )
 end
 
 describe 'Directory listing' do
@@ -30,6 +30,7 @@ describe 'Directory listing' do
   end
 
   Ramaze.map('/', lambda{|env| [404, {}, ['not found']]})
+  Ramaze.recompile_middleware(:spec)
 
   def build_listing(path)
     get('path').body