Changeset 11

Timestamp:

10/15/06 15:10:20 (2 years ago)

Author:

e.@brainspl.at

Message:

moving things around bear with me

Files:

• (root) (modified) (1 prop)
• LICENSE (moved) (moved from LICENSE.txt)
• README (moved) (moved from README.txt)
• Rakefile (modified) (3 diffs)
• app/views/upload/upload.rhtml (modified) (1 diff)
• bin (added)
• bin/merb (added)
• lib/merb (added)
• lib/merb.rb (modified) (1 diff)
• lib/merb/merb_router.rb (moved) (moved from lib/merb_router.rb) (4 diffs)
• lib/merb_handler.rb (added)
• merb_config.rb (modified) (1 diff)
• server.rb (modified) (1 diff)
• test/unit/route_matcher_test.rb (modified) (1 diff)

Rakefile

@@ -1 +1 @@
-require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'fileutils'
+include FileUtils
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
-
+spec = Gem::Specification.new do |s|
+  s.name = NAME
+  s.version = VERS
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README", "LICENSE"]
+  s.rdoc_options += RDOC_OPTS + 
+    ['--exclude', '^(app|uploads)']
+  s.summary = "Merb == Mongrel + Erb. Pocket rocket web framework."
+  s.description = s.summary
+  s.author = "Ezra Zygmuntowicz"
+  s.email = 'ez@engineyard.com'
+  s.homepage = 'http://merb.devjavu.com'
+  s.executables = ['merb']
+
+  s.add_dependency('mongrel')
+  s.required_ruby_version = '>= 1.8.4'
+
+  s.files = %w(LICENSE README Rakefile server.rb) + Dir.glob("{app,bin,doc,test,lib}/**/*") 
+      
+  s.require_path = "lib"
+  s.bindir = "bin"
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.need_tar = true
+  p.gem_spec = spec
+end
+
+task :install do
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+end
+
+task :uninstall => [:clean] do
+  sh %{sudo gem uninstall #{NAME}}
+end
+
+task :doc_rforge do
+  sh %{rake doc}
+  sh %{scp -r doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
+end
-
-desc 'Run unit tests'
@@ -21 +87 @@
-end
-
-desc 'Run specification tests'
-task :spec do
-  sh %{spec test/spec/*_spec.rb}
-end
-
-desc 'Run rcov'
-task :rcov do
-  sh %{rcov test/unit/*_test.rb test/functional/*_test.rb}
-end
-
-desc 'Run all tests'
-Rake::TestTask.new('test') do |t|
@@ -43 +99 @@
-  sh %{rake spec}
-end
+
+##############################################################################
+# Statistics
+##############################################################################
+
+STATS_DIRECTORIES = [
+  %w(Code               lib/),
+  %w(Unit\ tests        test/unit),
+  %w(Functional\ tests  test/functional)
+].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
+
+desc "Report code statistics (KLOCs, etc) from the application"
+task :stats do
+  require 'extra/stats'
+  verbose = true
+  CodeStatistics.new(*STATS_DIRECTORIES).to_s
+end
+
+##############################################################################
+# SVN
+##############################################################################
+
+desc "Add new files to subversion"
+task :svn_add do
+   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
+end

app/views/upload/upload.rhtml

@@ +1 @@
+<h2>File uploaded successfully</h2>
+
+<p>params for @params[:file].inspect</p>
-<%=@params[:file].inspect %>

lib/merb.rb

@@ -1 +1 @@
-require 'erb'
+
+module Merb
+  VERSION='0.0.1'
+end  
+
-
-module Merb

lib/merb/merb_router.rb

@@ -10 +10 @@
-      @@compiled_statement = String.new
-      yield self
+      compile_router
-    end  
-    
@@ -30 +31 @@
-    def self.compile_router
-      indx = 0
-lam
+router_lambda
-        m << compile(r,indx)
-        indx += 1
-        m
-default_route
-lam
-lam
+nil
+router_lambda
+router_lambda
-    end  
-    
-    def self.compile(route,indx)
+      raise ArgumentError unless String === route[0]
-      code, count = '', 0
-      raise ArgumentError unless String === route[0]
-      
-      while route[0] =~ SECTION_REGEX
-        route[0] = route[0].dup
-        name = $1
-        count += 1
- SECTION_REGEX, '(.+)'
+(SECTION_REGEX, '(.+)')
-        code << "    @sections[:#{name}] = $#{count}\n"
-      end  
@@ -55 +55 @@
-      statement
-    end
-
-
-
-
-
+
-  end
-  
@@ -73 +69 @@
-  end
-  
-  Merb::RouteMatcher.compile_router
-  
-  routes = Merb::RouteMatcher.new
-  puts routes.compiled_statement

merb_config.rb

@@ -13 +13 @@
-end
-
-Merb::RouteMatcher.compile_router

server.rb

@@ -4 +4 @@
-require 'active_support'
-require 'fileutils'
-require 'pp'
-$LOAD_PATH.unshift( File.join( File.dirname( __FILE__ ) , 'lib' ) )
-$LOAD_PATH.unshift( File.join( File.dirname( __FILE__ ) , 'app/controllers' ) )
+require 'merb'
-require 'merb_utils'
-
+_handler
-require 'merb_router'
-require 'merb_config'
-
-
-
-class MerbHandler < Mongrel::HttpHandler
-
-  def process(request, response)
-    if response.socket.closed?
-      return
-    end
-    controller, method, args = handle(request)
-    begin
-      output = if (controller && controller.kind_of?(Merb::Controller))
-        if method
-          ( args ? controller.send( method, args ) : controller.send(method) )
-        else
-          controller.to_s
-        end  
-      else
-        "<html><body>Error: no merb controller found for this url.</body></html>"
-      end
-    rescue Exception => e
-      response_code = 500
-      output = "<html>Error! #{ e.message } - (#{ e.class })" << 
-        "\n" << "#{(e.backtrace or []).join('\n')}</html>"
-    end  
-    response.start(response_code||200) do |head,out|
-      head["Content-Type"] = "text/html"
-      out << output
-    end 
-  end
-  
-  def handle(request)
-    path = request.params["PATH_INFO"]
-    #return [nil, nil, nil ] if path =~ /^\/$/
-    path = path[0..-2] if (path[-1] == ?/)
-    path.sub!(/\/+/, '/')
-    
-    routes = Merb::RouteMatcher.new
-    route = routes.route_request(path)
-    if route
-      [ instantiate_controller(route.delete(:class), request.body, request.params), 
-                               route.delete(:method), route  ]
-    else  
-      ["<html><body>Error: no route matches!</body></html>", nil, nil]
-    end
-  end
-  
-  def instantiate_controller(controller_name, req, env)
-    if !File.exist?(MERB_ROOT+"/app/controllers/#{controller_name}.rb")
-      return Object.const_get(:Noroutefound).new(req, env)
-    end  
-    controller_name.import
-    begin
-      return Object.const_get( controller_name.controller_class_name ).new(req, env)
-    rescue Exception
-      warn "Error getting instance of '#{controller_name.controller_class_name}': #{$!}"
-      raise $!
-    end
-  end
-    
-end
-
-h = Mongrel::HttpServer.new("0.0.0.0", PORT, 40)

test/unit/route_matcher_test.rb

@@ -12 +12 @@
-      r.add '.*', {:class => 'NoRouteFound', :method => 'noroute'}
-    end
-    Merb::RouteMatcher.compile_router
-  end  
-