mongrel2 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3cb27f3588dc682297c9455e76829fed679844
-  data.tar.gz: 1084020e70eeef4256b48081e6e084ef5d7686f7
+  metadata.gz: e5bdea37b7c56e0c93406a5653f43c7f567c5037
+  data.tar.gz: ed56dd644330b5f948426f9255e9210647299735
 SHA512:
-  metadata.gz: 87a4b4eea76ea916e2483c376366be3199f9a211f1f2603e084cfc0ae0f2061bf673374f54deef90a731e1181b62b0ef3af90685936298c9965a986d57ba5f8b
-  data.tar.gz: 0ff2f17129108899f374940aef82e9411f743d114c61a43458a53d2f56b3aba4c7bd4f27b63016d158c8835a8b1781f0b020646e86a15c0a28b31bb14cecec4a
+  metadata.gz: e47dfa343b471dd317ca448de04be667702d9d54321128478368487ea9b6e08d20bc8e02c4066237bdb32e6d6732c804bae4a0ec5e252bba23b4ff668e445ae8
+  data.tar.gz: 185e0c1e5d8d02a031365216baa1d5cdcfdfa5b48cea64f4f23aa56c460e0c724c8b9d4da6ab49399639f80666ac25200eb6cb3939efb2efb53f034fe0e9975c

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.38.0 [2013-09-18] Michael Granger <ged@FaerieMUD.org>
+
+- Update dependencies, add Gemfile.
+- Update to Mongrel2 1.8.1 config schema.
+
+
 == v0.37.0 [2013-09-13] Michael Granger <ged@FaerieMUD.org>
 
 - Make explicitly-set 'nil' body also a bodiless response.

data/README.rdoc

@@ -7,8 +7,7 @@ docs :: http://deveiate.org/code/mongrel2
 
 == Description
 
-Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
-Mongrel2[http://mongrel2.org/].
+Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
 This library includes configuration-database ORM classes, a Ruby
 implementation of the 'm2sh' tool, a configuration DSL for generating config
@@ -174,7 +173,7 @@ library. This implementation differs from them in several ways:
 
 == License
 
-Copyright (c) 2011-2012, Michael Granger
+Copyright (c) 2011-2013, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -15,6 +15,7 @@ end
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 Hoe.plugin :deveiate
+Hoe.plugin :bundler
 
 Hoe.plugins.delete :rubyforge
 
@@ -22,6 +23,7 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.readme_file = 'README.rdoc'
 	self.history_file = 'History.rdoc'
 	self.extra_rdoc_files = Rake::FileList[ '*.rdoc' ]
+	self.license 'BSD'
 
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
@@ -35,11 +37,12 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'loggability','~> 0.5'
 	self.dependency 'sqlite3',    '~> 1.3'
 
+	self.dependency 'amalgalite',      '~> 1.3', :developer
 	self.dependency 'configurability', '~> 2.0', :developer
 	self.dependency 'simplecov',       '~> 0.7', :developer
-	self.dependency 'hoe-deveiate',    '~> 0.1', :developer
+	self.dependency 'hoe-deveiate',    '~> 0.3', :developer
+	self.dependency 'hoe-bundler',     '~> 1.2', :developer
 
-	self.spec_extras[:licenses] = ["BSD"]
 	self.spec_extras[:rdoc_options] = ['-f', 'fivefish', '-t', 'Mongrel2 Ruby Connector']
 	self.require_ruby_version( '>= 1.9.2' )
 

data/data/mongrel2/config.sql

@@ -1,3 +1,5 @@
+begin transaction;
+
 DROP TABLE IF EXISTS server;
 DROP TABLE IF EXISTS host;
 DROP TABLE IF EXISTS handler;
@@ -15,11 +17,12 @@ CREATE TABLE server (id INTEGER PRIMARY KEY,
     error_log TEXT,
     chroot TEXT DEFAULT '/var/www',
     pid_file TEXT,
+    control_port TEXT DEFAULT "",
     default_host TEXT,
-    name TEXT DEFAULT '',
+    name TEXT DEFAULT "",
     bind_addr TEXT DEFAULT "0.0.0.0",
     port INTEGER,
-    use_ssl INTEGER default 0);
+    use_ssl INTEGER DEFAULT 0);
 
 CREATE TABLE host (id INTEGER PRIMARY KEY,
     server_id INTEGER,
@@ -52,8 +55,10 @@ CREATE TABLE route (id INTEGER PRIMARY KEY,
     target_id INTEGER,
     target_type TEXT);
 
+
 CREATE TABLE setting (id INTEGER PRIMARY KEY, key TEXT, value TEXT);
 
+
 CREATE TABLE statistic (id SERIAL,
     other_type TEXT,
     other_id INTEGER,
@@ -67,13 +72,13 @@ CREATE TABLE statistic (id SERIAL,
     sd REAL,
     primary key (other_type, other_id, name));
 
-CREATE TABLE mimetype (id INTEGER PRIMARY KEY, mimetype TEXT, extension TEXT);
-
-CREATE TABLE filter (id INTEGER PRIMARY KEY,
-    server_id INTEGER,
-    name TEXT,
+CREATE TABLE filter (id INTEGER PRIMARY KEY, 
+    server_id INTEGER, 
+    name TEXT, 
     settings TEXT);
 
+CREATE TABLE mimetype (id INTEGER PRIMARY KEY, mimetype TEXT, extension TEXT);
+
 CREATE TABLE IF NOT EXISTS log(id INTEGER PRIMARY KEY,
     who TEXT,
     what TEXT,
@@ -82,3 +87,4 @@ CREATE TABLE IF NOT EXISTS log(id INTEGER PRIMARY KEY,
     how TEXT,
     why TEXT);
 
+commit;

data/data/mongrel2/mimetypes.sql

@@ -848,7 +848,6 @@ insert into mimetype (extension, mimetype) values ('.jpgv', 'video/jpeg');
 insert into mimetype (extension, mimetype) values ('.ftc', 'application/vnd.fluxtime.clip');
 insert into mimetype (extension, mimetype) values ('.pqa', 'application/vnd.palm');
 insert into mimetype (extension, mimetype) values ('.java', 'text/x-java');
-insert into mimetype (extension, mimetype) values ('.apk', 'application/vnd.android.package-archive');
 insert into mimetype (extension, mimetype) values ('.vms', 'chemical/x-vamas-iso14976');
 insert into mimetype (extension, mimetype) values ('.asx', 'video/x-ms-asf');
 

data/lib/mongrel2.rb

@@ -10,6 +10,7 @@ require 'zmq'
 # == Author/s
 #
 # * Michael Granger <ged@FaerieMUD.org>
+# * Mahlon E. Smith <mahlon@martini.nu>
 #
 module Mongrel2
 	extend Loggability
@@ -21,10 +22,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.37.0'
+	VERSION = '0.38.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: cf053ff6b34f $
+	REVISION = %q$Revision: 0ea16429b0cf $
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/config/server.rb

@@ -12,18 +12,19 @@ require 'mongrel2/constants'
 class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	include Mongrel2::Constants
 
-	### As of Mongrel2/1.8.0:
+	### As of Mongrel2/1.8.1:
 	# CREATE TABLE server (id INTEGER PRIMARY KEY,
 	#     uuid TEXT,
 	#     access_log TEXT,
 	#     error_log TEXT,
 	#     chroot TEXT DEFAULT '/var/www',
 	#     pid_file TEXT,
+	#     control_port TEXT DEFAULT "",
 	#     default_host TEXT,
-	#     name TEXT DEFAULT '',
+	#     name TEXT DEFAULT "",
 	#     bind_addr TEXT DEFAULT "0.0.0.0",
 	#     port INTEGER,
-	#     use_ssl INTEGER default 0);
+	#     use_ssl INTEGER DEFAULT 0);
 
 	##
 	# Return the dataset for looking up a server by its UUID.

data/spec/mongrel2/config/dsl_spec.rb

@@ -58,6 +58,7 @@ describe Mongrel2::Config::DSL do
 				chroot '/service/mongrel2'
 				access_log '/var/log/access'
 				error_log '/var/log/errors'
+				control_port '/var/run/intranet.sock'
 			end
 
 			result.should be_a( Mongrel2::Config::Server )
@@ -66,6 +67,7 @@ describe Mongrel2::Config::DSL do
 			result.chroot.should == '/service/mongrel2'
 			result.access_log.should == '/var/log/access'
 			result.error_log.should == '/var/log/errors'
+			result.control_port.should == '/var/run/intranet.sock'
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -200,6 +200,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: amalgalite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: configurability
   requirement: !ruby/object:Gem::Requirement
@@ -234,14 +248,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: hoe-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -257,8 +285,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.7'
 description: |-
-  Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for
-  Mongrel2[http://mongrel2.org/].
+  Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/].
 
   This library includes configuration-database ORM classes, a Ruby
   implementation of the 'm2sh' tool, a configuration DSL for generating config
@@ -383,5 +410,5 @@ rubyforge_project: mongrel2
 rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
-summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for Mongrel2[http://mongrel2.org/]
+summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]
 test_files: []