RubyGems - nitro - Versions diffs - 0.7.0 → 0.8.0 - Mend

nitro 0.7.0 → 0.8.0

Files changed (102) hide show

data/AUTHORS +14 -4
data/ChangeLog +192 -1
data/README +50 -6
data/RELEASES +60 -0
data/Rakefile +1 -1
data/bin/cluster.rb +2 -2
data/bin/new_form.rb +1 -1
data/examples/blog/config.rb +5 -4
data/examples/blog/lib/blog.rb +56 -36
data/examples/blog/root/comments.xhtml +5 -2
data/examples/blog/root/entry_form.xhtml +7 -2
data/examples/blog/root/login.xhtml +1 -1
data/examples/blog/root/style.xsl +7 -0
data/examples/og/mock_example.rb +6 -9
data/examples/og/mysql_to_psql.rb +100 -0
data/examples/og/run.rb +8 -17
data/lib/glue.rb +7 -8
data/lib/glue/array.rb +1 -1
data/lib/glue/attribute.rb +86 -0
data/lib/glue/cache.rb +1 -1
data/lib/glue/hash.rb +1 -1
data/lib/glue/inflector.rb +1 -1
data/lib/glue/logger.rb +118 -18
data/lib/glue/mixins.rb +1 -1
data/lib/glue/number.rb +1 -1
data/lib/glue/pool.rb +1 -1
data/lib/glue/property.rb +48 -31
data/lib/glue/string.rb +1 -1
data/lib/glue/time.rb +2 -2
data/lib/glue/validation.rb +400 -0
data/lib/nitro/application.rb +6 -6
data/lib/nitro/builders/form.rb +5 -5
data/lib/nitro/builders/rss.rb +1 -1
data/lib/nitro/builders/xhtml.rb +119 -0
data/lib/nitro/builders/xml.rb +111 -0
data/lib/nitro/config.rb +6 -6
data/lib/nitro/events.rb +1 -1
data/lib/nitro/html.rb +1 -1
data/lib/nitro/markup.rb +15 -20
data/lib/nitro/scaffold.rb +2 -2
data/lib/nitro/server/appserver.rb +3 -3
data/lib/nitro/server/cluster.rb +2 -2
data/lib/nitro/server/dispatcher.rb +2 -2
data/lib/nitro/server/filters/autologin.rb +1 -1
data/lib/nitro/server/fragment.rb +2 -2
data/lib/nitro/server/handlers.rb +2 -2
data/lib/nitro/server/render.rb +17 -15
data/lib/nitro/server/request.rb +6 -6
data/lib/nitro/server/script.rb +2 -2
data/lib/nitro/server/server.rb +2 -2
data/lib/nitro/server/session.rb +6 -6
data/lib/nitro/server/shaders.rb +2 -2
data/lib/nitro/server/webrick.rb +1 -1
data/lib/nitro/sitemap.rb +2 -2
data/lib/nitro/uri.rb +1 -1
data/lib/nitro/version.rb +7 -5
data/lib/og.rb +95 -129
data/lib/og/backend.rb +47 -46
data/lib/og/backends/mysql.rb +64 -63
data/lib/og/backends/psql.rb +73 -72
data/lib/og/connection.rb +7 -8
data/lib/og/enchant.rb +80 -0
data/lib/og/meta.rb +21 -21
data/lib/og/mock.rb +31 -88
data/lib/og/version.rb +6 -5
data/lib/parts/README +9 -0
data/lib/parts/content.rb +23 -9
data/test/glue/tc_attribute.rb +22 -0
data/test/glue/tc_cache.rb +4 -6
data/test/glue/tc_hash.rb +2 -2
data/test/glue/tc_logger.rb +36 -0
data/test/glue/tc_numbers.rb +2 -2
data/test/glue/tc_property_mixins.rb +35 -4
data/test/glue/tc_strings.rb +32 -32
data/test/glue/tc_validation.rb +186 -0
data/test/nitro/builders/tc_xhtml.rb +38 -0
data/test/nitro/builders/tc_xml.rb +47 -0
data/test/nitro/server/tc_request.rb +2 -2
data/test/nitro/server/tc_session.rb +1 -1
data/test/nitro/tc_sitemap.rb +1 -1
data/test/nitro/ui/tc_pager.rb +1 -10
data/test/tc_og.rb +3 -3
data/vendor/blankslate.rb +53 -0
data/vendor/extensions/_base.rb +153 -0
data/vendor/extensions/_template.rb +36 -0
data/vendor/extensions/all.rb +21 -0
data/vendor/extensions/array.rb +68 -0
data/vendor/extensions/binding.rb +224 -0
data/vendor/extensions/class.rb +50 -0
data/vendor/extensions/continuation.rb +71 -0
data/vendor/extensions/enumerable.rb +250 -0
data/vendor/extensions/hash.rb +23 -0
data/vendor/extensions/io.rb +58 -0
data/vendor/extensions/kernel.rb +42 -0
data/vendor/extensions/module.rb +114 -0
data/vendor/extensions/numeric.rb +230 -0
data/vendor/extensions/object.rb +164 -0
data/vendor/extensions/ostruct.rb +41 -0
data/vendor/extensions/string.rb +316 -0
data/vendor/extensions/symbol.rb +28 -0
metadata +35 -13
data/lib/glue/property.rb.old +0 -307

data/test/nitro/builders/tc_xhtml.rb ADDED

@@ -0,0 +1,38 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require 'test/unit'
+require 'nitro/builders/xhtml'
+class TC_BuildersXhtml < Test::Unit::TestCase # :nodoc: all
+	def test_options
+		x = N::XhtmlString.new
+		options = ['Male', 'Female']
+		x.select(:name => 'sex') do
+			x.options(options, 1)
+		end
+		res = '<select name="sex"><option value="0">Male</option>' +
+					'<option value="1" selected="1">Female</option></select>'
+		assert_equal res, x
+		x = N::XhtmlString.new
+		options = ['Male', 'Female']
+		x.select('-- Select sex --', :name => 'sex') do
+			x.options(options, 1)
+		end
+		res = '<select name="sex"><option>-- Select sex --</option>' +
+					'<option value="0">Male</option>' +
+					'<option value="1" selected="1">Female</option></select>'
+		assert_equal res, x
+		x = N::XhtmlString.new
+		options = {'Male' => 'm', 'Female' => 'f'}
+		x.select(:name => 'sex') do
+			x.options(options, 'm')
+		end
+		res = '<select name="sex"><option value="m" selected="1">Male</option>' +
+					'<option value="f">Female</option></select>'
+		assert_equal res, x
+	end
+end

data/test/nitro/builders/tc_xml.rb ADDED

@@ -0,0 +1,47 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require 'test/unit'
+require 'nitro/builders/xml'
+class TC_BuildersXml < Test::Unit::TestCase # :nodoc: all
+	def test_string
+		x = N::XmlString.new
+		x.start_tag('html').
+			start_tag('title').text('hello').end_tag('title').
+		end_tag('html')
+		assert_equal '<html><title>hello</title></html>', x
+	end
+	def test_missing
+		x = N::XmlString.new
+		x.b('This is bold')
+		assert_equal '<b>This is bold</b>', x
+		x = N::XmlString.new
+		x.a('Navel', :href => 'http://www.navel.gr', :target => '_blank')
+		assert_equal '<a target="_blank" href="http://www.navel.gr">Navel</a>', x
+		x = N::XmlString.new
+		x.b {
+			x.i 'Hello', :class =>'new'
+			x.p 'Paragraph'
+		}
+		assert_equal '<b><i class="new">Hello</i><p>Paragraph</p></b>', x
+	end
+	def test_xml_builder
+		buffer = ''
+		x = N::XmlBuilder.new(buffer)
+		x.start_tag('html').
+			start_tag('title').text('hello').end_tag('title').
+		end_tag('html')
+		assert_equal '<html><title>hello</title></html>', buffer
+	end
+end

data/test/nitro/server/tc_request.rb CHANGED

@@ -2,7 +2,7 @@
 require "test/unit"
-require "glue/logger"; $log = Logger.new(STDERR) unless $log
+require "glue/logger"
 require "nitro/server/cookie"
 require "nitro/server/request"
@@ -67,4 +67,4 @@ class TC_Request < Test::Unit::TestCase
 		assert_equal(nil, request.get_tx_entity())
 	end
-end
+end

data/test/nitro/server/tc_session.rb CHANGED

@@ -31,4 +31,4 @@ class TC_N2_Web_Server_Session < Test::Unit::TestCase
 		assert_not_equal(id1, id6)
 	end
-end
+end

data/test/nitro/tc_sitemap.rb CHANGED

@@ -2,7 +2,7 @@
 require "test/unit"
-require "glue/logger"; $log = Logger.new(STDERR) unless $log
+require "glue/logger"
 require "nitro/sitemap"

data/test/nitro/ui/tc_pager.rb CHANGED

@@ -2,7 +2,7 @@
 require "test/unit"
-require "glue/logger"; $log = Logger.new(STDERR) unless $log
+require "glue/logger"
 require "og"
 require "nitro/ui/pager"
@@ -22,15 +22,6 @@ end
 class TC_N_UI_Pager < Test::Unit::TestCase
 	def setup
-=begin
-		$og = Og::Database.new(
-			:addres => "localhost",
-			:database => "testdb",
-			:user => "root",
-		#	:password => "navelrulez",
-			:connection_count => 2
-		)
-=end
 	end
 	def teardown

data/test/tc_og.rb CHANGED

@@ -1,7 +1,7 @@
-require "test/unit"
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require "glue/logger"; $log = Logger.new(STDERR) unless $log
-require "og"
+require 'test/unit'
+require 'og'
 module Test # :nodoc: all

data/vendor/blankslate.rb ADDED

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+module Builder #:nodoc:
+  # BlankSlate provides an abstract base class with no predefined
+  # methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+  # BlankSlate is useful as a base class when writing classes that
+  # depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+  class BlankSlate #:nodoc:
+    class << self
+      def hide(name)
+	      undef_method name if
+	        instance_methods.include?(name.to_s) and
+	        name !~ /^(__|instance_eval)/
+      end
+    end
+    instance_methods.each { |m| hide(m) }
+  end
+end
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a hook in the Object and Kernel classes that will hide any defined
+module Kernel #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return if self != Kernel
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end
+class Object #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return  if self != Object
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end

data/vendor/extensions/_base.rb ADDED

@@ -0,0 +1,153 @@
+#
+# This file is 'required' by all files that implement standard class
+# extensions as part of the "Ruby/Extensions" project.
+#
+# The "Extensions" project requires 1.8.0 or greater to run, as it is too
+# much hassle at the moment to consider supporting older versions.  That may
+# one day be implemented if demand is there.  One option would be to require
+# "shim", so that we can assume all 1.8 library methods are implemented.
+#
+# This file is only of interest to developers of the package, so no detailed
+# documentation is included here.  However, by way of introduction, this is what
+# it's all about.  Each method that is implemented as part of this package is
+# done so through a framework implemented in this file.  Take the following
+# simple example:
+#
+#   ExtensionsProject.implement(Integer, :even?, :instance) do
+#     class Integer
+#       #
+#       # RDoc comments.
+#       #
+#       def even?
+#         self % 2 == 0
+#       end
+#     end
+#   end
+#
+# This purposes of this are as follows:
+# - if the intended method (in this case IO.write) is already defined,
+#   we don't want to overwrite it (we issue a warning and move on)
+# - if the intended method is _not_ implemented as a result of the block,
+#   we have not done as we said, and an error is raised
+# - the ExtensionsProject class gathers information on which methods have
+#   been implemented, making for a very handy command-line reference (+rbxtm+)
+#
+# The <tt>ExtensionsProject.implement</tt> method is responsible for ensuring
+# these are so.  It gives us documentation, and some assurance that the
+# extensions are doing what we say they are doing.
+#
+# :enddoc:
+#
+# For what reason does Ruby define Module#methods, Module#instance_methods,
+# and Module#method_defined?, but not Module#instance_method_defined? ?
+#
+# No matter, extending standard classes is the name of the game here.
+#
+class Module
+  if Module.method_defined?(:instance_method_defined?)
+    STDERR.puts "Warning: Module#instance_method_defined? already defined; not overwriting"
+  else
+    def instance_method_defined?(_method)
+      instance_methods(true).find { |m| m == _method.to_s }
+    end
+  end
+  if Module.method_defined?(:module_method_defined?)
+    STDERR.puts "Warning: Module#module_method_defined? already defined; not overwriting"
+  else
+    def module_method_defined?(_method)
+      singleton_methods(true).find { |m| m == _method.to_s }
+    end
+  end
+end
+class ExtensionsProject
+  class << ExtensionsProject
+    @@extension_methods = []
+    #
+    # The list of methods implemented in this project.
+    #
+    def extension_methods
+      @@extension_methods
+    end
+    #
+    # Return the name of the project.  To be used in error messages, etc., for
+    # consistency.
+    #
+    def project_name
+      "Ruby/Extensions"
+    end
+    #
+    # Wraps around the implementation of a method, emitting a warning if the
+    # method is already defined.  Returns true to indicate - false to indicate
+    # failure (i.e. method is already defined).  Raises an error if the
+    # specified method is not actually implemented by the block.
+    #
+    def implement(_module, _method, _type=:instance)
+      raise "Internal error: #{__FILE__}:#{__LINE__}" unless
+        _module.is_a? Module and
+        _method.is_a? Symbol and
+        _type == :instance or _type == :class or _type == :module
+      fullname = _module.to_s + string_rep(_type) + _method.to_s
+      if _defined?(_module, _method, _type)
+        STDERR.puts "#{project_name}: #{fullname} is already defined; not overwriting"
+        return false
+      else
+        yield # Perform the block; presumably a method implementation.
+        if _method == :initialize and _type == :instance
+          # Special case; we can't verify this.
+          @@extension_methods<< "#{_module}::new"
+        else
+          unless _defined?(_module, _method, _type)
+            raise "#{project_name}: internal error: was supposed to implement " +
+              "#{fullname}, but it didn't!"
+          end
+          @@extension_methods << fullname
+        end
+        return true
+      end
+    end
+    # See whether the given module implements the given method, taking account
+    # of the type (class/instance) required.
+    def _defined?(_module, _method, _type)
+      case _type
+      when :instance
+        _module.instance_method_defined?(_method) # See definition above.
+      when :class, :module
+        _module.module_method_defined?(_method)   # See definition above.
+      end
+    end
+    private :_defined?
+    # Return the string representation of the given method type.
+    def string_rep(method_type)
+      case method_type
+      when :instance then "#"
+      when :class    then "."
+      when :module   then "."
+      else
+        nil
+      end
+    end
+    private :string_rep
+  end
+end    # class ExtensionsProject
+if VERSION < "1.8.0"
+  raise "#{ExtensionsProject.project_name} requires Ruby 1.8.0 at least (for now)"
+end

data/vendor/extensions/_template.rb ADDED

@@ -0,0 +1,36 @@
+#!/usr/local/bin/ruby -w
+# A template for new files in the project; of no interest to end users.  An
+# error will be raised if you +require+ it.
+#--
+# :enddoc:
+#
+# == extensions/XXX.rb
+#
+# Adds methods to the builtin XXX class.
+#
+raise "Do not load this file!"
+require "extensions/_base"
+#
+# * Enumerable#build_hash
+#
+ExtensionsProject.implement(Enumerable, :build_hash) do
+  module Enumerable
+    #
+    # Like #map/#collect, but it generates a Hash.
+    #
+    #   [1,5,11].build_hash { |x| [x, x**2] }
+    #      => { 1 => 2, 5 => 25, 11 => 121 }
+    #
+    def build_hash
+      result = {}
+      self.each do |elt|
+        key, value = yield elt
+        result[key] = value
+      end
+      result
+    end
+  end
+end

data/vendor/extensions/all.rb ADDED

@@ -0,0 +1,21 @@
+#
+# == extensions/all.rb
+#
+# Require this file in order to access all of the standard class extensions
+# available, or require individual extension files to narrow the selection.
+#
+require 'extensions/array.rb'
+require 'extensions/binding.rb'
+require 'extensions/class.rb'
+require 'extensions/continuation.rb'
+require 'extensions/enumerable.rb'
+require 'extensions/hash.rb'
+require 'extensions/io.rb'
+require 'extensions/kernel.rb'
+require 'extensions/module.rb'
+require 'extensions/numeric.rb'
+require 'extensions/object.rb'
+require 'extensions/ostruct.rb'
+require 'extensions/string.rb'
+require 'extensions/symbol.rb'

data/vendor/extensions/array.rb ADDED

@@ -0,0 +1,68 @@
+#!/usr/local/bin/ruby -w
+#
+# == extensions/array.rb
+#
+# Adds methods to the builtin Array class.
+#
+require "extensions/_base"
+#
+# * Array#select!
+#
+ExtensionsProject.implement(Array, :select!) do
+  class Array
+    #
+    # In-place version of Array#select.  (Counterpart to, and opposite of, the
+    # built-in #reject!)
+    #
+    def select!
+      reject! { |e| not yield(e) }
+    end
+  end
+end
+#
+# * Array#only
+#
+ExtensionsProject.implement(Array, :only) do
+  class Array
+    #
+    # Returns the _only_ element in the array.  Raises an IndexError if the array's size is not
+    # 1.
+    #
+    #   [5].only      # -> 5
+    #   [1,2,3].only  # -> IndexError
+    #   [].only       # -> IndexError
+    #
+    def only
+      unless size == 1
+        raise IndexError, "Array#only called on non-single-element array"
+      end
+      first
+    end
+  end
+end
+#
+# * Array#rand
+#
+ExtensionsProject.implement(Array, :rand) do
+  class Array
+    #
+    # Return a randomly-chosen (using Kernel.rand) element from the array.
+    #
+    #   arr = [48, 71, 3, 39, 15]
+    #   arr.rand     # -> 71
+    #   arr.rand     # -> 39
+    #   arr.rand     # -> 48
+    #   # etc.
+    #
+    def rand
+      idx = Kernel.rand(size)
+      at(idx)
+    end
+  end
+end