mblox 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjNlOGM0NDk1MjU5MzEzZWVkMTAwYmM2ZjhiZDlmOTk4Y2I3ZGQyZA==
+    NTUwMDM4OWViYzk1MGU1MDA2ZmVmNDA0Y2Y5YzZlYjg3MzdkYmI3Yw==
   data.tar.gz: !binary |-
-    ZjA3YzY2MGM5ZjhiNGY1NjNmNDVmODliNDIwNmZhNzI3ZjRhYTE0Zg==
+    ZWFlMjI4MzBlNGQ2NGU5Y2U0NjM0NTkwZDkyZTg1M2ViMTFiYmZkNQ==
 SHA512:
   metadata.gz: !binary |-
-    OGNiMDI2ZTExZWM0MzFiN2VlMzQ1YWQ1MzQwZDlmZWIxMmNmNDg4YWIxNGJm
-    MWNlZGNiMDc0OTJjYjZjMDQyNjU2M2NhYzQ4NjA4YWI0MDVmNGE0MzRjZjRl
-    ODAxOTVhMTE0ODQzZmQ5YmY2NGJjNTFmYTcwNzBjOTc4YjYxOWE=
+    NzUxYTJhZGFiZmI0OGY2OTM3YTU0YjlhOWY3NmQzOTBkMzM5NWNjMWFmOWVi
+    YmQ1ZjU0ZmRmZjM0MTJiZmUyNjVjYTA5Y2MwMjA0YjFhYzA2NmVjNDFjN2Rl
+    ZTM5YzZmYWI5YzQ5NDQwZjkxYTA2NzA5N2RmMTYxMTM0OThmYWI=
   data.tar.gz: !binary |-
-    NDA1ZTAwNGE1NDNjNmNjZmExYmI0NWVkOWY2NGE2MThlMjM3NjU0MjJhNGMz
-    YjkyZmI1ZjBiZGRiMzhhYmVlYmJmMjMzYTg3ODQ1YmJlOTkxYWM4YjU5YzYy
-    N2IzYTlmNjJiYTFlNmFkN2E1ODk3YjFmMmRmYmE4MTJhMDE2Yjk=
+    M2U2ZWU5YzI2N2U4Njc1ZTJkYWU1M2VjMTkxODdiM2I0YWI3MjBmZDAwZjJj
+    NzE5YjQ1NjEzYWRlNGVlZmU0Zjg1NzcxZWVjYTAzN2U4NWMzZjhiOWEzOTQz
+    ZGRkMzUxYjYxNmI5NjU5NjY3ODIzMjUxMWQ1NjhjNzZhMWU5ZDM=

data/lib/mblox.rb

@@ -10,5 +10,4 @@ module Mblox
       self.config.logger.__send__(self.config.log_level, *args) if self.config.logger
     end
   end
-  class MissingExpectedXmlContentError < StandardError; end
 end

data/lib/mblox/from_xml.rb

@@ -0,0 +1,16 @@
+require 'active_model/serialization'
+require 'active_model/serializers/xml.rb'
+
+module Mblox
+  class MissingExpectedXmlContentError < StandardError; end
+
+  class << self
+    def from_xml(xml)
+      begin
+        Hash.from_xml(xml)
+      rescue REXML::ParseException
+        raise MissingExpectedXmlContentError, "'#{xml}' is not parseable as XML"
+      end
+    end
+  end
+end

data/lib/mblox/sms_receipt.rb

@@ -1,10 +1,10 @@
-require 'active_model/serialization'
-require 'active_model/serializers/xml.rb'
+require 'mblox/from_xml'
+
 module Mblox
   class SmsReceipt
     attr_reader :batch_id, :subscriber_number, :timestamp, :msg_reference, :status, :reason
     def initialize(xml)
-      data = Hash.from_xml(xml)['NotificationService']
+      data = Mblox.from_xml(xml)['NotificationService']
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' node, but was #{xml}" if data.blank?
 
       data = data['NotificationList']

data/lib/mblox/sms_response.rb

@@ -1,6 +1,3 @@
-require 'active_model/serialization'
-require 'active_model/serializers/xml.rb'
-
 require 'active_model/callbacks'
 require 'active_model/validator'
 require 'active_model/naming'
@@ -8,6 +5,8 @@ require 'active_model/translation'
 require 'active_model/validations'
 require 'active_model/errors'
 
+require 'mblox/from_xml'
+
 module Mblox
   class SmsResponse
     class Result
@@ -34,8 +33,8 @@ module Mblox
 
     attr_reader :request, :result, :subscriber_result
     def initialize(xml)
-      data = Hash.from_xml(xml)
-      data = data['NotificationRequestResult']
+      data = Mblox.from_xml(xml)['NotificationRequestResult']
+
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' node, but was #{xml}" if data.blank?
       header = data['NotificationResultHeader']
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultHeader' node, but was #{xml}" if header.blank?

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/sms_receipt_spec.rb

@@ -107,6 +107,10 @@ describe Mblox::SmsReceipt do
     target.reason.should == reason
   end
 
+  it "should raise error when missing root node" do
+    expect{described_class.new('Abcdefg')}.to raise_error(Mblox::MissingExpectedXmlContentError, "'Abcdefg' is not parseable as XML")
+  end
+
   it "should raise error when missing notification service node" do
     expect{described_class.new(missing_notification_service)}.to raise_error(Mblox::MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' node, but was #{missing_notification_service}")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - config.yml.example
 - lib/mblox.rb
 - lib/mblox/configuration.rb
+- lib/mblox/from_xml.rb
 - lib/mblox/sms.rb
 - lib/mblox/sms_receipt.rb
 - lib/mblox/sms_response.rb