ramaze 2011.07.25 → 2011.10.23

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

@@ -25,7 +25,6 @@ module Ramaze
           "\e[#{value}m" + self + "\e[0m"
         end
       end
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -3,9 +3,7 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
       unless ''.respond_to?(:end_with?)
         # Compatibility with 1.9
@@ -14,7 +12,6 @@ module Ramaze
           self[-other.size, other.size] == other
         end
       end
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -3,17 +3,13 @@ require 'uri'
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
-
       # String#escape is an extensible escaping mechanism for string.  currently
       # it suports
       #   '<div>foo bar</div>'.esc(:html)
       #   'foo bar'.esc(:uri)
       #   'foo bar'.esc(:cgi)
-
       def escape which = :html
         case which
         when :html
@@ -28,7 +24,6 @@ module Ramaze
       end
 
       alias_method 'esc', 'escape'
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -3,19 +3,14 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
       unless ''.respond_to?(:ord)
-
         # compatibility with Ruby 1.9
-
         def ord
           self[0]
         end
       end
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -3,19 +3,16 @@
 
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
-
       # convert to snake_case from CamelCase
       #
-      #   'FooBar'.snake_case # => 'foo_bar'
-
+      # @example
+      #  'FooBar'.snake_case # => 'foo_bar'
+      #
       def snake_case
         gsub(/\B[A-Z][^A-Z]/, '_\&').downcase.gsub(' ', '_')
       end
-    end
-
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -1,19 +1,14 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
-
       unless ''.respond_to?(:start_with?)
-
         # Compatibility with 1.9
-
         def start_with?(other)
           other = other.to_s
           self[0, other.size] == other
         end
       end
-    end
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -1,10 +1,7 @@
 module Ramaze
   module CoreExtensions
-
     # Extensions for String
-
     module String
-
       # Useful for writing indented String and unindent on demand, based on the
       # first line with indentation.
       def unindent
@@ -23,6 +20,6 @@ module Ramaze
         self.replace unindent
       end
       alias ui! unindent!
-    end
-  end
-end
+    end # String
+  end # CoreExtensions
+end # Ramaze

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

@@ -2,10 +2,8 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 # Extensions for Thread
-
 class Thread
   # Copy all thread variables into the new thread
-
   def self.into *args
     Thread.new(Thread.current, *args) do |thread, *args|
       thread.keys.each do |k|
@@ -15,4 +13,4 @@ class Thread
       yield(*args)
     end
   end
-end
+end # Thread

data/lib/ramaze/spec.rb

@@ -1,33 +1,4 @@
 require File.expand_path('../', __FILE__) unless defined?(Ramaze)
 
-def spec_requires(*libs)
-  spec_precondition 'require' do
-    libs.each { |lib| require(lib) }
-  end
-end
-alias spec_require spec_requires
-
-def spec_precondition(name)
-  yield
-rescue LoadError => ex
-  puts "Spec require: %p failed: %p" % [name, ex.message]
-  exit 0
-rescue Exception => ex
-  puts "Spec precondition: %p failed: %p" % [name, ex.message]
-  exit 0
-end
-
-module Ramaze
-  Mock::OPTIONS[:app] = Ramaze
-
-  middleware!(:spec){|m| m.run(AppMap) }
-end
-
-# FIXME: will remove that in 2009.07, and then we can offer integration with
-#        any other test-framework we like and they can share this code.
-#        Then Ramaze can be:
-#          Any ruby, any ORM, any templating-engine, any test-framework
-unless defined?(Bacon)
-  Ramaze.deprecated "require('ramaze/spec')", "require('ramaze/spec/bacon')"
-  require 'ramaze/spec/bacon'
-end
+Ramaze.deprecated "require('ramaze/spec')", "require('ramaze/spec/bacon')"
+require File.expand_path('../spec/bacon', __FILE__)

data/lib/ramaze/spec/bacon.rb

@@ -5,10 +5,26 @@ rescue LoadError
   require 'bacon'
 end
 
-require File.expand_path('../', __FILE__) unless defined?(Ramaze)
-
+require File.expand_path('../../../ramaze', __FILE__)
 require 'innate/spec/bacon'
 
+def spec_requires(*libs)
+  spec_precondition 'require' do
+    libs.each { |lib| require(lib) }
+  end
+end
+alias spec_require spec_requires
+
+def spec_precondition(name)
+  yield
+rescue LoadError => ex
+  puts "Spec require: %p failed: %p" % [name, ex.message]
+  exit 0
+rescue Exception => ex
+  puts "Spec precondition: %p failed: %p" % [name, ex.message]
+  exit 0
+end
+
 # minimal middleware, no exception handling
 Ramaze.middleware!(:spec) do |m|
   m.run(Ramaze::AppMap)

data/lib/ramaze/version.rb

@@ -1,3 +1,3 @@
 module Ramaze
-  VERSION = "2011.07.25"
+  VERSION = "2011.10.23"
 end

data/lib/ramaze/view.rb

@@ -29,6 +29,6 @@ module Ramaze
     auto_register :Tagz,       :tagz
     auto_register :Tenjin,     :rbhtml, :tenjin
     auto_register :Slippers,   :st
-    auto_register :Mustache,   :mt
+    auto_register :Mustache,   :mustache, :mt
   end # View
 end # Ramaze

data/ramaze.gemspec

@@ -7,7 +7,7 @@ path = File.expand_path('../', __FILE__)
 Gem::Specification.new do |s|
   s.name                      = 'ramaze'
   s.version                   = Ramaze::VERSION
-  s.date                      = '25-07-2011'
+  s.date                      = '2011-10-23'
   s.authors                   = ['Michael \'manveru\' Fellinger']
   s.email                     = 'm.fellinger@gmail.com'
   s.summary                   = 'Ramaze is a simple and modular web framework'

data/spec/helper.rb

@@ -1,10 +1,11 @@
 if caller_line = caller.grep(%r!spec/ramaze/!).first
   caller_file = caller_line.split(':', 2).first
   caller_root = File.dirname(caller_file)
-  $0 = caller_file
+  $0          = caller_file
 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/bin/start.rb

@@ -1,9 +1,18 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
 require __DIR__('../../../lib/ramaze/bin/runner')
-require 'open3'
 
-describe('Ramaze::Bin::Start') do
+module Ramaze
+  module Bin
+    class Start
+      # Stub the method so that WEBrick doesn't have to be booted up.
+      def start_server(rackup_path, rackup_config, *params)
+        return true
+      end
+    end
+  end
+end
 
+describe('Ramaze::Bin::Start') do
   it('Should show a help message') do
     help = `#{Ramaze::BINPATH} start -h`.strip
 
@@ -11,28 +20,15 @@ describe('Ramaze::Bin::Start') do
   end
 
   it('Start using a directory') do
-    output = ''
-
-    Open3.popen3(Ramaze::BINPATH, 'start', Ramaze::BIN_APP) do |sin, sout, serr|
-      output += serr.gets(100).strip
+    cmd = Ramaze::Bin::Start.new
 
-      serr.close
-    end
-
-    output.should.match /INFO\s+WEBrick/
+    cmd.run([Ramaze::BIN_APP]).should == true
   end
 
   it('Start using a file') do
-    output = ''
-    path   = File.join(Ramaze::BIN_APP, 'config.ru')
-
-    Open3.popen3(Ramaze::BINPATH, 'start', path) do |sin, sout, serr|
-      output += serr.gets(100).strip
+    path = File.join(Ramaze::BIN_APP, 'config.ru')
+    cmd  = Ramaze::Bin::Start.new
 
-      serr.close
-    end
-
-    output.should.match /INFO\s+WEBrick/
+    cmd.run([path]).should == true
   end
-
 end

data/spec/ramaze/cache/localmemcache.rb

@@ -3,15 +3,12 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-# Ignore this test on Mac OS X
-spec_precondition 'User isn\'t running Mac OS X' do
-  if RUBY_PLATFORM.include? 'darwin'
-    should.flunk "Localmemcache doesn't work on Mac OS X and thus this test will be ignored."
-  else
-    spec_require 'localmemcache'
-  end
+spec_precondition 'LocalMemcache should be supported' do
+  should.flunk if Ramaze::UNSUPPORTED_GEMS.include?('localmemcache')
 end
 
+spec_require 'localmemcache'
+
 describe Ramaze::Cache::LocalMemCache do
   Ramaze.options.cache.names = [:one, :two]
   Ramaze.options.cache.default = Ramaze::Cache::LocalMemCache

