[DRE-commits] r3858 - in packages-wip: . merb merb/branches merb/branches/upstream merb/branches/upstream/current merb/branches/upstream/current/merb-core merb/branches/upstream/current/merb-core/bin merb/branches/upstream/current/merb-gen merb/branches/upstream/current/merb-gen/bin merb/branches/upstream/current/merb-slices merb/branches/upstream/current/merb-slices/bin

[Joshua Timberman]

Author: jtimberman-guest
Date: 2009-07-30 20:19:35 +0000 (Thu, 30 Jul 2009)
New Revision: 3858

Added:
   packages-wip/merb/
   packages-wip/merb/branches/
   packages-wip/merb/branches/upstream/
   packages-wip/merb/branches/upstream/current/
   packages-wip/merb/branches/upstream/current/merb-core/
   packages-wip/merb/branches/upstream/current/merb-core/bin/
   packages-wip/merb/branches/upstream/current/merb-core/bin/merb
   packages-wip/merb/branches/upstream/current/merb-core/bin/merb-specs
   packages-wip/merb/branches/upstream/current/merb-gen/
   packages-wip/merb/branches/upstream/current/merb-gen/bin/
   packages-wip/merb/branches/upstream/current/merb-gen/bin/merb-gen
   packages-wip/merb/branches/upstream/current/merb-slices/
   packages-wip/merb/branches/upstream/current/merb-slices/bin/
   packages-wip/merb/branches/upstream/current/merb-slices/bin/slice
Log:
[svn-inject] Installing original source of merb

Added: packages-wip/merb/branches/upstream/current/merb-core/bin/merb
===================================================================
--- packages-wip/merb/branches/upstream/current/merb-core/bin/merb	                        (rev 0)
+++ packages-wip/merb/branches/upstream/current/merb-core/bin/merb	2009-07-30 20:19:35 UTC (rev 3858)
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'merb-core'
+
+ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a mongrel]
+end
+
+Merb.start
\ No newline at end of file


Property changes on: packages-wip/merb/branches/upstream/current/merb-core/bin/merb
___________________________________________________________________
Added: svn:executable
   + 

Added: packages-wip/merb/branches/upstream/current/merb-core/bin/merb-specs
===================================================================
--- packages-wip/merb/branches/upstream/current/merb-core/bin/merb-specs	                        (rev 0)
+++ packages-wip/merb/branches/upstream/current/merb-core/bin/merb-specs	2009-07-30 20:19:35 UTC (rev 3858)
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__),"..","lib","merb-core","test","run_specs")
+
+run_specs ARGV


Property changes on: packages-wip/merb/branches/upstream/current/merb-core/bin/merb-specs
___________________________________________________________________
Added: svn:executable
   + 

Added: packages-wip/merb/branches/upstream/current/merb-gen/bin/merb-gen
===================================================================
--- packages-wip/merb/branches/upstream/current/merb-gen/bin/merb-gen	                        (rev 0)
+++ packages-wip/merb/branches/upstream/current/merb-gen/bin/merb-gen	2009-07-30 20:19:35 UTC (rev 3858)
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'merb-gen'
+
+Merb::Generators.run_cli(Dir.pwd, 'merb-gen', Merb::VERSION, ARGV)
\ No newline at end of file

Added: packages-wip/merb/branches/upstream/current/merb-slices/bin/slice
===================================================================
--- packages-wip/merb/branches/upstream/current/merb-slices/bin/slice	                        (rev 0)
+++ packages-wip/merb/branches/upstream/current/merb-slices/bin/slice	2009-07-30 20:19:35 UTC (rev 3858)
@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+
+__DIR__ = Dir.pwd
+
+require 'rubygems'
+require 'merb-core'
+require 'merb-slices'
+
+slice_name = File.basename(__DIR__)
+
+Merb::Config.use { |c|
+  c[:framework]           = { :public => [Merb.root / "public", nil] }
+  c[:session_store]       = 'none'
+  c[:exception_details]   = true
+}
+
+if File.exists?(slice_file = File.join(__DIR__, 'lib', "#{slice_name}.rb"))
+  Merb::BootLoader.before_app_loads do
+    $SLICE_MODULE = Merb::Slices.filename2module(slice_file)
+    require slice_file
+  end
+  Merb::BootLoader.after_app_loads do
+    # See Merb::Slices::ModuleMixin - $SLICE_MODULE is used as a flag
+    Merb::Router.prepare do 
+      slice($SLICE_MODULE)
+      slice_id = slice_name.gsub('-', '_').to_sym
+      slice_routes = Merb::Slices.named_routes[slice_id] || {}
+    
+      # Setup a / root path matching route - try several defaults
+      route = slice_routes[:home] || slice_routes[:index]
+      if route
+        params = route.params.inject({}) do |hsh,(k,v)|
+          hsh[k] = v.gsub("\"", '') if k == :controller || k == :action
+          hsh
+        end
+        match('/').to(params)
+      else
+        match('/').to(:controller => 'merb_slices', :action => 'index')
+      end
+    end
+  end
+else
+  puts "No slice found (expected: #{slice_name})"
+  exit
+end
+
+class MerbSlices < Merb::Controller
+  
+  def index
+    html = "<h1>#{slice.name}</h1><p>#{slice.description}</p>"  
+    html << "<h2>Routes</h2><ul>"
+    sorted_names = slice.named_routes.keys.map { |k| [k.to_s, k] }.sort_by { |pair| pair.first }
+    sorted_names.each do |_, name|
+      if name != :default && (route = slice.named_routes[name])
+        if name == :index
+          html << %Q[<li><a href="#{url(route.name)}" title="visit #{name}">#{name}: #{route.inspect}</a></li>]
+        else
+          html << %Q[<li>#{name}: #{route.inspect}</li>]
+        end
+      end
+    end
+    html << "</ul>"
+    html
+  end
+  
+  private
+  
+  def slice
+    @slice ||= Merb::Slices.slices.first
+  end
+  
+end
+
+ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a mongrel]
+end
+
+Merb.start
\ No newline at end of file