m2config 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d8a9fa3eccc1534a6cbff481a910190e163332
-  data.tar.gz: 31d5f71abafec20f678f4fb290e631b231ca475e
+  metadata.gz: 409e5df6b21362f88633bc922d489f2c17ec6a46
+  data.tar.gz: a97d5200c35196fac07995abc668330bfe8bf9f7
 SHA512:
-  metadata.gz: c08369ceb3433048c01f1a49108711dcda9330516ec90753f7937072b404d020e39390dd9e507f87cf0eb5af26da109f6d2b5792ba74d20fb4af897777a6a797
-  data.tar.gz: 3dd55d203a07f423ed59bde04b17929618559d32a9cb204303394b85452eb4b50c13be6f678115caaba695f7689308fcbf979710a1188fdf1694d85e976dd78d
+  metadata.gz: c916730148ca203090fb412222e5f7386bb8c65c51b6b91b63f8d0c9a6f134165d76fc3ee862ff2d0a1df961e9d380af56a638564d22c48ff8cbf208bd52f709
+  data.tar.gz: e79f22f6bb17f04321cf68de59bdb33e2c5def72ed632a34cdb59338190e4e87d875c9dc641066aa471725dc4d441c7113dcd8b1ddd50c5a0e2e25c79ba6db41

data/Gemfile

@@ -7,5 +7,7 @@ group :dev do
   gem 'rb-inotify'
   gem 'rspec'
   gem 'guard-rspec'
-  gem "libnotify"
+  gem 'libnotify'
+  gem 'pry'
+  gem 'pry-nav'
 end

data/lib/m2config/host.rb

@@ -1,6 +1,6 @@
 module M2Config
   class Host < Sequel::Model(:host)
-    one_to_many :routes
+    one_to_many :routes, {class: "M2Config::Route"}
   
     def initialize( fields )
       s = resolveServer fields
@@ -11,7 +11,13 @@ module M2Config
     end
   
     def check_routes
-      paths = routes.map { |route| route[:path] }
+      paths = routes(true).map {
+        |route|
+        route.path
+      }
+#      return true if paths.empty?
+      
+#      return "#{paths.uniq.to_s} == #{paths.to_s}"
       paths.uniq.size == paths.size
     end
 

data/lib/m2config/route.rb

@@ -9,7 +9,13 @@ module M2Config
       super(fields, false)
       save
     end
-  
+
+    def self.elect!( route66 )
+      toMatch = {path: route66.path, host_id: route66.host_id}
+      toExclude = {id: route66.id}
+      Route.where(toMatch).exclude(toExclude).delete
+    end
+
     def host=( hostOrId )
       self.host_id = hostOrId.kind_of?(Host) ? hostOrId.id : hostOrId
       save

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/m2config.rb

@@ -7,6 +7,8 @@ module M2Config
 
     DEFAULT_CONFIG = "config.sqlite"
     SCHEMA = File.read("#{File.dirname __FILE__}/m2config/schema.sql")
+  
+    attr_reader :db
     
     @@foundTables = []
     
@@ -28,20 +30,15 @@ module M2Config
       
       @db.run SCHEMA if creating
 
+      Sequel::Model.db = @db
+  
       require "m2config/server"
-      M2Config::Server.db = @db
       require "m2config/host"
-      M2Config::Host.db = @db
       require "m2config/dir"
-      M2Config::Dir.db = @db
       require "m2config/route"
-      M2Config::Route.db = @db
       require "m2config/proxy"
-      M2Config::Proxy.db = @db
       require "m2config/handler"
-      M2Config::Handler.db = @db
       require "m2config/setting"
-      M2Config::Setting.db = @db
     end
     
     def add_server( settings = {} )

data/spec/dir_spec.rb

@@ -1,36 +1,21 @@
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Dir do
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-  end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
   
   describe "::new" do
     it "needs to know the base path to handle" do
       M2Config::Dir.new({base:"images/"})
-      res= @db.get_first_row("SELECT * FROM directory;")
-      res["base"].should eq("images/")
+      CFG.db[:directory].first[:base].should eq("images/")
     end
     
     it "defaults to application/octet-stream for the default content type" do
       M2Config::Dir.new({base:"images/"})
-      res= @db.get_first_row("SELECT * FROM directory;")
-      res["default_ctype"].should eq("application/octet-stream")
+      CFG.db[:directory].first[:default_ctype].should eq("application/octet-stream")
     end
     
     it "defaults to index.html for the index file" do
       dir = M2Config::Dir.new({base:"/"})
-      res= @db.get_first_row("SELECT * FROM directory;")
-      res["index_file"].should eq("index.html")
+      CFG.db[:directory].first[:index_file].should eq("index.html")
     end
   
     describe "helps you spot common mistakes" do

data/spec/env.rb

@@ -2,7 +2,20 @@ require "bundler/setup"
 require "m2config" # rspec automatically adds ./lib to LOAD_PATH
 require "sqlite3"
 require "pp"
+require "pry"
+require "pry-nav"
 
 DEFAULT_DB_NAME = "config.sqlite"
 CUSTOM_DB_NAME = "custom.sqlite"
 EXISTING_DB_NAME = "empty.sqlite"
+
+RSpec.configure do |config|
+  File.delete DEFAULT_DB_NAME rescue nil
+  CFG = M2Config::Config.new
+  config.around(:each) do |example|
+    CFG.db.transaction do
+      example.call
+      raise Sequel::Error::Rollback
+    end
+  end
+end

data/spec/handler_spec.rb

@@ -1,37 +1,25 @@
 # -*- coding: utf-8 -*-
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Handler do
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-  end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
   
   describe "::new" do
     it "needs the ØMQ addresses and a send identifier" 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["send_spec"].should eq("tcp://10.0.0.1:8989")
-      res["recv_spec"].should eq("tcp://10.0.0.1:9898")
-      res["send_ident"].should eq("dev.example.com ID")
+      res = CFG.db[:handler].first
+      res[:send_spec].should eq("tcp://10.0.0.1:8989")
+      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
+      res = CFG.db[:handler].first
+      res[:recv_ident].should be_empty
     end
     
     describe "helps you spot common mistakes" do

data/spec/host_spec.rb

@@ -1,39 +1,29 @@
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Host do
   before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-    @srv = @cfg.add_server
+    @srv = CFG.add_server
   end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
-  
+
   describe "::new" do
     it "needs to know the domain name served" do
       M2Config::Host.new({matching:"example.com", name: "ex"})
-      res = @db.get_first_row("SELECT * FROM host;")
-      res["matching"].should eq("example.com")
+      res = CFG.db[:host].first
+      res[:matching].should eq("example.com")
     end
     
     it "can use the uuid of a server" do
       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")
+      res = CFG.db[:host].where(id: host.id).first
+      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", 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")
+      res = CFG.db[:host].where(id: host.id).first
+      res[:server_id].should eq(@srv.id)
+      res[:matching].should eq("example.com")
     end
   
     it "enforces mongrel2 constraint about nil name" do
@@ -49,8 +39,8 @@ describe M2Config::Host do
       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;")
-      res["host_id"].should eq(host.id)
+      res = CFG.db[:route].first
+      res[:host_id].should eq(host.id)
     end
   end
   
@@ -59,10 +49,26 @@ describe M2Config::Host do
       host = M2Config::Host.new({matching:"example.com", name: "ex"})
       dir1 = M2Config::Dir.new({base: "static/"})
       dir2 = M2Config::Dir.new({base: "images/"})
-      host.add_route M2Config::Route.new({path:"/blog", target: dir1})
-      host.add_route M2Config::Route.new({path:"/blog", target: dir2})
+      host.add_route M2Config::Route.new({path:"/blog1", target: dir1})
+      host.add_route M2Config::Route.new({path:"/blog1", target: dir2})
       host.check_routes.should be_false
     end
+
+    it 'returns true if all routes have different paths'  do
+      host = M2Config::Host.new({matching:"example2.com", name: "ex"})
+      dir1 = M2Config::Dir.new({base: "static/"})
+      dir2 = M2Config::Dir.new({base: "images/"})
+      r1 = M2Config::Route.new({path:"/blog3", target: dir1})
+      r2 = M2Config::Route.new({path:"/images", target: dir2})
+      host.add_route r1
+      host.add_route r2
+      host.check_routes.should be_true
+    end
+
+    it 'withstands the idea of not having any routes'  do # , {focus: true}
+      host = M2Config::Host.new({matching:"example.com", name: "ex"})
+      host.check_routes.should be_true
+    end
   end
 
 end

data/spec/m2config_spec.rb

@@ -1,18 +1,12 @@
 require "env"
   
 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
-
+  
 describe M2Config do
   
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    File.delete CUSTOM_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
+  before(:all) do
   end
-  
+    
   after(:each) do
     @db.close if @db && !@db.closed?
   end  
@@ -21,11 +15,6 @@ describe M2Config do
     File.should exist DEFAULT_DB_NAME
   end
   
