nitro 0.31.0 → 0.40.0

data/lib/part/admin/og/customize.rb

@@ -0,0 +1,4 @@
+require 'nitro/scaffold/model'
+
+module Nitro::Scaffold
+end

data/lib/part/admin/og/template/index.xhtml

@@ -0,0 +1,27 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    <a href="#{AdminController.mount_point}">Admin</a> / 
+    Og 
+  </SitePath>
+
+  <?r
+    @headers = [ 'Class',  'Count', ' ', ' ', ' ', ' ', ' ' ]
+    @values = @classes.inject([]) do |v, c| 
+      name = class_to_name(c)
+      v << [ 
+        %{<a href="#{R :list, :name, name}">#{c.name.gsub(/::/, ' ')}</a>}, 
+        c.count, 
+        %{<a href="#{R :create, :name, name}">create</a>},
+        %{<a href="#{R :list, :name, name}">list</a>},
+        %{<a href="#{R :search, :name, name}">search</a>},
+        %{<a href="#{R :delete_class, :name, name}" onclick="confirm('Are you sure?')">delete</a>},
+        %{<a href="#{R :destroy_class, :name, name}" onclick="confirm('Are you sure?')">destroy</a>}
+      ] 
+    end 
+  ?>
+
+  #{table :headers => @headers, :values => @values, :alternating_rows => true, :class => :data}
+
+</Page>

data/lib/part/admin/og/template/list.xhtml

@@ -0,0 +1,38 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    <a href="#{AdminController.mount_point}">Admin</a> / 
+    <a href="#{OgAdminController.mount_point}">Og</a> / 
+    <?r if action_name == 'list' ?>
+      #{@klass.name.gsub(/::/, ' ').plural}
+    <?r else ?>
+      Search results
+    <?r end ?>
+  </SitePath>
+
+  <?r
+    unless @objects.empty?
+      @headers = [ 'Name', ' ', ' ' ]
+      @values = @objects.inject([]) do |v, o| 
+        v << [ 
+          %{<a href="#{R :update, :name, class_to_name(@klass), :oid, o.oid}">#{o}</a>}, 
+          %{<a href="#{R :update, :name, class_to_name(@klass), :oid, o.oid}">update</a>}, 
+          %{<a href="#{R :delete, :name, class_to_name(@klass), :oid, o.oid}" onclick="confirm('Are you sure?')">delete</a>}
+        ] 
+      end 
+  ?>
+
+      #{table :headers => @headers, :values => @values, :alternating_rows => true, :class => :data}
+
+      <div class="pager" if="@pager and @pager.navigation?">
+        #{@pager.navigation}
+      </div>
+        
+  <?r else ?>
+  
+      No objects.
+  
+  <?r end ?>
+
+</Page>

data/lib/part/admin/og/template/search.xhtml

@@ -0,0 +1,20 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    <a href="#{AdminController.mount_point}">Admin</a> / 
+    <a href="#{OgAdminController.mount_point}">Og</a> / 
+    <a href="#{R OgAdminController, :list, :name, @obj.class}">#{@obj.class.name.gsub(/::/, ' ').plural}</a> / 
+    Search
+  </SitePath>
+
+  #{form :object => @obj, :action => "#{R :search_results}", :method => :post do |f|
+    f.form_errors
+    f.hidden :object_class_name, class_to_name(@obj.class)
+    f.attributes
+    f.br
+    f.submit 'Search'
+    f.text ' or <a href="' + R(:list, :name, class_to_name(@obj.class)) + '">Cancel</a>'  
+  end}
+
+</Page>

data/lib/part/admin/og/template/update.xhtml

@@ -0,0 +1,25 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    <a href="#{AdminController.mount_point}">Admin</a> / 
+    <a href="#{OgAdminController.mount_point}">Og</a> / 
+    <a href="#{R OgAdminController, :list, :name, @obj.class}">#{@obj.class.name.gsub(/::/, ' ').plural}</a> / 
+    <?r if action_name == 'update' ?>
+      Update '#@obj'
+    <?r else ?>
+      Create new #{@obj.class.name.gsub(/::/, ' ')}
+    <?r end ?>
+  </SitePath>
+
+  #{form :object => @obj, :action => "#{R :save}", :method => :post, :enctype => "multipart/form-data" do |f|
+    f.form_errors
+    f.hidden :object_class_name, class_to_name(@obj.class)
+    f.attributes
+    f.relations
+    f.br
+    f.submit 'Save'
+    f.text ' or <a href="' + R(:list, :name, class_to_name(@obj.class)) + '">Cancel</a>'  
+  end}
+
+</Page>

data/lib/part/admin/skin.rb

@@ -0,0 +1,207 @@
+module AdminSkin
+
+class Page
+
+  def head
+    %~
+    <head>
+      <title>\#{sitepath}</title>
+      <meta name="generator" content="nitro" />
+      <meta name="title" content="\#{sitepath}" /> 
+      <meta name="description" content="Nitro Administration" />
+      <meta name="category" content="portal" />
+      <meta name="robots" content="index, nofollow" />
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!--
+      <link rel="stylesheet" href="/style.css" type="text/css" />    
+      <link rel="alternate" type="application/rss+xml" title="Recent changes" href="\#{context.host_url}/feed" />
+      <script type="text/javascript" src="/js/dojo.js">
+        dojo.require('dojo.io.cookie');
+      </script>
+      <script type="text/javascript" src="/js/rounded_corners_lite.inc.js">//</script>
+-->   
+      #{css}
+    </head>
+    ~
+  end
+  
+  def css
+    %~
+    <style>
+      label {
+        font-weight: bold;
+        display: block;
+      }
+
+      img {
+        border: none;
+      }
+
+      input {
+        border: 1px solid #ccc;
+        font-size: 12px;
+        background: #fff;
+        padding: 2px;
+      }
+
+      textarea {
+        border: 1px solid #ccc;
+        background: #fff;
+        padding: 2px;
+      }
+
+      input:hover, textarea:hover {
+        border: 1px solid #999;
+      }
+
+      input:focus, textarea:focus {
+        border: 1px solid #f00;
+      }
+
+      input.button {
+        color: #fff;
+        background: #999;
+        border: 1px solid #999;
+        font-weight: bold;  
+      }
+
+      input.button:hover {
+        background: #f00;
+        border: 1px solid #f00;
+      }
+
+      select {
+        border: 1px solid #ccc;
+      }
+
+      a:hover {
+        color: #f00;
+      }
+      
+      /* --- forms --- */
+
+      form dl {
+        width: 100%;
+        margin: 0px;
+      }
+
+      form dt {
+        display: block;
+        margin: 0px;
+        margin-right: 10px;
+        padding-bottom: 10px;
+        font-weight: bold;
+      }
+
+      form dd {
+        display: block;  
+        margin: 0px;
+        padding-bottom: 10px;
+      }
+
+      /* --- tables ---*/
+      
+      table.data {
+        border-collapse: collapse;
+      }
+
+      .data th {
+        border-bottom: 1px solid #ccc;
+        background: #eee;
+        font-weight: bold;
+        text-align: left;
+        padding: 5px;
+      }
+
+      .data td {
+        border-bottom: 1px solid #ccc;
+        padding: 5px;
+      }
+
+      /* --- pager --- */
+            
+      .pager {
+        margin-top: 40px; margin-bottom: 50px;
+        border-top: 1px solid #ccc;
+        background-color: #f0f0f0;
+      }
+
+      .pager .first {
+        float: left;  
+        padding: 5px;
+      }
+
+      .pager .previous {
+        float: left;
+        padding: 5px;
+        margin-left: 5px;
+      }
+
+      .pager .next {
+        float: right;  
+        padding: 5px;
+        margin-right: 5px;
+      }
+
+      .pager .last {
+        float: right;
+        padding: 5px;
+      }
+
+      .pager ul {
+        float: left;
+        margin: 0px;
+        padding: 0px;
+      }
+
+      .pager li {
+        float: left;
+        display: inline;
+        padding: 5px;
+        padding-left: 10px;
+        padding-right: 10px;
+        background: none;
+      }
+
+      .pager li.active {
+        background-color: #ffa;
+      }
+
+      .noitems {
+        padding: 5px;
+        text-align: center;
+      }      
+    </style>
+    ~    
+  end
+
+  def footer
+    %~
+    <br /><br />
+    Powered by <strong><a href="http://www.nitroproject.org" target="_blank">Nitro</a></strong>.
+    ~
+  end
+  
+  def render
+    %~
+    <html>
+      #{head}
+      <body>
+        #{content}
+        #{footer}
+      </body>
+    </html>
+    ~
+  end
+end
+
+class SitePath
+  def render
+    %~
+      <h1>#{content}</h1>
+      <br /><br />
+    ~
+  end
+end
+
+end

data/lib/part/admin/template/denied.xhtml

@@ -0,0 +1,13 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    System / Access denied
+  </SitePath>
+
+  <p>
+    You don't have permission to access this page. Please, return 
+    to the <a href="/">home page</a>.
+  </p>
+  
+</Page>

data/lib/part/admin/template/index.xhtml

@@ -0,0 +1,12 @@
+<Page>
+
+  <SitePath>
+    <a href="/">#{Server.map['/'].ann.index[:title] || 'Home'}</a> / 
+    Admin
+  </SitePath>
+
+  <ul>
+    <li><a href="#{R OgAdminController, :index}">Og Administration</a></li>
+  </ul>
+
+</Page> 

data/lib/part/admin/todo.txt

@@ -0,0 +1,2 @@
+
+- use system plugins.

data/proto/public/error.xhtml

@@ -44,10 +44,12 @@
     <h1>Error</h1>
 
 <?r 
-    if Run.mode == :debug 
+    response.status = 501
+    
+    if Nitro.mode == :debug 
     require 'cgi'
 ?>
-    <?r  for error, path in @context.rendering_errors ?>
+    <?r for error, path in @context.rendering_errors ?>
       <div class="path"><strong>Path:</strong> #{path}</div>
       <div class="error"><strong>#{CGI.escapeHTML(error.to_s)}</strong></div>
       <div class="load">

data/proto/run.rb

@@ -95,5 +95,3 @@ class Proto
 end
 
 Nitro.run(Proto)
-
-# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_webfile.rb

@@ -0,0 +1 @@
+# Please add me!

data/test/nitro/cgi/tc_request.rb

@@ -10,6 +10,7 @@ class TC_Request < Test::Unit::TestCase # :nodoc: all
     
     def initialize
       @headers = {}
+      @params = {}
     end
   end
   
@@ -34,5 +35,27 @@ class TC_Request < Test::Unit::TestCase # :nodoc: all
     req.instance_variable_set '@post_format', nil
     req.headers['CONTENT_TYPE'] = 'text/xml'
     assert req.xml_post?
+    
+    req['test'] = 'hello'
+    assert req['test']
+    assert_equal 'hello', req['test']
+    assert req.has?('test')    
+    
+    assert !req.has?('phantom')
+    
+    req['bug'] = nil
+    assert !req.has?('bug')    
+  end
+
+  def test_local_net?
+    req = DummyRequest.new
+
+    local_ips = ["192.168.1.1", "192.168.20.1", "192.168.99.1", "192.168.200.1", "192.168.21.245", "192.168.90.34", "192.168.254.254", "172.16.1.1", "172.18.1.1", "172.31.254.1", "172.21.1.254", "10.16.1.1", "10.0.1.1", "10.254.1.254", "10.192.1.192", "10.254.254.254", "10.10.10.10"]
+
+    not_local_ips = ["191.168.1.1", "192.169.20.1", "193.168.254.254", "172.15.1.1", "171.18.1.1", "172.32.0.0", "173.21.1.254", "11.16.1.1", "66.249.93.104", "72.14.221.104", "66.102.9.104", "17.254.3.183", "207.46.250.119", "207.46.130.108", "207.68.160.190", "65.54.240.126", "213.199.144.151", "65.55.238.126"]
+
+    assert_equal true, local_ips.map { |ip| req.local_net?(ip) }.all?
+    assert_equal true, not_local_ips.map { |ip| req.local_net?(ip) }.all?{|v|!v}
   end
+
 end

data/test/nitro/helper/tc_feed.rb

@@ -133,6 +133,3 @@ class TC_FeedHelper < Test::Unit::TestCase # :nodoc: all
   end # test_opml
 
 end
-
-# * Fabian Buch <fabian@fabian-buch.de>
-# * George Moschovitis <gm@navel.gr>

data/test/nitro/helper/tc_navbar.rb

@@ -0,0 +1,74 @@
+require File.join(File.dirname(__FILE__), '..', 'CONFIG.rb')
+
+require 'test/unit'
+require 'nitro/helper/navigation'
+
+
+class TC_NavigationHelper < Test::Unit::TestCase # :nodoc: all
+  include Nitro
+  include NavigationHelper
+  FirstController = Class.new(Controller) do 
+    def self.mount_path() "controller1" end
+  end
+  Second          = Class.new(Controller) do
+    def self.mount_path() "controller2" end
+  end
+  MockRequest=Struct.new(:path)
+  attr :request
+  def setup
+    @request=MockRequest.new("controller1")
+  end
+  def check_div(text)
+    #offsets accomodate \n
+    assert_equal '<div id="navcontainer">',text[0,23]
+    assert_equal '</div>',text[-8,6]
+  end
+  def check_ul(text)
+    assert_equal '<ul id="navlist">',text[25,17]
+    assert_equal '</ul>',text[-14,5]
+  end
+  def test_navfor_around_html
+    text= menu_for(FirstController)
+    check_div(text)
+    check_ul(text)
+  end
+  
+  def test_navfor_inner_html_single
+    text= menu_for(FirstController)
+    text.gsub!(%r{</?(div|ul).*?>},'')
+    text.gsub!("\n",'')
+    assert_equal '<li id="active"><a href="controller1" id="current"> TC_NavigationHelper::First </a></li>',
+                 text.strip
+  end
+  def test_navfor_inner_html_many             
+    text = menu_for(FirstController,Second)
+    assert_match %r|href="controller1" id="current">| , text
+    assert_match %r|href="controller2">| , text
+    assert_match %r| TC_NavigationHelper::First | , text
+    assert_match %r| TC_NavigationHelper::Second |, text
+  end
+  
+  def test_navfor_yielding
+    text= menu_for(FirstController,Second) do |controller|
+      controller==FirstController ? 'first' : 'second'
+    end
+    assert_match %r|<a href="controller1".*first </a>|,text
+    assert_match %r|<a href="controller2".*second </a>|,text
+  end
+  def test_navforhash_around_html
+    text= menu_from_hash('path'=>'text')
+    check_div(text)
+    check_ul(text)
+  end
+  
+  def test_navforhash_inner_html_single
+    text= menu_from_hash('link'=>'text')
+    text.gsub!(%r{</?(div|ul).*?>},'')
+    text.gsub!("\n",'')
+    assert_equal '<li><a href="link"> text </a></li>',
+                 text.strip
+  end
+  
+
+               
+end