m2config 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af32f60790056db4c869961bf53572607910579
-  data.tar.gz: 94bece67112686d6f40e58a5f57647b869dbb8d0
+  metadata.gz: 30d8a9fa3eccc1534a6cbff481a910190e163332
+  data.tar.gz: 31d5f71abafec20f678f4fb290e631b231ca475e
 SHA512:
-  metadata.gz: a85f7fc5d80cb047a69494d85a433cf598b5dc22703c5bc509056b9027f93ebb7410b7b3646160fe02d730447abd2b86f877356787ed8ce1b98405637d4b5074
-  data.tar.gz: d5b4d69be4e351300217f8c5ae0414fbb4926d388d6ddab722a7e54da1e50aee5fb80c187d25ff770102ce9123e773c634fe0e1f3d051e10bf641ec1c10d31b0
+  metadata.gz: c08369ceb3433048c01f1a49108711dcda9330516ec90753f7937072b404d020e39390dd9e507f87cf0eb5af26da109f6d2b5792ba74d20fb4af897777a6a797
+  data.tar.gz: 3dd55d203a07f423ed59bde04b17929618559d32a9cb204303394b85452eb4b50c13be6f678115caaba695f7689308fcbf979710a1188fdf1694d85e976dd78d

data/lib/m2config/host.rb

@@ -1,6 +1,6 @@
 module M2Config
   class Host < Sequel::Model(:host)
-    plugin :validation_helpers
+    one_to_many :routes
   
     def initialize( fields )
       s = resolveServer fields
@@ -10,8 +10,9 @@ module M2Config
       save
     end
   
-    def add_route( route )
-      route.host = id
+    def check_routes
+      paths = routes.map { |route| route[:path] }
+      paths.uniq.size == paths.size
     end
 
     private
@@ -29,6 +30,5 @@ module M2Config
       s
     end
 
-  
   end
 end

data/lib/m2config/proxy.rb

@@ -1,6 +1,5 @@
 module M2Config
   class Proxy < Sequel::Model(:proxy)
-    plugin :validation_helpers
   
     def initialize( fields )
       super(fields, false)

data/lib/m2config/route.rb

@@ -1,6 +1,6 @@
 module M2Config
   class Route < Sequel::Model(:route)
-    plugin :validation_helpers
+    many_to_one :host
   
     def initialize( fields )
       fields[:target_id] = fields[:target].id
@@ -15,5 +15,19 @@ module M2Config
       save
     end
   
+    def target=( newTarget )
+      self.target_id = newTarget.id
+      self.target_type = newTarget.type
+      save
+    end
+  
+    def target
+      case target_type
+      when "proxy" then Proxy[target_id]
+      when "dir" then Dir[target_id]
+      when "handler" then Handler[target_id]
+      end
+    end
+
   end
 end

data/lib/m2config/server.rb

@@ -10,7 +10,6 @@ module M2Config
     PORT = 6767
     USE_SSL = 0
 
-    plugin :validation_helpers
     one_to_many :hosts
     
     def initialize( fields={} )
@@ -26,12 +25,13 @@ module M2Config
       fields[:use_ssl]      ||= USE_SSL
       super fields, false
       save
-  end
-
-    def add_host( host )
-      host.server_id = id
-      host.save
     end
-
+  
+    def self.first
+      raise "Careful ! You are calling Server.first on a database holding multiple servers" if
+        ((Server.get {count(id)}) > 1)
+      super
+    end
+    
   end
 end

data/lib/m2config/version.rb

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

data/sample/full.rb

@@ -11,7 +11,7 @@ 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  = M2Config::Route.new( {path:"/blog", target:appHand} )
-  
+
 exComHost.add_route appRoute
 exComHost.add_route pubRoute
   

data/spec/host_spec.rb

@@ -52,5 +52,17 @@ describe M2Config::Host do
       res = @db.get_first_row("SELECT * FROM route;")
       res["host_id"].should eq(host.id)
     end
-  end    
+  end
+  
+  describe '#check_routes' do
+    it 'returns false if some routes have identical paths'  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.check_routes.should be_false
+    end
+  end
+
 end

data/spec/route_spec.rb

@@ -23,7 +23,6 @@ describe M2Config::Route do
       res["target_id"].should eq(@dirH.id)
       res["target_type"].should eq(@dirH.type)
     end
-    
   end
   
   describe "#host=" do
@@ -42,6 +41,32 @@ describe M2Config::Route do
       res = @db.get_first_row("SELECT * FROM route;")
       res["host_id"].should eq(host.id)
     end
-    
   end
+  
+  describe '#host' do # , {focus: true}
+    it 'returns the associated Host object'  do
+      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
+  end
+
+  describe '#target=' do
+    it 'reassigns the target object' do
+      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)
+    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
+    end
+  end
+
 end

data/spec/server_spec.rb

@@ -9,14 +9,14 @@ 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", name: "ex"})
+    @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 # , {focus: true}
+  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)
@@ -32,6 +32,18 @@ describe M2Config::Server do
     
   end
   
+  describe '::first (from Sequel::Model)' do
+    it 'returns the first server found in the database' do
+      srv = M2Config::Server.first
+      srv.id.should eq(@srv.id)
+    end
+  
+    it 'raises if there is more than one server' do
+      M2Config::Server.new
+      expect { M2Config::Server.first }.to raise_exception /Careful ! You are calling Server.first on a database holding multiple servers/
+    end
+  end
+  
   describe '#add_host (assigns the given host to the server)' do
     it 'accepts an existing Host instance' do
       @srv.add_host @host

metadata

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