ramaze 2009.06.12 → 2009.07

data/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 'remarkably'
 
 Ramaze::App.options.views = 'remarkably'

data/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 'haml/util', 'sass/engine'
 
 Ramaze::App.options.views = 'sass'

data/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 'tagz'
 
 Ramaze::App.options.views = 'tagz'

data/spec/ramaze/view/tenjin.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'

data/spec/snippets/array/put_within.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

data/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 'locals' do
   should 'find locals' do

data/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#filesize_format" do
   it 'it should convert filesizes to human readable format' do

data/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 "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
+end

data/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 '__DIR__' do
   # this is hardly exhaustive, but better than nothing

data/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__)
 
 describe 'OrderedSet' do
   os = OrderedSet.new(1,2,3,1)

data/spec/snippets/ramaze/acquire.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'
 
 

data/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::Dictionary do
   Dictionary = Ramaze::Dictionary

data/spec/snippets/ramaze/lru_hash.rb

@@ -0,0 +1,88 @@
+#          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 LRU = Ramaze::LRUHash do
+  describe 'without restrictions' do
+    it 'fetches via #fetch' do
+      lru = LRU.new
+
+      lambda{ lru.fetch(:a) }.should.raise(LRU::KeyError).message ==  "key not found: :a"
+      lru.fetch(:a, :b).should == :b
+      lru.fetch(:a).should == :b
+      lru.fetch(:c){|key| key.to_s }.should == 'c'
+      lru.fetch(:c).should == 'c'
+    end
+
+    it 'stores and retrieves values via #[]= and #[]' do
+      lru = LRU.new
+
+      lru[:a].should == nil
+      lru[:a] = :b
+      lru[:a].should == :b
+    end
+  end
+
+  describe 'with max_count restriction' do
+    it 'stores and retrieves values via #[]= and #[]' do
+      lru = LRU.new(:max_count => 2)
+
+      # store the allowed two
+      lru[:a] = :b
+      lru[:c] = :d
+
+      # overflow by one
+      lru[:e] = :f
+
+      # first content must be gone
+      lru.key?(:a).should == false
+
+      # access :c to keep it around
+      lru[:c]
+      lru[:g] = :h
+
+      lru.key?(:c).should == true
+      lru.key?(:e).should == false
+    end
+
+    it 'should keep some statistics' do
+      lru = LRU.new(:max_count => 2)
+      lru.statistics.should == {:size => 0, :count => 0, :hits => 0, :misses => 0}
+
+      lru[:a] = :b
+      lru.statistics.should == {:size => 5, :count => 1, :hits => 0, :misses => 0}
+
+      lru[:a] = :b
+      lru.statistics.should == {:size => 5, :count => 1, :hits => 0, :misses => 0}
+
+      lru[:c] = :d
+      lru.statistics.should == {:size => 10, :count => 2, :hits => 0, :misses => 0}
+
+      lru[:c]
+      lru.statistics.should == {:size => 10, :count => 2, :hits => 1, :misses => 0}
+
+      lru[:d]
+      lru.statistics.should == {:size => 10, :count => 2, :hits => 1, :misses => 1}
+
+      lru[:e] = :f
+      lru.statistics.should == {:size => 10, :count => 2, :hits => 1, :misses => 1}
+
+      lru[:a]
+      lru.statistics.should == {:size => 10, :count => 2, :hits => 1, :misses => 2}
+
+      lru.delete :e
+      lru.statistics.should == {:size => 5, :count => 1, :hits => 1, :misses => 2}
+
+      lru[:a] = 'foobar'
+      s = lru.statistics
+      s.delete(:size) # Differs on 1.8/1.9
+      s.should == {:count => 2, :hits => 1, :misses => 2}
+    end
+  end
+
+  # TODO: Still missing
+  # :[], :[]=, :clear, :delete, :each_key, :each_pair, :each_value, :empty?,
+  # :expire, :fetch, :index, :key?, :keys, :length, :size, :statistics, :store,
+  # :to_hash, :value?, :values
+end

data/spec/snippets/ramaze/struct.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

data/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#camel_case" do
 

data/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#color' do
   it 'should define methods to return ANSI strings' do

data/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#snake_case" do
 

data/spec/snippets/string/unindent.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

data/spec/snippets/thread/into.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

data/tasks/bacon.rake

@@ -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
 

data/tasks/gem_setup.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

data/tasks/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ramaze
 version: !ruby/object:Gem::Version 
-  version: 2009.06.12
+  version: "2009.07"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 +09:00
+date: 2009-07-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2009.06.12
+        version: "2009.07"
     version: 
 - !ruby/object:Gem::Dependency 
   name: Remarkably
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.9
+        version: 2.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 1.1.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -110,7 +110,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: memcache-client
@@ -120,7 +120,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.7.2
+        version: 1.7.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: nagoro
@@ -140,7 +140,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-contrib
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -150,7 +160,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: 3.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: tagz
@@ -392,6 +402,7 @@ files:
 - lib/ramaze/app.rb
 - lib/ramaze/cache.rb
 - lib/ramaze/cache/localmemcache.rb
+- lib/ramaze/cache/lru.rb
 - lib/ramaze/cache/memcache.rb
 - lib/ramaze/cache/sequel.rb
 - lib/ramaze/contrib/addressable_route.rb
@@ -419,6 +430,7 @@ files:
 - lib/ramaze/helper.rb
 - lib/ramaze/helper/auth.rb
 - lib/ramaze/helper/bench.rb
+- lib/ramaze/helper/blue_form.rb
 - lib/ramaze/helper/cache.rb
 - lib/ramaze/helper/disqus.rb
 - lib/ramaze/helper/flash.rb
@@ -486,6 +498,7 @@ files:
 - lib/ramaze/snippets/ramaze/deprecated.rb
 - lib/ramaze/snippets/ramaze/dictionary.rb
 - lib/ramaze/snippets/ramaze/fiber.rb
+- lib/ramaze/snippets/ramaze/lru_hash.rb
 - lib/ramaze/snippets/ramaze/struct.rb
 - lib/ramaze/snippets/string/camel_case.rb
 - lib/ramaze/snippets/string/color.rb
@@ -511,6 +524,7 @@ files:
 - lib/ramaze/view/ezamar.rb
 - lib/ramaze/view/gestalt.rb
 - lib/ramaze/view/haml.rb
+- lib/ramaze/view/less.rb
 - lib/ramaze/view/liquid.rb
 - lib/ramaze/view/maruku.rb
 - lib/ramaze/view/nagoro.rb
@@ -551,8 +565,10 @@ files:
 - spec/ramaze/action/view/sub/sub_wrapper.erb
 - spec/ramaze/action/view/sub/sub_wrapper.xhtml
 - spec/ramaze/app.rb
+- spec/ramaze/app/location.rb
 - spec/ramaze/bin/ramaze.rb
 - spec/ramaze/cache/localmemcache.rb
+- spec/ramaze/cache/lru.rb
 - spec/ramaze/cache/memcache.rb
 - spec/ramaze/cache/sequel.rb
 - spec/ramaze/controller/actionless_templates.rb
@@ -580,6 +596,7 @@ files:
 - spec/ramaze/gestalt.rb
 - spec/ramaze/helper/auth.rb
 - spec/ramaze/helper/bench.rb
+- spec/ramaze/helper/blue_form.rb
 - spec/ramaze/helper/cache.rb
 - spec/ramaze/helper/flash.rb
 - spec/ramaze/helper/form.rb
@@ -632,6 +649,8 @@ files:
 - spec/ramaze/view/haml.rb
 - spec/ramaze/view/haml/external.haml
 - spec/ramaze/view/haml/sum.haml
+- spec/ramaze/view/less.rb
+- spec/ramaze/view/less/file.css.less
 - spec/ramaze/view/liquid.rb
 - spec/ramaze/view/liquid/external.liquid
 - spec/ramaze/view/liquid/sum.liquid
@@ -659,6 +678,7 @@ files:
 - spec/snippets/ordered_set.rb
 - spec/snippets/ramaze/acquire.rb
 - spec/snippets/ramaze/dictionary.rb
+- spec/snippets/ramaze/lru_hash.rb
 - spec/snippets/ramaze/struct.rb
 - spec/snippets/string/camel_case.rb
 - spec/snippets/string/color.rb