m2config 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8af32f60790056db4c869961bf53572607910579
+  data.tar.gz: 94bece67112686d6f40e58a5f57647b869dbb8d0
+SHA512:
+  metadata.gz: a85f7fc5d80cb047a69494d85a433cf598b5dc22703c5bc509056b9027f93ebb7410b7b3646160fe02d730447abd2b86f877356787ed8ce1b98405637d4b5074
+  data.tar.gz: d5b4d69be4e351300217f8c5ae0414fbb4926d388d6ddab722a7e54da1e50aee5fb80c187d25ff770102ce9123e773c634fe0e1f3d051e10bf641ec1c10d31b0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -48,6 +48,25 @@ exComHost.add_route pubRoute
 server.add_host exComHost
 ```
 
+Keep in mind that these lines will create their corresponding database
+records every time the script is run. For simplicity there is no check
+for duplicates. This has the benefit of complete flexibility and
+control but *you* must ensure that the DB ends up looking the way you
+want.
+
+You can swiftly dump your config using:
+
+```ruby
+require "pp"
+
+pp Server.all
+pp Host.all
+pp Handler.all
+pp Dir.all
+pp Route.all
+
+```
+
 ### This is Sequel
 
 The classes mapping the configuration are
@@ -61,7 +80,9 @@ A few features that you may miss if your needs go beyond mine:
 
   - MIME types are not handled (trivial to add, just ask)
   - Multiple DBs in same process
-  - A DSL-like syntax (probably improves readability in complex setups)
+  - A DSL-like syntax (likely to improve readability in complex setups)
+  - Declare proper associations
+  - Cleanup / consolidate DB (delete unreferenced entries)
   
   
   

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/m2config/dir.rb

@@ -5,6 +5,10 @@ module M2Config
     def initialize( fields )
       fields[:default_ctype] ||= "application/octet-stream"
       fields[:index_file] ||= "index.html"
+      raise ArgumentError, "Base directories are relative to chroot and must not start with a slash (as in your <#{fields[:base]}>)" if 
+        fields[:base] =~ /^\/.+/
+      raise ArgumentError, "Base directories must end with a slash (your <#{fields[:base]}> does not)" if 
+        !(fields[:base] =~ /\/$/)
       super(fields, false)
       save
     end

data/lib/m2config/handler.rb

@@ -5,6 +5,7 @@ module M2Config
     def initialize( fields )
       raise ArgumentError, "The send and receive endpoints can not be the same" if
         fields[:send_spec] == fields[:recv_spec]
+      fields[:recv_ident] ||= ""
       super(fields, false)
       save
     end

data/lib/m2config/host.rb

@@ -3,6 +3,20 @@ module M2Config
     plugin :validation_helpers
   
     def initialize( fields )
+      s = resolveServer fields
+      fields[:server_id] = s.id if s
+      raise ArgumentError, "Name can not be nil" if fields[:name].nil?
+      super fields, false
+      save
+    end
+  
+    def add_route( route )
+      route.host = id
+    end
+
+    private
+    
+    def resolveServer( fields )
       if fields[:srv]
         s=fields[:srv]
         fields.delete :srv
@@ -12,13 +26,7 @@ module M2Config
           fields.delete :srvUuid
         end
       end
-      fields[:server_id] = s.id if s
-      super(fields, false)
-      save
-    end
-  
-    def add_route( route )
-      route.host = id
+      s
     end
 
   

data/lib/m2config/schema.sql

@@ -52,3 +52,7 @@ CREATE TABLE statistic (id SERIAL,
     mean REAL,
     sd REAL,
     primary key (other_type, other_id, name));
+CREATE TABLE filter (id INTEGER PRIMARY KEY,
+    server_id INTEGER,
+    name TEXT,
+    settings TEXT);

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/m2config.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.required_ruby_version = '>= 1.9.0'
 end

data/sample/full.rb

@@ -3,14 +3,14 @@ require "m2config"
 include M2Config
 
 cfg       = M2Config::Config.new
-server    = Server.new
-exComHost = Host.new({matching:"example.com"})
-pubDir    = Dir.new({base:"/public"})
-pubRoute  = Route.new( {path:"/", target:pubDir} )
-appHand   = Handler.new({ send_spec:"tcp://10.0.0.1:8989",
+server    = M2Config::Server.new
+exComHost = M2Config::Host.new({matching:"example.com", name:"ex"})
+pubDir    = M2Config::Dir.new({base:"public/"})
+pubRoute  = M2Config::Route.new( {path:"/", target:pubDir} )
+appHand   = M2Config::Handler.new({ send_spec:"tcp://10.0.0.1:8989",
                                     recv_spec:"tcp://10.0.0.1:9898",
                                     send_ident: "dev.example.com ID" })
-appRoute  = Route.new( {path:"/blog", target:appHand} )
+appRoute  = M2Config::Route.new( {path:"/blog", target:appHand} )
   
 exComHost.add_route appRoute
 exComHost.add_route pubRoute

data/spec/dir_spec.rb

@@ -16,13 +16,13 @@ describe M2Config::Dir do
   
   describe "::new" do
     it "needs to know the base path to handle" do
-      M2Config::Dir.new({base:"/images"})
+      M2Config::Dir.new({base:"images/"})
       res= @db.get_first_row("SELECT * FROM directory;")
-      res["base"].should eq("/images")
+      res["base"].should eq("images/")
     end
     
     it "defaults to application/octet-stream for the default content type" do
-      M2Config::Dir.new({base:"/images"})
+      M2Config::Dir.new({base:"images/"})
       res= @db.get_first_row("SELECT * FROM directory;")
       res["default_ctype"].should eq("application/octet-stream")
     end
@@ -32,6 +32,25 @@ describe M2Config::Dir do
       res= @db.get_first_row("SELECT * FROM directory;")
       res["index_file"].should eq("index.html")
     end
+  
+    describe "helps you spot common mistakes" do
+      it "yells when the path contains a leading slash" do
+        expect {
+          M2Config::Dir.new({base:"/public"})
+        }.to raise_exception(ArgumentError, /base directories are relative to chroot and must not start with a slash/i) 
+      end
+  
+      it "yells when the path does not end with a slash" do
+        expect {
+          M2Config::Dir.new({base:"public"})
+        }.to raise_exception(ArgumentError, /base directories must end with a slash/i) 
+      end
+  
+      it "keeps calm with slashes inside the path" do
+        expect { M2Config::Dir.new({base:"public/assets/"}) }.to_not raise_exception
+      end
+  
+    end
   end
   
   describe '#type' do

data/spec/handler_spec.rb

@@ -25,6 +25,14 @@ describe M2Config::Handler do
       res["recv_spec"].should eq("tcp://10.0.0.1:9898")
       res["send_ident"].should eq("dev.example.com ID")
     end
+  
+    it "turns nil into empty string when recv_ident is not set" do
+      M2Config::Handler.new({ send_spec:"tcp://10.0.0.1:8989",
+                              recv_spec:"tcp://10.0.0.1:9898",
+                              send_ident: "dev.example.com ID"})
+      res = @db.get_first_row("SELECT * FROM handler;")
+      res["recv_ident"].should be_empty
+    end
     
     describe "helps you spot common mistakes" do
       it "yells when the addresses are the same" do
@@ -32,6 +40,7 @@ describe M2Config::Handler do
           M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8989", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev.example.com ID"})
         end.to raise_exception(ArgumentError, /send and receive endpoints can not be the same/i) 
       end
+  
     end
   end  
   

data/spec/host_spec.rb

@@ -17,30 +17,36 @@ describe M2Config::Host do
   
   describe "::new" do
     it "needs to know the domain name served" do
-      M2Config::Host.new({matching:"example.com"})
+      M2Config::Host.new({matching:"example.com", name: "ex"})
       res = @db.get_first_row("SELECT * FROM host;")
       res["matching"].should eq("example.com")
     end
     
     it "can use the uuid of a server" do
-      host = M2Config::Host.new({matching:"example.com", srvUuid: @srv.uuid})
+      host = M2Config::Host.new({matching:"example.com", name: "ex", srvUuid: @srv.uuid})
       res = @db.get_first_row("SELECT * FROM host WHERE id=?;", host.id)
       res["server_id"].should eq(@srv.id)
       res["matching"].should eq("example.com")
     end
   
     it "can use a server instance" do
-      host = M2Config::Host.new({matching:"example.com", srv: @srv})
+      host = M2Config::Host.new({matching:"example.com", name: "ex", srv: @srv})
       res = @db.get_first_row("SELECT * FROM host WHERE id=?;", host.id)
       res["server_id"].should eq(@srv.id)
       res["matching"].should eq("example.com")
     end
+  
+    it "enforces mongrel2 constraint about nil name" do
+      expect {
+        M2Config::Host.new({matching:"example.com"})
+      }.to raise_exception(ArgumentError, /name can not be nil/i) 
+    end
   end
   
   describe "#add_route" do
     it "activates a route (can be done using Route#host= too)" do
-      host = M2Config::Host.new({matching:"example.com"})
-      dirH = M2Config::Dir.new({base: "/static"})
+      host = M2Config::Host.new({matching:"example.com", name: "ex"})
+      dirH = M2Config::Dir.new({base: "static/"})
       dirR = M2Config::Route.new({path:"/blog", target: dirH})
       host.add_route dirR
       res = @db.get_first_row("SELECT * FROM route;")

data/spec/m2config_spec.rb

@@ -1,6 +1,6 @@
 require "env"
   
-TABLES = %w(directory handler host log mimetype proxy route server setting statistic)
+TABLES = %w(directory handler host log mimetype proxy route server setting statistic filter)
 
 File.delete EXISTING_DB_NAME rescue nil
 emptyDB = SQLite3::Database.new EXISTING_DB_NAME

data/spec/route_spec.rb

@@ -6,7 +6,7 @@ describe M2Config::Route do
   before(:each) do
     File.delete DEFAULT_DB_NAME rescue nil
     @cfg = M2Config::Config.new
-    @dirH = M2Config::Dir.new({base: "/static"})
+    @dirH = M2Config::Dir.new({base: "static/"})
     @db = SQLite3::Database.new DEFAULT_DB_NAME
     @db.results_as_hash = true
   end
@@ -28,7 +28,7 @@ describe M2Config::Route do
   
   describe "#host=" do
     it "can be used if the host is not known at creation" do
-      host = M2Config::Host.new({matching:"example.com"})
+      host = M2Config::Host.new({matching:"example.com", name: "ex"})
       r = M2Config::Route.new({path:"/blog", target: @dirH})
       r.host = host.id
       res = @db.get_first_row("SELECT * FROM route;")
@@ -36,7 +36,7 @@ describe M2Config::Route do
     end
     
     it "can take a Host instance" do
-      host = M2Config::Host.new({matching:"example.com"})
+      host = M2Config::Host.new({matching:"example.com", name: "ex"})
       r = M2Config::Route.new({path:"/blog", target: @dirH})
       r.host = host
       res = @db.get_first_row("SELECT * FROM route;")

data/spec/server_spec.rb

@@ -9,7 +9,7 @@ describe M2Config::Server do
     @db = SQLite3::Database.new DEFAULT_DB_NAME
     @db.results_as_hash = true
     @srv = M2Config::Server.new
-    @host = M2Config::Host.new({matching:"example.com"})
+    @host = M2Config::Host.new({matching:"example.com", name: "ex"})
   end
   
   after(:each) do

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,17 +69,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A library to easily manage a Mongrel2 configuration database
@@ -99,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
@@ -128,33 +118,26 @@ files:
 homepage: https://github.com/ameuret/m2config
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -327752419
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -327752419
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manage your Mongrel2 configuration database using handy model classes that
   map Servers, Hosts, Routes, Directories, Proxies, Handlers and Settings
 test_files: