m2config 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfeb1a86a0a6cdf4af5bb69f36298d1baa1f97b
-  data.tar.gz: f8fdfff8b5ab0941d27ce01519195936ea1c2ce3
+  metadata.gz: 8ff07c47abc8681428c309b6f7149d88bdfeab2f
+  data.tar.gz: 406ebf7f14b7d323cac91cc6b89601969c7bac7e
 SHA512:
-  metadata.gz: adf30e48ee1e39f25e694ade3172cc29464d34dd3c15221ec145df190e17c362758d7bc00b551362e798ef11b2f4a87bf75483713d6c56dbbe9ba0cef0bface4
-  data.tar.gz: 0952a47d1daceaf5cf1eb94b92d053d385f8597a84917de9050a819c4ebf3d1121123962b20febdb883ce6bfd517854667a2518be37e32c7a2ff8b50ed826d4f
+  metadata.gz: 5c71a0cd31e62607ee4de5f8d786c989b916433dea9b4ecc65b4e38e26e31f65cbcfe65b31e9a2f4e9479c66c911244b8fe3af692a163cc0d1e816fe41d547cf
+  data.tar.gz: a8f4be0037c8a953495530eb57bca1dc0aa3300ebdf2b8b881d00683423a86f1f41bcc2755a9dda9c16eda60d3f73cc1fc2cf2ad677c92eddf9c1d23c3e2aa05

data/lib/m2config/handler.rb

@@ -2,9 +2,14 @@ module M2Config
   class Handler < Sequel::Model(:handler)
     plugin :validation_helpers
   
+    ID_REGEX = /^[-a-zA-Z0-9]+$/
+  
     def initialize( fields )
       raise ArgumentError, "The send and receive endpoints can not be the same" if
         fields[:send_spec] == fields[:recv_spec]
+      raise ArgumentError, "Handler send and recv IDs must only use -a-zA-Z0-9" if
+        !(fields[:send_ident] =~ ID_REGEX &&
+         fields[:send_ident] =~ ID_REGEX)
       fields[:recv_ident] ||= ""
       super(fields, false)
       save

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/handler_spec.rb

@@ -7,34 +7,43 @@ describe M2Config::Handler 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"})
+                              send_ident: "dev-example-comID"})
       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")
+      res[:send_ident].should eq("dev-example-comID")
     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"})
+                              send_ident: "dev-example-comID"})
       res = CFG.db[:handler].first
       res[:recv_ident].should be_empty
     end
     
-    describe "helps you spot common mistakes" do
+    describe "helps you spot common mistakes:" do
       it "yells when the addresses are the same" do
         expect 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
   
+      it "yells when the send ID does not respect Mongrel2's constraints (UUID = (alpha | digit | '-')+ )" do
+        expect do
+          M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev.example.com ID"})
+        end.to raise_exception(ArgumentError, /Handler send and recv IDs must only use -a-zA-Z0-9/i) 
+        expect do
+          M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", recv_ident: "dev.example.com ID"})
+        end.to raise_exception(ArgumentError, /Handler send and recv IDs must only use -a-zA-Z0-9/i) 
+      end
+  
     end
   end  
   
   describe '#type' do
     it 'returns its type' do
-      M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev.example.com ID"}).type.should eq("handler")
+      M2Config::Handler.new({send_spec:"tcp://10.0.0.1:8988", recv_spec:"tcp://10.0.0.1:8989", send_ident: "dev-example-comID"}).type.should eq("handler")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Manage your Mongrel2 configuration database using handy model classes that