data/spec/ramaze/cache/memcache.rb

@@ -2,7 +2,9 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
-require 'dalli'
+spec_require 'dalli'
+
+Dalli.logger.level = Logger::ERROR
 
 spec_precondition 'memcached is running' do
   cache = Dalli::Client.new('localhost:11211')

data/spec/ramaze/cache/redis.rb

@@ -0,0 +1,62 @@
+#          Copyright (c) 2011 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 'redis'
+
+spec_precondition 'redis is running' do
+  cache = Redis.new
+  cache['active'] = true
+end
+
+describe Ramaze::Cache::Redis do
+  Ramaze.options.cache.names   = [:one, :two]
+  Ramaze.options.cache.default = Ramaze::Cache::Redis
+  Ramaze.setup_dependencies
+
+  cache = Ramaze::Cache.one
+  hello = 'Hello, World!'
+
+  should 'store without ttl' do
+    cache.store(:hello, hello).should == hello
+  end
+
+  should 'fetch' do
+    cache.fetch(:hello).should == hello
+  end
+
+  should 'delete' do
+    cache.delete(:hello)
+    cache.fetch(:hello).should == nil
+  end
+
+  should 'delete two key/value pairs at once' do
+    cache.store(:hello, hello).should == hello
+    cache.store(:ramaze, 'ramaze').should == 'ramaze'
+    cache.delete(:hello, :ramaze)
+    cache.fetch(:hello).should == nil
+    cache.fetch(:innate).should == nil
+  end
+
+  should 'store with ttl' do
+    cache.store(:hello, @hello, :ttl => 0.2)
+    cache.fetch(:hello).should == @hello
+    sleep 0.3
+    cache.fetch(:hello).should == nil
+  end
+
+  should 'clear' do
+    cache.store(:hello, @hello)
+    cache.fetch(:hello).should == @hello
+    cache.clear
+    cache.fetch(:hello).should == nil
+  end
+
+  should 'use a custom set of options' do
+    klass = Ramaze::Cache::Redis.using(:answer => 42)
+
+    klass.options[:answer].should     == 42
+    klass.new.options[:answer].should == 42
+  end
+end
+

data/spec/ramaze/helper/blue_form.rb

@@ -1,7 +1,5 @@
-require File.expand_path('../../../../lib/ramaze/helper/blue_form', __FILE__)
-
-require 'bacon'
-Bacon.summary_at_exit
+require File.expand_path('../../../../spec/helper', __FILE__)
+require 'ramaze/helper/blue_form'
 
 describe BF = Ramaze::Helper::BlueForm do
   extend BF
@@ -251,6 +249,37 @@ describe BF = Ramaze::Helper::BlueForm do
     FORM
   end
 
+  it 'Make a form with input_checkbox and check multiple values using an array' do
+    out = form_for(@data, :method => :get) do |f|
+      f.input_checkbox 'Assigned', :assigned, ['boo'], :values => ['boo', 'foo']
+    end
+
+    assert(<<-FORM, out)
+<form method="get">
+  <p>
+    <label for="form_assigned_0">Assigned</label>
+    <span class="checkbox_wrap"><input type="checkbox" name="assigned[]" id="form_assigned_0" checked="checked" value="boo" /> boo</span>
+    <span class="checkbox_wrap"><input type="checkbox" name="assigned[]" id="form_assigned_1" value="foo" /> foo</span>
+  </p>
+</form>
+    FORM
+  end
+
+  it 'Make a form with input_checkbox and check multiple values using a hash' do
+    out = form_for(@data, :method => :get) do |f|
+      f.input_checkbox 'Assigned', :assigned, ['boo'], :values => {'Boo' => 'boo'}
+    end
+
+    assert(<<-FORM, out)
+<form method="get">
+  <p>
+    <label for="form_assigned_0">Assigned</label>
+    <span class="checkbox_wrap"><input type="checkbox" name="assigned[]" id="form_assigned_0" checked="checked" value="boo" /> Boo</span>
+  </p>
+</form>
+    FORM
+  end
+
   it 'Make a form with input_checkbox(label, name) but hide the value of the checkbox' do
     out = form_for(@data, :method => :get) do |f|
       f.input_checkbox 'Assigned', :assigned, nil, :show_value => false