openagent 0.9.6 → 0.9.8

data/lib/openagent/client.rb

@@ -110,9 +110,9 @@ module OpenAgent
         begin
           run_once
           sleep wait_period
-        rescue ResponseError => e
+        rescue OpenAgent::ResponseError => e
           @log.error e
-        rescue Net::OpenTimeout => e
+        rescue Net::HTTPError => e
           @log.error e
           sleep(5)
         end
@@ -146,11 +146,11 @@ module OpenAgent
 
       log "Request", req.body
       @zone.send_request(req).tap do |response|
-        log "Response", formatted_xml(response.body, @pretty_print)
 
         if response.body.nil? or response.body.empty?
-          raise ResponseError, "Response is empty"
+          raise OpenAgent::ResponseError, "Response is empty"
         else
+          log "Response", formatted_xml(response.body, @pretty_print)
           incoming = Message.new
           MessageRepresenter.new(incoming).from_xml(response.body)
 

data/lib/openagent/version.rb

@@ -1,3 +1,3 @@
 module OpenAgent
-  VERSION = '0.9.6' unless defined?(OpenAgent::VERSION)
+  VERSION = '0.9.8' unless defined?(OpenAgent::VERSION)
 end

data/lib/sif/infra/messages/ack.rb

@@ -4,10 +4,11 @@ module SIF
       class Ack
         include Virtus.model
 
+        attribute :header, Common::Header
+
         attribute :original_source_id, String
         attribute :original_msg_id,    String
 
-        attribute :header, Common::Header
         attribute :status, Common::Status
         attribute :error,  Common::Error
       end

data/lib/sif/representations/infra/messages/ack.rb

@@ -6,12 +6,12 @@ module SIF
 
           self.representation_wrap = 'SIF_Ack'
 
-          property :original_source_id, :as => 'SIF_OriginalSourceId'
-          property :original_msg_id,    :as => 'SIF_OriginalMsgId'
-
           property :header, :as => 'SIF_Header',
                    :class => SIF::Infra::Common::Header,
                    :decorator => Infra::Common::Header
+          property :original_source_id, :as => 'SIF_OriginalSourceId'
+          property :original_msg_id,    :as => 'SIF_OriginalMsgId'
+
           property :status, :as => 'SIF_Status',
                    :class => SIF::Infra::Common::Status,
                    :decorator => Infra::Common::Status

data/spec/message_builder_spec.rb

@@ -74,7 +74,7 @@ describe OpenAgent::MessageBuilder do
   it "acks" do
     msg = header_checks_out{ builder.ack("SRCID", "MSGID", "1") }
     msg.ack.status.code.should == 1
-    represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Ack>\n    <SIF_OriginalSourceId>SRCID</SIF_OriginalSourceId>\n    <SIF_OriginalMsgId>MSGID</SIF_OriginalMsgId>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_Status>\n      <SIF_Code>1</SIF_Code>\n    </SIF_Status>\n  </SIF_Ack>\n</SIF_Message>"
+    represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Ack>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_OriginalSourceId>SRCID</SIF_OriginalSourceId>\n    <SIF_OriginalMsgId>MSGID</SIF_OriginalMsgId>\n    <SIF_Status>\n      <SIF_Code>1</SIF_Code>\n    </SIF_Status>\n  </SIF_Ack>\n</SIF_Message>"
   end
 
   it "provisions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openagent
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake