nitro 0.22.0 → 0.23.0

data/lib/nitro/mixin/rss.rb

@@ -1,7 +1,7 @@
 require 'cgi'
 require 'rss/0.9'
 
-require 'facet/string/first_char'
+require 'nano/string/first_char'
 
 require 'nitro/mixin/markup'
 

data/lib/nitro/mixin/xhtml.rb

@@ -5,6 +5,8 @@ module Nitro
 
 module XhtmlMixin
 
+private
+
   # Render select options. The parameter is a hash of options.
   #
   # [+labels+]
@@ -13,14 +15,17 @@ module XhtmlMixin
   # [+values+]
   #    The corresponding values.
   #
-  #  [+selected+]
+  # [+labels_values+]
+  #    Use when labels == values.
+  #
+  # [+selected+]
   #    The value of the selected option.
   #
   # === Examples
   #
   # labels = ['Male', 'Female']
   # o.select(:name => 'sex') { 
-  #    o.options(:labels => labels, :selected => 1) 
+  #   o.options(:labels => labels, :selected => 1) 
   # }
   #
   # or
@@ -29,11 +34,14 @@ module XhtmlMixin
   # #{build :options, :labels => labels, :values => [..], :selected => 1}
   
   def options(options = {})
-    if labels = options[:labels]
+    if labels = options[:labels] || options[:labels_values]
       str = ''
       
       unless values = options[:values]
-        values = (0...labels.size).to_a
+        if values = options[:labels_values]
+        else
+          values = (0...labels.size).to_a
+        end
       end
       
       selected = (options[:selected] || -1).to_i
@@ -67,6 +75,85 @@ module XhtmlMixin
 
     return str
   end
