mulder 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859d33d9fff0b6499c90530e69a148b2d40ec0a6
-  data.tar.gz: c4f722ad1f2cb0940d2a5473159457ddf7b46e32
+  metadata.gz: bb924012ddd6660fb1324aaa9a774f9b395199f6
+  data.tar.gz: a021f1092d305af2512e6de228cafc8a6caf7842
 SHA512:
-  metadata.gz: 39a6eec52a45f0e3e83d7ff45200b2a7c5a1d5379424aeb9db0467b42060f9004f564f7fd4916c3a619f27634d7fdade4b8269943e38852d43c8bd8d9a5faacb
-  data.tar.gz: 7831ee1ca49fc5bbebd31f57d93b954acd1ae51d7fd856e52b28c3a5f65bf0d86af9836a131f14a55aeded1a3497694253a4ddf8b93c153b02df570a91215b0e
+  metadata.gz: 9de11ada5bbd69241eaed4d593b385a13e5da0393b96476ee00ea115ceae987f5e6cc2a405d3b073b895d555c130de5a03904eb18e93835723fa87a032cc23e1
+  data.tar.gz: 400042dafe5c63253f33a2d3062501567bccfd1a2a9cc4ba6f88693586fd97bf44b1fecc842f0c4c35b2c470e1fc289cec7e7b624c14984a0eeb27fbec644d0c

data/lib/mulder/client.rb

@@ -19,7 +19,7 @@ module Mulder
     end
 
     def id_regexp
-      /^.*-?#{@app}-#{@environment}-(.*-)?#{@role}-.*$/i
+      /^#{@app}-#{@environment}-(.*-)?#{@role}-.*$/i
     end
 
   end

data/lib/mulder/version.rb

@@ -1,3 +1,3 @@
 module Mulder
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/lib/mulder/client_spec.rb

@@ -17,7 +17,7 @@ describe Mulder::Client do
   describe '#group' do
     it 'finds the correct group based on the given attributes' do
       mocked_connection = mock
-      mocked_connection.expects(:group_by_id_regexp).with(/^.*-?foo-bar-(.*-)?WorkerGroup-.*$/i)
+      mocked_connection.expects(:group_by_id_regexp).with(/^foo-bar-(.*-)?WorkerGroup-.*$/i)
       client = described_class.new(mocked_connection, 'foo', 'bar', 'WorkerGroup')
 
       client.group
@@ -47,9 +47,28 @@ describe Mulder::Client do
       'foo-bar-abc123-worker-3'.should match(client.id_regexp)
     end
 
-    it 'matches with a prefixed id' do
-      client = described_class.new(mock, 'foo', 'bar', 'worker')
-      'widget-foo-bar-abd123-worker-8'.should match(client.id_regexp)
+    context 'with prefixed id' do
+      let(:client) { described_class.new(mock, 'widget-foo', 'bar', 'worker') }
+
+      it 'matches the prefixed group' do
+        'widget-foo-bar-abd123-worker-8'.should match(client.id_regexp)
+      end
+
+      it 'does not match the non-prefixed group' do
+        'foo-bar-derp456-worker-99'.should_not match(client.id_regexp)
+      end
+    end
+
+    context 'with non-prefixed id' do
+      let(:client) { described_class.new(mock, 'foo', 'bar', 'worker') }
+
+      it 'does not match the prefixed group' do
+        'widget-foo-bar-abd123-worker-8'.should_not match(client.id_regexp)
+      end
+
+      it 'matches the non-prefixed group' do
+        'foo-bar-derp456-worker-99'.should match(client.id_regexp)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Duncan Grazier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler