cohitre-perro 0.6.0 → 0.8.0

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 lib/perro.rb
-lib/perro/haml_handler.rb
-lib/perro/proxy_handler.rb
-lib/perro/sass_handler.rb
+lib/perro/route.rb
 test/test_perro.rb
+test/sample.rb

data/README.txt

@@ -26,21 +26,30 @@ help with that if asked nicely.
 
 require "rubygems"
 require "perro"
+require "sass"
+require "open-uri"
 
 HOME_FOLDER = File.expand_path( "~" )
 
-server = Perro::Server.new(3001)
-server.static( "/javascripts" , "#{HOME_FOLDER}/libs/javascript")
-server.sass( "/stylesheets" , "#{HOME_FOLDER}/libs/sass")
-server.proxy( "/service" , "http://example.com" )
-server.haml( "/" , "#{File.expand_path(".")}/" )
+server = Perro::Server.new(3000)
+
+server.get "/javascripts/:file" do |params|
+  open( "#{HOME_FOLDER}/libs/javascript#{params[:file]}" ).read
+end
+
+server.get "/stylesheets/:file.css" do |params|
+  Sass::Engine.new( open("#{HOME_FOLDER}#{params[:file]}.sass").read )
+end
+
+server.get "/proxy" do |params|
+  open( "http://cohitre.com/#{params[:path]}" )
+end
+
 server.start
 
 == REQUIREMENTS:
 
 mongrel
-haml
-
 
 == INSTALL:
 

data/Rakefile

@@ -6,5 +6,5 @@ Hoe.new('perro', Perro::VERSION) do |p|
   p.name = "perro"
   p.developer('carlos', 'carlosrr@gmail.com')
   p.summary = "A quick and dirty solution for serving files easily."
-  p.extra_deps = [ ["mongrel", ">= 1.1.4"], ["haml" , ">= 2.0.2"] ]
+  p.extra_deps = [ ["hoe" , ">= 1.8.0"] , ["mongrel", ">= 1.1.4"] ]
 end

data/lib/perro/route.rb

@@ -0,0 +1,19 @@
+module Perro
+  class Route
+    def initialize( r )
+      @regexp = Regexp.new( Regexp.escape( r ).gsub(/:[\w]*/ , '(.*?)' )+"(\\?.*)?$" )
+      @params_symbols = r.scan(/:(\w+)/).collect{ |m| m[0] }
+    end
+
+    def match( string )
+      match = string.match( @regexp )
+      return nil if match.nil?
+      
+      params = {}
+      @params_symbols.each_index do |i|
+        params[@params_symbols[i].to_sym] = match[i+1]
+      end
+      params
+    end
+  end
+end

data/lib/perro.rb

@@ -1,52 +1,85 @@
 begin
   require 'action_controller'
+  ActionView::Base.helper_modules.each {|m| include m }  
 rescue
   puts "It appears that you don't have action_controller."
   puts "`sudo gem install rails` might help you with that."
 end
 
-require "open-uri"
 require "mongrel"
-
-ActionView::Base.helper_modules.each {|m| include m }
+require "#{File.expand_path( __FILE__ +"/..")}/perro/route.rb"
 
 module Perro
-  VERSION = '0.6.0'
-
-  class Server
-    attr_reader :routes
-    @@route_keys = {}
+  VERSION = '0.8.0'
 
+  class StringHandler < Mongrel::HttpHandler
+    def initialize
+      @routes = []
+      @handlers = {}
+    end
 
-    def self.route_manager key , handler
-      @@route_keys[key] = handler
+    def push( route , block)
+      r = Route.new( route[:route] )
+      @routes.push( route.merge( { :route_object => r } ) )
+      @handlers[r] = block
     end
 
-    def initialize port=3000
-      @routes_manager = {}
-      @port = port
+    def find_handler( uri )
+      @routes.find{|r| r[:route_object].match(uri)}
     end
 
-    def route key , uri , file
-      @routes_manager[key] ||= []
-      r = { :route => uri , :resource => file }
-      @routes_manager[key].push( r )
+    def process request , response
+      uri = request.params["PATH_INFO"]
+
+      handler = self.find_handler( uri )
+
+      if ( handler.nil? )
+        response.start(404) do |head,out|
+          head['Content-Type'] = 'text/html'
+          out.write( "404 error" )
+        end
+      else
+        
+        route = handler[:route_object]
+
+        form_params = {}
+        (request.params["QUERY_STRING"]||"").split("&").each do |d|
+          pair = d.split("=")
+          form_params.merge!( {pair[0].to_sym => pair[1] })
+        end
+        
+        user_params = route.match( uri ).merge( form_params ).merge({
+          :path => request.params["PATH_INFO"]
+        })
+        puts user_params.inspect
+        result = @handlers[route].call( user_params )
+
+        response.start(200) do |head,out|
+          head['Content-Type'] = handler[:mime]
+          out.write( result.to_s )
+        end
+      end
     end
+  end
 
-    def static uri , file
-      route( :static , uri , file )
+  class Server
+    attr_reader :path
+    
+    def initialize port=3000
+      @global_handler = StringHandler.new()
+      @port = port
     end
 
+    def get route , mime="text/html" , &block
+      @global_handler.push( { :route => route , :mime=>mime } , block )
+    end
+    
     def start
-      routes = @routes_manager
+      routes = @global_handler
       port = @port
       config = Mongrel::Configurator.new :host => "0.0.0.0" do
         listener :port => port do
-          routes.each do |k,v|
-            v.each do |r|
-              uri( r[:route] , :handler => @@route_keys[k].new( r[:resource]) )
-            end
-          end
+          uri("/" , :handler => routes )
         end
         run
       end
@@ -58,10 +91,4 @@ module Perro
       config.join
     end
   end
-
-  Server.route_manager( :static , Mongrel::DirHandler )
 end
-
-require "#{File.expand_path( __FILE__+"/.." )}/perro/haml_handler.rb"
-require "#{File.expand_path( __FILE__+"/.." )}/perro/proxy_handler.rb"
-require "#{File.expand_path( __FILE__+"/.." )}/perro/sass_handler.rb"

data/test/sample.rb

@@ -0,0 +1,22 @@
+require "rubygems"
+require "perro"
+require "sass"
+require "open-uri"
+
+HOME_FOLDER = File.expand_path( "~" )
+
+server = Perro::Server.new(3000)
+
+server.get "/javascripts/:file" do |params|
+  open( "#{HOME_FOLDER}/libs/javascript#{params[:file]}" ).read
+end
+
+server.get "/stylesheets/:file.css" do |params|
+  Sass::Engine.new( open("#{HOME_FOLDER}#{params[:file]}.sass").read )
+end
+
+server.get "/proxy/:uri" do |params|
+  open( "http://cohitre.com/#{params[:uri]}" ).read
+end
+
+server.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cohitre-perro
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - carlos
@@ -9,9 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-10 00:00:00 -07:00
+date: 2008-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
   version_requirement: 
@@ -37,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: Perro is a light server built on top of mongrel that helps at least  one developer be happy. If it had been designed as production server  it would have a cooler name. Like "Dinosaur" or "Freckle".  The Internet is a global system of interconnected computer networks.  Developer creates files that are served through this global system.  Developer may be tempted to develop such files by creating a folder,  moving the files to such folder, double clicking them and watching  what happens on the browser whose address bar reads  "file:///Users/cohitre/development/my-project/index.html".  Perro helps developer be happy by helping overcome temptation.
 email: 
@@ -56,10 +65,9 @@ files:
 - README.txt
 - Rakefile
 - lib/perro.rb
-- lib/perro/haml_handler.rb
-- lib/perro/proxy_handler.rb
-- lib/perro/sass_handler.rb
+- lib/perro/route.rb
 - test/test_perro.rb
+- test/sample.rb
 has_rdoc: true
 homepage: http://code.cohitre.com
 post_install_message: 

data/lib/perro/haml_handler.rb

@@ -1,34 +0,0 @@
-require "haml"
-
-module Perro
-
-  class HAMLHandler < Mongrel::HttpHandler
-    def initialize file
-      super()
-      @file = file
-    end
-
-    def process request , response
-      filename = request.params['PATH_INFO'].empty? ? "#{@file}/index.haml" : @file+request.params["PATH_INFO"]
-      if ( !File.exists?( filename) )
-        response.start(404) do |head,out|
-          out.write( "404 Error : File #{filename} was not found" )
-        end
-      else
-        response.start(200) do |head,out|
-          head['Content-Type'] = 'text/html'
-          engine = Haml::Engine.new( open(filename).read )
-          out.write( engine.render )
-        end
-      end
-    end
-  end
-
-  class Server
-    def haml uri , file
-      route( :haml , uri , file )
-    end
-  end
-
-  Server.route_manager( :haml , HAMLHandler )
-end

data/lib/perro/proxy_handler.rb

@@ -1,23 +0,0 @@
-module Perro
-
-  class ProxyHandler < Mongrel::HttpHandler
-    def initialize url
-      super()
-      @url = url
-    end
-
-    def process request , response
-      response.start(200) do |head,out|
-        head['Content-Type'] = 'text/html'
-        out.write( open(@url + request.params["PATH_INFO"]).read )
-      end
-    end
-  end
-
-  class Server
-    def proxy uri , file
-      route( :proxy , uri , file )
-    end
-  end
-  Server.route_manager( :proxy , ProxyHandler )
-end

data/lib/perro/sass_handler.rb

@@ -1,28 +0,0 @@
-require "sass"
-
-module Perro
-
-  class SASSHandler < Mongrel::HttpHandler
-    def initialize path
-      super()
-      @path = path
-    end
-
-    def process request , response
-      response.start(200) do |head,out|
-        head['Content-Type'] = 'text/css'
-
-        engine = Sass::Engine.new( open("#{@path}#{request.params["PATH_INFO"]}").read )
-
-        out.write( engine.render )
-      end
-    end
-  end
-
-  class Server
-    def sass uri , file
-      route( :sass , uri , file )
-    end
-  end
-  Server.route_manager( :sass , SASSHandler )
-end