moomerman-rambo 0.4.11 → 0.5.1

data/lib/rambo/application_context.rb

@@ -0,0 +1,52 @@
+module Rambo
+  class ApplicationContext
+    attr_accessor :application_name
+    
+    def initialize(application_name = nil)
+      @application_name = application_name
+      puts "Initializing application: #{application_name || 'default'}"
+      @prefix = "#{self.application_name}/" if self.application_name
+      @prefix ||= ''
+      load_classes
+    end
+    
+    def load_classes
+      Dir["#{@prefix}controller/*.rb"].each { |x| funkyload x; }
+      Dir["#{@prefix}model/*.rb"].each { |x| funkyload x }
+      Dir["#{@prefix}lib/*.rb"].each { |x| funkyload x }
+      Dir["#{@prefix}*.rb"].each { |x| funkyload x unless x == 'Rakefile.rb' }
+    end
+    
+    def reload
+      load_classes
+    end
+    
+    def view_path
+      "./#{@prefix}view"
+    end
+    
+    private
+      def funkyload(file)
+        @@loadcache ||= {}
+        begin
+          if cache = @@loadcache[file]
+            return if Env.config['rambo'] and Env.config['rambo']['reload_classes'] == false
+            if (mtime = File.mtime(file)) > cache
+              puts "rambo: reloading: #{file}"
+              load file
+              @@loadcache[file] = mtime
+            end
+          else
+            puts " ->  loading: #{file}"
+            load file
+            @@loadcache[file] = File.mtime(file)
+          end
+        rescue Exception => e
+          puts "Exception loading class [#{file}]: #{e.message}"
+          puts e.backtrace.join("\n")
+          raise e
+        end
+      end
+    
+  end
+end

data/lib/rambo/application_request.rb

@@ -0,0 +1,25 @@
+module Rambo
+  class ApplicationRequest < Rambo::Request
+    
+    def initialize(env)
+      super
+    end
+    
+    def application
+      path_components[1]
+    end
+    
+    def controller
+      path_components[2] || default_controller
+    end
+  
+    def action
+      path_components[3] || 'index'
+    end
+    
+    def controller_class
+      self.application.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase } + '::' + super
+    end
+    
+  end
+end

data/lib/rambo/controller.rb

@@ -12,7 +12,7 @@ module Rambo
     include Params
     include Redirect
     
-    def rendered?
+    def already_rendered?
       @rendered
     end
     

data/lib/rambo/controller/template.rb

@@ -7,24 +7,32 @@ module Template
     render :erb, template, options, locals
   end
   
+  def haml(template, options={}, locals={})
+    require 'haml' unless defined? ::Haml
+    render :haml, template, options, locals
+  end
+  
   private
     def render(engine, template, options={}, locals={})
       # extract generic options
       layout = options.delete(:layout)
       layout = :layout if layout.nil? || layout == true
-      views = options.delete(:views) || "./view"
+      views = options.delete(:views) || self.request.application_context.view_path
       locals = options.delete(:locals) || locals || {}
- 
+
       # render template
-      data = lookup_template(engine, template, views)
-      output = __send__("render_#{engine}", template, data, options, locals)
- 
+      data, options[:filename], options[:line] = lookup_template(engine, template, views)
+      output = __send__("render_#{engine}", data, options, locals)
+
       # render layout
-      if layout && data = lookup_layout(engine, layout, views)
-        __send__("render_#{engine}", layout, data, options, {}) { output }
-      else
-        output
+      if layout
+        data, options[:filename], options[:line] = lookup_layout(engine, layout, views)
+        if data
+          output = __send__("render_#{engine}", data, options, locals) { output }
+        end
       end
+
+      output
     end
  
     def lookup_template(engine, template, views_dir)
@@ -34,14 +42,14 @@ module Template
         #   cached
         # else
           path = ::File.join(views_dir, "#{template}.#{engine}")
-          res = ::File.read(path)
+          [ ::File.read(path), path, 1 ]
         #  @@template_cache[template] = res
         #  res
         #end
       when Proc
