nitro 0.23.0 → 0.24.0

data/lib/nitro/mixin/javascript.rb

@@ -28,11 +28,15 @@ private
   def behaviour(id, js)
     @_behaviours ||= []
     @_behaviours << [id, js]
+    return nil
   end
   
   # :section: prototype.js
 
   def live_request(id, options = {})
+    __append_script_file__ 'js/behaviour.js'
+    __append_script_file__ 'js/prototype.js'
+    
     if href = options.delete(:href)
       behaviour "##{id}", %{
         el.onclick = function() {
@@ -48,6 +52,7 @@ private
         }
       }
     end
+    return nil
   end
   alias_method :live, :live_request
   alias_method :async, :live_request
@@ -57,8 +62,13 @@ private
   # Make the element dragable.
   
   def draggable(id, options = {})
-    @_javascript ||= ''
-    @_javascript << "\nnew Draggable('#{id}', #{hash_to_js(options)});"
+    __append_script_file__ 'js/behaviour.js'
+    __append_script_file__ 'js/prototype.js'
+    __append_script_file__ 'js/effects.js'
+    __append_script_file__ 'js/dragdrop.js'
+    
+    __append_script__ "\nnew Draggable('#{id}', #{hash_to_js(options)});"
+    return nil
   end
   
   # :section: script.aculo.us controls.js
@@ -68,8 +78,13 @@ private
   def auto_complete(id, options = {})
     update = options[:update] || "#{id}_auto_complete"
     url = options[:url] || "#{id}_auto_complete"
-    @_javascript ||= ''
-    @_javascript << "\nnew Ajax.Autocompleter('#{id}', '#{update}', '#{url}');"
+
+    __append_script_file__ 'js/behaviour.js'
+    __append_script_file__ 'js/prototype.js'
+    __append_script_file__ 'js/effects.js'
+    __append_script_file__ 'js/controls.js'
+    
+    __append_script__ "\nnew Ajax.Autocompleter('#{id}', '#{update}', '#{url}');"
     
     # Turn off the browser's autocomplete functionality to avoid
     # interference.
@@ -77,18 +92,127 @@ private
     behaviour "##{id}", %{
       el.autocomplete = 'off';
     }
+    return nil
+  end
+  
+  # :section: styling.
+  
+  # Style border.
+  
+  def style_border
+  end
+  
+  # Round element corners using the nifty corners technique.
+  
+  def round_corners(id, options = {})
+    o = {
+      :bg => '#fff',
+      :fg => '#ccc',
+    }.update(options)
+
+    __append_script_file__ 'js/prototype.js'
+    __append_script_file__ 'js/round.js'
+
+    __append_script__ %{
+      Box.round('#{id}', '#{o[:fg]}', '#{o[:bg]}');
+    }
+
+    __append_css__ %{
+      .rtop,.rbottom{display:block}
+      .rtop *,.rbottom *{display:block;height: 1px;overflow: hidden}
+      .r1{margin: 0 5px}
+      .r2{margin: 0 3px}
+      .r3{margin: 0 2px}
+      .r4{margin: 0 1px;height: 2px}
+    }
+   
+    return nil
+  end
+  
+  # Generalized border decoration.
+  
+  def decorate_borders(options = {})
+    o = {
+      :bg => '#fff',
+      :fg => '#ccc',
+      :klass => 'w'
+    }.update(options)
+
+    klass = o[:klass]
+
+    __append_script_file__ 'js/prototype.js'
+    __append_script_file__ 'js/styler.js'
+
+    __append_script__ %{ 
+      decorateBorders('#{klass}');
+    }
+
+    __append_css__ %{
+      .#{klass}t {
+        background: #{o[:bg]};  
+        background-image: url(m/#{klass}t.gif);
+        background-repeat: repeat-x;
+        background-position: top;
+      }
+      .#{klass}r {
+        background-image: url(m/#{klass}r.gif);
+        background-repeat: repeat-y;
+        background-position: right;
+      }
+      .#{klass}b {
+        background-image: url(m/#{klass}b.gif);
+        background-repeat: repeat-x;
+        background-position: bottom;
+      }
+      .#{klass}l {
+        background-image: url(m/#{klass}l.gif);
+        background-repeat: repeat-y;
+        background-position: left;
+      }
+      .#{klass}tl {
+        background-image: url(m/#{klass}tl.gif);
+        background-repeat: no-repeat;
+        background-position: top left;
+      }
+      .#{klass}tr {
+        background-image: url(m/#{klass}tr.gif);
+        background-repeat: no-repeat;
+        background-position: top right;
+      }
+      .#{klass}bl {
+        background-image: url(m/#{klass}bl.gif);
+        background-repeat: no-repeat;
+        background-position: bottom left;
+      }
+      .#{klass}br {
+        background-image: url(m/#{klass}br.gif);
+        background-repeat: no-repeat;
+        background-position: bottom right;
+      }
+      .#{klass}c {
+        padding: 25px;
+      }      
+    }
+   
+    return nil
   end
   
   # :section: general javascript helpers.
   
   # Include external javascript file.
   
-  def include_script(files = DEFAULT_JAVASCRIPT_FILES)
-    code = ''
+  def include_script(*files)
+    return if @_script_files.nil? and files.empty?
     
-    for file in [files].flatten
-      code << %|<script src="#{file}" type="text/javascript">//</script>|
-    end
+    code = ''
+
+    for file in files
+      code << %|<script src="#{file}" type="text/javascript">//</script>\n|
+    end if files
+
+    for file in @_script_files
+      code << %|<script src="#{file}" type="text/javascript">//</script>\n|
+    end if @_script_files
     
     return code
   end
@@ -105,12 +229,20 @@ private
     '{' + options.map {|k, v| "#{k}:#{v}"}.join(', ') + '}'
   end
 
+  # Emits the aggregated css.
+  
+  def emit_css
+    return unless @_css
+    %{<style>#{@_css.join("\n")}</style>}
+  end
+  alias_method :helper_css, :emit_css
+
   # Emits the aggregated helper javascript.
   #--
   # FIXME: refactor this!
   #++
   
-  def helper_script
+  def emit_script
     code = %|<script type="text/javascript">\n|
     unless @_behaviours.empty?
       code << %|var _behaviours = {\n|
@@ -125,11 +257,38 @@ private
       |
     end
     code << %|
-        #@_javascript
+        #{@_script.join("\n")}
+    | if @_script
+    code << %|
       </script>
     |
   end
+  alias_method :helper_script, :emit_script
+
+  # ...
   
+  def js_distance_of_time_in_words(time)
+    time = time.utc.strftime("%a, %d %b %Y %H:%M:%S GMT")
+    %|<span class="human_time" title="#{time}">#{time}</span>|
+  end
+
+  # :section: internal helpers.
+
+  def __append_script_file__(file)
+    @_script_files ||= []
+    @_script_files << file unless @_script_files.include?(file)
+  end
+
+  def __append_script__(script)
+    @_script ||= []
+    @_script << script unless @_script.include?(script)
+  end
+
+  def __append_css__(css)
+    @_css ||= []
+    @_css << css unless @_css.include?(css)
+  end
+
 end
 
 end

data/lib/nitro/mixin/markup.rb

@@ -85,6 +85,7 @@ private
   end  
   
   def escape(str)
+    return nil unless str
     CGI.escape(str.gsub(/ /, '_'))
   end
 

data/lib/nitro/mixin/pager.rb

@@ -1,6 +1,8 @@
 require 'glue/uri'
 require 'glue/configuration'
 
+require 'og/collection'
+
 module Nitro
 
 # Displays a collection of entitities in multiple pages.
@@ -258,24 +260,25 @@ private
   
   def paginate(items, options = {})
     per_page = options.delete(:per_page) || Pager.per_page
-
+    pager_key = options.delete(:pager_key) || Pager.key
+    
     case items
       when Array
         items = items.dup
-        pager = Pager.new(request, per_page, items.size, key = Pager.key)
+        pager = Pager.new(request, per_page, items.size, pager_key)
         items = items.slice(pager.offset, pager.per_page)
         return items, pager      
       
       when Og::Collection
         collection = items
-        pager = Pager.new(request, per_page, collection.count, key = Pager.key)
+        pager = Pager.new(request, per_page, collection.count, pager_key)
         options.update(pager.limit)
         items = collection.reload(options)
         return items, pager
       
       when Class
         klass = items
-        pager = Pager.new(request, per_page, klass.count(options), key = Pager.key)
+        pager = Pager.new(request, per_page, klass.count(options), pager_key)
         options.update(pager.limit)
         items = klass.all(options)
         return items, pager

data/lib/nitro/mixin/rss.rb

@@ -32,6 +32,7 @@ module RssMixin
   
   def build_rss_09(objects, options = {})
     c = {
+      :title => 'Syndication',
       :description => 'Syndication'
     }.update(options)
 
@@ -40,6 +41,7 @@ module RssMixin
     raise "Option ':base' cannot be infered!" unless c[:base] 
   
     channel = RSS::Rss::Channel.new
+    channel.title = c[:title]
     channel.description = c[:description]
     channel.link = c[:link] if c[:link] 
     

data/lib/nitro/mixin/table.rb

@@ -8,11 +8,11 @@ module Nitro
 #
 # <?r
 # users = User.all.map { |u| [u.name, u.first_name, u.last_name, u.email] }
-# header = ['Username', 'First name', 'Last name', 'Email']
+# headers = ['Username', 'First name', 'Last name', 'Email']
 # ?>
 # 
 # <div class="custom-table-class">
-#   #{table(users, header)}
+#   #{table :values => users, :headers => header}
 # </div>
 #--
 # TODO: sorting, thead/tbody/legend etc, verbose...
@@ -32,7 +32,25 @@ module TableMixin
 
     str = '<table'
     str << %| id="#{c[:id]}"| if c[:id]
-    str << '><tr>'
+    str << '>'
+
+    str << table_rows(options)
+    
+    str << '</table>'
+  end
+  alias_method :build_table, :table
+
+  # [+options+]
+  #    A hash of options.
+  # 
+  # :id = id of the component.
+  # :headers = an array of the header values
+  # :values = an array of arrays.
+
+  def table_rows(options)
+    c = options
+
+    str = '<tr>'
 
     for h in c[:headers]
       str << %|<th>#{h}</th>|
@@ -40,6 +58,8 @@ module TableMixin
 
     str << "</tr>"
 
+    items = c[:values] || c[:items] || c[:rows]
+
     for row in c[:values]
       str << "<tr>"
       
@@ -50,11 +70,8 @@ module TableMixin
       str << "</tr>"
     end
 
-    str << "</table>"
-
     return str
   end
-  alias_method :build_table, :table
 
 end
 

data/lib/nitro/mixin/xhtml.rb

@@ -90,7 +90,7 @@ private
         #{options(:labels_values => (1..31).to_a, :selected => date.day)}        
       </select>&nbsp;
       <select id="#{name}.month" name="#{name}.month">
-        #{options(:labels => Date::MONTHNAMES, :values => (1..12).to_a, :selected => (date.month+1))}        
+        #{options(:labels => Date::MONTHNAMES, :values => (1..12).to_a, :selected => (date.month))}
       </select>&nbsp;
       <select id="#{name}.year" name="#{name}.year">
         #{options(:labels_values => ((Time.now.year-10)..(Time.now.year+10)).to_a, :selected => date.year)}        
@@ -129,7 +129,7 @@ private
       :scrollbars => false,
     }.merge(options)
 
-    poptions = (o[:resizable] ? 'resizable=yes' : 'resizable=no')
+    poptions = (o[:resizable] ? 'resizable=yes,' : 'resizable=no,')
     poptions << (o[:scrollbars] ? 'scrollbars=yes' : 'scrollbars=no')
     
     url = o[:url] || o[:uri]

data/lib/nitro/render.rb

@@ -1,7 +1,8 @@
 require 'singleton'
 require 'sync'
+require 'stringio'
 
-require 'nano/string/blank%3F'
+require 'nano/string/blank'
 
 require 'glue/attribute'
 require 'glue/settings'
@@ -21,7 +22,7 @@ module Nitro
 
 class ActionExit < Exception; end
   
-# Raise or Thorw this exception to stop rendering altogether.
+# Raise or Throw this exception to stop rendering altogether.
 # Typically called by redirects.
 
 class RenderExit < Exception; end
@@ -121,10 +122,10 @@ module Render
     if self.class == klass 
       self.send(action)
     else
-      klass.new(self, base).send(action)
+      klass.new(@context, base).send(action)
     end
 
-  rescue RenderExit => e
+  rescue RenderExit, ActionExit => e
 
     # Just stop rendering.
     # For example called by redirects.
@@ -140,6 +141,19 @@ module Render
 
 private
 
+  # Helper method to exit the current action, typically used
+  # to skip the template.
+  
+  def exit
+    raise ActionExit.new
+  end
+
+  # Flush the IO object if we are in streaming mode.
+  
+  def flush
+    @out.flush if @out.is_a?(IO)
+  end
+
   # Send a redirect response.
   #
   # If the url starts with '/' it is considered absolute, else
@@ -197,7 +211,7 @@ private
   
   def render_template(filename)
     filename = "#{filename}.xhtml" unless filename =~ /\.xhtml$/
-    template = File.read("#{self.class.template_root}/#{filename}")
+    template = File.read("#{template_root}/#{filename}")
     Template.process_template(template, '@out', binding)
   end