mblox 0.2.9 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODgwZjU3MWFlNWUzYjI1OTAxNzBlY2MwMmI0NTNhZmE0Y2M1YjMxMw==
+    NDhiNjUwZDE4N2YyOTU3MGI3NWQ2MjBmYmUxODYzOTAzZjdjOGNjMA==
   data.tar.gz: !binary |-
-    OGVkNTE1ZWRmZjY1ZmRkN2JlMmJlYmU2MTQ1ZmQyMjEzODExYzdmMg==
+    MDc4NzYxYWE4MjhkZGJiNDE5OTZiNGUyODBhODNhMWZkZDZlOGQ4NA==
 SHA512:
   metadata.gz: !binary |-
-    OGYyYjhlNjQxNjljM2Q5M2I3NDZjZGZmZmMzNGU4Y2I0ZDdmZDQ5ZmMzN2Y3
-    YzlmODE1YjFmZTI1YWU2M2I5MmEwMWJiYTM0ZjRlNmRmMjlhMzQ0M2NmZjFk
-    MDdjMmQyMjY4OTgxMmJjOWI1MWJhNDRmOThjOTg0NmRkNjk5ZWM=
+    OGNhNjBjYjI0NWUxMGJmZGU3ODQxZTIyMDNiNjIwNjk1NzNkNDdkNzQ3Zjc3
+    OTc1NWI5MDk3ZjU0OTAzZTE4YTE0YjY4YTAwZjEzOTM1YjJjZDllNWUyMDEz
+    NmUxMzQ2YjJmZWVhZjgyZTVlODA4YmNkMjZjY2U3ZjZiYmVjN2I=
   data.tar.gz: !binary |-
-    NWUyMTNkZTVjZDYxOTg2MTVmNTdlMTdlYjZhZDNmNWY5YjgyMGQ5NDBkZDli
-    ZWNlN2I4OWYwMWUxMzY2N2IwYzhiMjI1OGZmNWY5ZDcyYzU5NTMzMWJjNjFk
-    ZGM0MDI1MTFlYTdhOGM4NmM5MjQ5YTQzY2M1MDAwMjY0YjA1YTc=
+    MTNiMThhMDMzZTRkZTJlZmIyNGQ0OWVjMzIxNTNkYzJiN2Y4YWY5NzdmYTdm
+    MmIxNjE5NDI3NDZkYWY3MTlmMmUzODAwYzgwYzg4NTAwNTY5ZWNiNTBmODU1
+    ZTJhYTRjNWRiOTkzZTk1ZWY0MTFiZTFmMWIwYjRhMGE0OGMzY2U=

data/lib/mblox/from_xml.rb

@@ -1,15 +1,11 @@
-require 'active_model/serialization'
-require 'active_model/serializers/xml.rb'
+require 'nokogiri'
 
 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"
+      Nokogiri::XML(xml) { |config| config.nonet }.tap do |_|
+        raise MissingExpectedXmlContentError, "'#{xml}' is not parseable as XML" unless _.errors.empty?
       end
     end
   end

data/lib/mblox/sms_receipt.rb

@@ -2,38 +2,49 @@ require 'mblox/from_xml'
 
 module Mblox
   class SmsReceipt
-    attr_reader :batch_id, :subscriber_number, :timestamp, :msg_reference, :status, :reason
+    attr_reader :batch_id, :subscriber_number, :timestamp, :msg_reference, :status, :reason, :operator
     def initialize(xml)
-      data = Mblox.from_xml(xml)['NotificationService']
+      data = Mblox.from_xml(xml).xpath '//NotificationService'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' node, but was #{xml}" if data.blank?
 
-      data = data['NotificationList']
+      data = data.xpath '//NotificationList'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' -> 'NotificationList' node, but was #{xml}" if data.blank?
 
-      data = data['Notification']
+      data = data.xpath '//Notification'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' -> 'NotificationList' -> 'Notification' node, but was #{xml}" if data.blank?
+      @batch_id = data.attribute('BatchID').value.to_i
 
-      @batch_id = data['BatchID'].to_i
-
-      data = data['Subscriber']
+      data = data.xpath '//Subscriber'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationService' -> 'NotificationList' -> 'Notification' -> 'Subscriber' node, but was #{xml}" if data.blank?
 
-      @subscriber_number = data['SubscriberNumber']
+      @subscriber_number = value_at(:SubscriberNumber, data)
       @subscriber_number = @subscriber_number[1..-1] if '1' == @subscriber_number[0]
 
-      unless data['TimeStamp'].blank?
+      timestamp = value_at(:TimeStamp, data)
+      unless timestamp.blank?
         @timestamp = begin
-          Time.strptime("#{data['TimeStamp']}+0000", '%Y%m%d%H%M%z')
+          Time.strptime("#{timestamp}+0000", '%Y%m%d%H%M%z')
         rescue ArgumentError
           nil
         end
       end
 
       @timestamp = @timestamp.to_datetime if @timestamp
-
-      @msg_reference = data['MsgReference']
-      @status = data['Status']
-      @reason = data['Reason'].blank? ? nil : data['Reason'].to_i
+      @msg_reference = value_at(:MsgReference, data)
+      @status = value_at(:Status, data)
+      reason = value_at(:Reason, data)
+      @reason = reason.blank? ? nil : reason.to_i
+      data = data.xpath('//Tags').xpath('//Tag')
+      return if data.empty?
+      data.each do |d|
+        @operator = d.child.content.to_i if "Operator" == data.attribute('Name').content
+        return if @operator
+      end
     end
+    private
+      def value_at(path, data)
+        data = data.xpath("//#{path}")
+        (data.empty? || data.children.empty?) ? nil : data.first.child.content
+      end
   end
 end

data/lib/mblox/sms_response.rb

@@ -19,6 +19,11 @@ module Mblox
         @code, @text = (code.to_i.to_s == code ? code.to_i : code), text
       end
 
+      def self.from_xml(xml, xpath)
+        code, text = xml.xpath("//#{xpath}Code"), xml.xpath("//#{xpath}Text")
+        new(code.first.child.content, text.first.child.content)
+      end
+
       def ok?
         0 == @code
       end
@@ -33,25 +38,25 @@ module Mblox
 
     attr_reader :request, :result, :subscriber_result
     def initialize(xml)
-      data = Mblox.from_xml(xml)['NotificationRequestResult']
+      data = Mblox.from_xml(xml).xpath '//NotificationRequestResult'
 
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' node, but was #{xml}" if data.blank?
-      header = data['NotificationResultHeader']
+      header = data.xpath '//NotificationResultHeader'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultHeader' node, but was #{xml}" if header.blank?
-      @request = Result.new(header['RequestResultCode'], header['RequestResultText'])
+      @request = Result.from_xml(header, :RequestResult)
       @request = nil unless @request.valid?
 
-      result_list = data['NotificationResultList']
+      result_list = data.xpath '//NotificationResultList'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' node, but was #{xml}" if result_list.blank?
-      result_list = result_list['NotificationResult']
+      result_list = result_list.xpath '//NotificationResult'
       raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' -> 'NotificationResult' node, but was #{xml}" if result_list.blank?
-      @result = Result.new(result_list['NotificationResultCode'], result_list['NotificationResultText'])
+      @result = Result.from_xml(result_list, :NotificationResult)
       @result = nil unless @result.valid?
 
       if @result.ok?
-        result_list = result_list['SubscriberResult']
+        result_list = result_list.xpath '//SubscriberResult'
         raise MissingExpectedXmlContentError, "Xml should have contained a 'NotificationRequestResult' -> 'NotificationResultList' -> 'NotificationResult' -> 'SubscriberResult' node, but was #{xml}" if result_list.blank?
-        @subscriber_result = Result.new(result_list['SubscriberResultCode'], result_list['SubscriberResultText'])
+        @subscriber_result = Result.from_xml(result_list, :SubscriberResult)
         @subscriber_result = nil unless @subscriber_result.valid?
       end
     end

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/mblox.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'builder'
+  spec.add_runtime_dependency "nokogiri", ">= 1.5.0"
 end

data/spec/sms_receipt_spec.rb

@@ -33,6 +33,9 @@ describe Mblox::SmsReceipt do
             s.MsgReference(msg_reference)
             s.Status(status)
             s.Reason(reason)
+            s.Tags do |t|
+              t.Tag(10487, :Name => :Operator)
+            end
           end
         end
       end
@@ -105,6 +108,7 @@ describe Mblox::SmsReceipt do
     target.msg_reference.should == msg_reference
     target.status.should == status
     target.reason.should == reason
+    target.operator.should == 10487
   end
 
   it "should raise error when missing root node" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Isaac Betesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 description: Send SMS messages
 email:
 - iybetesh@gmail.com