nitro 0.25.0 → 0.26.0

data/lib/nitro/helper/xhtml.rb

@@ -37,21 +37,24 @@ private
     if labels = options[:labels] || options[:labels_values]
       str = ''
       
-      unless values = options[:values]
-        if values = options[:labels_values]
-        else
-          values = (0...labels.size).to_a
-        end
-      end
+      values = options[:values] || options[:labels_values] || (0...labels.size).to_a
       
       selected = (options[:selected] || -1).to_i
       
       labels.each_with_index do |label, idx|
         value = values[idx]
+        if options[:style]
+          style = if options[:style].is_a?(Array) 
+            options[:style][idx]
+          else
+            options[:style]
+          end
+          style = %{ style="#{style}"}
+        end
         if value == selected
-          str << %|<option value="#{value}" selected="1">#{label}</option>|
+          str << %|<option value="#{value}" selected="selected"#{style}>#{label}</option>|
         else
-          str << %|<option value="#{value}">#{label}</option>|
+          str << %|<option value="#{value}"#{style}>#{label}</option>|
         end
       end
       

data/lib/nitro/helper/xml.rb

@@ -99,7 +99,7 @@ end
 # output to a target buffer.
 
 class XmlBuilder
-  include XmlMixin
+  include XmlHelper
 
   # The target receives the generated xml,
   # should respond_to :<<

data/lib/nitro/routing.rb

@@ -3,6 +3,9 @@ module Nitro
 # Router mixin. Typically used to generate 'nice' urls.
 # Nice urls are considered (?) more Search Engine 
 # friendly.
+#
+# However, due to the power of Nitro'w intelligent dispatching
+# mechanism, routing is almost never used!
   
 module Router
   
@@ -10,6 +13,10 @@ module Router
   # can be handled by the Dispatcher.
 
   attr_accessor :routes
+  
+  # Strip the beginning of the path, used by cgi adapter.
+  
+  setting :strip_path, :default => nil, :doc => 'Strip the beginning of the path, used by cgi adapter'
 
   # Apply routing rules to the path.
 
@@ -23,6 +30,7 @@ module Router
       end
     end
 
+    path.sub!(Router.strip_path, '') if Router.strip_path
     return path
   end
 
@@ -31,4 +39,3 @@ end
 end
 
 # * George Moschovitis  <gm@navel.gr>
-

data/lib/nitro/scaffolding.rb

@@ -0,0 +1,344 @@
+require 'nitro/helper/form'
+require 'nitro/helper/pager'
+
+
+module Nitro
+
+# This module is applied to controllers to provide 
+# automatically generated CRUD methods.
+#--
+# TODO: add search, add base, add to_title, validate/error 
+# handling.
+#++
+
+module Scaffolding
+
+  # The directory where the default scaffold templates reside.
+  
+  setting :template_root, :default => File.join(Nitro.proto_path, 'public', 'scaffold'), :doc => 'The directory where the default scaffold templates reside'
+
+  # The items to show per page in the scaffolder lists.
+  
+  setting :per_page, :default => 20, :doc => 'The items to show per page in the scaffolder lists'
+
+  def self.included(base)
+    super
+    base.helper(:form)
+    base.helper(:pager)
+    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
+
+  #--
+  # Compiles the scaffolding code.
+  #++
+  
+  class ScaffoldCompiler
+  
+    def initialize(controller, klass, options)
+      @controller = controller
+      @klass = klass
+      @options = options      
+      @oid = options[:oid] || options[:pk]
+      @name = options[:name]
+      @plural = options[:plural_name]
+      @suffix = options[:suffix]
+      @compiler = Compiler.new(@controller)
+      @base = options[:base] || options[:mount] || options[:at]
+      @base = @plural.dup if @base == true
+      @base__ = "#{@base}__" if @base
+    end
+  
+    def class_to_name(klass)
+      klass.to_s.demodulize.underscore.downcase
+    end
+
+    def define_class_method(meth, code)
+      unless @klass.instance_methods.include?(meth.to_s) 
+        @klass.module_eval %{
+          def #{meth}
+            #{code}
+          end
+        } 
+      end
+    end
+    
+    def define_controller_action(definition, code, template = nil)
+      sym, args = definition.to_s.split(/\(|\)/)
+      
+      if sym == 'index'
+        action = "#{@base__}index"
+      else
+        action = "#@base__#{sym}#@suffix"
+      end
+
+      unless @controller.action?(action)
+        @controller.module_eval %{
+          def #{action}(#{args})
+            @klass = #{@klass}
+            #{code}
+          end
+        }
+      end
+
+      unless @compiler.template?(action)
+
+        # Use the standard scaffold template.
+        path = File.join(Scaffolding.template_root, "#{template || sym}.xhtml")
+
+        if File.exist?(path) and source = File.read(path)
+          # Interpolate the source.
+          source.gsub!(/%base%/, @base.to_s)
+          source.gsub!(/%name%/, @name)
+          source.gsub!(/%plural%/, @plural)
+          
+          # Transform the source.
+          source = @compiler.transform_template(source)
+
+          @controller.module_eval %{
+            def #{action}_template
+              #{source}
+            end
+          }
+        end
+      end
+    end
+
+    # Scaffold the class and the controller.
+    
+    def scaffold
+      scaffold_class
+      scaffold_controller
+    end
+    
+    # Scaffold the class.
+    
+    def scaffold_class      
+      define_class_method :scaffold_base, %{
+        "#{@controller.ann.self.mount_point}/#@base"
+      }          
+      
+      define_class_method :to_href, %{
+        "#{@controller.ann.self.mount_point}/#@base/view/\#@#{@oid}"
+      }    
+
+      define_class_method :to_edit_href, %{
+        "#{@controller.ann.self.mount_point}/#@base/edit/\#@#{@oid}"
+      }    
+    end
+    
+    # Scaffold the controller.
+    
+    def scaffold_controller      
+      define_controller_action 'index', %{
+        #{Aspects.gen_advice_code(:scaffold_index, @controller.advices, :pre)}
+        @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
+      }
+
+      define_controller_action 'list', %{
+        #{Aspects.gen_advice_code(:scaffold_list, @controller.advices, :pre)}
+        @list, @pager = paginate(@klass, :per_page => Scaffolding.per_page)
+      }
+        
+      define_controller_action 'view(oid)', %{
+        #{Aspects.gen_advice_code(:scaffold_view, @controller.advices, :pre)}
+        @obj = @klass[oid]
+      }
+
+      define_controller_action 'new(all = false)', %{
+        #{Aspects.gen_advice_code(:scaffold_new, @controller.advices, :pre)}
+        @obj = @klass.new
+        @all = all
+      }
+
+      define_controller_action 'edit(oid = nil, all = false)', %{
+        #{Aspects.gen_advice_code(:scaffold_edit, @controller.advices, :pre)}
+        @obj = @klass[oid]
+        @all = all
+      }
+
+      # FIXME: investigate save, improve.
+      
+      define_controller_action 'save', %{
+        if oid = request['#@oid']
+          oid = oid.to_s # fix StringIO (post).
+          obj = request.fill(@klass[oid], :assign_relations => true, :force_boolean => true, :preprocess => true)
+        else
+          obj = request.fill(@klass.create, :assign_relations => true, :preprocess => true)
+        end
+        #{Aspects.gen_advice_code(:scaffold_save, @controller.advices, :pre)}
+        unless obj.valid?
+          flash[:ERRORS] = obj.errors
+          redirect_to_referer
+        end
+        obj.save
+        #{Aspects.gen_advice_code(:scaffold_save, @controller.advices, :post)}
+        redirect '#{action_path(:list)}'
+      }
+
+      define_controller_action 'search(query)', %{
+        #{Aspects.gen_advice_code(:scaffold_search, @controller.advices, :pre)}
+        @query = query
+        if @klass.respond_to? :search
+          @list = #@klass.search(query)
+        end
+      }
+    
+      define_controller_action 'delete(oid)', %{
+        #{Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :pre)}
+        @klass.delete(oid)
+        #{Aspects.gen_advice_code(:scaffold_delete, @controller.advices, :post)}
+        redirect_to_referer
+      }            
+      
+      # Actions for the relations
+      
+      for rel in @klass.relations        
+        define_controller_action "remove_#{rel.target_singular_name}(oid, rid)", %{
+          obj = @klass[oid]
+          #{Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :pre)}
+          rob = #{rel.target_class}[rid]
+          obj.#{rel.name}.remove(rob)
+          #{Aspects.gen_advice_code(:scaffold_remove_relation, @controller.advices, :post)}
+          redirect_to_referer
+        }
+        define_controller_action "delete_#{rel.target_singular_name}(oid, rid)", %{
+          #{Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :pre)}
+          obj = @klass[oid]
+          rob = #{rel.target_class}[rid]
+          obj.#{rel.name}.delete(rob)
+          #{Aspects.gen_advice_code(:scaffold_delete_relation, @controller.advices, :post)}
+          redirect_to_referer
+        }
+      end        
+    end    
+    
+    private
+    
+    def action_method(sym)
+      action = "#{@base__}#{sym}"
+      action << @suffix unless @suffix.nil? or sym == :index
+      return action
+    end
+    
+    def action_path(sym)
+      action = "#{@base}/#{sym}"
+      action << @suffix unless @suffix.nil? or sym == :index
+      return action
+    end
+  end
+
+  module ClassMethods
+
+    # This method modifies both the controller and the
+    # scaffolded Class. 
+    #
+    # === Example
+    #
+    # scaffold Article
+    #
+    # ==== Actions/Methods added to the Controller
+    #
+    # * articles
+    # * edit_article
+    # * view_article
+    # * delete_article
+    # * search_artile
+    # * query_article
+    #
+    # ==== Methods added to the Class (ex: Article)
+    #
+    # * to_href
+    # * to_edit_href
+    #
+    #--
+    # This is the first phase of the scaffolding proccess,
+    # scaffold targets are marked, and default options set.
+    #++
+  
+    def scaffold(klass, options = {})
+      o = {
+        :pk => 'oid',
+        :name => Scaffolding.class_to_name(klass),
+        :plural_name => Scaffolding.class_to_list(klass),
+        :mount => true
+      }
+      o.merge!(options)
+      if scaffolding_classes.has_key? klass
+        scaffolding_classes[klass].merge!(o)
+      else
+        scaffolding_classes[klass] = o
+      end
+    end
+
+    #--
+    # This is the second phase of the scaffolding process
+    #++
+    
+    def compile_scaffolding_code
+      # load scaffolding for all og classes if specified
+      
+      if scaffold_all?
+        options = scaffold_all_options
+        Og.manager.manageable_classes.each do |klass|
+          unless klass.ancestors.include?(Og::Unmanageable) or options[:except] && options[:except].include?(klass)
+            scaffold(klass, options)
+          end
+        end
+        scaffold_all false
+      end
+      
+      # compile the scaffold methods
+      
+      scaffolding_classes.each do |klass, options|
+        Scaffolding::ScaffoldCompiler.new(self, klass, options).scaffold
+      end
+    end
+    
+    #--
+    # set the options flag to trigger scaffolding of all classes in second phase
+    # use exclude to ignore classes.... scaffold_all :exclude => [Product, Category]
+    #++
+    
+    def scaffold_all(options = {})
+      if options
+        o = if options.kind_of? Hash then options else Hash.new end
+      else
+        o = nil
+      end
+      @scaffold_all_options = o
+    end
+    
+    #--
+    # Keep track of scaffolded classes on this controller
+    #++
+    
+    def scaffolding_classes
+      # TODO: maybe make this with a inhertitor?
+      # although inhertited scaffolding might be pointless
+      @scaffolding_classes ||= {}
+    end
+    
+    #--
+    # Scaffold all classes flag
+    #++
+    
+    def scaffold_all_options
+      @scaffold_all_options
+    end
+    alias_method :scaffold_all?, :scaffold_all_options
+    
+  end
+
+end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/server.rb

