merb 0.5.3 → 0.9.2

data/app_generators/merb/templates/script/generate

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-# required to overcome a callback in rspec
-def at_exit
-end
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-
-require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-require File.join(Merb.root, 'config', 'dependencies')
-module Kernel
-  undef dependency if defined?(Kernel.dependency)
-end
-
-# Make the App's local gems available
-Gem.clear_paths
-Gem.path.unshift(APP_ROOT / "gems")
-
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-
-# Default is to use rspec generators in gems.  To change this to
-# Test::Unit use [:merb, :test_unit]
-RubiGen::Base.use_component_sources! Merb::GENERATOR_SCOPE
-RubiGen::Scripts::Generate.new.run(ARGV)

data/app_generators/merb/templates/script/stop_merb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-
-pids=[]
-
-port_or_star = ARGV[0] || '*'
-
-Dir[File.dirname(__FILE__)+"/../log/merb.#{port_or_star}.pid"].each do |f|
-  pid = IO.read(f).chomp.to_i
-  puts "killing PID: #{pid}"
-  Process.kill(9, pid)
-  FileUtils.rm f
-end

data/app_generators/merb/templates/script/win_script.cmd

@@ -1 +0,0 @@
-@ruby <%= File.join("script", filename) %> %*

data/app_generators/merb/templates/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-progress
---timeout
-20
---diff

data/app_generators/merb/templates/spec/spec_helper.rb

@@ -1,15 +0,0 @@
-$TESTING=true
-require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-Merb.environment="test"
-require File.join(Merb.root, 'config', 'merb_init')
-
-require 'merb/test/helper'
-require 'merb/test/rspec'
-
-Spec::Runner.configure do |config|
-    config.include(Merb::Test::Helper)
-    config.include(Merb::Test::RspecMatchers)
-end
-
-
-### METHODS BELOW THIS LINE SHOULD BE EXTRACTED TO MERB ITSELF

data/app_generators/merb/templates/test/test_helper.rb

@@ -1,14 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", 'config', 'boot')
-
-$TESTING=true
-
-require 'rubygems'
-require 'test/unit'
-require File.join(Merb.root, 'config', 'merb_init')
-
-require 'merb/test/helper'
-
-class Test::Unit::TestCase
-  include Merb::Test::Helper
-  # Add more helper methods to be used by all tests here...
-end

data/app_generators/merb_plugin/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/app_generators/merb_plugin/merb_plugin_generator.rb

@@ -1,68 +0,0 @@
-class MerbPluginGenerator < RubiGen::Base
-  attr_reader :name
-  
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
-  
-  default_options   :shebang => DEFAULT_SHEBANG
-  
-  
-  def initialize(args, runtime_options = {})
-    super
-    usage if args.empty?
-    @name = args.shift.gsub(/-/,"_")
-    @destination_root = File.expand_path(@name)
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory ''
-      m.directory "lib/#{name}"
-      m.directory "spec"
-      
-      m.template "Rakefile", "Rakefile", :assigns => {:name => name}
-      m.template "README", "README", :assigns => {:name => name}
-
-      m.template "LICENSE", "LICENSE"
-      m.template "TODO", "TODO", :assigns => {:name => name}
-      
-      m.file "spec_helper.rb", "spec/spec_helper.rb"
-
-      m.template "sampleplugin_spec.rb", "spec/#{name}_spec.rb", :assigns => {:name => name}
-      m.template "sampleplugin.rb", "lib/#{name}.rb", :assigns => {:name => name}
-      m.template "merbtasks.rb", "lib/#{name}/merbtasks.rb", :assigns => {:name => name}
-      
-      m.dependency "install_rubigen_scripts", [destination_root, "rubygems"], :shebang => options[:shebang]
-    end
-  end
-  
-  protected
-    def banner
-      <<-EOS
-Creates a Merb plugin stub.
-
-USAGE: #{spec.name} --generate-plugin path"
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # # For each option below, place the default
-      # # at the top of the file next to "default_options"
-      # opts.on("-r", "--ruby=path", String,
-      #        "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
-      #        "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-    
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-
-end

data/app_generators/merb_plugin/templates/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) <%= Time.now.year %> YOUR NAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app_generators/merb_plugin/templates/README

@@ -1,4 +0,0 @@
-<%= name %>
-=================
-
-A plugin for the Merb framework that provides ....

data/app_generators/merb_plugin/templates/Rakefile

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-
-PLUGIN = "<%= name %>"
-NAME = "<%= name %>"
-VERSION = "0.0.1"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://merb-plugins.rubyforge.org/<%= name %>/"
-SUMMARY = "Merb plugin that provides ..."
-
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.4.0')
-  s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
-end

data/app_generators/merb_plugin/templates/TODO

@@ -1,5 +0,0 @@
-TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/<%= name %>.rb
-Add your Merb rake tasks to lib/<%= name %>/merbtasks.rb

data/app_generators/merb_plugin/templates/merbtasks.rb

@@ -1,6 +0,0 @@
-namespace :<%= name %> do
-  desc "Do something for <%= name %>"
-  task :default do
-    puts "<%= name %> doesn't do anything"
-  end
-end

data/app_generators/merb_plugin/templates/sampleplugin.rb

@@ -1,10 +0,0 @@
-# make sure we're running inside Merb
-if defined?(Merb::Plugins)
-
-  # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-  Merb::Plugins.config[:<%= name %>] = {
-    :chickens => false
-  }
-  
-  Merb::Plugins.add_rakefiles "<%= name %>/merbtasks"
-end

data/app_generators/merb_plugin/templates/sampleplugin_spec.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "<%= name %>" do
-  it "should do nothing" do
-    true.should == true
-  end
-end

data/app_generators/merb_plugin/templates/spec_helper.rb

@@ -1,2 +0,0 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')

data/bin/merb

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'merb/server'
-Merb::Server.run

data/lib/autotest/discover.rb

@@ -1,3 +0,0 @@
-Autotest.add_discovery do
-  "merb" if File.exist?('config/merb_init.rb')
-end

data/lib/autotest/merb_rspec.rb

@@ -1,80 +0,0 @@
-# based on rails_rspec.rb from rspec_on_rails by Nick Sieger
-
-### rspec_on_rails (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
-### 
-### Permission is hereby granted, free of charge, to any person
-### obtaining a copy of this software and associated documentation files
-### (the "Software"), to deal in the Software without restriction,
-### including without limitation the rights to use, copy, modify, merge,
-### publish, distribute, sublicense, and/or sell copies of the Software,
-### and to permit persons to whom the Software is furnished to do so,
-### subject to the following conditions:
-### 
-### The above copyright notice and this permission notice shall be
-### included in all copies or substantial portions of the Software.
-### 
-### THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-### EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-### MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-### NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-### BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-### ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-### CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-### SOFTWARE.
-
-require 'autotest/rspec'
-require 'merb/core_ext/inflector'
-
-class Autotest::MerbRspec < Autotest::Rspec
-
-  def initialize # :nodoc:
-    super
-    @exceptions = %r%^\./(?:coverage|gems|doc|log|public|schema|script|previous_failures.txt)%
-    @test_mappings = {
-      %r%^(test|spec)/fixtures/(.*).yml$% => proc { |_, m|
-        ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
-      },
-      %r%^spec/(models|controllers|views|helpers|lib)/.*rb$% => proc { |filename, _|
-        filename
-      },
-      %r%^app/models/(.*)\.rb$% => proc { |_, m|
-        ["spec/models/#{m[1]}_spec.rb"]
-      },
-      %r%^app/helpers/application_helper\.rb$% => proc {
-        files_matching %r%^spec/(views|helpers)/.*_spec\.rb$%
-      },
-      %r%^app/helpers/(.*)_helper\.rb$% => proc { |_, m|
-        if m[1] == "application" then
-          files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-        else
-          ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
-        end
-      },
-      # Handles both the old .rhtml and new .html.erb extensions
-      # index.rhtml    => index_rhtml_spec.rb
-      # index.html.erb => index_html_spec.rb
-      %r%^app/views/([^.]*)\.([^.]*)(\..*)?$% => proc { |_, m|
-        files_matching %r%^spec/views/#{m[1]}(_|\.)#{m[2]}_spec.rb$%
-      },
-      %r%^app/controllers/application\.rb$% => proc { |_, m|
-        files_matching %r%^spec/controllers/.*_spec\.rb$%
-      },
-      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
-        ["spec/controllers/#{m[1]}_spec.rb"]
-      },
-      %r%^config/router\.rb$% => proc { # FIX:
-        files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
-      },
-      %r%^config/database\.yml$% => proc { |_, m|
-        files_matching %r%^spec/models/.*_spec\.rb$%
-      },
-      %r%^(spec/(spec_helper|shared/.*)|config/(dependencies|merb_init|environment(s/test)?))\.rb$% => proc {
-        files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
-      },
-      %r%^lib/(.*)\.rb$% => proc { |_, m|
-        ["spec/lib/#{m[1]}_spec.rb"]
-      },
-    }    
-  end
-    
-end

data/lib/merb.rb

@@ -1,188 +0,0 @@
-require 'rubygems'
-if ENV['SWIFT']
-  begin
-    require 'swiftcore/swiftiplied_mongrel'
-    puts "Using Swiftiplied Mongrel"
-  rescue LoadError
-    require 'mongrel'
-	puts "SWIFT variable set but not installed - falling back to normal Mongrel"
-  end
-elsif ENV['EVENT']
-  begin
-    require 'swiftcore/evented_mongrel' 
-    puts "Using Evented Mongrel"
-  rescue LoadError
-    require 'mongrel'
-	puts "EVENT variable set but swiftiply not installed - falling back to normal Mongrel"
-  end
-elsif ENV['PACKET']
-  begin
-    require 'packet_mongrel' 
-    puts "Using Packet Mongrel"
-  rescue LoadError
-    require 'mongrel'
-	puts "PACKET variable set but packet not installed - falling back to normal Mongrel"
-  end
-else
- require 'mongrel'
-end
-require 'set'
-require 'fileutils'
-require 'merb/erubis_ext'
-require 'merb/logger'
-require 'merb/version'
-require 'merb/config'
-
-autoload :MerbUploadHandler, 'merb/upload_handler'
-autoload :MerbHandler, 'merb/mongrel_handler'
-
-module Merb
-  autoload :AbstractController,     'merb/abstract_controller'
-  autoload :Assets,                 'merb/assets'
-  autoload :Authentication,         'merb/mixins/basic_authentication'
-  autoload :Caching,                'merb/caching'
-  autoload :Const,                  'merb/constants'
-  autoload :Controller,             'merb/controller'
-  autoload :ControllerExceptions,   'merb/exceptions'
-  autoload :ControllerMixin,        'merb/mixins/controller'
-  autoload :Cookies,                'merb/cookies'
-  autoload :Dispatcher,             'merb/dispatcher'
-  autoload :DrbServiceProvider,     'drb_server'
-  autoload :ErubisCaptureMixin,     'merb/mixins/erubis_capture'
-  autoload :GeneralControllerMixin, 'merb/mixins/general_controller'
-  autoload :InlinePartialMixin,     'merb/mixins/inline_partial'
-  autoload :MailController,         'merb/mail_controller'
-  autoload :Mailer,                 'merb/mailer'
-  autoload :PartController,         'merb/part_controller'
-  autoload :Plugins,                'merb/plugins'
-  autoload :Rack,                   'merb/rack_adapter'
-  autoload :RenderMixin,            'merb/mixins/render'
-  autoload :Request,                'merb/request'
-  autoload :ResponderMixin,         'merb/mixins/responder'
-  autoload :Router,                 'merb/router'
-  autoload :Server,                 'merb/server'
-  autoload :SessionMixin,           'merb/session'
-  autoload :Template,               'merb/template'
-  autoload :UploadProgress,         'merb/upload_progress'
-  autoload :ViewContext,            'merb/view_context'
-  autoload :ViewContextMixin,       'merb/mixins/view_context'
-  autoload :WebControllerMixin,     'merb/mixins/web_controller'
-  
-  # This is where Merb-global variables are set and held
-  class << self
-    
-		def environment
-			@environment
-		end
-		
-		def environment=(value)
-			@environment = value
-		end
-		
-		def load_paths
-			@load_paths ||= [ "/app/models/**/*.rb",
-				"/app/controllers/application.rb",
-				"/app/controllers/**/*.rb",
-				"/app/helpers/**/*.rb",
-				"/app/mailers/**/*.rb",
-				"/app/parts/**/*.rb",
-				"/config/router.rb"
-			]
-		end
-		
-		# Application paths
-		def root
-		  @root || Merb::Config[:merb_root] || Dir.pwd
-		end
-		
-		def root_path(*path)
-			File.join(root, *path)
-		end
-		
-		def view_path
-			root_path 'app/views'
-		end
-		
-		def model_path
-			root_path 'app/models'
-		end
-		
-		def application_controller_path
-			root_path 'app/controllers/application.rb'
-		end
-		
-		def controller_path
-			root_path 'app/controllers'
-		end
-		
-		def helper_path
-			root_path 'app/helpers'
-		end
-		
-		def mailer_path
-			root_path 'app/mailers'
-		end
-		
-		def part_path
-		  root_path 'app/parts'
-		end
-		
-		def router_path
-			root_path '/config/router.rb'
-		end
-		
-		def root=(value)
-			@root ||= value
-		end
-		
-		# Logger settings
-		attr :logger, true
-		
-		def log_path
-		  if $TESTING
-        "#{Merb.root}/log/merb_test.log"
-      elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster] )
-        STDOUT
-      else
-        "#{Merb.root}/log/merb.#{Merb::Config[:port]}.log"
-		  end
-		end
-		
-		# Framework paths
-		
-		def framework_root
-			@framework_root ||= File.dirname(__FILE__)
-		end
-		
-		def framework_path(path)
-			File.join(framework_root, path)
-		end
-		
-		def lib_path
-			framework_path 'merb'
-		end
-		
-		def skeleton_path
-			framework_path '../app_generators/merb/templates'
-		end
-  end
-
-  # Set up default generator scope
-  GENERATOR_SCOPE = [:merb_default, :merb, :rspec]
-end
-
-# Load up the core extensions
-require Merb.framework_path('merb/core_ext')
-require Merb.framework_path('merb/version')
-
-# Set the environment
-Merb.environment =  Merb::Config[:environment] || ($TESTING ? 'test' : 'development')
-
-# Create and setup the logger
-Merb.logger = Merb::Logger.new(Merb.log_path)
-Merb.logger.level = Merb::Logger.const_get(Merb::Config[:log_level].upcase) rescue Merb::Logger::INFO
-
-if $TESTING
-  test_files = File.join(Merb.lib_path, 'test', '*.rb')
-  Dir[test_files].each { |file| require file }
-end