ramaze 0.1.2 → 0.1.3

data/lib/ramaze/inform/informing.rb

@@ -15,9 +15,15 @@ module Ramaze
   #   end
 
   module Informing
-    def tag_inform(tag, meth, *strings)
-      strings.each do |string|
-        string = (string.respond_to?(:to_str) ? string : string.send(meth))
+
+    # Takes the tag (:warn|:debug|:error|:info) and the name of a method to be
+    # called upon elements of msgs that don't respond to :to_str
+    # Goes on and sends the tag and transformed messages each to the #inform method.
+    # If you include this module you have to define #inform or it will raise.
+
+    def tag_inform(tag, meth, *msgs)
+      msgs.each do |msg|
+        string = (msg.respond_to?(:to_str) ? msg : msg.send(meth))
         inform(tag, string)
       end
     end

data/lib/ramaze/inform/knotify.rb

@@ -3,13 +3,17 @@
 
 module Ramaze
 
+  # Informer for the Knotify notfication system used on KDE.
+  # Doesn't need any special libraries.
+
   class Knotify
     include Informing
 
     trait :present => 16
 
-    # Please see for more information:
+    # Please see for more information on the API used here:
     # http://lukeplant.me.uk/articles.php?id=3
+
     def inform(tag, *messages)
       present = class_trait[:present]
       tag = tag.to_s.capitalize

data/lib/ramaze/inform/syslog.rb

@@ -4,6 +4,9 @@
 require 'syslog'
 
 module Ramaze
+
+  # Informer for Syslog from rubys standard-library.
+
   class Syslog
     include ::Syslog
 

data/lib/ramaze/inform/xosd.rb

@@ -6,6 +6,11 @@ require 'thread'
 
 module Ramaze
 
+  # Informer for the XOSD notification system for X11.
+  #
+  # You can install the ruby-bindings with:
+  #   gem install xosd.
+
   class Xosd < ::Xosd
     attr_accessor :options
 
@@ -36,6 +41,11 @@ module Ramaze
     # Here new messages are pushed to eventually displaying them.
     QUEUE = Queue.new
 
+    # Create a new instance, valid options are in DEFAULT.
+    # In the background a new thread will be running that checks the QUEUE
+    # and processes all messages that are being sent to it.
+    # This is done to make output nicer and readable.
+
     def initialize(options = {})
       @options = DEFAULT.merge(options)
 
@@ -67,6 +77,8 @@ module Ramaze
       end
     end
 
+    # pushes all messages it gets on the QUEUE for further processing.
+
     def inform(tag, *messages)
       messages.each do |message|
         QUEUE << [tag, message]

data/lib/ramaze/template.rb

@@ -5,6 +5,9 @@
 # Amrita2, Erubis, Haml, Liquid and Markaby if you refer to them.
 
 module Ramaze
+
+  # Namespace for templating.
+
   module Template
 
     COMPILED = {} unless defined?(COMPILED)

data/lib/ramaze/template/amrita2.rb

@@ -5,7 +5,9 @@ require 'amrita2/template'
 
 module Ramaze
   module Template
+
     # Is responsible for compiling a template using the Amrita2 templating engine.
+    # Can be found at: http://rubyforge.org/projects/amrita2
 
     class Amrita2 < Template
 

data/lib/ramaze/template/erubis.rb

@@ -7,6 +7,7 @@ module Ramaze
   module Template
 
     # Is responsible for compiling a template using the Erubis templating engine.
+    # Can be found at: http://rubyforge.org/projects/erubis
 
     class Erubis < Template
 

data/lib/ramaze/template/ezamar.rb

@@ -2,6 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/template/ezamar/engine'
+require 'ramaze/template/ezamar/render_partial'
 
 module Ramaze
   module Template

data/lib/ramaze/template/ezamar/element.rb

@@ -123,7 +123,13 @@ class Ezamar::Element
     #   <Page foo="true" />
 
     def finish_transform(klass, params, content)
-      instance = constant(klass).new(content)
+      scope =
+        if Ramaze::Action.current
+          Ramaze::Action.current.controller
+        else
+          self.class
+        end
+      instance = scope.constant(klass).new(content)
 
       demunge_passed_variables(params).each do |key, value|
         instance.instance_variable_set("@#{key}", value)
@@ -147,17 +153,17 @@ class Ezamar::Element
     # Just remember, walk like a duck, talk like a duck.
 
     def demunge_passed_variables(template)
-      template.scan(/\s?(.*?)="(.*?)"/).inject({}) do |hash, (key, value)|
+      template.scan(/\s?(.*?)=["'](.*?)["']/).inject({}) do |hash, (key, value)|
         value =
-        case value
-        when 'true'
-          true
-        when 'false'
-          false
-        else
-          Integer(value) rescue Float(value) rescue value
-        end
-      hash.merge key => value
+          case value
+          when 'true'
+            true
+          when 'false'
+            false
+          else
+            Integer(value) rescue Float(value) rescue value
+          end
+        hash.merge key => value
       end
     end
   end

data/lib/ramaze/template/ezamar/engine.rb

@@ -17,6 +17,11 @@ module Ezamar
   # This class is responsible for initializing and compiling the template.
 
   class Template
+
+    # Take a template (anything that responds to ::to_str) and options.
+    # At the moment the only option used is :file, which is used to tell
+    # Kernel::eval how to produce better backtraces.
+
     def initialize(template, options = {})
       @template, @options = template, options
       compile

data/lib/ramaze/template/ezamar/render_partial.rb

@@ -2,20 +2,22 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/template/ezamar/engine'
+require 'ramaze/helper/partial'
 
 module Ezamar
   class RenderPartial
+    extend Ramaze::PartialHelper
 
     # Renders <render src="/path" [optional="option", ...]> in place.
     #
     # Other options than `src` will be transformed to session parameters for the
     # rendered action to use.
 
-    def self.transform(template, action, file = __FILE__)
+    def self.transform(template)
       template.gsub!(/<render (.*?) \/>/) do |m|
         args = Hash[*$1.scan(/(\S+)=["'](.*?)["']/).flatten]
         if src = args.delete('src')
-          PartialHelper.render_partial(src, args)
+          render_partial(src, args)
         end
       end
 

data/lib/ramaze/template/haml.rb

@@ -5,6 +5,10 @@ require 'haml/engine'
 
 module Ramaze
   module Template
+
+    # Is responsible for compiling a template using the Haml templating engine.
+    # Can be found at: http://haml.hamptoncatlin.com/
+
     class Haml < Template
 
       # Custom HAML-options for your controller to be merged.

data/lib/ramaze/template/liquid.rb

@@ -5,6 +5,10 @@ require 'liquid'
 
 module Ramaze
   module Template
+
+    # Is responsible for compiling a template using the Liquid templating engine.
+    # Can be found at: http://home.leetsoft.com/liquid
+
     class Liquid < Template
 
       ENGINES[self] = %w[ liquid ]

data/lib/ramaze/template/markaby.rb

@@ -5,6 +5,10 @@ require 'markaby'
 
 module Ramaze
   module Template
+
+    # Is responsible for compiling a template using the Markaby templating engine.
+    # Can be found at: http://code.whytheluckystiff.net/markaby/
+
     class Markaby < Template
       ENGINES[self] = %w[ mab ]
 

data/lib/ramaze/template/remarkably.rb

@@ -5,6 +5,10 @@ require 'remarkably/engines/html'
 
 module Ramaze
   module Template
+
+    # Is responsible for compiling a template using the Remarkably templating engine.
+    # Can be found at: http://rubyforge.org/projects/remarkably
+
     class Remarkably < Template
       ENGINES[self] = %w[ rem ]
 

data/lib/ramaze/tool.rb

@@ -0,0 +1,10 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+module Ramaze::Tool
+  autoload :Create, 'ramaze/tool/create'
+  autoload :Localize, 'ramaze/tool/localize'
+  autoload :Mime, 'ramaze/tool/mime'
+  autoload :Record, 'ramaze/tool/record'
+  autoload :Tidy, 'ramaze/tool/tidy'
+end

data/lib/ramaze/tool/localize.rb

@@ -48,7 +48,7 @@ class Ramaze::Tool::Localize
       locale = session[:LOCALE] || set_session_locale
 
       body.gsub!(trait[:regex]) do
-        localize($1, locale)
+        localize($1, locale) unless $1.to_s.empty?
       end
 
       store(locale, trait[:default_language]) if trait[:collect]

data/lib/ramaze/trinity/session.rb

@@ -1,7 +1,11 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'digest/sha2'
+if RUBY_VERSION >= "1.9.0"
+  require 'digest/sha1'
+else
+  require 'digest/sha2'
+end
 
 module Ramaze
 
@@ -11,6 +15,9 @@ module Ramaze
   # are stored, about updates.
 
   class SessionHash
+
+    # Sets @hash to an empty Hash
+
     def initialize
       @hash = {}
     end

data/lib/ramaze/version.rb

@@ -5,7 +5,7 @@ module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rake_tasks/maintaince.rake

@@ -232,7 +232,7 @@ end
 
 task 'release' => ['distribute'] do
   sh 'rubyforge login'
-  sh 'rubyforge add_release ramaze ramaze #{VERS} pkg/ramaze-#{VERS}.gem'
+  #sh "rubyforge add_release ramaze ramaze #{VERS} pkg/ramaze-#{VERS}.gem"
 
   require 'open-uri'
   require 'hpricot'
@@ -267,7 +267,7 @@ task 'undocumented-module' do
       total, missing = [], []
       until @s.eos?
         unless @s.scan(/^\s*#.*/)
-          comment = true if @s.scan(/^=begin$/)
+          comment = true if @s.scan(/^=begin[^$]*$/)
           comment = false if comment and @s.scan(/^=end$/)
 
           unless comment

data/spec/ramaze/action/basics.rb

@@ -6,7 +6,7 @@ describe 'Action() basics' do
 
     action.params.should == []
     action.method.should be_nil
-    action.template.should be_nil 
+    action.template.should be_nil
   end
 
   it 'should sanitize parameters' do

data/spec/ramaze/cache.rb

@@ -60,5 +60,16 @@ caches.each do |cache, name|
       @cache[:beh] = :feh
       @cache.values_at(:baz, :beh).should == [:foo, :feh]
     end
+
+    it "different cache namespaces should not overlap" do
+      Ramaze::Cache.add :foo
+      Ramaze::Cache.add :bar
+
+      key = "foobar"
+      Ramaze::Cache.foo[key] = 'foo'
+      Ramaze::Cache.bar[key] = 'bar'
+
+      Ramaze::Cache.foo[key].should_not == Ramaze::Cache.bar[key]
+    end
   end
 end

data/spec/ramaze/controller.rb

@@ -54,7 +54,6 @@ describe "Controller" do
       ],
 
       '/foo/bar' => [
-        ["/foo__bar", "index",    []],
         ["/foo/bar",  "index",    []],
 
         ["/foo",      "bar",      []],
@@ -67,12 +66,8 @@ describe "Controller" do
 
       '/foo/bar/baz' => [
 
-        ['/foo__bar__baz', 'index',         []],
         ['/foo/bar/baz',   'index',         []],
 
-        ['/foo__bar',      'baz',           []],
-        ['/foo__bar',      'index',         ['baz']],
-
         ['/foo/bar',       'baz',           []],
         ['/foo/bar',       'index',         ['baz']],
 
@@ -87,20 +82,11 @@ describe "Controller" do
       ],
 
       '/foo/bar/baz/oof' => [
-        ['/foo__bar__baz__oof', 'index',               []],
-
         ['/foo/bar/baz/oof',    'index',               []],
 
-        ['/foo__bar__baz',      'oof',                 []],
-        ['/foo__bar__baz',      'index',               ['oof']],
-
         ['/foo/bar/baz',        'oof',                 []],
         ['/foo/bar/baz',        'index',               ['oof']],
 
-        ['/foo__bar',           'baz__oof',            []],
-        ['/foo__bar',           'baz',                 ['oof']],
-        ['/foo__bar',           'index',               ['baz', 'oof']],
-
         ['/foo/bar',            'baz__oof',            []],
         ['/foo/bar',            'baz',                 ['oof']],
         ['/foo/bar',            'index',               ['baz', 'oof']],

data/spec/ramaze/dispatcher/file.rb

@@ -3,22 +3,22 @@ require 'spec/helper'
 describe 'Dispatcher::File' do
   before :all do
     ramaze
+    @public_root = Ramaze::Global.public_root = 'spec/ramaze/dispatcher/public'
   end
 
   it 'should serve from proto/public' do
   end
 
   it 'should serve from Global.public_root' do
-    dir = Ramaze::Global.public_root = 'spec/ramaze/public'
-    css = File.read(dir/'test_download.css')
+    css = File.read(@public_root/'test_download.css')
     re_css = get('/test_download.css')
     re_css.body.should == css
     re_css.status.should == 200
   end
 
-  it 'should serve from Global.public_proto' do
-    file = (Ramaze::Global.public_proto/'error.zmr')
+  it 'should give priority to Global.public_root' do
+    file = (@public_root/'favicon.ico')
     original = File.read(file)
-    get('/error.zmr').body.should == original
+    get('/favicon.ico').body.should == original
   end
 end

data/spec/ramaze/dispatcher/public/test_download.css

@@ -0,0 +1,141 @@
+/*#############################################################
+ * Name: Light
+ * Date: 2006-08-20
+ * Description: Bright and smooth.
+ * Author: Viktor Persson
+ * URL: http://templates.arcsin.se
+ *
+ * Feel free to use and modify but please provide credits.
+ * #############################################################*/
+
+/* standard elements */
+{
+  margin: 0;
+  padding: 0;
+}
+a {
+  color: #567;
+}
+a:hover {
+  color: #28E;
+}
+body {
+  background: #F2F2F2 url(/media/bg.gif) repeat-y center top;
+  color: #555A60;
+  font: normal 62.5% "Lucida Sans Unicode",sans-serif;
+  margin: 0;
+}
+p,cite,code,ul {
+  font-size: 1.0em;
+  padding-bottom: 1.2em;
+}
+h1 {
+  font-size: 1.4em;
+  margin-bottom: 4px;
+}
+li {
+  list-style: url(/media/li.gif);
+  margin-left: 18px;
+}
+code {
+  background: url(/media/bgcode.gif);
+  border: 1px solid #F6F6F6;
+  color: #666;
+  display: block;
+  font: normal 1.1em "Lucida Sans Unicode",serif;
+  margin-bottom: 12px;
+  padding: 8px 10px;
+  white-space: pre;
+}
+cite {
+  background: url(/media/quote.gif) no-repeat;
+  color: #456;
+  display: block;
+  font: normal 1.4em "Lucida Sans Unicode",serif;
+  padding-left: 28px;
+}
+h1,h2,h3 {
+  color: #579;
+  padding-top: 6px;
+}
+*
+/* misc */
+.clearer {
+  clear: both;
+}
+
+/* structure */
+.container {
+  margin: 0 auto;
+  width: 730px;
+}
+
+/* title */
+.title {
+  float: left;
+  margin-top: 22px;
+  text-align: center;
+  width: 220px;
+}
+.title h1 {
+  font: normal 2em Verdana,sans-serif;
+}
+.title h2 {
+  color: #999;
+  font: normal 1.1em Verdana,sans-serif;
+}
+
+/* navigation */
+.navigation {
+  background: url(/media/holder.jpg) no-repeat;
+  height: 100px;
+  padding: 0 16px;
+}
+.navigation a {
+  border-left: 1px solid #DDD;
+  border-right: 1px solid #FFF;
+  color: #89A;
+  float: right;
+  font: bold 1.2em "Trebuchet MS",sans-serif;
+  margin-top: 9px;
+  padding: 58px 18px 8px;
+  text-align: center;
+  text-decoration: none;
+}
+.navigation a:hover {
+  background: #FFF url(/media/navhover.gif) repeat-x;
+  color: #28E;
+  padding: 56px 18px 10px;
+}
+
+/* holders */
+.holder {
+  background: url(/media/bgholder.jpg) repeat-y;
+  padding: 0 32px;
+}
+.holder_top,.footer {
+  clear: both;
+  background: url(/media/holder.jpg) no-repeat;
+  height: 40px;
+}
+
+/* footer */
+.footer {
+  background-position: left bottom;
+  color: #666;
+  font-size: 1.1em;
+  text-align: center;
+}
+
+form {
+  text-align: right;
+}
+
+form input {
+  width: 95%;
+}
+
+form textarea {
+  width: 95%;
+  height: 30em;
+}