mongrel2 0.9.2 → 0.10.0

data/spec/mongrel2/config/dsl_spec.rb

@@ -214,5 +214,32 @@ describe Mongrel2::Config::DSL do
 
 	end
 
+	describe 'filters' do
+
+		it "can add a filter to a server" do
+			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
+				filter '/usr/lib/mongrel2/null.so'
+			end
+
+			result.filters.should have( 1 ).member
+			result.filters.first.should be_a( Mongrel2::Config::Filter )
+			result.filters.first.settings.should == {}
+		end
+
+		it "can add a filter with settings to a server" do
+			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
+				filter '/usr/lib/mongrel2/null.so',
+					extensions: ["*.html", "*.txt"],
+					min_size: 1000
+			end
+
+			result.filters.should have( 1 ).member
+			result.filters.first.should be_a( Mongrel2::Config::Filter )
+			result.filters.first.settings.should ==
+				{ 'extensions' => ["*.html", "*.txt"], 'min_size' => 1000 }
+		end
+
+	end
+
 end
 

data/spec/mongrel2/config/filter_spec.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
+
+	libdir = basedir + "lib"
+
+	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+}
+
+require 'rspec'
+
+require 'spec/lib/helpers'
+
+require 'mongrel2'
+require 'mongrel2/config'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe Mongrel2::Config::Filter do
+
+	# No functionality outside of Sequel::Model's purview yet
+
+end
+

data/spec/mongrel2/config/route_spec.rb

@@ -40,7 +40,7 @@ describe Mongrel2::Config::Route do
 
 	it "returns a Mongrel2::Config::Directory if its target_type is 'dir'" do
 		dir = Mongrel2::Config::Directory.create(
-		 	:base => 'var/www/',
+			:base => 'var/www/',
 			:default_ctype => 'text/plain',
 			:index_file => 'index.html' )
 

data/spec/mongrel2/config/server_spec.rb

@@ -32,6 +32,7 @@ describe Mongrel2::Config::Server do
 	before( :each ) do
 		@server = Mongrel2::Config::Server.new(
 			uuid:         TEST_UUID,
+			chroot:       '/usr/local/www',
 			access_log:   '/logs/access.log',
 			error_log:    '/logs/error.log',
 			pid_file:     '/run/mongrel2.pid',
@@ -80,5 +81,29 @@ describe Mongrel2::Config::Server do
 	end
 
 
+	it "knows where its control socket is if there's no setting for control_port" do
+		Mongrel2::Config::Setting.dataset.truncate
+		@server.control_socket_uri.should == 'ipc://usr/local/www/run/control'
+	end
+
+	it "knows where its control socket is if there is a setting for control_port" do
+		Mongrel2::Config::Setting.dataset.truncate
+		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
+		@server.control_socket_uri.should == 'ipc://usr/local/www/var/run/control.sock'
+	end
+
+	it "can create a Mongrel2::Control for its control port" do
+		Mongrel2::Config::Setting.dataset.truncate
+		sock = @server.control_socket
+		sock.should be_a( Mongrel2::Control )
+		sock.close
+	end
+
+	it "knows what the Pathname of its PID file is" do
+		pidfile = @server.pid_file_path
+		pidfile.should be_a( Pathname )
+		pidfile.to_s.should == '/usr/local/www/run/mongrel2.pid'
+	end
+
 end
 

data/spec/mongrel2/config_spec.rb

@@ -67,6 +67,15 @@ describe Mongrel2::Config do
 		Mongrel2::Config.servers.first.uuid.should == TEST_UUID
 	end
 
+	it "has a convenience method for getting a setting's value" do
+		Mongrel2::Config.init_database
+		Mongrel2::Config::Setting.dataset.truncate
+		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
+		Mongrel2::Config.settings.should be_a( Hash )
+		Mongrel2::Config.settings.should have( 1 ).member
+		Mongrel2::Config.settings[ :control_port ].should == 'ipc://var/run/control.sock'
+	end
+
 	it "can read the configuration schema from a data file" do
 		Mongrel2::Config.load_config_schema.should =~ /create table server/i
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -48,11 +48,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-10-12 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70108858887920 !ruby/object:Gem::Requirement
+  requirement: &70339771539100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,21 +60,21 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70108858887920
+  version_requirements: *70339771539100
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70108858887400 !ruby/object:Gem::Requirement
+  requirement: &70339771538660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.26'
+        version: '3.31'
   type: :runtime
   prerelease: false
-  version_requirements: *70108858887400
+  version_requirements: *70339771538660
 - !ruby/object:Gem::Dependency
   name: amalgalite
-  requirement: &70108858886980 !ruby/object:Gem::Requirement
+  requirement: &70339771538220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70108858886980
+  version_requirements: *70339771538220
 - !ruby/object:Gem::Dependency
   name: tnetstring
-  requirement: &70108858886420 !ruby/object:Gem::Requirement
+  requirement: &70339771537780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -93,21 +93,43 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70108858886420
+  version_requirements: *70339771537780
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70108858885920 !ruby/object:Gem::Requirement
+  requirement: &70339771537340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70339771537340
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &70339771536880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70108858885920
+  version_requirements: *70339771536880
+- !ruby/object:Gem::Dependency
+  name: sysexits
+  requirement: &70339771536400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70339771536400
 - !ruby/object:Gem::Dependency
   name: zmq
-  requirement: &70108858885480 !ruby/object:Gem::Requirement
+  requirement: &70339771535960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -115,10 +137,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70108858885480
+  version_requirements: *70339771535960
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70108858885040 !ruby/object:Gem::Requirement
+  requirement: &70339771535500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -126,10 +148,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *70108858885040
+  version_requirements: *70339771535500
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70108858884580 !ruby/object:Gem::Requirement
+  requirement: &70339771535040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -137,10 +159,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70108858884580
+  version_requirements: *70339771535040
 - !ruby/object:Gem::Dependency
   name: configurability
-  requirement: &70108858884120 !ruby/object:Gem::Requirement
+  requirement: &70339771534580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -148,21 +170,21 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70108858884120
+  version_requirements: *70339771534580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70108858883700 !ruby/object:Gem::Requirement
+  requirement: &70339771534040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70108858883700
+  version_requirements: *70339771534040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70108858883240 !ruby/object:Gem::Requirement
+  requirement: &70339771533600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -170,7 +192,18 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70108858883240
+  version_requirements: *70339771533600
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70339771667280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: *70339771667280
 description: ! "Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for \nMongrel2[http://mongrel2.org/].\n\nThis
   library includes configuration-database ORM classes, a Ruby\nimplementation of the
   'm2sh' tool, a configuration DSL for generating config\ndatabases in pure Ruby,
@@ -219,6 +252,7 @@ files:
 - lib/mongrel2/config.rb
 - lib/mongrel2/config/directory.rb
 - lib/mongrel2/config/dsl.rb
+- lib/mongrel2/config/filter.rb
 - lib/mongrel2/config/handler.rb
 - lib/mongrel2/config/host.rb
 - lib/mongrel2/config/log.rb
@@ -248,6 +282,7 @@ files:
 - spec/lib/matchers.rb
 - spec/mongrel2/config/directory_spec.rb
 - spec/mongrel2/config/dsl_spec.rb
+- spec/mongrel2/config/filter_spec.rb
 - spec/mongrel2/config/handler_spec.rb
 - spec/mongrel2/config/host_spec.rb
 - spec/mongrel2/config/log_spec.rb
@@ -292,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 1.8.10
+rubygems_version: 1.8.14
 signing_key: 
 specification_version: 3
 summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for  Mongrel2[http://mongrel2.org/]