spec/client_spec.rb in metricsd-0.2.3 vs spec/client_spec.rb in metricsd-0.2.4

@@ -32,136 +32,116 @@
     end
   end
 
   describe '.record_hit' do
     it 'should send two metrics in a single packet' do
-      @socket.should_receive(:send).with('[e-mail]_count:1;[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:1;[e-mail]:450', 0)
       Metricsd::Client.record_hit('custom.metric', true, 0.45)
     end
 
     it 'should handle is_success=false' do
-      @socket.should_receive(:send).with('[e-mail]_count:-1;[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:-1;[e-mail]:450', 0)
       Metricsd::Client.record_hit('custom.metric', false, 0.45)
     end
 
-    it 'should change separator if :sep option is specified' do
-      @socket.should_receive(:send).with('[e-mail]!count:1;[e-mail]!time:450', 0)
-      Metricsd::Client.record_hit('custom.metric', true, 0.45, :sep => '!')
-    end
-
     it 'should apply group to both the metrics' do
-      @socket.should_receive(:send).with('all@test$custom.metric_count:1;all@test$custom.metric_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:1;[e-mail]:450', 0)
       Metricsd::Client.record_hit('custom.metric', true, 0.45, :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
-      @socket.should_receive(:send).with('[e-mail]_count:1;[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:1;[e-mail]:450', 0)
       Metricsd::Client.record_hit('custom.metric', true, 0.45, :source => '')
     end
 
     it 'should apply source if specified' do
-      @socket.should_receive(:send).with('[e-mail]_count:1;[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:1;[e-mail]:450', 0)
       Metricsd::Client.record_hit('custom.metric', true, 0.45, :source => 'test2')
     end
   end
 
   describe '.record_success' do
     it 'should record successes' do
-      @socket.should_receive(:send).with('[e-mail]_count:1', 0)
+      @socket.should_receive(:send).with('[e-mail]:1', 0)
       Metricsd::Client.record_success('custom.metric')
     end
 
-    it 'should change separator if :sep option is specified' do
-      @socket.should_receive(:send).with('[e-mail]!count:1', 0)
-      Metricsd::Client.record_success('custom.metric', :sep => '!')
-    end
-
     it 'should apply group if specified' do
-      @socket.should_receive(:send).with('all@test$custom.metric_count:1', 0)
+      @socket.should_receive(:send).with('[e-mail]:1', 0)
       Metricsd::Client.record_success('custom.metric', :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
-      @socket.should_receive(:send).with('[e-mail]_count:1', 0)
+      @socket.should_receive(:send).with('[e-mail]:1', 0)
       Metricsd::Client.record_success('custom.metric', :source => '')
     end
 
     it 'should apply source specified' do
-      @socket.should_receive(:send).with('[e-mail]_count:1', 0)
+      @socket.should_receive(:send).with('[e-mail]:1', 0)
       Metricsd::Client.record_success('custom.metric', :source => 'test2')
     end
   end
 
   describe '.record_failure' do
     it 'should record failures' do
-      @socket.should_receive(:send).with('[e-mail]_count:-1', 0)
+      @socket.should_receive(:send).with('[e-mail]:-1', 0)
       Metricsd::Client.record_failure('custom.metric')
     end
 
-    it 'should change separator if :sep option is specified' do
-      @socket.should_receive(:send).with('[e-mail]!count:-1', 0)
-      Metricsd::Client.record_failure('custom.metric', :sep => '!')
-    end
-
     it 'should apply group if specified' do
-      @socket.should_receive(:send).with('all@test$custom.metric_count:-1', 0)
+      @socket.should_receive(:send).with('[e-mail]:-1', 0)
       Metricsd::Client.record_failure('custom.metric', :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
-      @socket.should_receive(:send).with('[e-mail]_count:-1', 0)
+      @socket.should_receive(:send).with('[e-mail]:-1', 0)
       Metricsd::Client.record_failure('custom.metric', :source => '')
     end
 
     it 'should apply source specified' do
-      @socket.should_receive(:send).with('[e-mail]_count:-1', 0)
+      @socket.should_receive(:send).with('[e-mail]:-1', 0)
       Metricsd::Client.record_failure('custom.metric', :source => 'test2')
     end
   end
 
   describe '.record_time' do
     it 'should record time if specified' do
-      @socket.should_receive(:send).with('[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:450', 0)
       Metricsd::Client.record_time('custom.metric', 0.45)
     end
 
     it 'should yield a block if time is not specified' do
-      @socket.should_receive(:send).with(match(/[e-mail]_time:1\d{2}/), 0)
+      @socket.should_receive(:send).with(match(/[e-mail]:1\d{2}/), 0)
       yielded = false
       Metricsd::Client.record_time('custom.metric') do
         yielded = true
         sleep 0.1
       end
       yielded.should be_true
     end
 
     it 'should use options if time is not specified' do
-      @socket.should_receive(:send).with(match(/[e-mail]_time:\d+/), 0)
+      @socket.should_receive(:send).with(match(/[e-mail]:\d+/), 0)
       yielded = false
       Metricsd::Client.record_time('custom.metric', {}) do
         yielded = true
       end
       yielded.should be_true
     end
 
-    it 'should change separator if :sep option is specified' do
-      @socket.should_receive(:send).with('[e-mail]!time:450', 0)
-      Metricsd::Client.record_time('custom.metric', 0.45, :sep => '!')
-    end
-
     it 'should apply group if specified' do
-      @socket.should_receive(:send).with('all@test$custom.metric_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:450', 0)
       Metricsd::Client.record_time('custom.metric', 0.45, :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
-      @socket.should_receive(:send).with('[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:450', 0)
       Metricsd::Client.record_time('custom.metric', 0.45, :source => '')
     end
 
     it 'should apply source specified' do
-      @socket.should_receive(:send).with('[e-mail]_time:450', 0)
+      @socket.should_receive(:send).with('[e-mail]:450', 0)
       Metricsd::Client.record_time('custom.metric', 0.45, :source => 'test2')
     end
   end
 
   describe '.record_value' do
@@ -169,11 +149,11 @@
       @socket.should_receive(:send).with('[e-mail]:23', 0)
       Metricsd::Client.record_value('custom.metric', 23)
     end
 
     it 'should apply group if specified' do
-      @socket.should_receive(:send).with('all@test$custom.metric:23', 0)
+      @socket.should_receive(:send).with('[e-mail]:23', 0)
       Metricsd::Client.record_value('custom.metric', 23, :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
       @socket.should_receive(:send).with('[e-mail]:23', 0)
@@ -185,17 +165,17 @@
       Metricsd::Client.record_value('custom.metric', 23, :source => 'test2')
     end
 
     it 'should apply default group if specified' do
       Metricsd.default_group = 'grp'
-      @socket.should_receive(:send).with('all@grp$custom.metric:23', 0)
+      @socket.should_receive(:send).with('[e-mail]:23', 0)
       Metricsd::Client.record_value('custom.metric', 23)
     end
 
     it 'should override default group with the specified one' do
       Metricsd.default_group = 'grp'
-      @socket.should_receive(:send).with('all@group$custom.metric:23', 0)
+      @socket.should_receive(:send).with('[e-mail]:23', 0)
       Metricsd::Client.record_value('custom.metric', 23, :group => 'group')
     end
 
     it 'should clear group, if there is a default one, and empty string specified' do
       Metricsd.default_group = 'grp'
@@ -209,10 +189,10 @@
       @socket.should_receive(:send).with('[e-mail]:47;[e-mail]:23', 0)
       Metricsd::Client.record_values({'custom.metric' => 23, 'another.metric' => 47})
     end
 
     it 'should apply group if specified' do
-      @socket.should_receive(:send).with('all@test$another.metric:47;all@test$custom.metric:23', 0)
+      @socket.should_receive(:send).with('[e-mail]:47;[e-mail]:23', 0)
       Metricsd::Client.record_values({'custom.metric' => 23, 'another.metric' => 47}, :group => 'test')
     end
 
     it 'should apply source if empty string passed' do
       @socket.should_receive(:send).with('[e-mail]:47;[e-mail]:23', 0)