nitro 0.31.0 → 0.40.0

data/lib/nitro/compiler/errors.rb

@@ -58,12 +58,12 @@ class Exception # :nodoc: all
         number = start
         extract = source[start..finish].collect do |line| 
           number += 1
-          line = line.gsub(/; @out << %\^/, ' ?>').gsub(/\^;/, '<?r ')
+          line = line.gsub(/; @out #{Nitro::TemplateMixin::START_DELIM}/, ' ?>').gsub(/#{Nitro::TemplateMixin::END_DELIM}/, '<?r ')
           "#{' ' * indent}#{number}: #{line}"
         end  
 
         return extract.join("\n")
-      rescue => ex
+      rescue Object => ex
         ''
       end
     end
@@ -110,6 +110,3 @@ class Exception # :nodoc: all
   end
   
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Rob Pitt <rob@motionpath.co.uk>

data/lib/nitro/compiler/include.rb

@@ -19,8 +19,10 @@ class StaticInclude
   # <?include href="root/myfile.sx" ?>
   
   def self.transform(text, compiler)
-    controller = compiler.controller
-    
+    resolve_include(text, compiler.controller)    
+  end
+
+  def self.resolve_include(text, controller)
     return text.gsub(/<\?include href=["|'](.*?)["|'](.*)\?>/) do |match|
       found = false
 
@@ -29,7 +31,7 @@ class StaticInclude
         # root.
 
         href = $1[1, 999999] # hack!!
-        template_stack = [ Glue::Template.root ]
+        template_stack = [ Nitro::Template.root ]
       else
         # Relative path, traverse the template_root stack.
         
@@ -60,13 +62,13 @@ class StaticInclude
 
       itext = File.read(filename)
       itext.gsub!(/<\?xml.*\?>/, '')
-      itext.gsub!(/<\/?root(.*?)>/m, ' ');
-      itext
+      itext.gsub!(/<\/?root(.*?)>/m, ' ')
+      
+      # Recursively resolve to handle sub-includes.
+      
+      resolve_include(itext, controller)
     end
   end
-  
 end
   
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/layout.rb

@@ -17,5 +17,3 @@ class LayoutCompiler # :nodoc: all
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/localization.rb

@@ -23,5 +23,3 @@ class Localization
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/markup.rb

@@ -1,23 +1,31 @@
-require 'glue/markup'
+require 'nitro/markup'
 
 module Nitro
 
-module Markup
-  
-  include Glue::Markup
+module MarkupCompiler
+  include Markup
   
   # Transform the markup macros.
   # Maps #(..) to :sanitize.
   # Maps #|..| to :markup.
+  #
+  # Additional markup macros:
+  #
+  # Maps ''..'' to #{...to_link}
+  # Maps {{..}} to #{R ..}
+  # Maps #<..> to #{R ..}
   
   def self.transform(text, compiler = nil)
     text.gsub!(/\#\((.*?)\)/, '#{sanitize(\1)}')
     text.gsub!(/\#\|(.*?)\|/, '#{markup(\1)}')
+
+    text.gsub!(/\'\'(.*?)\'\'/, '#{\1.to_link}')    
+    text.gsub!(/\{\{(.*?)\}\}/, '#{R \1}')    
+    text.gsub!(/\#\<(.*?)\>/, '#{R \1}')    
+    
     return text
   end
   
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/morphing.rb

@@ -203,7 +203,7 @@ class Morphing
     end
 
     def comment(c)
-      unless Glue::Template.strip_xml_comments
+      unless Nitro::Template.strip_xml_comments
         @buffer << "<!--#{c}-->"
       end
     end    
@@ -270,7 +270,3 @@ class Morphing
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>
-# * Chris Farmiloe <chris.farmiloe@farmiloe.com>

data/lib/nitro/compiler/script.rb

@@ -12,7 +12,7 @@ module ScriptCompiler
   def self.transform(text, compiler)
     begin
       client = constant("#{compiler.controller}::Client")    
-    rescue Object 
+    rescue NameError => ex 
       client = nil
     end
 
@@ -50,7 +50,7 @@ module ScriptCompiler
               #{function_code}
             }
           }
-        rescue => ex
+        rescue Object => ex
           Logger.debug ex.inspect if $DBG
         end
       end
@@ -113,5 +113,3 @@ module ScriptCompiler
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/squeeze.rb

@@ -17,5 +17,3 @@ class Squeeze
 end
   
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/compiler/xslt.rb

@@ -58,5 +58,3 @@ class XSLTransform
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/context.rb

@@ -3,6 +3,7 @@ require 'forwardable'
 require 'facet/kernel/assign_with'
 
 require 'glue/cache/memory'
+require 'glue/attributeutils'
 
 require 'nitro/cgi'
 require 'nitro/cgi/request'
@@ -112,6 +113,12 @@ class Context
     @out
   end
 
+  # Access the server
+  
+  def server
+    @dispatcher.server
+  end
+
   # Lazy lookup of the session to avoid costly cookie
   # lookup when not needed.
 
@@ -126,7 +133,7 @@ class Context
     return Global
   end
   alias_method :application, :global
-
+=begin
   # Lookup the controller for this request.
   #--
   # FIXME: improve this! BUGGY
@@ -135,7 +142,7 @@ class Context
   def controller
     @dispatcher.controllers[@base || '/'] 
   end
-
+=end
   # Automagically populate an object from request parameters.
   # This is a truly dangerous method.
   #
@@ -153,7 +160,7 @@ class Context
   # User.new.assign_with(request)
   
   def fill(obj, options = {})
-    Property.populate_object(obj, @params, options)
+    AttributeUtils.populate_object(obj, @params, options)
   end
   alias_method :populate, :fill
   alias_method :assign, :fill  
@@ -181,5 +188,3 @@ class Context
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/control.rb

@@ -0,0 +1,18 @@
+require 'nitro/element'
+require 'nitro/helper/xhtml'
+
+module Nitro
+
+# A specialized kind of element used for implementing UI 
+# controls.
+#--
+# TODO: add support for the singleton pattern to avoid excessive
+# memory usage.
+#++
+
+class Control < Element  
+  # THINK: maybe include this in element too?
+  include Nitro::XhtmlHelper
+end
+
+end

data/lib/nitro/control/attribute.rb

@@ -0,0 +1,88 @@
+require 'nitro/control'
+
+module Nitro
+
+# The base class for controls used to inspect object 
+# attributes.
+#--
+# TODO: find a better name.
+#++
+
+class AttributeControl < Control
+
+  # The attribute that this control renders.
+  
+  attr_accessor :attribute
+
+  # The annotations used for rendering
+  
+  attr_accessor :anno
+      
+  # The value
+  
+  attr_accessor :value
+  alias values value
+  
+  # === Input
+  #
+  # * object = the object to inspect
+  # * a = the attribute to inspect
+  # * options = additional options
+ 
+  def initialize(object, a, options)
+    @object = object
+    @attribute = a
+    @anno = @object.class.ann(@attribute)
+    @objann = @object.annotation[@attribute] || @object.annotation
+    @value = @object.send(@attribute)
+    @options = options
+  end
+  
+private
+
+  # Emit the label for this control.
+  # The label is skipped if the control is created with the
+  # option :no_label set to true.
+  
+  def emit_label
+    return '' if @options[:no_label]
+    title = @anno[:title] || @options[:label] || @attribute.to_s.humanize
+    %{<label for="#{@attribute}">#{title}</label>}
+  end
+    
+  # Emit the css style for this control.
+  # This mehtod takes into account the passed options (first) 
+  # and then the attribute annotations.
+  
+  def emit_style
+    unless style = (@options[:style] || @anno[:control_style])
+#   unless style = (@objann[:control_style] || @options[:style] || @anno[:control_style])
+      if self.class.respond_to? :style
+        style = self.class.style
+      else
+        style = nil
+      end
+    end
+    style ? %{ style="#{style}"} : ''
+  end
+  
+  # Add support to your controls for being disabled
+  # by including an emit_disabled on form items
+  # or testing for is_disabled? on more complex controls.
+  
+  def emit_disabled
+    is_disabled? ? %{ disabled="disabled"} : ''
+  end
+  
+  #--
+  # FIXME
+  #++
+  
+  def is_disabled?
+    return false if @options[:all]
+    @options[:disable_controls] || @anno[:disable_control]
+  end
+
+end
+
+end

data/lib/nitro/control/attribute/checkbox.rb

@@ -0,0 +1,19 @@
+require 'nitro/control/attribute'
+
+module Nitro
+
+# A Control used to edit boolean attributes.
+
+class CheckboxControl < AttributeControl
+  setting :style, :default => '', :doc => 'The default style'
+
+  def render
+    checked = @value == true ? ' checked="checked"' : ''
+    %{
+    <input type="checkbox" id="#{@attribute}_ctl" name="#{@attribute}" #{emit_style}#{checked}#{emit_disabled} />&nbsp;#{emit_label}
+    }
+  end
+  
+end
+
+end

data/lib/nitro/control/attribute/datetime.rb

@@ -0,0 +1,21 @@
+require 'nitro/control/attribute'
+
+module Nitro
+
+# A Control used to edit datetime attributes.
+#--
+# TODO: implement me!
+#++
+
+class DatetimeControl < AttributeControl
+  setting :style, :default => '', :doc => 'The default style'
+
+  def render
+    %{
+    NOT IMPLEMENTED
+    }
+  end
+  
+end
+
+end

data/lib/nitro/control/attribute/file.rb

@@ -0,0 +1,20 @@
+require 'nitro/control/attribute'
+
+module Nitro
+
+# Usage note:
+#  don't forget to set form :method to :multipart
+#  or :method to :post and :enctype to 'multipart/form-data'
+
+class FileControl < AttributeControl
+  setting :style, :default => 'width: 250px', :doc => 'The default style'
+
+  def render
+    %{
+    #{emit_label}
+    <input type="file" id="#{@attribute}_ctl" name="#{@attribute}" value="#{@object.send(@attribute)}"#{emit_style}#{emit_disabled} />
+    }
+  end
+end
+
+end

data/lib/nitro/control/attribute/fixnum.rb

@@ -0,0 +1,26 @@
+require 'nitro/control/attribute'
+
+module Nitro
+
+# Controls a Fixnum attribute.
+
+class FixnumControl < AttributeControl
+  setting :style, :default => 'width: 100px', :doc => 'The default style'
+
+  def render
+    style = @anno.control_style || self.class.style 
+    %{
+      #{emit_label}
+      <input type="text" id="#{@attribute}_ctl" name="#{@attribute}" value="#{value}"#{emit_style}#{emit_disabled} />
+      <a href="#" onclick="el=document.getElementById('#{@attribute}_ctl'); el.value=(parseInt(el.value) || 0)+#{step}; return false;">+</a>
+      <a href="#" onclick="el=document.getElementById('#{@attribute}_ctl'); el.value=(parseInt(el.value) || 0)-#{step}; return false;">-</a>
+    }
+  end
+  
+  def step
+    1
+  end
+  
+end
+
+end

data/lib/nitro/control/attribute/float.rb

@@ -0,0 +1,26 @@
+require 'nitro/control/attribute'
+
+module Nitro
+
+# Controls a Float attribute.
+
+class FloatControl < AttributeControl
+  setting :style, :default => 'width: 100px', :doc => 'The default style'
+
+  def render
+    style = @anno.control_style || self.class.style 
+    %{
+      #{emit_label}
+      <input type="text" id="#{@attribute}_ctl" name="#{@attribute}" value="#{value}"#{emit_style}#{emit_disabled} />
+      <a href="#" onclick="el=document.getElementById('#{@attribute}_ctl'); el.value=(parseInt(el.value) || 0)+#{step}; return false;">+</a>
+      <a href="#" onclick="el=document.getElementById('#{@attribute}_ctl'); el.value=(parseInt(el.value) || 0)-#{step}; return false;">-</a>
+    }
+  end
+  
+  def step
+    0.5
+  end
+  
+end
+
+end