@@ -120,7 +120,11 @@ class Server
     server = Server.new
     server.start(options)
     
-    runner.invoke(server) unless $NITRO_NO_INVOKE 
+    unless $NITRO_NO_INVOKE 
+      runner.invoke(server)
+    else
+      Logger.info 'Running in console mode.'
+    end
     
     return server
   end

data/lib/nitro/server/runner.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 
 require 'glue/configuration'
+require 'nitro/compiler'
 
 module Nitro
 
@@ -151,6 +152,8 @@ class Runner
           irb_name = 'irb'
         end
         ENV['NITRO_INVOKE'] = 'irb'
+        $NITRO_NO_INVOKE = true
+        @server = :console
         conf_file = File.basename(caller.last.split(':').first)
         exec "#{irb_name} -r #{conf_file} -r irb/completion --noinspect"
         exit
@@ -284,31 +287,35 @@ class Runner
 
       @server ||= Runner.adapter
 
-      puts "\n",
-        "==> Listening at #{server.address}:#{server.port}. (#{self.class.mode} mode)",
-        "==> Press Ctrl-C to shutdown; Run with --help for options.\n\n"
+      puts "\n==> Setup for #{self.class.mode} mode"
 
       case @server
         when :webrick
           require 'nitro/adapter/webrick'
+          puts "==> Listening at #{server.address}:#{server.port}."
+          puts "==> Press Ctrl-C to shutdown; Run with --help for options.\n\n"    
           Webrick.start(server)
 
         when :lhttpd
           require 'nitro/adapter/fastcgi'
+          puts "==> Launching lighttpd (FastCGI)."
           `lighttpd -f conf/lhttpd_fcgi.conf`
 
         when :lhttpd_scgi
           require 'nitro/adapter/scgi'
+          puts "==> Launching lighttpd (SCGI)."
           `lighttpd -f conf/lhttpd_scgi.conf`
 
         when :apache
           require 'nitro/adapter/fastcgi'
+          puts "==> Launching apache (FastCGI)."
           `apachectl -d #{Dir.pwd} -f conf/apache.conf -k start`
 
         when :cgi
           require 'nitro/adapter/cgi'
+          puts "==> Using standard CGI. Please look into using Fast/Scgi"
       end
-    
+      
     when :stop
 
       case @server
@@ -342,24 +349,21 @@ class Runner
   # Attempt to load external configuration in Ruby or
   # YAML format. The files:
   #
-  #  * conf/mode.rb
+  # * conf/mode.rb
   # * conf/mode.yaml
   #
   # are considered.
   
   def load_external_configuration(mode = :debug)
-    begin
-      # gmosx: Workaround for an RDoc bug.
-      # require "conf/#{mode}.rb"
-      eval %|require 'conf/#{mode}.rb'|
-    rescue Object
-    end
+    
+    # require "conf/#{mode}.rb"
+    ruby_conf = "conf/#{mode}.rb"
+    load ruby_conf if File.exist?(ruby_conf)
 
     # Try to configure from a yaml file.
-    begin
-      Configuration.load "conf/#{mode}.yml"
-    rescue Object => ex
-    end
+    yml_conf = "conf/#{mode}.yml"
+    Configuration.load yml_conf if File.exist?(yml_conf)
+
   end
 
 end