nitro 0.29.0 → 0.30.0

data/proto/public/js/scriptaculous.js

@@ -20,16 +20,18 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var Scriptaculous = {
-  Version: '1.5.3',
+  Version: '1.6.1',
   require: function(libraryName) {
     // inserting via DOM fails in Safari 2.0, so brute force approach
     document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
   },
   load: function() {
-    if((typeof Prototype=='undefined') ||
-      parseFloat(Prototype.Version.split(".")[0] + "." +
-                 Prototype.Version.split(".")[1]) < 1.4)
-      throw("script.aculo.us requires the Prototype JavaScript framework >= 1.4.0");
+    if((typeof Prototype=='undefined') || 
+       (typeof Element == 'undefined') || 
+       (typeof Element.Methods=='undefined') ||
+       parseFloat(Prototype.Version.split(".")[0] + "." +
+                  Prototype.Version.split(".")[1]) < 1.5)
+       throw("script.aculo.us requires the Prototype JavaScript framework >= 1.5.0");
     
     $A(document.getElementsByTagName("script")).findAll( function(s) {
       return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))

data/proto/public/js/unittest.js

@@ -258,6 +258,9 @@ Test.Unit.Assertions.prototype = {
     this.failures++;
     this.messages.push("Failure: " + message);
   },
+  info: function(message) {
+    this.messages.push("Info: " + message);
+  },
   error: function(error) {
     this.errors++;
     this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
@@ -336,6 +339,14 @@ Test.Unit.Assertions.prototype = {
   },
   assertVisible: function(element) {
     this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
   }
 }
 

data/proto/public/scaffold/advanced_search.xhtml

@@ -0,0 +1,30 @@
+<SystemPage>
+  <?r base = "#{@base}/%base%" ?>
+  <h1><a href="/"> Home</a> > <a href="#@base">System</a> > <a href="#{base}/list">#{"%plural%".humanize}</a> > Advanced Search</h1>
+  <p>
+  <form action="#{base}/search">
+    Search #{"%plural%".humanize}: <input type="text" name="q" />&nbsp;<input type="submit" value="Search" /> 
+    <a href="#{base}/advanced_search">Advanced search</a>
+  </form>
+  </p>
+  <?r if @list.nil? ?>
+    <h3>Enter properties for advanced search:</h3>
+    #{form_for %klass%.new, :submit => 'Search', :action => :self, :no_relations => true}
+  <?r else ?>
+    <table>
+    <?r for obj in @list ?>
+      <tr>
+        <td width="100%"><a href="#{base}/edit/#{obj.oid}">#(obj.to_s)</a></td>
+        <?r if obj.respond_to?(:update_time) ?>
+          <td nowrap="1">#{obj.update_time.stamp(:db)}</td>
+        <?r end ?>
+        <td><a href="#{base}/edit/#{obj.oid}">edit</a></td>
+        <td><a href="#{base}/delete/#{obj.oid}">del</a></td>
+      </tr>
+    <?r end ?>
+    </table>
+    <div class="pager" if="@pager and @pager.navigation?">
+      #{@pager.navigation}
+    </div>  
+  <?r end ?>
+</SystemPage>

data/proto/public/scaffold/list.xhtml

@@ -4,7 +4,8 @@
   <a href="#{base}/new">New #{"%name%".humanize}</a>
   <p>
   <form action="#{base}/search">
-    Search #{"%plural%".humanize}: <input type="text" name="q" />&nbsp;<input type="submit" value="Search" />
+    Search #{"%plural%".humanize}: <input type="text" name="q" />&nbsp;<input type="submit" value="Search" /> 
+    <a href="#{base}/advanced_search">Advanced search</a>
   </form>
   </p>
   <table>
@@ -14,6 +15,12 @@
       <?r if obj.respond_to?(:update_time) ?>
         <td nowrap="1">#{obj.update_time.stamp(:db)}</td>
       <?r end ?>
+      <?r if Glue.const_defined?(:Orderable) and @klass.include?(Glue::Orderable) ?>
+      <td><a href="#">Top</a></td>
+      <td><a href="#">Up</a></td>
+      <td><a href="#">Down</a></td>
+      <td><a href="#">Bottom</a></td>
+      <?r end ?>
       <td><a href="#{base}/edit/#{obj.oid}">edit</a></td>
       <td><a href="#{base}/delete/#{obj.oid}" onclick="confirm('Are you sure?')">del</a></td>
     </tr>

data/proto/public/scaffold/search.xhtml

@@ -3,7 +3,8 @@
   <h1><a href="/"> Home</a> > <a href="#@base">System</a> > <a href="#{base}/list">#{"%plural%".humanize}</a> > Search for '#@query'</h1>
   <p>
   <form action="#{base}/search">
-    Search #{"%plural%".humanize}: <input type="text" name="q" />&nbsp;<input type="submit" value="Search" />
+    Search #{"%plural%".humanize}: <input type="text" name="q" />&nbsp;<input type="submit" value="Search" /> 
+    <a href="#{base}/advanced_search">Advanced search</a>
   </form>
   </p>
   <?r if @list.nil? ?>

data/proto/script/scgi_service

@@ -24,7 +24,7 @@ class NitroProcessor < SCGIProcessor
                 cgi.stdinput.rewind
                 cgi.env["QUERY_STRING"] = (cgi.env["REQUEST_URI"] =~ /^[^?]+\?(.+)$/ and $1).to_s
                 Nitro::Cgi.process($server, cgi, cgi.stdinput, cgi.stdoutput)
-                Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager)
+                Og.manager.put_store if defined?(Og) and Og.respond_to?(:manager) and Og.manager
             end
         rescue IOError
             @log.error("received IOError #$! when handling client.  Your web server doesn't like me.")

data/src/part/admin/controller.rb

@@ -40,7 +40,7 @@ class AdminController < Nitro::Controller
   # store the class instances.
   
   def destroy(klass)
-    constant(klass).delete_all
+    constant(klass).destroy
     redirect_to_referer
   end
   

data/src/part/admin/skin.rb

@@ -13,7 +13,7 @@ class SystemPage < Nitro::Element
       <body>
         <h1>#@title</h1>
         #{content}
-        <p>Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}</p>
+        <p>Powered by <a href="http://www.nitroproject.org">Nitro</a> version #{Nitro::Version}</p>
       </body>
     </html>
     ~

