shoutbox-client 0.0.13 → 0.0.14

data/lib/shoutbox_client.rb

@@ -28,8 +28,8 @@ class ShoutboxClient
       req = Net::HTTP::Put.new( request_url(options) )
       default_headers(req)
       body_data = { :statusId => options[:statusId], :group => (options[:group] || configuration.default_group), :status => options[:status].to_s }
-      body_data[:message] = options[:message] if options[:status].to_s == 'red' or (options[:status].to_s == 'yellow' and options[:message])
-      raise ArgumentError if (options[:status] == :red) and body_data[:message].to_s.empty?
+      body_data[:message] = options[:message] if options[:message]
+      raise ArgumentError if (options[:status] == :red or options[:status] == :yellow) and body_data[:message].to_s.empty?
       req.body = body_data.to_json
       http.request(req)
     end

data/spec/shoutbox_client_spec.rb

@@ -52,15 +52,6 @@ describe "ShoutboxClient" do
       ShoutboxClient.shout( :statusId => "test_status", :status => :green ).should == true
     end
 
-    it 'should not include a message when status is yellow and no message given' do
-      stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"yellow\"}", 
-             :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
-        to_return(:status => 200, :body => "OK", :headers => {})
-
-      ShoutboxClient.shout( :statusId => "test_status", :status => :yellow ).should == true
-    end
-
     it 'should include a message when status is yellow and message is given' do
       stub_request(:put, "http://localhost:3000/status").
         with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"yellow\",\"message\":\"This is what you should do now..\"}", 
@@ -79,19 +70,26 @@ describe "ShoutboxClient" do
       ShoutboxClient.shout( :statusId => "test_status", :status => :red, :message => "This is what you should do now.." ).should == true
     end
     
-    it 'should not include a message when status is green' do
+    it 'should deny red update if message is missing' do
+      lambda {
+        ShoutboxClient.shout( :statusId => "test_status", :status => :red )
+      }.should raise_error(ArgumentError)
+    end
+
+    it 'should deny yellow update if message is missing' do
+      lambda {
+        ShoutboxClient.shout( :statusId => "test_status", :status => :yellow )
+      }.should raise_error(ArgumentError)
+    end
+
+    it 'should send optional status on green update' do
       stub_request(:put, "http://localhost:3000/status").
-        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"green\"}", 
+        with(:body    => "{\"statusId\":\"test_status\",\"group\":\"default group\",\"status\":\"green\",\"message\":\"everything's ok!\"}", 
              :headers => {'Accept'=>'application/json', 'User-Agent'=>'Ruby shoutbox-client'}).
         to_return(:status => 200, :body => "OK", :headers => {})
-
-      ShoutboxClient.shout( :statusId => "test_status", :status => :green, :message => "This is what you should do now.." ).should == true
-    end
-    
-    it 'should deny red update if message is missin' do
       lambda {
-        ShoutboxClient.shout( :statusId => "test_status", :status => :red )
-      }.should raise_error(ArgumentError)
+        ShoutboxClient.shout( :statusId => "test_status", :status => :green, :message => "everything's ok!" )
+      }.should_not raise_error(ArgumentError)
     end
     
     it 'should delete a status' do

metadata

@@ -2,7 +2,7 @@
 name: shoutbox-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Benjamin Krause
@@ -10,7 +10,7 @@ autorequire: shoutbox_client
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: shout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4318415923322988878
+      hash: -3529820727078864145
       segments: 
       - 0
       version: "0"