-  it 'can create the database in a specific file' do
-    @cfg = M2Config::Config.new CUSTOM_DB_NAME
-    File.should exist CUSTOM_DB_NAME
-  end
-  
   it 'learns the DB schema from the official schema dump' do
     for table in TABLES do
       M2Config::Config.tables.should include table
@@ -39,23 +28,12 @@ describe M2Config do
     end
   end
   
-  it 'does not change the schema if the database file pre-exists' do
-    @cfg = M2Config::Config.new EXISTING_DB_NAME
-    expect {emptyDB.execute("SELECT * FROM server;")}.to raise_error
-  end
-  
   describe '#[]=' do
-    
     it 'creates or modifies the value of a setting' do
-      db = SQLite3::Database.new DEFAULT_DB_NAME
-      db.results_as_hash = true
-      @cfg["zeromq.threads"] = 8
-      res = db.get_first_row("SELECT * FROM setting WHERE key=?;", "zeromq.threads")
-      res["value"].should eq("8")
+      CFG["zeromq.threads"] = 8
+      CFG.db[:setting].where(key:"zeromq.threads").first[:value].should eq("8")
     end
-    
   end
-  
 
 end
 

data/spec/proxy_spec.rb

@@ -3,23 +3,13 @@ require "env"
 M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
 
 describe M2Config::Proxy do
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-  end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
   
   describe "::new" do
     it "needs an address and a port number" do
       M2Config::Proxy.new({addr:"legacy.local", port: 8080})
-      res= @db.get_first_row("SELECT * FROM proxy;")
-      res["addr"].should eq("legacy.local")
-      res["port"].should eq(8080)
+      res = CFG.db[:proxy].first
+      res[:addr].should eq("legacy.local")
+      res[:port].should eq(8080)
     end
   end
   

data/spec/route_spec.rb

@@ -1,51 +1,57 @@
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Route do
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @dirH = M2Config::Dir.new({base: "static/"})
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-  end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
   
   describe "::new" do
     it "needs to know the path pattern and the target handler" do
-      M2Config::Route.new({path:"/blog", target: @dirH})
-      res = @db.get_first_row("SELECT * FROM route;")
-      res["path"].should eq("/blog")
-      res["target_id"].should eq(@dirH.id)
-      res["target_type"].should eq(@dirH.type)
+      dirH = M2Config::Dir.new({base: "static/"})
+      M2Config::Route.new({path:"/blog", target: dirH})
+      res = CFG.db[:route].first
+      res[:path].should eq("/blog")
+      res[:target_id].should eq(dirH.id)
+      res[:target_type].should eq(dirH.type)
+    end
+  end
+  
+  describe "::elect!" do
+    it "makes a route the exclusive matcher for its path by deleting all other matching routes (on the same host)" do
+      host = M2Config::Host.new({name:"main",matching:"actime.biz"})
+      dirH = M2Config::Dir.new({base: "static/"})
+      dir2 = M2Config::Dir.new({base: "ManceRayder/"})
+      r1 = M2Config::Route.new({path:"/king", target: dirH})
+      r2 = M2Config::Route.new({path:"/king", target: dir2})
+      r3 = M2Config::Route.new({path:"/king", target: dirH})
+      M2Config::Route.elect!(r2)
+      host.check_routes.should be_true
+      king = M2Config::Route.where(path: "/king").first
+      king.target.base.should eq("ManceRayder/")
     end
   end
   
   describe "#host=" do
     it "can be used if the host is not known at creation" do
       host = M2Config::Host.new({matching:"example.com", name: "ex"})
-      r = M2Config::Route.new({path:"/blog", target: @dirH})
+      dirH = M2Config::Dir.new({base: "static/"})
+      r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = host.id
-      res = @db.get_first_row("SELECT * FROM route;")
-      res["host_id"].should eq(host.id)
+      res = CFG.db[:route].first
+      res[:host_id].should eq(host.id)
     end
     
     it "can take a Host instance" do
       host = M2Config::Host.new({matching:"example.com", name: "ex"})
-      r = M2Config::Route.new({path:"/blog", target: @dirH})
+      dirH = M2Config::Dir.new({base: "static/"})
+      r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = host
-      res = @db.get_first_row("SELECT * FROM route;")
-      res["host_id"].should eq(host.id)
+      res = CFG.db[:route].first
+      res[:host_id].should eq(host.id)
     end
   end
   
-  describe '#host' do # , {focus: true}
+  describe '#host' do # 
     it 'returns the associated Host object'  do
-      r = M2Config::Route.new({path:"/blog", target: @dirH})
+      dirH = M2Config::Dir.new({base: "static/"})
+      r = M2Config::Route.new({path:"/blog", target: dirH})
       r.host = M2Config::Host.new({matching:"example.com", name: "ex"})
       r.host.matching.should eq("example.com")
     end
@@ -53,19 +59,21 @@ describe M2Config::Route do
 
   describe '#target=' do
     it 'reassigns the target object' do
-      r = M2Config::Route.new({path:"/blog", target: @dirH})
+      dirH = M2Config::Dir.new({base: "static/"})
+      r = M2Config::Route.new({path:"/blog", target: dirH})
       newTarget = M2Config::Proxy.new({addr:"127.0.0.1", port: 15970})
       r.target = newTarget
-      res = @db.get_first_row("SELECT * FROM route;")
-      res["target_id"].should eq(newTarget.id)
-      res["target_type"].should eq(newTarget.type)
+      res = CFG.db[:route].first
+      res[:target_id].should eq(newTarget.id)
+      res[:target_type].should eq(newTarget.type)
     end
   end
   
   describe '#target' do
     it 'returns the Target object' do
-      r = M2Config::Route.new({path:"/blog", target: @dirH})
-      r.target.base.should eq @dirH.base
+      dirH = M2Config::Dir.new({base: "static/"})
+      r = M2Config::Route.new({path:"/blog", target: dirH})
+      r.target.base.should eq dirH.base
     end
   end
 

data/spec/server_spec.rb

@@ -1,33 +1,23 @@
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Server do
   before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
     @srv = M2Config::Server.new
     @host = M2Config::Host.new({matching:"example.com", name: "ex", server_id:(rand 42)})
   end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
 
   describe '::new' do
     it 'creates a server entry with reasonable default settings' do
-      res= @db.get_first_row("SELECT * FROM server;")
-      res["access_log"].should eq(M2Config::Server::ACCESS_LOG)
-      res["error_log"].should eq(M2Config::Server::ERROR_LOG)
-      res["pid_file"].should eq(M2Config::Server::PID_FILE)
-      res["chroot"].should eq(M2Config::Server::CHROOT)
-      res["default_host"].should eq(M2Config::Server::DEFAULT_HOST)
-      res["name"].should eq(M2Config::Server::NAME)
-      res["bind_addr"].should eq(M2Config::Server::BIND_ADDR)
-      res["port"].should eq(M2Config::Server::PORT)
-      res["use_ssl"].should eq(M2Config::Server::USE_SSL)
+      res = CFG.db[:server].first
+      res[:access_log].should eq(M2Config::Server::ACCESS_LOG)
+      res[:error_log].should eq(M2Config::Server::ERROR_LOG)
+      res[:pid_file].should eq(M2Config::Server::PID_FILE)
+      res[:chroot].should eq(M2Config::Server::CHROOT)
+      res[:default_host].should eq(M2Config::Server::DEFAULT_HOST)
+      res[:name].should eq(M2Config::Server::NAME)
+      res[:bind_addr].should eq(M2Config::Server::BIND_ADDR)
+      res[:port].should eq(M2Config::Server::PORT)
+      res[:use_ssl].should eq(M2Config::Server::USE_SSL)
     end
     
   end
@@ -47,8 +37,8 @@ describe M2Config::Server do
   describe '#add_host (assigns the given host to the server)' do
     it 'accepts an existing Host instance' do
       @srv.add_host @host
-      res= @db.get_first_row("SELECT * FROM host WHERE id=?;", @host.id)
-      res["server_id"].should eq(@srv.id)
+      res = CFG.db[:host].where(id: @host.id).first
+      res[:server_id].should eq(@srv.id)
     end
   end
 end

data/spec/setting_spec.rb

@@ -1,32 +1,20 @@
 # -*- coding: utf-8 -*-
 require "env"
 
-M2Config::Config.new # Dummy call to ensure that model classes are required (cf. M2Config::new)
-
 describe M2Config::Setting do
-  before(:each) do
-    File.delete DEFAULT_DB_NAME rescue nil
-    @cfg = M2Config::Config.new
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    @db.results_as_hash = true
-  end
-  
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
   
   describe "::new" do
     it "stores the given value under the given key" do
       M2Config::Setting.new("answer",42)
-      res = @db.get_first_row("SELECT * FROM setting;")
-      res["value"].should eq("42")
+      res = CFG.db[:setting].first
+      res[:value].should eq("42")
     end
   
     it "updates the existing value if the given key is already present" do
       M2Config::Setting.new("answer",41)
       M2Config::Setting.new("answer",42)
-      res = @db.get_first_row("SELECT * FROM setting;")
-      res["value"].should eq("42")
+      res = CFG.db[:setting].first
+      res[:value].should eq("42")
     end
   end    
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3