ramaze 2009.07 → 2009.10

data/.gitignore

@@ -1,3 +1,5 @@
 pkg
 .yardoc
 ydoc
+*~
+*.swp

data/MANIFEST

@@ -240,6 +240,7 @@ lib/ramaze/helper/bench.rb
 lib/ramaze/helper/blue_form.rb
 lib/ramaze/helper/cache.rb
 lib/ramaze/helper/disqus.rb
+lib/ramaze/helper/erector.rb
 lib/ramaze/helper/flash.rb
 lib/ramaze/helper/form.rb
 lib/ramaze/helper/formatting.rb
@@ -327,6 +328,7 @@ lib/ramaze/tool/create.rb
 lib/ramaze/tool/project_creator.rb
 lib/ramaze/version.rb
 lib/ramaze/view.rb
+lib/ramaze/view/erector.rb
 lib/ramaze/view/erubis.rb
 lib/ramaze/view/ezamar.rb
 lib/ramaze/view/gestalt.rb
@@ -339,6 +341,7 @@ lib/ramaze/view/nagoro/render_partial.rb
 lib/ramaze/view/redcloth.rb
 lib/ramaze/view/remarkably.rb
 lib/ramaze/view/sass.rb
+lib/ramaze/view/slippers.rb
 lib/ramaze/view/tagz.rb
 lib/ramaze/view/tenjin.rb
 lib/vendor/etag.rb
@@ -445,6 +448,12 @@ spec/ramaze/session/memcache.rb
 spec/ramaze/struct.rb
 spec/ramaze/template/ramaze/external.test
 spec/ramaze/view.rb
+spec/ramaze/view/erector.rb
+spec/ramaze/view/erector/external.erector
+spec/ramaze/view/erector/invoke_helper_method.erector
+spec/ramaze/view/erector/layout.erector
+spec/ramaze/view/erector/strict_xhtml.erector
+spec/ramaze/view/erector/sum.erector
 spec/ramaze/view/erubis.rb
 spec/ramaze/view/erubis/external.rhtml
 spec/ramaze/view/erubis/sum.rhtml
@@ -471,6 +480,9 @@ spec/ramaze/view/remarkably/external.rem
 spec/ramaze/view/remarkably/sum.rem
 spec/ramaze/view/sass.rb
 spec/ramaze/view/sass/file.css.sass
+spec/ramaze/view/slippers.rb
+spec/ramaze/view/slippers/external.st
+spec/ramaze/view/slippers/sum.st
 spec/ramaze/view/tagz.rb
 spec/ramaze/view/tagz/external.tagz
 spec/ramaze/view/tagz/sum.tagz

data/Rakefile

@@ -21,25 +21,34 @@ PROJECT_COPYRIGHT   = [
 ]
 
 DEPENDENCIES = {
-  'innate' => {:version => '= 2009.07'},
+  'innate' => {:version => '= 2009.10'},
 }
 
 DEVELOPMENT_DEPENDENCIES = {
+  'RedCloth'         => {:version => '~> 4.2.2'},
   'Remarkably'       => {:version => '~> 0.5.2', :lib => 'remarkably'},
+  'activesupport'    => {:version => '~> 2.3.4'},
+  'addressable'      => {:version => '~> 2.1.0'},
   'bacon'            => {:version => '>= 1.1.0'},
+  'erector'          => {:version => '~> 0.7.0'},
   'erubis'           => {:version => '>= 2.6.4'},
   'ezamar'           => {:version => '>= 2009.06'},
   'haml'             => {:version => '~> 2.2.1'},
   'hpricot'          => {:version => '>= 0.8.1'},
   'json'             => {:version => '>= 1.1.7'},
+  'less'             => {:version => '~> 1.1.13'},
   'liquid'           => {:version => '~> 2.0.0'},
+  'locale'           => {:version => '~> 2.0.4'},
   'localmemcache'    => {:version => '~> 0.4.1'},
+  'maruku'           => {:version => '~> 0.6.0'},
   'memcache-client'  => {:version => '~> 1.7.4', :lib => 'memcache'},
   'nagoro'           => {:version => '>= 2009.05'},
-  'rack-test'        => {:version => '>= 0.4.0', :lib => 'rack/test'},
   'rack-contrib'     => {:version => '>= 0.9.2', :lib => 'rack/contrib'},
+  'rack-test'        => {:version => '>= 0.4.0', :lib => 'rack/test'},
   'sequel'           => {:version => '=  3.2.0'},
-  'tagz'             => {:version => '>= 5.0.1'},
+  'slippers'         => {:version => '~> 0.0.10'},
+  'sqlite3-ruby'     => {:version => '~> 1.2.5', :lib => 'sqlite3'},
+  'tagz'             => {:version => '>= 7.1.0'},
   'tenjin'           => {:version => '~> 0.6.1'},
 }
 

data/doc/AUTHORS

@@ -1,15 +1,16 @@
 Following persons have contributed to ramaze.
 (Sorted by number of submitted patches, then alphabetically)
 
-  2641 Michael Fellinger <m.fellinger@gmail.com>
+  2655 Michael Fellinger <m.fellinger@gmail.com>
    216 Aman Gupta <aman@ramaze.net>
     87 Jonathan Buch <john@oxyliquit.de>
-    75 Pistos <gitsomegrace.5.pistos@geoshell.com>
+    77 Pistos <gitsomegrace.5.pistos@geoshell.com>
     63 Clive Crous <clive@crous.co.za>
     27 Keita Yamaguchi <keita.yamaguchi@gmail.com>
     20 Ryan Grove <ryan@wonko.com>
     11 TJ Vanderpoel <bougy.man@gmail.com>
     11 Wang, Jinjing <nfjinjing@gmail.com>
+     8 Mario Gutierrez <mgutz@mgutz-mbp.local>
      7 Tadahiko Uehara <kikofx@gmail.com>
      6 Aki Reijonen <aki.reijonen@gmail.com>
      6 Sam Carr <samcarr@gmail.com>
@@ -23,6 +24,8 @@ Following persons have contributed to ramaze.
      2 Andrew Farmer <xichekolas@gmail.com>
      2 Jonathan Buch <jonathan.buch@gmail.com>
      2 Lars Olsson <lasso@lassoweb.se>
+     2 starapor <me@sarahtaraporewalla.com>
+     2 Yutaka HARA <yutaka.hara+github@gmail.com>
      1 Aaron Mueller <mail@aaron-mueller.de>
      1 Ara T. Howard <ara.t.howard@gmail.com>
      1 Carlo Zottmann <carlo@zottmann.org>

data/doc/CHANGELOG

@@ -1,3 +1,121 @@
+[842d47f | Fri Oct 02 15:09:43 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.10
+
+[ba23aa6 | Fri Oct 02 15:09:32 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * dependency against latest innate
+
+[e4c63be | Fri Oct 02 15:06:41 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve release tasks
+
+[6d758f3 | Thu Oct 01 14:39:03 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * Add missing erector spec template
+
+[84587e5 | Thu Oct 01 14:38:04 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * Call helper methods from external erector template
+
+[a95384c | Thu Oct 01 12:24:32 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * moved erector helper methods from engine into helper
+
+[6c10e2a | Tue Sep 29 14:03:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix slippers spec
+
+[4b31204 | Tue Sep 29 13:55:31 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding slippers as dev dependency
+
+[9561d90 | Tue Sep 29 13:46:23 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update dependencies
+
+[d7d368b | Mon Sep 28 13:14:55 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * Added strict_xhtml Erector method
+
+[23ffbd0 | Mon Sep 28 08:01:11 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * Updated Erector dependencies
+
+[e70a358 | Sun Sep 27 14:23:03 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * added erector specs
+
+[72684cb | Sun Sep 27 07:39:33 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * adding erector engine convenience methods
+
+[18501a7 | Sun Sep 27 06:12:25 UTC 2009] Mario Gutierrez <mgutz@mgutz-mbp.local>
+
+  * adding Erector view engine
+
+[98e41a6 | Sat Sep 26 00:53:20 UTC 2009] starapor <me@sarahtaraporewalla.com>
+
+  * the view_root now uses all the view directories available in teh attribute
+
+[b4f6f0e | Sat Sep 26 00:19:12 UTC 2009] starapor <me@sarahtaraporewalla.com>
+
+  * Adding a view engine for slippers
+
+[5dda528 | Sun Aug 16 12:58:31 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove shared mock, fix webrat
+
+[f545a47 | Tue Aug 11 03:01:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix wrong constant reference
+
+[e7732d1 | Tue Aug 11 02:39:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Only try to get win32console on ruby < 1.9, fix logger
+
+[8d79efe | Wed Aug 05 12:58:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Provide support for :haml_options trait again
+
+[1d21bad | Sat Aug 01 04:07:45 UTC 2009] Pistos <gitsomegrace.5.pistos@geoshell.com>
+
+  * Don't use system temp dir;
+
+    ('openid-store' in our case).
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[e417109 | Mon Jul 27 05:00:18 UTC 2009] Pistos <gitsomegrace.5.pistos@geoshell.com>
+
+  * Fixed error in rdocs of Ramaze::Request#to_instance_variables.
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[3713845 | Sat Aug 01 08:39:25 UTC 2009] Yutaka HARA <yutaka.hara+github@gmail.com>
+
+  * Added DataMapperPager (does not load all the rows)
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[802c0d9 | Fri Jul 31 09:03:27 UTC 2009] Yutaka HARA <yutaka.hara+github@gmail.com>
+
+  * paginate helper supports DataMapper
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[c098591 | Wed Jul 29 13:39:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Require snippets using Find::find instead of Dir::glob
+
+[37470de | Sat Jul 25 14:30:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fixing the auth example by mapping it to /
+
+[e95e5f1 | Fri Jul 24 19:04:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update announcement
+
 [d0267ff | Fri Jul 24 18:56:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2009.07

data/doc/meta/announcement.txt

@@ -51,6 +51,8 @@ Simple example:
 
 - Michael Fellinger (manveru)
   - Adding support for the less CSS templating engine
+  - Adding LRU cache
+  - Fixing problems in paginate
   - Better defaults for proto specs
   - The Helper::Cache#cache_value optionally takes a block now
   - Make sure proto/config.ru points to correct location

data/examples/app/auth/start.rb

@@ -11,6 +11,8 @@ module Auth
 
   class AuthController < Ramaze::Controller
     map '/', :auth
+    app.location = '/'
+
     helper :auth
     layout :auth
     trait :auth_table => USERS

data/lib/ramaze/helper/erector.rb

@@ -0,0 +1,58 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'erector'
+
+module Ramaze
+
+  # Allows you to use some shortcuts for Erector in your Controller.
+
+  # use this inside your controller to directly build Erector 
+  # Refer to the Erector-documentation and testsuite for more examples.
+  # Usage:
+  #   erector { h1 "Apples & Oranges" }                           #=> "<h1>Apples &amp; Oranges</h1>"
+  #   erector { h1(:class => 'fruits&floots'){ text 'Apples' } }  #=> "<h1 class=\"fruits&amp;floots\">Apples</h1>"
+
+  module Helper
+    module Erector
+      include ::Erector::Mixin
+
+      class ::Erector::Widget
+        alias :raw! :rawtext
+        alias :old_css :css
+
+        def strict_xhtml(*args, &block)
+          raw! '<?xml version="1.0" encoding="UTF-8"?>'
+          raw! '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">'
+          html(:xmlns => "http://www.w3.org/1999/xhtml", :"xml:lang" => "en", :lang => "en", &block)
+        end
+
+        def js(src)
+          script :src => src
+        end
+
+        def ie_if(expr, &block)
+          raw! "<!--[if #{expr}]>"
+          yield
+          raw! "<![endif]-->"
+        end
+
+        # Diagnostics
+        def inspect(elem)
+          text elem.inspect
+        end
+
+        def css(href, args = {})
+          attrs = {
+            :rel => "stylesheet", 
+            :href => href, 
+            :type => "text/css" 
+          }.merge(args)
+
+          link attrs
+        end
+      end
+    end
+  end
+end
+

data/lib/ramaze/helper/identity.rb

@@ -8,7 +8,7 @@ require 'openid/extensions/sreg'
 
 module Ramaze
 
-  openid_store_file = ::File.join(Dir.tmpdir, 'openid-store')
+  openid_store_file = ::File.join(Ramaze.options.roots[0], '/tmp', 'openid-store')
 
   # Constant for storing meta-information persistent
   OpenIDStore = OpenID::Store::Filesystem.new(openid_store_file)

data/lib/ramaze/helper/paginate.rb

@@ -164,6 +164,8 @@ module Ramaze
           case obj
           when Array
             ArrayPager.new(obj, @page, @limit)
+          when (defined?(DataMapper::Collection) and DataMapper::Collection)
+            DataMapperPager.new(obj, @page, @limit)
           else
             obj.paginate(@page, @limit)
           end
@@ -196,7 +198,7 @@ module Ramaze
           end
 
           def page_count
-            pages, rest = @array.size.divmod(@limit)
+            pages, rest = size.divmod(@limit)
             rest == 0 ? pages : pages + 1
           end
 
@@ -231,6 +233,30 @@ module Ramaze
           include Enumerable
         end
 
+        # Wrapper for DataMapper::Collection to behave like the Sequel
+        # pagination.
+        # needs 'datamapper' (or 'dm-core' and 'dm-aggregates')
+        class DataMapperPager < ArrayPager
+
+          def initialize(*args)
+            unless defined?(DataMapper::Aggregates)
+              Ramaze::Log.warn "paginate.rb: it is strongly " +
+                               "recommended to require 'dm-aggregates'"
+            end
+
+            super
+          end
+
+          def size
+            @cached_size ||= @array.count
+          end
+
+          def empty?
+            size == 0
+          end
+
+        end
+
       end
     end
   end

data/lib/ramaze/log.rb

@@ -2,23 +2,10 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/log/logging'
-
-module Ramaze
-  Log = Innate::Log
-
-  module Logger
-    autoload :Analogger, 'ramaze/log/analogger'
-  end
-end
-
-__END__
-
-require 'ramaze/log/logging'
-require 'ramaze/log/hub'
 require 'ramaze/log/informer'
 
 begin
-  require 'win32console' if RUBY_PLATFORM =~ /win32/i
+  require 'win32console' if RUBY_PLATFORM =~ /win32/i && RUBY_VERSION < '1.9'
 rescue LoadError => ex
   puts ex
   puts "For nice colors on windows, please `gem install win32console`"
@@ -26,14 +13,14 @@ rescue LoadError => ex
 end
 
 module Ramaze
-  autoload :Analogger, "ramaze/log/analogger"
-  autoload :Knotify,   "ramaze/log/knotify"
-  autoload :Syslog,    "ramaze/log/syslog"
-  autoload :Growl,     "ramaze/log/growl"
-  autoload :Xosd,      "ramaze/log/xosd"
-  autoload :Logger,    "ramaze/log/logger"
+  Log = Innate::Log
 
-  unless defined?(Log)
-    Log = Logger::LogHub.new(Logger::Informer)
+  module Logger
+    autoload :Analogger, 'ramaze/log/analogger'
+    autoload :Knotify,   "ramaze/log/knotify"
+    autoload :Syslog,    "ramaze/log/syslog"
+    autoload :Growl,     "ramaze/log/growl"
+    autoload :Xosd,      "ramaze/log/xosd"
+    autoload :Logger,    "ramaze/log/logger"
   end
 end

data/lib/ramaze/log/informer.rb

@@ -9,7 +9,7 @@ module Ramaze
 
     class Informer
       include Logging
-      include Ramaze::Traited
+      include Innate::Traited
 
       attr_accessor :out, :colorize, :log_levels
 

data/lib/ramaze/request.rb

@@ -19,7 +19,7 @@ module Ramaze
     #
     # Usage:
     #   request.params # => {'name' => 'manveru', 'q' => 'google', 'lang' => 'de'}
-    #   to_ivs(:name, :q)
+    #   request.to_ivs(:name, :q)
     #   @q    # => 'google'
     #   @name # => 'manveru'
     #   @lang # => nil