data/test/nitro/CONFIG.rb

@@ -0,0 +1,3 @@
+$NITRO_NO_ENVIRONMENT = true
+
+require 'nitro'

data/test/nitro/adapter/tc_webrick.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 require 'ostruct'

data/test/nitro/cgi/tc_cookie.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 

data/test/nitro/cgi/tc_request.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 
@@ -16,12 +16,12 @@ class TC_Request < Test::Unit::TestCase # :nodoc: all
   def test_all
     req = DummyRequest.new
 
-    req.headers['HTTP_HOST'] = 'www.nitrohq.com'
-    assert_equal 'nitrohq.com', req.domain
+    req.headers['HTTP_HOST'] = 'www.nitroproject.org'
+    assert_equal 'nitroproject.org', req.domain
     assert_equal 'www', req.subdomains.first
     
-    req.headers['HTTP_HOST'] = 'www.nitrohq.co.uk'
-    assert_equal 'nitrohq.co.uk', req.domain(2)
+    req.headers['HTTP_HOST'] = 'www.nitroproject.co.uk'
+    assert_equal 'nitroproject.co.uk', req.domain(2)
 
     req.headers['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
     assert req.xhr?

data/test/nitro/compiler/tc_client_morpher.rb

@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'test/unit'
+
+require 'nitro/test/testcase'
+require 'nitro/compiler'
+
+class TC_ClientMorpher < Test::Unit::TestCase
+  class MyController < Nitro::Controller
+    class Client
+      def check_album
+        ajax_update 'tools_block', {
+          :action => 'checked_albums',
+          :params => 'some parameters'
+        }
+      end
+    end
+  end
+
+  Action_Name = :an_object_responding_to_the_method_to_sym_is_now_required_when_compiling_a_template
+
+  def setup
+    @compiler = Nitro::Compiler.new(MyController)
+  end
+
+  def teardown
+    @compiler = nil
+  end
+
+  def test_javascript_no_params
+    template = '<a href="#" client="check_album">Test</a>'
+    result = @compiler.transform_template(Action_Name, template)
+    assert_match(/__nc_check_album\(\)/, result)
+  end
+
+  def test_javascript_one_param
+    template = '<a href="#" client="check_album" params="this.id">Test</a>'
+    result = @compiler.transform_template(Action_Name, template)
+    assert_match(/__nc_check_album\(this\.id\)/, result)
+  end
+
+  def test_javascript_multi_params
+    template = '<a href="#" client="check_album" params="this.id, this.class">Test</a>'
+    result = @compiler.transform_template(Action_Name, template)
+    assert_match(/__nc_check_album\(this\.id, this\.class\)/, result)
+  end    
+end

data/test/nitro/compiler/tc_compiler.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
 require 'test/unit'
 
 require 'nitro/test/testcase'

data/test/nitro/helper/tc_feed.rb

@@ -0,0 +1,138 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'test/unit'
+require 'nitro/helper/feed'
+
+class TC_FeedHelper < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include FeedHelper
+  
+  Blog = Struct.new(:title, :body, :to_href) 
+  Blog2 = Struct.new(:title, :body, :to_href, :update_time)
+  # TODO: add more (all)
+  FullBlown = Struct.new(:title, :body, :full_content, :to_href, :update_time, :create_time, :author)
+
+  # RSS Testing
+  def test_rss
+    blogs = []
+    blogs << Blog.new('Hello1', 'World1', 'uri1');
+    blogs << Blog.new('Hello2', 'World2', 'uri2');
+    blogs << Blog.new('Hello3', 'World3', 'uri3');
+    blogs2 = []
+    updated = Time.now
+    blogs2 << Blog2.new('Hello1', 'World1', 'uri1', updated);
+    blogs2 << Blog2.new('Hello2', 'World2', 'uri2', updated);
+    blogs2 << Blog2.new('Hello3', 'World3', 'uri3', updated);
+
+    # rss without version (0.9)
+    rss = build_rss(blogs, :base => 'http://oxyliquit.de')
+
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rss
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rss
+    
+    # rss 0.9
+    rss09 = build_rss(blogs, :version => "0.91", :link => 'http://oxyliquit.de')
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rss09
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rss09
+    
+    # rss 1.0
+    rss10 = build_rss(blogs, :version => "1.0", :link => 'http://oxyliquit.de')
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rss10
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rss10
+    
+    # rss 2.0
+    rss20 = build_rss(blogs2, :version => "2.0", :link => 'http://oxyliquit.de')
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rss20
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rss20
+    
+    # rss full blown
+    rssfull = build_rss(blogs, :version => "0.9", :base => 'http://oxyliquit.de', :link => 'http://oxyliquit.de/feed', :title => "Oxyliquit feed", :language => 'en', :about => 'http://ox.li/about.rdf', :description => "Example feed of Oxyliquit", :search_title => "Oxyliquit search", :search_description => "Search through Oxyliqit", :search_input_name => "q", :search_form_action => "http://oxyliquit.de/search")
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rssfull
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rssfull
+    # TODO: there should be some more
+    
+    # rss with full blown object
+    update_time = Time.now
+    create_time = Time.now - 360
+    author = Hash.new
+    author[:name] = "Bill"
+    author[:link] = "http://bills.url"
+    author[:email] = "bill@email.com"
+    fullblownobject = []
+    fullblownobject << FullBlown.new('Hello1', 'World1', 'Fullsize text with lots of words..', 'uri1', update_time, create_time, author)
+    fullblownobject << FullBlown.new('Hello2', 'World2', ' text with lots of words..', 'uri2', update_time, create_time, author)
+    rss_f_o = build_rss(fullblownobject, :version => "0.9", :base => 'http://oxyliquit.de', :link => 'http://oxyliquit.de/feed', :title => "Oxyliquit feed", :language => 'en', :about => 'http://ox.li/about.rdf', :description => "Example feed of Oxyliquit", :search_title => "Oxyliquit search", :search_description => "Search through Oxyliqit", :search_input_name => "q", :search_form_action => "http://oxyliquit.de/search")
+    assert_match %r{<link>http://oxyliquit.de/uri1</link>}, rss_f_o
+    assert_match %r{<link>http://oxyliquit.de/uri2</link>}, rss_f_o
+    
+    # rss with wrong version
+    assert_raise(RuntimeError) do
+      build_rss(blogs, :version => "0.5", :link => 'http://oxyliquit.de')
+    end
+    
+  end # test_rss
+  
+  # Atom Testing
+  def test_atom
+    blogs = []
+    updated = Time.now
+    blogs << Blog2.new('Hello1', 'World1', 'uri1', updated);
+    blogs << Blog2.new('Hello2', 'World2', 'uri2', updated);
+    blogs << Blog2.new('Hello3', 'World3', 'uri3', updated);
+        
+    # atom small
+    atom = build_atom(blogs, :base => 'http://oxyliquit.de')
+
+    assert_match %r{<id>http://oxyliquit.de/uri1</id>}, atom
+    assert_match %r{<id>http://oxyliquit.de/uri2</id>}, atom
+    
+    # atom big
+    atom = build_atom(blogs, :title => "Oxyliquit Feed", :base => "http://oxyliquit.de", :link => "http://oxyliquit.de/atomfeed", :author_name => "Fabian Buch", :author_email => "fabian@fabian-buch.de", :author_link => "http://fabian-buch.de")
+    
+    assert_match %r{<id>http://oxyliquit.de/uri1</id>}, atom
+    assert_match %r{<id>http://oxyliquit.de/uri2</id>}, atom
+    assert_match %r{<title>Oxyliquit Feed</title>}, atom
+    assert_match %r{<updated>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})</updated>}, atom
+    
+    # atom with full blown object
+    update_time = Time.now
+    create_time = Time.now - 360
+    author = Hash.new
+    author[:name] = "Bill"
+    author[:link] = "http://bills.url"
+    author[:email] = "bill@email.com"
+    fullblownobject = []
+    fullblownobject << FullBlown.new('Hello1', 'World1', 'Fullsize text with lots of words..', 'uri1', update_time, create_time, author)
+    fullblownobject << FullBlown.new('Hello2', 'World2', ' text with lots of words..', 'uri2', update_time, create_time, author)
+    atom_f_o = build_atom(fullblownobject, :title => "Oxyliquit Feed", :base => "http://oxyliquit.de", :link => "http://oxyliquit.de/atomfeed", :author_name => "Fabian Buch", :author_email => "fabian@fabian-buch.de", :author_link => "http://fabian-buch.de")
+    assert_match %r{<id>http://oxyliquit.de/uri1</id>}, atom_f_o
+    assert_match %r{<id>http://oxyliquit.de/uri2</id>}, atom_f_o
+    assert_match %r{<title>Oxyliquit Feed</title>}, atom_f_o
+    assert_match %r{<summary>\w+</summary>}, atom_f_o
+    assert_match %r{<updated>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})</updated>}, atom_f_o
+    assert_match %r{<published>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})</published>}, atom_f_o
+    assert_match %r{<author><name>Bill</name><email>bill@email.com</email><uri>http://bills.url</uri></author>}, atom_f_o
+    
+  end # test_atom
+  
+  # OPML Testing
+  def test_opml
+    
+    opml = build_opml(
+      {
+      "http://oxyliquit.de/feed" => "rss",
+      "http://oxyliquit.de/feed/questions" => "rss",
+      "http://oxyliquit.de/feed/tips" => "rss",
+      "http://oxyliquit.de/feed/tutorials" => "rss"
+      },
+      :title => "My feeds"
+    )
+    
+    assert_match %r{<outline xmlUrl='http://oxyliquit.de/feed/tips' type='rss'/>}, opml
+    
+  end # test_opml
+
+end
+
+# * Fabian Buch <fabian@fabian-buch.de>
+# * George Moschovitis <gm@navel.gr>

data/test/nitro/helper/tc_pager.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 

data/test/nitro/helper/tc_rss.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 require 'nitro/helper/rss'

data/test/nitro/helper/tc_table.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 require 'nitro/helper/table'

data/test/nitro/helper/tc_xhtml.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
 
 require 'test/unit'
 require 'nitro/helper/xhtml'

data/test/nitro/tc_caching.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
 require 'test/unit'
 

data/test/nitro/tc_cgi.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
 require 'stringio'
 require 'tempfile'

data/test/nitro/tc_context.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
 require 'test/unit'
 require 'ostruct'

data/test/nitro/tc_controller.rb

@@ -1,6 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
-
-$NITRO_NO_ENVIRONMENT = true
+require File.join(File.dirname(__FILE__), 'CONFIG.rb')
 
 require 'test/unit'
 require 'ostruct'
@@ -12,6 +10,11 @@ require 'nitro'
 class TC_Controller < Test::Unit::TestCase # :nodoc: all
   include Nitro
   
+  class Blog1Controller < Controller
+    def list
+    end
+  end
+
   class Blog2Controller < Controller
     attr_reader :aqflag, :tflag
 
@@ -22,11 +25,26 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
     def list
       @aqflag = true 
     end
+    
+    def another(oid)
+       # nop
+    end
+    
+private
+
+    def encode_myself
+      encode_url :list
+    end
+
+    def encode_blog1
+      encode_url Blog1Controller, :list
+    end
   end
   
   def setup
     @disp = Dispatcher.new({
       '/blog' => Blog2Controller,
+      '/blog1' => Blog1Controller                       
     })
     @conf = OpenStruct.new
     @conf.dispatcher = @disp
@@ -47,6 +65,12 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
       # drink
     end
 
+    assert_equal('/blog/list', c.send(:encode_myself))
+    assert_equal('/blog1/list', c.send(:encode_blog1))
+
+    # handle action with arity.
+    assert_equal('/blog/another/32', c.send(:encode_url, :another, :oid, 32))
+
     assert_equal true, c.aqflag
     assert_equal true, $include1
     assert_equal true, $include2
@@ -63,4 +87,8 @@ class TC_Controller < Test::Unit::TestCase # :nodoc: all
     assert Blog2Controller.action_methods.include?('list')
   end
 
+  def test_encode_decode_methods
+    
+  end
+
 end