moomerman-rambo 0.3 → 0.4.1

data/lib/rambo/controller/cache.rb

@@ -0,0 +1,17 @@
+module Cache
+  def fresh?(model, options={})
+    @@etags ||= {}
+    etag = Digest::SHA1.hexdigest(model.inspect)
+    response.header['ETag'] = "\"#{etag}\""
+    response.header['Expires'] = (MooTime.now + options[:expires_in]).httpdate if options[:expires_in]
+    response.header['Cache-Control'] = 'public'
+    if @@etags[request.uri] == etag
+      response.status = 304
+      response.body = ''
+      return true
+    else
+      @@etags[request.uri] = etag
+      return false
+    end
+  end
+end

data/lib/rambo/controller/params.rb

@@ -0,0 +1,26 @@
+module Params
+  def params
+    if !self.request.params.keys.join.include?('[')
+      @params ||= indifferent_hash.merge(self.request.params)
+    else
+      @params ||= self.request.params.inject indifferent_hash do |res, (key,val)|
+        if key.include?('[')
+          head = key.split(/[\]\[]+/)
+          last = head.pop
+          head.inject(res){ |hash,k| hash[k] ||= indifferent_hash }[last] = val
+        else
+          res[key] = val
+        end
+        res
+      end
+    end
+    if request.path_components.size() > 2
+      @params.merge!(:id => request.path_components[3])
+    end
+    @params
+  end
+  
+  def indifferent_hash
+    Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+  end
+end

data/lib/rambo/controller/redirect.rb

@@ -0,0 +1,13 @@
+module Redirect
+  def redirect(destination, options={})
+    destination = destination.to_s if destination.is_a? Symbol
+    unless destination[0,1] == "/"
+      destination = "/#{self.controller}/#{destination}"
+    end
+    puts "redirecting to #{destination}"
+
+    response.status = 302
+    response.header['Location'] = destination
+    return ""
+  end
+end

data/lib/rambo/{templating.rb → controller/template.rb}

@@ -1,4 +1,4 @@
-module Templating
+module Template
   
   @@template_cache = {}
   

data/lib/rambo/controller.rb

@@ -0,0 +1,24 @@
+require 'rambo/controller/template'
+require 'rambo/controller/cache'
+require 'rambo/controller/params'
+require 'rambo/controller/redirect'
+
+module Rambo
+  class Controller
+    attr_accessor :params, :request, :response
+    
+    include Template
+    include Cache
+    include Params
+    include Redirect
+    
+    def controller
+      self.request.controller
+    end
+  
+    def action
+      self.request.action
+    end
+  
+  end
+end

data/lib/rambo/server.rb

@@ -5,8 +5,7 @@ require 'thin'
 
 require 'rambo/lock'
 require 'rambo/proxy'
-require 'rambo/templating'
-require 'rambo/base_controller'
+require 'rambo/controller'
 require 'rambo/time'
 require 'rambo/upload'
 require 'rambo/request'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moomerman-rambo
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.4.1
 platform: ruby
 authors: 
 - Richard Taylor
@@ -13,24 +13,14 @@ date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: thin
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 1.0.0
     version: 
 description: rambo is an experimental ruby web framework
 email: moomerman@gmail.com
@@ -44,13 +34,17 @@ files:
 - README
 - lib/rambo.rb
 - lib/rambo
-- lib/rambo/base_controller.rb
+- lib/rambo/controller.rb
+- lib/rambo/controller
+- lib/rambo/controller/template.rb
+- lib/rambo/controller/cache.rb
+- lib/rambo/controller/redirect.rb
+- lib/rambo/controller/params.rb
 - lib/rambo/lock.rb
 - lib/rambo/server.rb
 - lib/rambo/proxy.rb
 - lib/rambo/request.rb
 - lib/rambo/response.rb
-- lib/rambo/templating.rb
 - lib/rambo/time.rb
 - lib/rambo/upload.rb
 has_rdoc: false

data/lib/rambo/base_controller.rb

@@ -1,71 +0,0 @@
-load 'rambo/templating.rb'
-
-module Rambo
-  class BaseController
-    include Templating
-  
-    attr_accessor :params, :request, :response
-
-    def params
-      if !self.request.params.keys.join.include?('[')
-        @params ||= indifferent_hash.merge(self.request.params)
-      else
-        @params ||= self.request.params.inject indifferent_hash do |res, (key,val)|
-          if key.include?('[')
-            head = key.split(/[\]\[]+/)
-            last = head.pop
-            head.inject(res){ |hash,k| hash[k] ||= indifferent_hash }[last] = val
-          else
-            res[key] = val
-          end
-          res
-        end
-      end
-      if request.path_components.size() > 2
-        @params.merge!(:id => request.path_components[3])
-      end
-      @params
-    end
-  
-    def fresh?(model, options={})
-      @@etags ||= {}
-      etag = Digest::SHA1.hexdigest(model.inspect)
-      response.header['ETag'] = "\"#{etag}\""
-      response.header['Expires'] = (MooTime.now + options[:expires_in]).httpdate if options[:expires_in]
-      response.header['Cache-Control'] = 'public'
-      if @@etags[request.uri] == etag
-        response.status = 304
-        response.body = ''
-        return true
-      else
-        @@etags[request.uri] = etag
-        return false
-      end
-    end
-  
-    def controller
-      self.request.controller
-    end
-  
-    def action
-      self.request.action
-    end
-  
-    def indifferent_hash
-      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
-    end
-  
-    def redirect(destination, options={})
-      destination = destination.to_s if destination.is_a? Symbol
-      unless destination[0,1] == "/"
-        destination = "/#{self.controller}/#{destination}"
-      end
-      puts "redirecting to #{destination}"
-    
-      response.status = 302
-      response.header['Location'] = destination
-      return ""
-    end
-  
-  end
-end