-        template.call
+        [template.call, template, 1]
       when String
-        template
+        [template, template, 1]
       else
         raise ArgumentError
       end
@@ -53,7 +61,7 @@ module Template
       nil
     end
  
-    def render_erb(template, data, options, locals, &block)
+    def render_erb(data, options, locals, &block)
       original_out_buf = @_out_buf
       data = data.call if data.kind_of? Proc
  
@@ -65,4 +73,8 @@ module Template
       @_out_buf, result = original_out_buf, @_out_buf
       result
     end
+    
+    def render_haml(data, options, locals, &block)
+      ::Haml::Engine.new(data, options).render(self, locals, &block)
+    end
 end

data/lib/rambo/env.rb

@@ -1,3 +1,6 @@
+# Env handles all the configuration loading, database initialization and class (re)loading
+# would be nice to allow the user to specify their own init though if they want
+# Env.new can be called anywhere in any application and therefore acts as a global config
 module Rambo
   class Env
     def self.config
@@ -8,12 +11,16 @@ module Rambo
     def initialize
       begin
         # TODO: config reload
-      
+        
+        if dbconf = Env.config['mongodb']
+          require 'mongomapper'
+          @@database ||= MongoMapper.database = dbconf['database']
+        end
+        
         if dbconf = Env.config['datamapper']
           require 'dm-core'
           require 'dm-validations'
           require 'dm-timestamps'
-          #DataMapper.setup(:default, 'mysql://localhost/moo_development')
           @@connection ||= DataMapper.setup(
             :default,
             :adapter => :mysql, 
@@ -27,38 +34,10 @@ module Rambo
       rescue Exception => e
         puts "Exception initializing environment: #{e.message}"
         puts e.backtrace.join("\n")
+        raise e
       end
       
-      Dir["controller/*.rb"].each { |x| funkyload x }
-      Dir["model/*.rb"].each { |x| funkyload x }
-      Dir["lib/*.rb"].each { |x| funkyload x }
-      Dir["*.rb"].each { |x| funkyload x unless x == 'Rakefile.rb' }
     end
     
-    private
-      # turn this into a thread that checks every x seconds
-      # (any chance of a callback?) so it is outside of the 
-      # request/response cycle
-      def funkyload(file)
-        @@loadcache ||= {}
-        begin
-          if cache = @@loadcache[file]
-            return if Env.config['rambo'] and Env.config['rambo']['reload_classes'] == false
-            if (mtime = File.mtime(file)) > cache
-              puts "rambo: reloading: #{file}"
-              load file
-              @@loadcache[file] = mtime
-            end
-          else
-            #puts "rambo: loading: #{file}"
-            load file
-            @@loadcache[file] = File.mtime(file)
-          end
-        rescue Exception => e
-          puts "Exception loading class [#{file}]: #{e.message}"
-          puts e.backtrace.join("\n")
-        end
-      end
-    
   end
 end

data/lib/rambo/middleware/proxy.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'right_http_connection'
+#require 'right_http_connection'
 
 module Rack
   class Proxy

data/lib/rambo/request.rb

@@ -1,3 +1,5 @@
+require 'rack'
+
 module Rambo
   class Request < Rack::Request
     def user_agent
@@ -10,11 +12,11 @@ module Rambo
     end
   
     def path
-      env["REQUEST_PATH"]
+      @env["REQUEST_PATH"]
     end
   
     def uri
-      env["REQUEST_URI"]
+      @env["REQUEST_URI"]
     end
   
     def path_components
@@ -22,13 +24,21 @@ module Rambo
     end
     
     def default_controller
-      if Rambo::Env.config['rambo']
-        Rambo::Env.config['rambo']['default_controller'] || 'home'
+      if rambo_conf = Rambo::Env.config['rambo']
+        rambo_conf['default_controller'] || 'home'
       else
         'home'
       end
     end
     
+    def application_context
+      @application_context
+    end
+    
+    def application_context=(ctx)
+      @application_context = ctx
+    end
+    
     def controller
       path_components[1] || default_controller
     end
@@ -36,7 +46,11 @@ module Rambo
     def action
       path_components[2] || 'index'
     end
-  
+    
+    def controller_class
+      self.controller.downcase.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase } + 'Controller'
+    end
+    
     # Override Rack 0.9.x's #params implementation (see #72 in lighthouse)
     def params
       self.GET.update(self.POST)
