spec/ramaze/app/location.rb @@ -1,16 +1,17 @@ -The Ramaze development team is happy to announce version 2009.06 of Ramaze, the +The Ramaze development team is happy to announce version 2009.07 of Ramaze, the light and modular open source web framework that tries to stay out of your way. -This release features a lot of work directly from our community and we are -really greatful for everybody who helped in testing, patching and contributing -exciting new features. +This release contains mostly bug fixes and compatibility improvements. -Our extensive set of specs and docs now covers almost every detail of -implementation and usage. Ramaze is under development by a growing community -and in production use at companies. +Also, thanks to the work of Jeremy Evans, Scaffolding Extensions works with the +current version of Ramaze again, giving you a powerful and simple way to +provide CRUD and admin interfaces for Sequel and ActiveRecord. -There have been too many changes since the last official announcement in -2008.07, so I will only list changes since the last release. +I also would like to take this opportunity to ask for volunteers that are +running on Windows, we are currently working on a major overhaul of the ramaze +executable and would like to make sure it behaves correctly. +If you are interested, check out the modular-bin branch and report any issues +on the bug tracker or hang out on IRC. == Metadata @@ -19,6 +20,7 @@ Home page: http://ramaze.net Wiki: http://wiki.ramaze.net Repository: http://github.com/manveru/ramaze +Bug tracker: http://github.com/manveru/ramaze/issues Git clone: git://github.com/manveru/ramaze Current tarball: http://github.com/manveru/ramaze/tarball/master @@ -30,7 +32,7 @@ Simple example: require 'ramaze' - class MainController + class MainController < Ramaze::Controller def index 'Hello, World!' end @@ -39,66 +41,33 @@ Simple example: Ramaze.start -== Around 80 commits since 2009.05 - -- Improved bin/ramaze with lots of specs, should work now even on windows. -- Middleware order has been inverted. -- Support for Webrat out of the box. -- Fixed MemCache caching and sessions. -- Removed a whole lot of methods that were marked deprecated. -- New default Layout helper - - == Summarized changes with their respective commits -- Antti Tuomi - - Link helper did not set the prefix, added spec and fixed the behaviour - [ af753a0 | bae2b53 | eba4734 ] +- Aaron Müller + - Update identity helper with new link helper + +- Masahiro Nakagawa + - Rewrite localization example - Michael Fellinger (manveru) - - Fix bug that made default port/handler break in bin/ramaze [ e6715e1 ] - - Remove deprecated methods on Ramaze::Controller, Helper::Cache, - Helper::Link, and Helper::Auth. Also remove the deprecated methods - Object#acquire, String#/, and Symbol#/ - [ 272fced | 1e4ac92 | a0a9329 | 68242b3 | 57e7a85 | 31b809a | 3fc4622 ] - - The bacon scope :mock was renamed to :rack_test, added shared :webrat, so - you can run your specs with that as well. Also move the bacon-specific code - to ramaze/spec/bacon, prepare for test-framework-agnostic behaviour. - [ f1a2669 | c12a0a4 | fdde916 ] - - Fix ordering of middleware [ 508bffc ] - - Warn and fix the ttl if someone exceeds the maximum ttl allowed by MemCache - [ 3124879 | bc08091 ] - - Comaptibility with localmemcache 0.4.0 [ 096f051 ] - - Fixed Cache::Sequel to work with 3.1.0 [ d2c2b85 ] - - Fix bug with memcache on 1.9, make sure the Etag middleware works on it - [ 21763df | 1d0dff5 ] - - A little bit of example-usage for Helper::Form#form_select, improve by - allowing :multiple => 10 [ a634582 | de73014 ] - - Avoid useless iteration and fix ambigous linking in helper/paginate - [ 6fb74df | 9b73450 ] - - Respect preset options for port/adapter on ramaze start [ 6efaaaa ] - - Preserve file permissions during `ramaze create` [ 3e3bc0a ] - - Implement and spec the lonely controller rule [ fdfe5b9 | 4dd866b ] - - Fix "bug" pointed out by druby [ 796627a ] - - Output to logger in ramaze/setup if Log is available, don't output the - require exception twice. Avoid infinite recursion when a - gem name does not match it's lib name [ b9fa0c4 | 7bc9d65 | e6b4996 ] - - Put a notice into config.ru making clear that the handler cannot be set - inside [ b4bad57 ] - - Some mods to contrib, fix facebook.rb syntax for ruby 1.9 and adding - Ramaze::AddressableRoute for great profit! [ c7fbf0c | cafe657 ] - - Don't write a file to /tmp during the bin/ramaze spec [ eb5e4ef ] - -- Pistos - - Explicitly state top-level namespace for ::File in config.ru, since - otherwise it is confused for Rack::File. - [ 5509950 ] - - Added Layout helper with specs and documentation - [ a84f675 | 41ad023 | 4f23d16 ] - -- TJ Vanderpoel (bougyman) - - Added some specs for ramaze/bin, correcting a require bug already in - bin/ramaze. [ 8bbb8e8 | 9a3edf3 | 33fa3aa ] + - Adding support for the less CSS templating engine + - Better defaults for proto specs + - The Helper::Cache#cache_value optionally takes a block now + - Make sure proto/config.ru points to correct location + - Fix annoying behaviour when '/' location is assigned to an app loaded + earlier, apps loaded afterwards would overwrite the mapping. This caused + some very annoying and hard to debug behaviour. + - Fix bacon task dependency + - Fix Controller to work properly on Ruby 1.8.6 + - Fix bug when using localmemcache on Ruby 1.9 + - Fix the misc/css example + - Remove Helper::Cache#cache method + - Use absolute paths for requires in all ramaze specs, $LOAD_PATH in Ruby + 1.9.2 will not include '.' + - Remove ContentLength middleware from :live and :dev modes. Rack handlers + use it already. + - Refactor contrib/addressable_route, it now uses instance variables and can + take a mapping on initialize. A complete Changelog is available at http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true @@ -106,19 +75,22 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true == Known issues -- Some problems may show up when running the specs, these are mostly caused - by the gem-versions of Rack::Test and Rack, they only affect the specs and - should have no influence on the actual runtime. +- When running on Ruby 1.9.x, Rack 1.0.0 has problems with the encoding, it is + recommended to use master HEAD from http://github.com/rack/rack until the + next release of Rack. +- When running on Ruby 1.9.2dev (ruby trunk), using the thin handler can lead + to memory leaks. The cause is yet unknown, please use Ruby 1.9.1 or another + handler (mongrel, webrick, and fcgi are known to work well) == Ramaze Features - Builds on top of the Rack library, which provides easy use of adapters like - Mongrel, WEBrick, LiteSpeed, Thin, CGI or FCGI. + Mongrel, WEBrick, LiteSpeed, Thin, CGI, SCGI, or FCGI. -- Supports a wide range of templating-engines like: ERB, Erubis, Haml, Liquid, - Maruku, Redcloth, Remarkably, Sass, Tagz, Tenjin. And its own engines called - Etanni, Ezamar, Gestalt, and Nagoro. +- Supports a wide range of templating-engines like: ERB, Erubis, Haml, Less, + Liquid, Maruku, Redcloth, Remarkably, Sass, Tagz, Tenjin. And its own engines + called Etanni, Ezamar, Gestalt, and Nagoro. - Highly modular structure: you can just use the parts you like. This also means that it's very simple to add your own customizations. @@ -128,8 +100,7 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true controllers. - It is possible to use the ORM you like, be it Sequel, DataMapper, - ActiveRecord, Og, Kansas or something more simplistic like DBI, or a wrapper - around YAML::Store. + ActiveRecord, Og, Kansas or something more simplistic like M4DBI. - Good documentation: although we don't have 100% documentation right now (dcov says around 75%), just about every part of Ramaze is covered with basic and @@ -137,7 +108,7 @@ http://github.com/manveru/ramaze/tree/master/doc/CHANGELOG?raw=true available. - Friendly community: there are people from all over the world using Ramaze, so - you can get almost instant help and info. + you can get plenty of help and information around the clock. For more information please come to http://ramaze.net or ask directly on IRC doc/meta/announcement.txt @@ -10,15 +10,10 @@ module Ramaze::SourceReloadHooks end class CSSController < Ramaze::Controller - engine :Sass - - helper :aspect - before_all do - response['Content-Type'] = 'text/css' - nil - end + helper :cache + provide :css, :type => 'text/css', :engine => :Sass - define_method('style.css') do + def style %( body font: @@ -29,9 +24,8 @@ body ) end - helper :cache - cache 'style.css' + cache_action :method => 'style' end -# http://localhost:81/css/style.css -Ramaze.start :adapter => :mongrel, :port => 81 +# http://localhost:7000/css/style.css +Ramaze.start :adapter => :mongrel, :port => 7000 examples/misc/css.rb @@ -66,7 +66,6 @@ module Ramaze m.use Rack::ShowExceptions m.use Rack::ShowStatus m.use Rack::RouteExceptions - m.use Rack::ContentLength m.use Rack::ConditionalGet m.use Rack::ETag m.use Rack::Head @@ -78,7 +77,6 @@ module Ramaze m.use Rack::CommonLogger, Ramaze::Log m.use Rack::RouteExceptions m.use Rack::ShowStatus - m.use Rack::ContentLength m.use Rack::ConditionalGet m.use Rack::ETag m.use Rack::Head lib/ramaze.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 lib/ramaze/app.rb @@ -18,25 +18,22 @@ module Ramaze # @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 - ROUTES = {} - - def self.map(from, to) - ROUTES[Addressable::Template.new(from)] = to - end - - def initialize(app) + 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| + @routes.each do |template, target| extracted = template.extract(path_info) return dispatch(env, target, extracted) if extracted end @@ -44,6 +41,10 @@ module Ramaze @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']) lib/ramaze/contrib/addressable_route.rb @@ -51,9 +51,7 @@ module Ramaze trait(:provide_set => false) end - return if trait[:skip_controller_map] - - map(generate_mapping(name)) + map(generate_mapping(name)) unless trait[:skip_controller_map] end def self.engine(name) lib/ramaze/controller.rb @@ -93,11 +93,19 @@ module Ramaze end module SingletonMethods - def cache(name, hash = {}) - Ramaze.deprecated('Helper::Cache::cache', 'Helper::Cache::cache_action') - cache_action(hash.merge(:method => name)) - end - + # This method allows you to cache whole actions. + # + # @example Basic usage + # + # class Foo < Ramaze::Controller + # helper :cache + # cache_action :method => :bar + # + # def bar + # rand + # end + # end + # def cache_action(hash, &block) hash[:key] = block if block_given? hash[:method] = hash[:method].to_s lib/ramaze/helper/cache.rb @@ -150,8 +150,11 @@ module Ramaze # Maybe port to ruby < 1.8.7 ? def obfuscate_email(email, text = nil) - obfuscated = email.to_s.each_byte.map{|c| "&#%03d" % c}.join - %(<a href="mailto:#{obfuscated}">#{text || obfuscated}</a>) + obfuscated = [] + email.to_s.each_byte{|c| obfuscated << "&#%03d" % c } + joined = obfuscated.join + + %(<a href="mailto:#{joined}">#{text || joined}</a>) end # Returns Hash with tags as keys and their weight as value. lib/ramaze/helper/formatting.rb @@ -55,7 +55,7 @@ module Ramaze # set_layout 'default' => [ :index, :admin ] def set_layout(hash_or_the_layout) if hash_or_the_layout.respond_to?(:to_hash) - f = hash_or_the_layout.first + f = hash_or_the_layout.to_hash.find{|k,v| k && v } the_layout = f[0] whitelist = f[1].map{|action| action.to_s } else @@ -78,7 +78,7 @@ module Ramaze # set_layout_except 'default' => [ :user_data ] def set_layout_except(hash_or_the_layout) if hash_or_the_layout.respond_to?(:to_hash) - f = hash_or_the_layout.to_hash.first + f = hash_or_the_layout.to_hash.find{|k,v| k && v } the_layout = f[0] blacklist = f[1].map{|action| action.to_s } else lib/ramaze/helper/layout.rb @@ -9,11 +9,16 @@ require File.expand_path('../', __FILE__) unless defined?(Ramaze) require 'innate/spec/bacon' +# minimal middleware, no exception handling +Ramaze.middleware!(:spec){|m| + m.run(Ramaze::AppMap) +} + shared :rack_test do Ramaze.setup_dependencies extend Rack::Test::Methods - def app; Ramaze::AppMap; end + def app; Ramaze.middleware; end end shared :webrat do lib/ramaze/spec/bacon.rb @@ -1,5 +1,8 @@ +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + shared :template_spec do - behaves_like :mock + behaves_like :rack_test def spec_template(spec_engine) it 'works on /' do lib/ramaze/spec/helper/template_examples.rb @@ -1,4 +1,4 @@ -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) require 'ramaze/contrib/addressable_route' class SpecAddressableRoute < Ramaze::Controller @@ -12,11 +12,9 @@ end describe 'addressable routing' do behaves_like :rack_test - RAR = Ramaze::AddressableRoute - RAR.map('/customer/{customer_id}/order/{order_id}', '/order/show') - Ramaze.middleware! :spec do |m| - m.use RAR + m.use(Ramaze::AddressableRoute, + '/customer/{customer_id}/order/{order_id}' => '/order/show') m.run Ramaze::AppMap end spec/contrib/addressable_route.rb @@ -1,4 +1,4 @@ -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) require 'ramaze/contrib/rest' class Posts < Ramaze::Controller spec/contrib/rest.rb @@ -1,5 +1,5 @@ -require 'spec/helper' -require 'examples/helpers/cache' +require File.expand_path('../../../spec/helper', __FILE__) +require File.expand_path('../../../examples/helpers/cache', __FILE__) describe 'Caching' do behaves_like :rack_test spec/examples/caching.rb @@ -1,6 +1,6 @@ -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) spec_require 'haml' -require 'examples/misc/css' +require File.expand_path('../../../examples/misc/css', __FILE__) describe 'CSSController' do behaves_like :rack_test spec/examples/css.rb @@ -1,6 +1,6 @@ -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) spec_require 'nagoro' -require 'examples/basic/element' +require File.expand_path('../../../examples/basic/element', __FILE__) describe 'Element' do behaves_like :rack_test spec/examples/element.rb @@ -1,5 +1,5 @@ -require 'spec/helper' -require 'examples/basic/hello' +require File.expand_path('../../../spec/helper', __FILE__) +require File.expand_path('../../../examples/basic/hello', __FILE__) describe 'Hello' do behaves_like :rack_test spec/examples/hello.rb @@ -1,5 +1,5 @@ -require 'spec/helper' -require 'examples/helpers/httpdigest' +require File.expand_path('../../../../spec/helper', __FILE__) +require File.expand_path('../../../../examples/helpers/httpdigest', __FILE__) # Not sure if we should change the behaviour of digest_authorize, it keeps # challenging the authorization even after a logout, which will log us in right spec/examples/helpers/httpdigest.rb @@ -1,5 +1,5 @@ -require 'spec/helper' -require 'examples/basic/linking' +require File.expand_path('../../../spec/helper', __FILE__) +require File.expand_path('../../../examples/basic/linking', __FILE__) describe 'Linking' do behaves_like :rack_test spec/examples/linking.rb @@ -1,5 +1,5 @@ -require 'spec/helper' -require 'examples/basic/simple' +require File.expand_path('../../../spec/helper', __FILE__) +require File.expand_path('../../../examples/basic/simple', __FILE__) describe 'Simple' do behaves_like :rack_test spec/examples/simple.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'erubis' -require 'examples/templates/template_erubis' +require File.expand_path('../../../../examples/templates/template_erubis', __FILE__) describe 'Template Erubis' do behaves_like :template_spec spec/examples/templates/template_erubis.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'ezamar' -require 'examples/templates/template_ezamar' +require File.expand_path('../../../../examples/templates/template_ezamar', __FILE__) describe 'Template Ezamar' do behaves_like :template_spec spec/examples/templates/template_ezamar.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'haml' -require 'examples/templates/template_haml' +require File.expand_path('../../../../examples/templates/template_haml', __FILE__) describe 'Template Haml' do behaves_like :template_spec spec/examples/templates/template_haml.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'liquid' -require 'examples/templates/template_liquid' +require File.expand_path('../../../../examples/templates/template_liquid', __FILE__) describe 'Template Liquid' do behaves_like :template_spec spec/examples/templates/template_liquid.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' # spec_require 'markaby' -# require 'examples/templates/template_markaby' +# require File.expand_path('../../../../examples/templates/template_erubis', __FILE__) describe 'Template Markaby' do # behaves_like :template_spec spec/examples/templates/template_markaby.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'nagoro' -require 'examples/templates/template_nagoro' +require File.expand_path('../../../../examples/templates/template_nagoro', __FILE__) describe 'Template Nagoro' do behaves_like :template_spec spec/examples/templates/template_nagoro.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'redcloth' -spec_require 'examples/templates/template_redcloth' +require File.expand_path('../../../../examples/templates/template_redcloth', __FILE__) describe 'Template RedCloth' do behaves_like :template_spec spec/examples/templates/template_redcloth.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'remarkably/engines/html' -require 'examples/templates/template_remarkably' +require File.expand_path('../../../../examples/templates/template_remarkably', __FILE__) describe 'Template Remarkably' do behaves_like :template_spec spec/examples/templates/template_remarkably.rb @@ -1,8 +1,11 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/spec/helper/template_examples' spec_require 'tenjin' -require 'examples/templates/template_tenjin' +require File.expand_path('../../../../examples/templates/template_tenjin', __FILE__) describe 'Template Tenjin' do behaves_like :template_spec spec/examples/templates/template_tenjin.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) class SpecAction < Ramaze::Controller map '/' spec/ramaze/action/render.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../spec/helper', __FILE__) class SpecAppMain < Ramaze::Controller map '/', :core spec/ramaze/app.rb @@ -1,8 +1,13 @@ -require "spec/helper" +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require "ramaze/tool/bin" + require "pathname" + module Ramaze - BINPATH = Pathname.new(Ramaze::ROOT).join("..", "bin", "ramaze").expand_path + BINPATH = Pathname(Ramaze::ROOT).join("../bin/ramaze").expand_path end USAGE = <<TXT spec/ramaze/bin/ramaze.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'localmemcache' describe Ramaze::Cache::LocalMemCache do spec/ramaze/cache/localmemcache.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_precondition 'memcached is running' do require 'memcache' spec/ramaze/cache/memcache.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'sequel' DB = Sequel.sqlite spec/ramaze/cache/sequel.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) Ramaze::App.options.merge!(:layouts => 'view') spec/ramaze/controller/actionless_templates.rb @@ -1,5 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. +require File.expand_path('../../../../spec/helper', __FILE__) class SpecHello < Ramaze::Controller def index spec/ramaze/controller/lonely_mapping.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) describe 'Controller::generate_mapping' do def gen(klass) spec/ramaze/controller/mapping.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) class SpecControllerInheritedMain < Ramaze::Controller Ramaze.node('/') spec/ramaze/controller/provide_inheritance.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class MainController < Ramaze::Controller map '/' spec/ramaze/controller/resolve.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class BaseController < Ramaze::Controller alias_view :foo, :bar spec/ramaze/controller/subclass.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecViewAlias < Ramaze::Controller map '/' spec/ramaze/controller/template_resolving.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'hpricot' spec/ramaze/dispatcher/directory.rb @@ -1,18 +1,18 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) # This spec more or less tries to ensure that we integrate with rack and # rack-contrib in regards to static file serving. -module Ramaze - # minimal middleware, no exception handling - middleware!(:spec){|m| - m.apps Rack::ConditionalGet, Rack::ETag - m.innate - } -end +spec_require 'rack/contrib' + +# minimal middleware, no exception handling +Ramaze.middleware!(:spec){|m| + m.apps Rack::ConditionalGet, Rack::ETag + m.run Ramaze::AppMap +} describe 'Serving static files' do behaves_like :rack_test spec/ramaze/dispatcher/file.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) require 'rexml/document' require 'rexml/xpath' spec/ramaze/error.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../spec/helper', __FILE__) class SpecFilesCore < Ramaze::Controller map '/', :core spec/ramaze/files.rb @@ -1,6 +1,9 @@ # * Encoding: UTF-8 +# +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) require 'ramaze/gestalt' describe "Gestalt" do spec/ramaze/gestalt.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) $password = Digest::SHA1.hexdigest('pass') spec/ramaze/helper/auth.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/helper/bench' describe Ramaze::Helper::Bench do spec/ramaze/helper/bench.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecHelperCache < Ramaze::Controller map '/' @@ -107,7 +107,7 @@ describe Ramaze::Helper::Cache do lambda{ get('/ttl').body }.should.not.change{ get('/ttl').body } end - lambda{ sleep 1; get('/ttl').body }.should.change{ get('/ttl').body } + lambda{ sleep 1.5; get('/ttl').body }.should.change{ get('/ttl').body } end it 'caches actions with block keys' do spec/ramaze/helper/cache.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecHelperFlash < Ramaze::Controller map '/' spec/ramaze/helper/flash.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) spec_requires 'hpricot' spec/ramaze/helper/form.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/helper/formatting' describe 'Helper::Formatting' do spec/ramaze/helper/formatting.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/helper/gestalt' describe Ramaze::Helper::Gestalt do spec/ramaze/helper/gestalt.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/helper/gravatar' describe Ramaze::Helper::Gravatar do spec/ramaze/helper/gravatar.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) REALM = 'HttpDigestTestRealm' spec/ramaze/helper/httpdigest.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class LayoutHelperOne < Ramaze::Controller map '/one' spec/ramaze/helper/layout.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecHelperLink < Ramaze::Controller map '/' spec/ramaze/helper/link.rb @@ -1,6 +1,9 @@ # * Encoding: UTF-8 +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + $KCODE = 'u' if /regexp/.respond_to?(:kcode) -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_requires 'locale/tag', 'locale' class SpecHelperLocalize < Ramaze::Controller spec/ramaze/helper/localize.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'maruku' class SpecHelperMaruku < Ramaze::Controller spec/ramaze/helper/maruku.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'hpricot' module Og spec/ramaze/helper/pager.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'hpricot' class SpecHelperPaginateArray < Ramaze::Controller spec/ramaze/helper/paginate.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) class SpecHelperRequestAccessor < Ramaze::Controller map '/' spec/ramaze/helper/request_accessor.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) spec_requires 'hpricot', 'sequel' spec/ramaze/helper/sequel_form.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecSimpleCaptcha < Ramaze::Controller helper :simple_captcha spec/ramaze/helper/simple_captcha.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) class SpecStackHelper < Ramaze::Controller map '/' spec/ramaze/helper/stack.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) class MockSequelUser def profile spec/ramaze/helper/user.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/helper/xhtml' describe Ramaze::Helper::XHTML do spec/ramaze/helper/xhtml.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/log/informer' describe 'Informer' do spec/ramaze/log/informer.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../spec/helper', __FILE__) class SpecLogger include Ramaze::Logging spec/ramaze/log/logging.rb @@ -1,14 +1,14 @@ # Copyright (c) 2008 rob@rebeltechnologies.nl # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) require 'ramaze/log/syslog' describe 'Syslog' do # close the syslog, if it was open for some reason before we - # start a test. + # start a test. before do if ( Syslog.opened? ) ::Syslog.close @@ -24,8 +24,8 @@ describe 'Syslog' do end it 'should handle non default initialization' do - syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', - ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT, + syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', + ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT, ::Syslog::LOG_DAEMON ) ::Syslog.opened?.should == true ::Syslog.ident.should == 'ramaze_syslog_test' @@ -43,7 +43,7 @@ describe 'Syslog' do child = fork { logpipe[0].close STDERR.reopen(logpipe[1]) - syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', + syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test', ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR, ::Syslog::LOG_USER ) syslog.send priority, msg @@ -54,7 +54,7 @@ describe 'Syslog' do logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n" end - + it 'should handle debug' do test_log_msg :direct, :debug, "Hello Debug World" end spec/ramaze/log/syslog.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) class TCParamsController < Ramaze::Controller map '/' spec/ramaze/params.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../spec/helper', __FILE__) describe 'Ramaze::Request' do def request(env = {}) spec/ramaze/request.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_precondition 'memcached is running' do require 'memcache' spec/ramaze/session/memcache.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../spec/helper', __FILE__) Point = Ramaze::Struct.new(:x,:y) spec/ramaze/struct.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../spec/helper', __FILE__) module Ramaze module View spec/ramaze/view.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'erubis' Ramaze::App.options.views = 'erubis' spec/ramaze/view/erubis.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'ezamar' Ramaze::App.options.views = 'ezamar' spec/ramaze/view/ezamar.rb @@ -1,7 +1,7 @@ -# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'ramaze/gestalt' Ramaze::App.options.views = 'gestalt' spec/ramaze/view/gestalt.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'haml' Ramaze::App.options.views = 'haml' spec/ramaze/view/haml.rb @@ -1,11 +1,7 @@ - -### And the CSS output it produces: - - # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'less' Ramaze::App.options.views = 'less' @@ -31,12 +27,17 @@ end describe Ramaze::View::Less do behaves_like :rack_test + def cmp(actually, expected) + actually.strip.split("\n").sort. + should == expected.strip.split("\n").sort + end + should 'render inline' do got = get('/style.css') got.status.should == 200 got['Content-Type'].should == 'text/css' - got.body.should == <<-CSS.strip + cmp(got.body, <<-CSS) .outline { border: 1px solid black; } .article a { text-decoration: none; } .article p { color: #110011; } @@ -48,7 +49,8 @@ describe Ramaze::View::Less do got = get('/file.css') got.status.should == 200 got['Content-Type'].should == 'text/css' - got.body.should == <<-CSS.strip + + cmp(got.body, <<-CSS) .outline { border: 1px solid black; } .article a { text-decoration: none; } .article p { color: #110011; } spec/ramaze/view/less.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'liquid' Ramaze::App.options.views = 'liquid' spec/ramaze/view/liquid.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'nagoro' Ramaze::App.options.views = 'nagoro' spec/ramaze/view/nagoro.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_requires 'erubis', 'redcloth' Ramaze::App.options.views = 'redcloth' spec/ramaze/view/redcloth.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'remarkably' Ramaze::App.options.views = 'remarkably' spec/ramaze/view/remarkably.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'haml/util', 'sass/engine' Ramaze::App.options.views = 'sass' spec/ramaze/view/sass.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'tagz' Ramaze::App.options.views = 'tagz' spec/ramaze/view/tagz.rb @@ -1,7 +1,7 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com # All files in this distribution are subject to the terms of the Ruby license. -require 'spec/helper' +require File.expand_path('../../../../spec/helper', __FILE__) spec_require 'tenjin' Ramaze::App.options.views = 'tenjin' spec/ramaze/view/tenjin.rb @@ -1,33 +1,38 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. -describe 'Array#put_within' do - it 'should put a given object at a well-described position' do - array = [:foo, :bar, :baz] - array.put_within(:foobar, :after => :bar, :before => :baz) - array.should == [:foo, :bar, :foobar, :baz] - end +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) + +describe 'Array' do + describe '#put_within' do + it 'puts a given object at a well-described position' do + array = [:foo, :bar, :baz] + array.put_within(:foobar, :after => :bar, :before => :baz) + array.should == [:foo, :bar, :foobar, :baz] + end - it 'should raise on uncertainity' do - array = [:foo, :bar, :baz] - lambda{ - array.put_within(:foobar, :after => :foo, :before => :baz) - }.should.raise(ArgumentError). - message.should == "Too many elements within constrain" + it 'raises on uncertainity' do + array = [:foo, :bar, :baz] + lambda{ + array.put_within(:foobar, :after => :foo, :before => :baz) + }.should.raise(ArgumentError). + message.should == "Too many elements within constrain" + end end -end -describe 'Array#put_after' do - it 'should put a given object at a well-described position' do - array = [:foo, :bar, :baz] - array.put_after(:bar, :foobar) - array.should == [:foo, :bar, :foobar, :baz] + describe '#put_after' do + it 'puts a given object at a well-described position' do + array = [:foo, :bar, :baz] + array.put_after(:bar, :foobar) + array.should == [:foo, :bar, :foobar, :baz] + end end -end -describe 'Array#put_within' do - it 'should put a given object at a well-described position' do - array = [:foo, :bar, :baz] - array.put_before(:bar, :foobar) - array.should == [:foo, :foobar, :bar, :baz] + describe '#put_within' do + it 'puts a given object at a well-described position' do + array = [:foo, :bar, :baz] + array.put_before(:bar, :foobar) + array.should == [:foo, :foobar, :bar, :baz] + end end end spec/snippets/array/put_within.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe 'locals' do should 'find locals' do spec/snippets/binding/locals.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe "Numeric#filesize_format" do it 'it should convert filesizes to human readable format' do spec/snippets/numeric/filesize_format.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe "Numeric time extensions" do it 'should provide times in the past' do @@ -9,4 +12,4 @@ describe "Numeric time extensions" do it 'should provide times in the future' do 2.weeks.from_now.to_i.should == (Time.now + 2*7*24*60*60).to_i end -end \ No newline at end of file +end spec/snippets/numeric/time.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe '__DIR__' do # this is hardly exhaustive, but better than nothing spec/snippets/object/__dir__.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../lib/ramaze/spec/helper/snippets', __FILE__) describe 'OrderedSet' do os = OrderedSet.new(1,2,3,1) spec/snippets/ordered_set.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) require 'fileutils' spec/snippets/ramaze/acquire.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe Ramaze::Dictionary do Dictionary = Ramaze::Dictionary spec/snippets/ramaze/dictionary.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe Ramaze::Struct do should 'provide #values_at' do spec/snippets/ramaze/struct.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe "String#camel_case" do spec/snippets/string/camel_case.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe 'String#color' do it 'should define methods to return ANSI strings' do spec/snippets/string/color.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe "String#snake_case" do spec/snippets/string/snake_case.rb @@ -1,4 +1,7 @@ -require 'lib/ramaze/spec/helper/snippets' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe "String#unindent" do it "should remove indentation" do spec/snippets/string/unindent.rb @@ -1,4 +1,7 @@ -require 'spec/helper' +# Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com +# All files in this distribution are subject to the terms of the Ruby license. + +require File.expand_path('../../../../lib/ramaze/spec/helper/snippets', __FILE__) describe 'Thread.into' do it 'should provide access to thread vars' do spec/snippets/thread/into.rb @@ -16,16 +16,22 @@ task :bacon => :setup do left_format = "%4d/%d: %-#{len + 11}s" spec_format = "%d specifications (%d requirements), %d failures, %d errors" + load_path = File.expand_path('../../lib', __FILE__) + specs.each_with_index do |spec, idx| print(left_format % [idx + 1, specs_size, spec]) - Open3.popen3(RUBY, spec) do |sin, sout, serr| + Open3.popen3(RUBY, '-I', load_path, spec) do |sin, sout, serr| out = sout.read.strip err = serr.read.strip - # this is conventional, see spec/innate/state/fiber.rb for usage + # this is conventional if out =~ /^Bacon::Error: (needed .*)/ puts(yellow % ("%6s %s" % ['', $1])) + elsif out =~ /^Spec (precondition: "[^"]*" failed)/ + puts(yellow % ("%6s %s" % ['', $1])) + elsif out =~ /^Spec require: "require" failed: "(no such file to load -- [^"]*)"/ + puts(yellow % ("%6s %s" % ['', $1])) else total = nil tasks/bacon.rake @@ -44,8 +44,10 @@ task :gem_setup do setup end - # first try to activate, install and try to activate again if activation - # fails the first time + # First try to activate. + # If activation fails, try to install and activate again. + # If the second activation also fails, try to require as it may just as + # well be in $LOAD_PATH. def setup_gem(name, options) version = [options[:version]].compact lib_name = options[:lib] || name @@ -53,19 +55,30 @@ task :gem_setup do log "activating #{name}" Gem.activate(name, *version) - rescue LoadError - install_gem(name, options) - Gem.activate(name, *version) + rescue Gem::LoadError + log "activating #{name} failed, try to install" + + install_gem(name, version, options) end # tell rubygems to install a gem - def install_gem(name, options) + def install_gem(name, version, options) installer = Gem::DependencyInstaller.new(options) temp_argv(options[:extconf]) do - log "Installing #{name}" - installer.install(name, options[:version]) + log "installing #{name}" + installer.install(name, *version) end + + Gem.activate(name, *version) + + log "install and final activation successful" + rescue Gem::GemNotFoundException => ex + log "installation failed: #{ex}, use normal require" + + require(options[:lib] || name) + + log "require successful, cannot verify version though" end # prepare ARGV for rubygems installer tasks/gem_setup.rake @@ -1,6 +1,12 @@ desc 'install all possible dependencies' task :setup => [:gem_setup] do - GemSetup.new :verbose => true do - setup_gemspec GEMSPEC + GemSetup.new :verbose => false do + DEPENDENCIES.each do |name, options| + gem(name, options) + end + + DEVELOPMENT_DEPENDENCIES.each do |name, options| + gem(name, options) + end end end tasks/setup.rake bad1f2e013f1378e0e77659f4ad3dffe744ed0b4 b8d016bd0949ae9d84d91b24666e781e9e5c4945 Michael Fellinger m.fellinger@gmail.com http://github.com/manveru/ramaze/commit/efe2b905650df04286519359557819090cc91287 efe2b905650df04286519359557819090cc91287 2009-07-03T01:49:55-07:00 2009-07-03T01:49:55-07:00 Merge branch 'master' into modular-bin * master: Increase the time we wait for the cache ttl to expire Recognize Spec precondition and Spec require in bacon task Add the ramaze/lib directory to -I on bacon task Clean up the spec middleware mess, it's _always_ m.run(Ramaze::AppMap) Add missing rack-contrib development dependency Now even obfuscate_mail should work on 1.8 again Layout helper asks for #to_hash, so it should use it. Also don't rely on Enumerable#first, not in 1.8.6 Don't rely on order in less spec Improve gem_setup task Update announcement Let the bacon task pass -I with the root directory Fix the require path for bin/ramaze spec Refactor AddressableRoute, use instance variable instead of constant Fix annoying behaviour when '/' location is assigned to an app earlier loaded, apps after it would overwrite the location. Now only :pristine uses it by default Remove ContentLength middleware from default stacks, all Rack handlers do that already Fix the misc/css example Use absolute path when spec requires spec/helper, '.' will be removed from the load path in 1.9.2 Remove deprecated cache method, add basic doc for cache_action 4d7ab0f3975f4ff2bafe91235f7a33e8be3106d6 Michael Fellinger m.fellinger@gmail.com