This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
def exiting=(bool) | |
Extlib.exiting = bool | |
if bool && Extlib.const_defined?("Pooling") && Extlib::Pooling.scavenger? | |
Extlib::Pooling.scavenger.wakeup | |
end | |
@exiting = bool | |
end | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
given "logged in" do | |
login | |
end | |
context "when logged in" do | |
context "Homepage: url(:home)", :given => "logged in" do | |
before(:each) do | |
@rack = request(:home) | |
end | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/merb-core.rb b/lib/merb-core.rb | |
index 28317f1..f9f034a 100644 | |
--- a/lib/merb-core.rb | |
+++ b/lib/merb-core.rb | |
@@ -36,7 +36,15 @@ module Merb | |
module GlobalHelpers; end | |
class << self | |
- attr_accessor :exiting | |
+ attr_reader :exiting |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
def self.update_logger | |
Merb::Config[:log_stream] = File.open(Merb::Config[:log_file], "w+") if Merb::Config[:log_file] | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Speakers < Application | |
# provides :xml, :yaml, :js | |
def index | |
@speakers = Speaker.all | |
display @speakers | |
end | |
def show(id) | |
@speaker = Speaker.get(id) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require "rubygems" | |
# Add the local gems dir if found within the app root; any dependencies loaded | |
# hereafter will try to load from the local gems before loading system gems. | |
if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil? | |
$BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir) | |
end | |
require "merb-core" | |
require "spec" # Satisfies Autotest and anyone else not using the Rake tasks |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtY3Of5hXBuEVA2+fmOjcsIuHf0zj5dwo5xcesA9EE6+J+mAEGeJHhk30IC41B0GBA0L0geBIy7tOieRSArVrsai6AeoyNMJ8nZT99DALA2NAdfKqWvDIDH+c5Ddq1YSKCnGgzaWOXBt28GWwMZ851TKN1U7iKJ2d3itxbH0b3jrvEaWbJVBAeCe7wgSiBy2AXAl42IAdQizhMYqf2QjFZuaq9PIaeH1ARDVV+RZJvNImHqZS0yAYAfpz3O7EcXPp5WUvw2+x6eletqwPJbvSTAc3eA29BfehDxw4tt8ugXpZie+o87fAJcr/YfLqdKiEjYRcBs0Wy69vIcIcTRGVsQ== [email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Host merbivore.com | |
HostKeyAlias ey00-s00063 | |
Hostname 65.74.171.253 | |
Port 8063 | |
User merb | |
ForwardAgent yes | |
IdentityFile ~/.ssh/id_rsa_ey |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/rdoc.rb b/lib/rdoc.rb | |
index 797b119..98d6af1 100644 | |
--- a/lib/rdoc.rb | |
+++ b/lib/rdoc.rb | |
@@ -389,7 +389,7 @@ module RDoc | |
CONSTANT_MODIFIERS = GENERAL_MODIFIERS | |
METHOD_MODIFIERS = GENERAL_MODIFIERS + | |
- %w[arg args yield yields notnew not-new not_new doc] | |
+ %w[arg args yield yields notnew not-new not_new doc api] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merb::Config.use { |c| | |
c[:session_store] = :none | |
c[:log_level] = :error # or error, warn, info or fatal | |
c[:log_stream] = STDOUT | |
c[:use_mutex] = false | |
c[:reload_classes] = false | |
c[:reload_templates] = false | |
} | |
Merb::Router.prepare do |