moomerman-rambo 0.4.2 → 0.4.3

data/README

@@ -5,8 +5,9 @@ sudo gem install moomerman-rambo
 
 To run the example:
 
-clone the repo (the examples are not part of the gem)
+git clone git://github.com/moomerman/rambo.git
 cd rambo/example/blog/
-thin start -R server.ru -p 4000 --threaded
+rake db:setup # assumes database named rambo_blog
+rake server
 
 head over to http://localhost:4000/

data/lib/rambo/env.rb

@@ -0,0 +1,44 @@
+module Rambo
+  class Env
+    def initialize
+      # load from config - only do this IF database required
+      require 'dm-core'
+      require 'dm-validations'
+      require 'dm-timestamps'
+      #DataMapper.setup(:default, 'mysql://localhost/moo_development')
+      @connection ||= DataMapper.setup(
+        :default, 
+        :adapter => :mysql, 
+        :host => 'localhost', 
+        :database => 'rambo_blog', 
+        :username => 'root', 
+        :password => ''
+      )
+      #DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :debug)
+    
+      Dir["controller/*.rb"].each { |x| funkyload x }
+      Dir["model/*.rb"].each { |x| funkyload x }
+      Dir["lib/*.rb"].each { |x| funkyload x }
+    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 ||= {}
+        if cache = @@loadcache[file] 
+          if (mtime = File.mtime(file)) > cache
+            #puts "reloading: #{file}"
+            load file
+            @@loadcache[file] = mtime
+          end
+        else
+          #puts "loading: #{file}"
+          load file
+          @@loadcache[file] = File.mtime(file)
+        end
+      end
+    
+  end
+end

data/lib/rambo/middleware.rb

@@ -0,0 +1,3 @@
+require 'rambo/middleware/lock'
+require 'rambo/middleware/proxy'
+require 'rambo/middleware/upload'

data/lib/rambo/server.rb

@@ -3,33 +3,23 @@
 require 'rubygems'
 require 'thin'
 
-require 'rambo/lock'
-require 'rambo/proxy'
+require 'rambo/env'
 require 'rambo/controller'
+require 'rambo/middleware'
 require 'rambo/time'
-require 'rambo/upload'
 require 'rambo/request'
 require 'rambo/response'
 
 module Rambo
   class Server
-  
+    
     def initialize(options = {})
       @options = options
-      # load from config - only do this IF database required
-      require 'dm-core'
-      require 'dm-validations'
-      require 'dm-timestamps'
-      #DataMapper.setup(:default, 'mysql://localhost/moo_development')
-      DataMapper.setup(:default, :adapter => :mysql, :host => 'localhost', :database => 'moo_development', :username => 'root', :password => '')
-      #DataObjects::Mysql.logger = DataObjects::Logger.new(STDOUT, :debug)
     end
   
     def call(env)
       begin
-        Dir["controller/*.rb"].each { |x| funkyload x }
-        Dir["model/*.rb"].each { |x| funkyload x }
-        Dir["lib/*.rb"].each { |x| funkyload x }
+        Rambo::Env.new
       
         request = Request.new(env)
         response = Response.new
@@ -56,24 +46,5 @@ module Rambo
         return [500, response.header, "<pre><b>#{e.message.gsub("<","&lt;")}</b>\n#{e.backtrace.join("\n")}</pre>"]
       end
     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 ||= {}
-        if cache = @@loadcache[file] 
-          if (mtime = File.mtime(file)) > cache
-            #puts "reloading: #{file}"
-            load file
-            @@loadcache[file] = mtime
-          end
-        else
-          #puts "loading: #{file}"
-          load file
-          @@loadcache[file] = File.mtime(file)
-        end
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moomerman-rambo
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Richard Taylor
@@ -34,19 +34,22 @@ files:
 - README
 - lib/rambo.rb
 - lib/rambo
+- lib/rambo/env.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/middleware.rb
+- lib/rambo/middleware
+- lib/rambo/middleware/lock.rb
 - lib/rambo/server.rb
-- lib/rambo/proxy.rb
+- lib/rambo/middleware/proxy.rb
 - lib/rambo/request.rb
 - lib/rambo/response.rb
 - lib/rambo/time.rb
-- lib/rambo/upload.rb
+- lib/rambo/middleware/upload.rb
 has_rdoc: false
 homepage: http://github.com/moomerman/rambo
 post_install_message: