ramaze 2009.05 → 2009.06

data/spec/ramaze/view/erubis.rb

@@ -28,7 +28,7 @@ class SpecErubis < Ramaze::Controller
 end
 
 describe "Ramaze::View::Erubis" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/ezamar.rb

@@ -28,7 +28,7 @@ class SpecEzamar < Ramaze::Controller
 end
 
 describe "Ramaze::View::Ezamar" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/gestalt.rb

@@ -66,7 +66,7 @@ module SpecGestalDifferentModule
 end
 
 describe Ramaze::View::Gestalt do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'use g helper' do
      get('/').body.should == '<h1>Gestalt Index</h1>'

data/spec/ramaze/view/haml.rb

@@ -32,7 +32,7 @@ class SpecHaml < Ramaze::Controller
 end
 
 describe Ramaze::View::Haml do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/liquid.rb

@@ -28,7 +28,7 @@ class SpecLiquid < Ramaze::Controller
 end
 
 describe 'Ramaze::View::Liquid' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/nagoro.rb

@@ -28,7 +28,7 @@ class SpecNagoro < Ramaze::Controller
 end
 
 describe "Ramaze::View::Nagoro" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/redcloth.rb

@@ -28,7 +28,7 @@ class SpecRedCloth < Ramaze::Controller
 end
 
 describe "Ramaze::View::RedCloth" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     got = get('/')

data/spec/ramaze/view/remarkably.rb

@@ -29,7 +29,7 @@ class SpecRemarkably < Ramaze::Controller
 end
 
 describe Ramaze::View::Remarkably do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'use remarkably methods' do
     get('/').body.should == '<h1>Remarkably Index</h1>'

data/spec/ramaze/view/sass.rb

@@ -40,7 +40,7 @@ body
 end
 
 describe Ramaze::View::Sass do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render inline' do
     got = get('/style.css')

data/spec/ramaze/view/tagz.rb

@@ -31,7 +31,7 @@ class SpecTagz < Ramaze::Controller
 end
 
 describe Ramaze::View::Tagz do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'use tagz methods' do
     get('/').body.should == '<h1>Tagz Index</h1>'

data/spec/ramaze/view/tenjin.rb

@@ -28,7 +28,7 @@ class SpecTenjin < Ramaze::Controller
 end
 
 describe 'Ramaze::View::Tenjin' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'render' do
     get('/').body.should == '<h1>Tenjin Index</h1>'

data/spec/ramaze/view.rb

@@ -25,7 +25,7 @@ class SpecView < Ramaze::Controller
 end
 
 describe Ramaze::View do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'uses MyEngine' do
     got = get('/')

data/tasks/changelog.rake

@@ -1,12 +1,14 @@
 desc 'update changelog'
 task :changelog do
-  File.open('CHANGELOG', 'w+') do |changelog|
+  File.open('doc/CHANGELOG', 'w+') do |changelog|
     `git log -z --abbrev-commit`.split("\0").each do |commit|
       next if commit =~ /^Merge: \d*/
       ref, author, time, _, title, _, message = commit.split("\n", 7)
       ref    = ref[/commit ([0-9a-f]+)/, 1]
       author = author[/Author: (.*)/, 1].strip
       time   = Time.parse(time[/Date: (.*)/, 1]).utc
+      time   = time.strftime('%a %b %d %H:%M:%S %Z %Y')
+
       title.strip!
 
       changelog.puts "[#{ref} | #{time}] #{author}"

data/tasks/{gem_installer.rake → gem_setup.rake}

@@ -1,14 +1,17 @@
-task :gem_installer do
-  class GemInstaller
+task :gem_setup do
+  class GemSetup
     def initialize(options = {}, &block)
       @gems = []
-      @options = options
+      @options = options.dup
+      @verbose = @options.delete(:verbose)
 
       run(&block)
     end
 
     def run(&block)
-      instance_eval(&block) if block_given?
+      return unless block_given?
+      instance_eval(&block)
+      setup
     end
 
     def gem(name, version = nil, options = {})
@@ -21,6 +24,16 @@ task :gem_installer do
       @gems << [name, options]
     end
 
+    # all gems defined, let's try to load/install them
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
     def setup_gemspec(gemspec)
       gemspec.dependencies.each do |dependency|
         dependency.version_requirements.as_list.each do |version|
@@ -31,36 +44,31 @@ task :gem_installer do
       setup
     end
 
-    def setup
-      require 'rubygems'
-      require 'rubygems/dependency_installer'
+    # first try to activate, install and try to activate again if activation
+    # fails the first time
+    def setup_gem(name, options)
+      version = [options[:version]].compact
+      lib_name = options[:lib] || name
 
-      @gems.each do |name, options|
-        setup_gem(name, options)
-      end
-    end
+      log "activating #{name}"
 
-    def setup_gem(name, options, try_install = true)
-      print "activating #{name} ... "
-      Gem.activate(name, *[options[:version]].compact)
-      require(options[:lib] || name)
-      puts "success."
-    rescue LoadError => error
-      puts error
-      install_gem(name, options) if try_install
-      setup_gem(name, options, try_install = false)
+      Gem.activate(name, *version)
+    rescue LoadError
+      install_gem(name, options)
+      Gem.activate(name, *version)
     end
 
+    # tell rubygems to install a gem
     def install_gem(name, options)
       installer = Gem::DependencyInstaller.new(options)
 
       temp_argv(options[:extconf]) do
-        print "Installing #{name} ... "
+        log "Installing #{name}"
         installer.install(name, options[:version])
-        puts "done."
       end
     end
 
+    # prepare ARGV for rubygems installer
     def temp_argv(extconf)
       if extconf ||= @options[:extconf]
         old_argv = ARGV.clone
@@ -72,5 +80,20 @@ task :gem_installer do
     ensure
       ARGV.replace(old_argv) if extconf
     end
+
+    private
+
+    def log(msg)
+      return unless @verbose
+
+      if defined?(Log)
+        Log.info(msg)
+      else
+        puts(msg)
+      end
+    end
+
+    def rubyforge; 'http://gems.rubyforge.org/' end
+    def github; 'http://gems.github.com/' end
   end
 end

data/tasks/release.rake

@@ -5,12 +5,14 @@ namespace :release do
   task :github => [:jquery, :reversion, :authors, :gemspec] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
+    sh('git', 'add',
+       'MANIFEST', 'doc/CHANGELOG', 'doc/AUTHORS',
+       "#{name}.gemspec",
+       "lib/#{name}/version.rb")
 
-git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
+    puts <<INSTRUCTIONS
 
-Then commit them, tag the commit, and push:
+I added the relevant files, you can commit them, tag the commit, and push:
 
 git commit -m 'Version #{version}'
 git tag -a -m '#{version}' '#{version}'

data/tasks/setup.rake

@@ -1,24 +1,6 @@
 desc 'install all possible dependencies'
-task :setup do
-  GemInstaller.new do
-    # core
-    gem 'innate',     '= 2009.04'
-
-    # misc
-    gem 'bacon',      '>= 1.0'
-    gem 'json',       '>= 1.1.3'
-    gem 'memcache',   '~> 1.7.0'
-
-    # templating engines
-    gem 'Remarkably', '~> 0.5.2'
-    gem 'erubis',     '>= 2.6.4'
-    gem 'haml',       '~> 2.0.9'
-    gem 'hpricot',    '>= 0.7'
-    gem 'liquid',     '~> 2.0.0'
-    gem 'sequel',     '>= 2.11.0'
-    gem 'tagz',       '>= 5.0.1'
-    gem 'tenjin',     '~> 0.6.1'
-
-    setup
+task :setup => [:gem_setup] do
+  GemSetup.new :verbose => true do
+    setup_gemspec GEMSPEC
   end
 end

data/tasks/todo.rake

@@ -1,8 +1,6 @@
 desc "show a todolist from all the TODO tags in the source"
 task :todo do
-  files = Dir[File.join(BASEDIR, '{lib,spec}', '**/*.rb')]
-
-  files.each do |file|
+  Dir.glob('{lib,spec}/**/*.rb') do |file|
     lastline = todo = comment = long_comment = false
 
     File.readlines(file).each_with_index do |line, lineno|
@@ -10,7 +8,7 @@ task :todo do
       comment = line =~ /^\s*?#.*?$/
       long_comment = line =~ /^=begin/
       long_comment = line =~ /^=end/
-      todo = true if line =~ /TODO/ and (long_comment or comment)
+      todo = true if line =~ /TODO|FIXME|THINK/ and (long_comment or comment)
       todo = false if line.gsub('#', '').strip.empty?
       todo = false unless comment or long_comment
       if todo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ramaze
 version: !ruby/object:Gem::Version 
-  version: "2009.05"
+  version: "2009.06"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,19 +9,169 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +09:00
+date: 2009-06-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: innate
   type: :runtime
   version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: "2009.06"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: Remarkably
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.6.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ezamar
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :development
+  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: liquid
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: localmemcache
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.7.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: nagoro
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
         version: "2009.05"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: tagz
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 5.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: tenjin
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
 description: Ramaze is a simple and modular web framework
 email: m.fellinger@gmail.com
 executables: 
@@ -31,8 +181,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - .mailmap
-- CHANGELOG
 - MANIFEST
 - README.md
 - Rakefile
@@ -74,7 +224,6 @@ files:
 - doc/meta/internals.txt
 - doc/meta/users.kml
 - doc/tutorial/todolist.html
-- doc/tutorial/todolist.mkd
 - doc/tutorial/todolist.txt
 - examples/app/auth/layout/auth.xhtml
 - examples/app/auth/start.rb
@@ -242,6 +391,7 @@ files:
 - lib/ramaze/cache/localmemcache.rb
 - lib/ramaze/cache/memcache.rb
 - lib/ramaze/cache/sequel.rb
+- lib/ramaze/contrib/addressable_route.rb
 - lib/ramaze/contrib/app_graph.rb
 - lib/ramaze/contrib/email.rb
 - lib/ramaze/contrib/facebook.rb
@@ -275,6 +425,7 @@ files:
 - lib/ramaze/helper/gravatar.rb
 - lib/ramaze/helper/httpdigest.rb
 - lib/ramaze/helper/identity.rb
+- lib/ramaze/helper/layout.rb
 - lib/ramaze/helper/link.rb
 - lib/ramaze/helper/localize.rb
 - lib/ramaze/helper/markaby.rb
@@ -317,14 +468,12 @@ files:
 - lib/ramaze/snippets/array/put_within.rb
 - lib/ramaze/snippets/binding/locals.rb
 - lib/ramaze/snippets/blankslate.rb
-- lib/ramaze/snippets/divide.rb
 - lib/ramaze/snippets/fiber.rb
 - lib/ramaze/snippets/kernel/pretty_inspect.rb
 - lib/ramaze/snippets/metaid.rb
 - lib/ramaze/snippets/numeric/filesize_format.rb
 - lib/ramaze/snippets/numeric/time.rb
 - lib/ramaze/snippets/object/__dir__.rb
-- lib/ramaze/snippets/object/acquire.rb
 - lib/ramaze/snippets/object/instance_variable_defined.rb
 - lib/ramaze/snippets/object/pretty.rb
 - lib/ramaze/snippets/object/scope.rb
@@ -345,6 +494,7 @@ files:
 - lib/ramaze/snippets/string/unindent.rb
 - lib/ramaze/snippets/thread/into.rb
 - lib/ramaze/spec.rb
+- lib/ramaze/spec/bacon.rb
 - lib/ramaze/spec/helper/bacon.rb
 - lib/ramaze/spec/helper/pretty_output.rb
 - lib/ramaze/spec/helper/snippets.rb
@@ -370,6 +520,7 @@ files:
 - lib/vendor/etag.rb
 - lib/vendor/route_exceptions.rb
 - ramaze.gemspec
+- spec/contrib/addressable_route.rb
 - spec/contrib/rest.rb
 - spec/examples/caching.rb
 - spec/examples/css.rb
@@ -397,10 +548,12 @@ files:
 - spec/ramaze/action/view/sub/sub_wrapper.erb
 - spec/ramaze/action/view/sub/sub_wrapper.xhtml
 - spec/ramaze/app.rb
+- spec/ramaze/bin/ramaze.rb
 - spec/ramaze/cache/localmemcache.rb
 - spec/ramaze/cache/memcache.rb
 - spec/ramaze/cache/sequel.rb
 - spec/ramaze/controller/actionless_templates.rb
+- spec/ramaze/controller/lonely_mapping.rb
 - spec/ramaze/controller/mapping.rb
 - spec/ramaze/controller/provide_inheritance.rb
 - spec/ramaze/controller/resolve.rb
@@ -431,6 +584,8 @@ files:
 - spec/ramaze/helper/gestalt.rb
 - spec/ramaze/helper/gravatar.rb
 - spec/ramaze/helper/httpdigest.rb
+- spec/ramaze/helper/layout.rb
+- spec/ramaze/helper/layout/default.xhtml
 - spec/ramaze/helper/link.rb
 - spec/ramaze/helper/localize.rb
 - spec/ramaze/helper/maruku.rb
@@ -459,6 +614,7 @@ files:
 - spec/ramaze/public/test_download.css
 - spec/ramaze/request.rb
 - spec/ramaze/rewrite/file.css
+- spec/ramaze/session/memcache.rb
 - spec/ramaze/struct.rb
 - spec/ramaze/template/ramaze/external.test
 - spec/ramaze/view.rb
@@ -494,7 +650,6 @@ files:
 - spec/ramaze/view/tenjin/sum.rbhtml
 - spec/snippets/array/put_within.rb
 - spec/snippets/binding/locals.rb
-- spec/snippets/kernel/constant.rb
 - spec/snippets/numeric/filesize_format.rb
 - spec/snippets/numeric/time.rb
 - spec/snippets/object/__dir__.rb
@@ -512,10 +667,9 @@ files:
 - tasks/changelog.rake
 - tasks/copyright.rake
 - tasks/gem.rake
-- tasks/gem_installer.rake
+- tasks/gem_setup.rake
 - tasks/git.rake
 - tasks/grancher.rake
-- tasks/install_dependencies.rake
 - tasks/jquery.rake
 - tasks/manifest.rake
 - tasks/metric_changes.rake
@@ -557,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ramaze
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Ramaze is a simple and modular web framework