nitro 0.21.2 → 0.22.0

data/CHANGELOG

@@ -1,5 +1,126 @@
+07-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/tc_controller.rb: ditto.
+
+  * lib/nitro/tc_dispatcher.rb: tmp fix for require order problem.
+  
+  * doc/README: updated.
+  
+  * doc/RELEASES: updated.
+
+  * test/nitro/tc_mail.rb: removed.
+  
+  * lib/nitro/mail.rb: moved to glue.
+
+06-08-2005  George Moschovitis <gm@navel.gr>
+
+  * proto/script/runner.rb: implemented.
+
+05-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/render.rb (#render_template): implemented [mneumann].
+  
+  * lib/nitro/element.rb: prefix setting added,
+  (#start_tag/#end_tag): also work in prefix mode!
+
+04-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/template.rb: moved to glue.
+  
+  * lib/nitro/test.rb: $NITRO_NO_INVOKE added.
+  
+  * lib/nitro/test/testcase.rb (#controller): reimplemented to 
+  be similar to the og test helpers and more flexible,
+  no need for settings.rb.
+  
+  * lib/nitro/cache/output.rb (#expire_output): use the passed 
+  name as is.
+  
+03-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/server.rb (#start): accepts options hash [marcus].
+
+03-08-2005  Michael Neumann <mneumann@ntecs.de>
+
+  * lib/nitro/adapter/cgi.rb (#parse_params): add query parameters
+  to the post parameters.
+
+02-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/mixin/rss.rb: use markup instead of cgi.escape [lindsay].
+  
+01-08-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/cache/output.rb (#expire_output): fixed index bug.
+    
+  * lib/nitro/mixin/pager.rb: dont sent offset 0, works with
+  older versions of mysql.
+
+31-07-2005  George Moschovitis <gm@navel.gr>
+  
+  * lib/nitro/compiler.rb: fix, don't pass more parameters
+  than the method arity.
+
+  * lib/nitro/caching/output.rb: fixed indexindex.
+  
+  * test/nitro/tc_controller_aspect.rb: implemented.
+  
+  * proto/public/settings.xhtml: only display in debug mode for
+  security.
+  
+  * proto/public/error.xhtml: only display in debug mode for
+  security.
+  
+  * lib/nitro/runner.rb: added mode setting,
+  better handling of mode,
+  Run alias for Runner.
+
+30-07-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/mixin/pager.rb (#first_page?, #last_page?): 
+  implemented,
+  added more comments.
+  (#link_xxx_page): added helpers.
+  (#paginate): added support for Og::Collections.
+  
+  * proto/public/error.xhtml: updated.
+
+29-07-2005  George Moschovitis <gm@navel.gr>
+
+  * lib/nitro/response.rb (#content_type): added.
+  
+  * lib/nitro/test/testcase.rb: recoded from scratch,
+  automatically build environment,
+  (#process): accept an option hash to be more flexible.
+  added process helpers,
+  add leading '/' if missing.
+
+  * lib/nitro/test/assertions.rb (#assert_response): reimplemented,
+  (#assert_METHOD): helpers added,
+  (#assert_output): reimplemented,
+  keep the old assertions, give more option.
+  (#assert_session): reimplemented,
+  (#assert_redirected): reimplemented.
+  (#assert_response): generalized.
+  (#assert_cookie): reimplemented.
+  
+  * lib/nitro/test*: renamed from testing.
+  
+  * test/nitro/tc_request.rb: added test case to test the 
+  new feature, as always I found some bugs :)
+  
+  * lib/nitro/request.rb: added method predicates for all 
+  request methods,
+  (#post_format): added,
+  (#xxx_post?): added a set of helper methods,
+  (#xml_http_request?): added,
+  (#domain): added,
+  (#subdomains): added.
+
 28-07-2005  George Moschovitis <gm@navel.gr>
 
+  * --- VERSION 0.21.1 ---
+  
   * lib/nitro/dispatcher/nice.rb (#dispatch): fixed.
   
   * doc/RELEASES: updated.

data/README

@@ -1,4 +1,4 @@
-= Nitro 0.21.2 README
+= Nitro 0.22.0 README
 
 Nitro provides everything you need to develop professional Web
 applications using Ruby and Javascript. 
@@ -112,7 +112,7 @@ A short summary of the major features:
   'RunTime' time.
   
   <!-- compile time include (static include) -->
-  <?include href="myfile.inc" />
+  <?include href="myfile.inc" ?>
   
   <!-- run time include (dynamic include) -->
   <include href="myfile.inc" />
@@ -239,6 +239,11 @@ A short summary of the major features:
     p u.errors[:password]
   end
   
+* Excellent support for Test Driven Development and Testing. 
+  Nitro provides full support for fixtures, mocking and a set
+  of custom assertions for testing everything, from controller
+  logic to your models.
+  
 * Implicit nice urls. Nitro automatically generates nice urls
   for your actions. However, if you want to customize the defaults,
   a powerful routing mechanism is provided.
@@ -272,7 +277,8 @@ A short summary of the major features:
 * Mailer 
 
   Nitro provides excellent support for handling emails in your
-  Web application.
+  Web application. Both incoming and outgoing email support is
+  provided.
   
 * Wee integration.
 

data/doc/RELEASES

@@ -1,9 +1,94 @@
+== Version 0.22.0
+
+A snapshot of the latest developments. Many requested features
+where implemented, and many reported bugs fixed.
+
+* The much requested Og 'reverse mode' is implemented. Og's 
+domain specific language and API is extended to allow fine-grained 
+customization of the schema-to-objects mapping. Og can now handle 
+most of the legacy schemas you can throw at it. Here is an 
+example:
+
+class User
+  property :name, String, :field => :thename, :uniq => true
+  property :password, String
+  property :age, Fixnum, :field => :age3    
+  has_many Comment, :foreign_field => :user
+  set_table :my_users
+  set_primary_key :name, String
+end
+
+class Comment
+  property :cid, Fixnum
+  property :body, String
+  belongs_to User, :field => :user
+  set_table :my_comments
+  set_primary_key :cid
+end
+
+As you can see, even relation fields can be customized. For 
+higher level customization you can overload methods like #table,
+#field_for_property etc.
+
+* Og now handles multiple connections to multiple stores even 
+in thread safe mode. This means you can now have objects serialized
+in different RDBM systems in the same application. Or you can have
+some objects managed by an RDBMS store and others by a FAST 
+in-memory store. You can still have relations between objects in
+different stores. An example:
+
+mysql = Og.setup(:store => :mysql, ..)
+psql = Og.setup(:store => :psql, ..)
+
+class User
+  has_many Comment
+end
+
+class Comment
+  belongs_to User
+end
+
+mysql.manage_class User
+psql.manage_class Comment
+
+user.comments << comment
+
+* Greatly improved support for testing and test-driven-development.
+A reworked testing infrastructure for controllers is in place.
+Moreover, support for Og fixtures and automatic test database
+setup is provided. Fixtures can be defined with yml or csv files.
+
+For an example of the testing infrastructure check out the 
+Spark 0.4.0 sources. Spark is a Wiki powered by Nitro.
+
+* Reworked mailer implementation. The new mailer allows for 
+incoming email handling. Here is an example:
+
+class Mailman < Glue::Mailer
+  def receive(mail)
+    article = Article.new(mail.subject, mail.body)
+    article.category = Category.find_by_name(mail.to.split('@').first)
+    article.save
+  end
+end
+
+* Added script/runner in proto as a convenience to running
+ruby code in your application environment.
+
+* Many fixes in the caching infrastructure.
+
+* Many fixes in the XMLRPC service infrastructure.
+
+* Many smaller changes and feature implementations that make
+development with Nitro so much more pleasurable.
+
+
 == Version 0.21.2
 
 This is mainly a bug fix release. Some minor features are 
 implemented:
 
-* Plugable dispatchers. A new dispatcher that implicitly handles
+* Pluggable dispatchers. A new dispatcher that implicitly handles
 nice urls is enabled by default. You can easily change to the
 old general dispatcher though.
 

data/lib/nitro.rb

@@ -25,7 +25,7 @@ module Nitro
   
   # The version.
 
-  Version = '0.21.2'
+  Version = '0.22.0'
 
   # Library path.
 

data/lib/nitro/adapter/cgi.rb

@@ -204,8 +204,10 @@ class CgiUtils
     if (:post == method) and
         %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(context.headers['CONTENT_TYPE'])
       boundary = $1.dup
-      # context.params = read_multipart(boundary, Integer(context.headers['CONTENT_LENGTH']), context.in, context.headers)
       context.params = parse_multipart(context, boundary)
+
+      # Also include the URL parameters.
+      context.params.update(CgiUtils.parse_query_string(context.query_string))      
     else 
       case method
       when :get, :head
@@ -338,3 +340,4 @@ end
 
 # * George Moschovitis <gm@navel.gr>
 # * James Britt <james_b@neurogami.com>
+# * Michael Neumann <mneumann@ntecs.de>

data/lib/nitro/adapter/scgi.rb

@@ -56,6 +56,8 @@ class Scgi
   end
   
   def self.start(server)
+  
+    puts '-------------1'
     children = "5"
     host = "127.0.0.0"
     port = "8888"

data/lib/nitro/adapter/webrick.rb

@@ -83,7 +83,7 @@ class WebrickAdapter < WEBrick::HTTPServlet::AbstractServlet
     rescue WEBrick::HTTPStatus::PartialContent, WEBrick::HTTPStatus::NotModified => err
       res.set_error(err)
       return true
-    rescue 
+    rescue Object => ex
       return false
     ensure
       unrewrite(req)

data/lib/nitro/caching/output.rb

@@ -24,7 +24,7 @@ module Caching
         filepath = output_cache_path(path)
         FileUtils.makedirs(File.dirname(filepath))
         File.open(filepath, 'w+') { |f| f.write(content) }
-        Logger.debug "Cached page: #{filepath}" if $DBG
+        Logger.debug "Cached page '#{filepath}'" if $DBG
       end
 
       # Enable output caching for the given actions.
@@ -35,16 +35,16 @@ module Caching
         str = actions.collect { |a| ":#{a}" }.join(', ')
 
         module_eval %{
-          post "do_cache_output", :only => [ #{str} ]
+          after "do_cache_output", :on => [ #{str} ]
         }
       end
 
       private
 
       def output_cache_path(path)
-        filename = ((path.empty? || path == '/') ? '/index' : path.dup)
+        filename = ((path.empty? || path == '/') ? 'index.html' : path.dup)
 #        filename.gsub!(/\/$/, '')
-        filename << 'index.html' unless (name.split('/').last || name).include? '.'
+        filename << 'index.html' unless (filename.split('/').last || filename).include? '.'
         return output_cache_root + '/' + filename                     
       end
       
@@ -60,7 +60,8 @@ module Caching
 
     def expire_output(name)
       begin
-        FileUtils.rm("#{context.dispatcher.public_root}/#{name}/index.html")
+        Logger.debug "Expirinig cache file '#{context.dispatcher.public_root}/#{name}'" if $DBG
+        FileUtils.rm_rf("#{context.dispatcher.public_root}/#{name}")
       rescue Object
         # gmosx: is this the right thing to do?
       end

data/lib/nitro/compiler.rb

@@ -1,6 +1,6 @@
 require 'facet/object/singleton_class'
 
-require 'nitro/template'
+require 'glue/template'
 require 'nitro/compiler/errors'
 
 module Nitro
@@ -135,7 +135,13 @@ class Compiler
         code << %{
           params = []
           if context.query_string
-            context.query_string.split(/[&;]/).each do |qs|
+            context.query_string.split(/[&;]/).each_with_index do |qs, i|
+        }
+        # Don't pass more parameters than the action's arity.
+        if param_count > 0 
+          code << "break if i >= #{param_count};"
+        end
+        code << %{
               params << qs.split(/=/).last            
             end            
           end          
@@ -232,7 +238,6 @@ class Compiler
     compile_template(klass, action, template_path) if template_path
 
     return true
-
   end
 
   # Compiles an action method in the given (controller) class.

data/lib/nitro/dispatcher.rb

@@ -13,7 +13,7 @@ class Dispatcher
   include Router
 
   # The dispatcher specialization used.
-  
+
   setting :mode, :default => :nice, :doc => 'The dispatcher specialization used'
 
   unless const_defined? :ROOT
@@ -86,7 +86,7 @@ class Dispatcher
       end
 
       auto_mixin(c)      
-      
+
       # Try to setup a template_root if none is defined:
       
       unless c.template_root

data/lib/nitro/dispatcher/nice.rb

@@ -27,7 +27,7 @@ class Dispatcher
     end        
 
     unless parts.empty?
-      context.headers['QUERY_STRING'] = "#{parts.join(';')}#{context.headers['QUERY_STRING']}"
+      context.headers['QUERY_STRING'] = "#{parts.join(';')};#{context.headers['QUERY_STRING']}"
     end
 
     return klass, "#{action}_action", base

data/lib/nitro/element.rb

@@ -2,6 +2,9 @@ require 'rexml/document'
 require 'rexml/streamlistener'
 
 require 'facet/string/capitalized%3F'
+require 'facet/string/camelize'
+
+require 'glue/configuration'
 
 module Nitro
 
@@ -17,6 +20,10 @@ module Nitro
 #++
 
 class Element
+  # The prefix for element tags (in xhtml compatibility mode)
+  
+  setting :prefix, :default => 'x', :doc => 'The prefix for element tags'
+
   # The parent of this element.
   
   attr_accessor :_parent
@@ -84,8 +91,15 @@ class ElementProcessor # :nodoc: all
       @stack = []
     end
     
+    PREFIX_RE = /^#{Element.prefix}:/
+    CAPITALIZED_RE = /^[A-Z]/
+    
     def tag_start(name, attributes)    
-      if name =~ /^[A-Z]/ # .capitalized?    
+      # check if the name starts with the element prefix, or
+      # is capitalized.
+      if name =~ PREFIX_RE or name =~ CAPITALIZED_RE    
+         name = name.split(':')[1].camelize if name =~ PREFIX_RE
+        
         obj = Object.const_get(name).new
         
         attributes.each do | k, v | 
@@ -111,7 +125,10 @@ class ElementProcessor # :nodoc: all
     end
 
     def tag_end(name)    
-      if name =~ /^[A-Z]/ # .capitalized?    
+      # check if the name starts with the element prefix, or
+      # is capitalized.
+      if name =~ PREFIX_RE or name =~ CAPITALIZED_RE    
+         name = name.split(':')[1].camelize if name =~ PREFIX_RE
         obj, @buffer = @stack.pop
         @buffer << obj.render
       else