+
+  # Render a date select. Override to customize this.
+  #
+  # === Example
+  #
+  # #{date_select date, :name => 'brithday'}
+
+  def date_select(date, options = {})
+    raise 'No name provided to date_select' unless name = options[:name]
+    date ||= Time.now
+    %{
+      <select id="#{name}.day" name="#{name}.day">
+        #{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))}        
+      </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)}        
+      </select>}
+  end
+    
+  # Render a time select. Override to customize this.
+
+  def time_select(time, options = {})
+    raise 'No name provided to time_select' unless name = options[:name]
+    time ||= Time.now
+    %{
+      <select id="#{name}.hour" name="#{name}.hour">
+        #{options(:labels_values => (1..60).to_a, :selected => time.hour)}        
+      </select>&nbsp;
+      <select id="#{name}.min" name="#{name}.min">
+        #{options(:labels_values => (1..60).to_a, :selected => time.min)}        
+      </select>}
+  end
+    
+  # Render a datetime select. Override to customize this.
+  
+  def datetime_select(time, options)
+    date_select(time, options) + '&nbsp;at&nbsp;' + time_select(time, options)
+  end
+
+  
+  # gmosx: keep the leading / to be IE friendly.
+
+  def js_popup(options = {})
+    o = {
+      :width => 320,
+      :height => 240,
+      :title => 'Popup',
+      :resizable => false,
+      :scrollbars => false,
+    }.merge(options)
+
+    poptions = (o[:resizable] ? 'resizable=yes' : 'resizable=no')
+    poptions << (o[:scrollbars] ? 'scrollbars=yes' : 'scrollbars=no')
+    
+    url = o[:url] || o[:uri]
+    
+    %[javascript: var pwl = (screen.width - #{o[:width]}) / 2; var pwt = (screen.height - #{o[:height]}) / 2; window.open('#{url}', '#{o[:title]}', 'width=#{o[:width]},height=#{o[:height]},top='+pwt+',left='+pwl+', #{poptions}'); return false;"]       
+  end
+
+  # === Example
+  #
+  # <a href="#" #{onclick_popup 'add-comment', :scrollbars => true}>Hello</a>
+  
+  def onclick_popup(options = {})
+    %|onclick="#{js_popup(options)}"|
+  end
+  
+  # Emit a link that spawns a popup window.
+  #
+  # === Example
+  #
+  # <a href="#" #{onclick :text => 'Hello', :url => 'add-comment', :scrollbars => true}>Hello</a>
+  
+  def popup(options = {})
+    %|<a href="#" #{onclick_popup(options)}>#{options[:text] || 'Popup'}</a>|
+  end
   
 end
 

data/lib/nitro/render.rb

@@ -1,11 +1,9 @@
 require 'singleton'
 require 'sync'
 
-require 'facet/string/blank%3F'
+require 'nano/string/blank%3F'
 
 require 'glue/attribute'
-require 'glue/misc'
-require 'glue/object'
 require 'glue/settings'
 require 'glue/template'
 require 'glue/builder'
@@ -76,8 +74,15 @@ module Render
   # The name of the currently executing action.
 
   attr_accessor :action_name
+
+  # The base url for this render.
+  
+  attr_accessor :base
   
   # The name of the current controller.
+  #--
+  # gmosx: Needed for WEE. Will be deprecated.
+  #++
   
   attr_accessor :controller_name
   
@@ -88,17 +93,24 @@ module Render
 
   def initialize(context, base = nil)
     @request = @response = @context = context
-    @controller_name = base
+    @controller_name = @base = base
     @out = context.out
   end
 
   # Renders the action denoted by path. The path
   # is resolved by the dispatcher to get the correct
   # controller.
+  #
+  # Both relative and absolute paths are supported. Relative
+  # paths are converted to absolute by prepending the @base
+  # path of the controller.
   
   def render(path)
+    # Convert relative paths to absolute paths.
+    path = "#@base/#{path}" unless path =~ /^\//
+      
     Logger.debug "Rendering '#{path}'." if $DBG
-    
+  
     klass, action, base = @context.dispatcher.dispatch(path, @context)
 
     # FIXME: 
@@ -129,10 +141,17 @@ module Render
 private
 
   # Send a redirect response.
+  #
+  # If the url starts with '/' it is considered absolute, else
+  # the url is considered relative to the current controller and
+  # the controller base is prepended.
   
   def redirect(url, status = 303)
     url = url.to_s
-    url = "#{@context.host_url}/#{url.gsub(/^\//, '')}" unless url =~ /http/
+    unless url =~ /^http/
+      url = "#@base/#{url}" unless url =~ /^\//
+      url = "#{@context.host_url}/#{url.gsub(/^\//, '')}"
+    end
 
     @context.status = status
     @context.out = "<html><a href=\"#{url}\">#{url}</a>.</html>\n"

data/lib/nitro/request.rb

@@ -30,13 +30,14 @@ module Request
   # The request protocol.
 
   def protocol
-    443 == port ? 'https://' : 'http://'
+    @headers['HTTPS'] == 'on' ? 'https://' : 'http://'
   end
 
   # Is this an ssl request?
 
   def ssl?
-    443 == port
+#   443 == port
+    @headers['HTTPS'] == 'on'
   end
     
   # The request uri.
@@ -208,8 +209,9 @@ module Request
   # The host url.
   
   def host_url
-    "http://#{host}"
+    "#{protocol}#{host}"
   end
+  alias_method :server_url, :host_url
 
   # The raw data of the request.
   # Useful to implement Webservices.
@@ -243,8 +245,16 @@ module Request
   def fetch(param, default = nil)
     @params.fetch(param, default)
   end
+  
+  # Check if a param is available.
+  
+  def has_key?(key)
+    @params.has_key?(key)
+  end
+  alias_method :has_param?, :has_key?
 end
 
 end
 
 # * George Moschovitis <gm@navel.gr>
+# * Guillaume Pierronnet <guillaume.pierronnet@laposte.net>

data/lib/nitro/scaffold.rb

@@ -1,14 +1,12 @@
-require 'facet/string/singular'
-require 'facet/string/demodulize'
-require 'facet/string/underscore'
+require 'mega/orm_support'
 
 require 'nitro/compiler'
+require 'nitro/mixin/form'
 
 module Nitro
 
 # The scaffolder adds default actions to a Controller.
 #
-# WARNING: This code is slightly outdated.
 #--
 # FIXME: handle controller base in generated routes.
 # FIXME: better handle templates (check if action exists).
@@ -18,9 +16,35 @@ module Scaffolding
 
   def self.append_features(base) # :nodoc: 
     super
+    base.send :include, FormMixin
     base.extend(ClassMethods)
   end
 
+  def self.class_to_name(klass)
+    klass.to_s.demodulize.underscore.downcase
+  end
+  
+  def self.class_to_list(klass)
+    klass.to_s.demodulize.underscore.downcase.plural
+  end
+  
+  def self.compile_scaffold_action(compiler, controller, action, suffix)
+    unless compiler.template_for_action("#{action}#{suffix}", controller.template_root)
+      source = File.read(File.join(Nitro.proto_path, 'public', 'scaffold', "#{action}.xhtml"))
+      template = compiler.transform_template(source)
+      
+      yield template
+
+      return %{
+        def #{action}#{suffix}
+          #{template}
+        end
+      }
+    end
+    
+    return nil
+  end
+  
   module ClassMethods 
 
     # Enchant the caller with a number of default methods.
@@ -30,108 +54,107 @@ module Scaffolding
       compiler = Compiler.new
       
       oid = options[:oid] || 'oid'
-      name = options[:name] || klass.to_s.demodulize.underscore.downcase
-      list_name = options[:list_name] || name.plural
-      options[:nosuffix] ? suffix = nil : suffix = "_#{name}"
+      name = options[:name] || Scaffolding.class_to_name(klass)
+      list_name = options[:plural_name] || name.plural
+      suffix = options[:nosuffix] ? nil : "_#{name}"
 
       # Add methods to the scaffolded class.
   
-      klass.module_eval %{ 
-        def to_href 
-          "view#{suffix}?oid=\#\{@oid\}"
-          # "view#{suffix}/\#\{@oid\}"
+      unless klass.respond_to? :to_href
+        klass.send(:define_method, :to_href) do
+          "#{name}/#{@oid}"
         end
-      }
+      end
+
+      unless klass.respond_to? :to_edit_link
+        klass.send(:define_method, :to_edit_link) do |base|
+          %{<a href="#{base}/#{name}/#{@oid}">#{self}</a>&nbsp;(<a href="#{base}/edit#{suffix}/#{@oid}">edit</a>, <a href="#{base}/delete#{suffix}/#{@oid}">del</a>)}
+        end
+      end
       
       # Add methods to the service.
 
       code = ''
 
-      if options[:index]
-        code << %{ 
-          def index
-            list#{suffix}
-          end
-        }
-      end
-    
       code << %{
         def new#{suffix}
           @#{name} = #{klass}.new
-          render '/form#{suffix}'
+          render 'form#{suffix}'
         end
 
-        def edit#{suffix}
-          @#{name} = #{klass}[request['oid']] 
-          render '/form#{suffix}'
+        def edit#{suffix}(oid)
+          @#{name} = #{klass}[oid] 
+          render 'form#{suffix}'
+        end
+        
+        def form#{suffix}
         end
       }
-  
-      unless compiler.template_for_action("form#{suffix}", self.template_root)
-        code << %{
-          def form#{suffix}
-            o << %|
-            <html>
-              <form action="save#{suffix}" method="post">
-            |
-            if @#{name}.oid
-              o << %|
-                  <input type="hidden" name="oid" value="\#\{@#{name}\}" />
-              |
-            end
-            o.build_form(@#{name})
-            o << %|
-                <input type="submit" value="Save" />
-              </form>
-            </html>
-            |
-          end
-        }
+
+      code << Scaffolding.compile_scaffold_action(compiler, self, 'form', suffix) do |template|
+        template.gsub!(/%name%/, "#{name}")
+        template.gsub!(/%name_plural%/, "#{name.plural}")
       end
 
       code << %{
         # TODO: add pager support here!
 
-        def list#{suffix}
-          @#{list_name} = #{klass}.all('ORDER BY oid')
+        def #{name.plural}
+          @#{list_name} = #{klass}.all
       }
-      unless compiler.template_for_action("list#{suffix}", self.template_root)
+=begin      
+      code << Scaffolding.compile_scaffold_action(compiler, self, 'list', suffix) do |template|
+        template.gsub!(/%name%/, "#{name}")
+        template.gsub!(/%list_name%/, "#{list_name}")
+      end
+=end
+      unless compiler.template_for_action(list_name, self.template_root)
+        source = File.read(File.join(Nitro.proto_path, 'public', 'scaffold', 'list.xhtml'))
+        template = Compiler.new.transform_template(source)
+        
+        template.gsub!(/%name%/, "#{name}")
+        template.gsub!(/%list_name%/, "#{list_name}")
+        
         code << %{
-          o.ul {
-            for item in @#{list_name}
-              o.li(item.to_s)
-            end
-          }
+          #{template}
         }
       end
+
       code << %{
         end
         
-        def view#{suffix}
-          # @#{name} = #{klass}[@context['#{oid}']]
-          @#{name} = #{klass}[@#{oid}]
+        def #{name}(oid)
+          @#{name} = #{klass}[oid]
         end
-        action :view#{suffix}, :route => \%r\{#{@base}/view#{suffix}/(.*)\}, 'oid' => 1
         
         def save#{suffix}
-          if oid = request['oid']
-            @#{name} = request.fill(#{klass}[oid])
+          if oid = request['#{oid}']
+            obj = request.fill(#{klass}[oid])
           else
-            @#{name} = request.fill(#{klass}.new)
+            obj = request.fill(#{klass}.new)
           end
-
-          @#{name}.save
-
-          redirect 'list#{suffix}'
+          unless obj.valid?
+            session[:ERRORS] = obj.errors
+            redirect_to_referer
+          end
+          obj.save
+          redirect '#{name.plural}'
         end
         
-        def del#{suffix}
-          #{klass}.delete(@context['#{oid}'])
-          redirect_referer
+        def delete#{suffix}(oid)
+          #{klass}.delete(oid)
+          redirect_to_referer
         end
-        alias_method :delete#{suffix}, :del#{suffix}
       }    
 
+      if options[:index]
+        code << %{ 
+          alias_action :index, :#{name.plural}
+        }
+      end
+
+#      puts '--', klass, '..', code
+    
       class_eval(code)
     end