@@ -44,4 +58,4 @@ module Rambo
       self.GET
     end
   end
-end
+end

data/lib/rambo/server.rb

@@ -1,52 +1,67 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'thin'
-
 require 'rambo/env'
 require 'rambo/controller'
 require 'rambo/middleware'
 require 'rambo/time'
 require 'rambo/request'
+require 'rambo/application_request'
 require 'rambo/response'
+require 'rambo/application_context'
 
+# Server simply routes the request to the correct controller/action and returns the result
 module Rambo
   class Server
     
     def initialize(options = {})
       @options = options
+      env = Rambo::Env.new
+      @contexts = {
+        'default' => Rambo::ApplicationContext.new(),
+        #'blog' => Rambo::ApplicationContext.new('blog')
+      }
     end
-  
+    
     def call(env)
       begin
-        Rambo::Env.new
-      
+        
+        @contexts.each { |key, context| context.reload } if Rambo::Env.config
+        
         request = Request.new(env)
         response = Response.new
-      
-        ctl_string = (request.controller.downcase.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase } + 'Controller')
+        
+        if @contexts.keys.include? request.controller.downcase
+          current_context = @contexts[request.controller.downcase]
+          request = Rambo::ApplicationRequest.new(env)
+        end
+        current_context ||= @contexts['default']
+        request.application_context = current_context
+        
+        #puts "rambo: looking for #{request.controller_class}"
+        
         begin
-          obj = Object.module_eval("::#{ctl_string}", __FILE__, __LINE__).new
+          controller = Object.module_eval("::#{request.controller_class}", __FILE__, __LINE__).new
         rescue Exception => e
-          return [404, response.header, "<h1>Controller #{ctl_string} Not Found</h1>"]
+          return [404, response.header, "<h2>Routing error: controller <span style='color:grey'>#{request.controller}</span> not found</h2>"]
+        end
+        controller.request = request
+        controller.response = response
+        
+        controller.init if controller.respond_to? :init 
+        
+        unless controller.respond_to? request.action
+          return [404, response.header, "<h2>Routing error: action <span style='color:grey'>#{request.action}</span> not found in <span style='color:grey'>#{request.controller}</span></h2>"]
         end
-        obj.request = request
-        obj.response = response
         
-        obj.init if obj.respond_to? :init 
+        result = controller.send(request.action) unless controller.already_rendered?
         
-        #begin
-          result = obj.send(request.action) unless obj.rendered?
-        #rescue Exception => e
-          #return [404, response.header, "<h1>Action #{request.action} Not Found</h1>"]
-        #end
         response.body = result if result
         
         [response.status, response.header, response.body]
       rescue Exception => e
         puts e.message
-        return [500, response.header, "<pre><b>#{e.message.gsub("<","&lt;")}</b>\n#{e.backtrace.join("\n")}</pre>"]
+        return [500, {}, "<pre><b>#{e.message.gsub("<","&lt;")}</b>\n#{e.backtrace.join("\n")}</pre>"]
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moomerman-rambo
 version: !ruby/object:Gem::Version 
-  version: 0.4.11
+  version: 0.5.1
 platform: ruby
 authors: 
 - Richard Taylor
@@ -48,10 +48,13 @@ files:
 - lib/rambo/middleware/proxy.rb
 - lib/rambo/request.rb
 - lib/rambo/response.rb
+- lib/rambo/application_request.rb
+- lib/rambo/application_context.rb
 - lib/rambo/time.rb
 - lib/rambo/middleware/upload.rb
 has_rdoc: false
 homepage: http://github.com/moomerman/rambo
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -73,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rambo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: rambo is an experimental ruby web framework