mblox 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWJiZmZlZWIxMDViNmIxNGE3MzE2NWYzYzZlY2M1MWIyNDg0MzkxNQ==
+    ZTcwM2ZhN2QyZDFjZjc3NDk5NDhmN2NkYTNiNGIyZDdlNzdkMjEwYQ==
   data.tar.gz: !binary |-
-    ZDY0YmNkNzdjYmNhNDZkMDBhYjMxZTliNDdkYmNkZmVkMDhhMjk2MQ==
+    MDQ3Yzc3ZWRhNGM3YWJlNGE3N2JjZjY3NTcyNWQ0MDUxYTZhNzQ4NA==
 SHA512:
   metadata.gz: !binary |-
-    MjE3NDJkODAwNThiOTZhYTQ0Y2EwZmQ5YzYxYzU2ZTgwZTQwNWQwODQwYzM0
-    ODcwZWU1NDIwODE3NmJiMDA0OWM2Y2VjZjg4OWI2NDUxMjNkYWY5ZDA5ZjE2
-    M2VhY2U4NzlmNGRjYjMyYzQ0ZGZjZGFmY2IyZThmZjFjODEyOGM=
+    NWIyMWI2YzEwYWFiNjYyZWMzYmRiODViZmRjYzMzODlkZTUwNDVhOTA5YTFm
+    OWM3ZTk1OWYxMTE3NjEzZTkwZmNlMjQ0MzM0ZTg4NDFkYTQ3YWQwMTQ5MTE2
+    YjFhZmFmZDRlOTI5YjliYTg3MzY1YTNkMjI4NWE4YmIyZmI4MmM=
   data.tar.gz: !binary |-
-    MzllZTE0OGZiZTg0ZTg0NTEyYWM5NjllYjMzZDMxMzY4ZmI2YzcwYWU5YTBl
-    NTA0ZWIzYzEyYmFmYzhiZjFmOWY5NGFhODcyNTg1MGM1ODE3MTkxYTc4ZTNi
-    M2VjNzA5NDk1YWY3NzU3NzkyMWRlMDk5ZmM1ODkwZGE5OWFmNjY=
+    MWZlOWM0ZjhjY2QzYzZiY2U3YTgwZjRmNTM4OTY1NzAzM2MwOGMzZDkxMzM2
+    Zjc4M2RkODY2M2MwYzU4OTJjMWVhYTk1Yzk2YzhjMGJhNzI2ODkxODY2MjU4
+    MTNjN2U5ZjEwMDQwZWM3OWE2Y2UzM2Q4ZGI4OTc5ODE2OTFhYzg=

data/lib/mblox/sms_response.rb

@@ -47,18 +47,21 @@ module Mblox
         args.delete(attr)
       end
       raise ::ArgumentError, "Unrecognized attributes: #{args.inspect}" unless args.empty?
-      missing_fields = ATTRIBUTES.reject { |attr| __send__(attr) }
-      if 1 == missing_fields.count
-        raise ValidationError, "#{missing_fields.first} cannot be blank"
-      elsif missing_fields.count > 1
-        raise ValidationError, "The following fields cannot be blank: #{missing_fields.join(', ')}"
-      end
-      wrong_type_fields = ATTRIBUTES.reject { |attr| __send__(attr).is_a?(self.class::Result) }
+
+      wrong_type_fields = ATTRIBUTES.reject { |attr| __send__(attr).nil? ||  __send__(attr).is_a?(self.class::Result) }
       if 1 == wrong_type_fields.count
         raise ValidationError, "#{wrong_type_fields.first} must be of type Mblox::SmsResponse::Result"
       elsif wrong_type_fields.count > 1
         raise ValidationError, "The following fields must be of type Mblox::SmsResponse::Result: #{wrong_type_fields.join(', ')}"
       end
+
+      missing_fields = [:request, :result].reject { |attr| __send__(attr) }
+      missing_fields << :subscriber_result if result && result.ok? && subscriber_result.nil?
+      if 1 == missing_fields.count
+        raise ValidationError, "#{missing_fields.first} cannot be blank"
+      elsif missing_fields.count > 1
+        raise ValidationError, "The following fields cannot be blank: #{missing_fields.join(', ')}"
+      end
     end
 
     def ok?

data/lib/mblox/version.rb

@@ -1,3 +1,3 @@
 module Mblox
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/sms_response_spec.rb

@@ -1,26 +1,61 @@
 require "spec_helper"
 
 describe Mblox::SmsResponse do
-  let(:args) { { :request => Mblox::SmsResponse::Result.new(9, "SomeRequest"), :result => Mblox::SmsResponse::Result.new(10, "SomeResult") , :subscriber_result => Mblox::SmsResponse::Result.new(11, "SomeSubscriberResult")  } }
+  describe "validation" do
+    let(:args) { { :request => Mblox::SmsResponse::Result.new(9, "SomeRequest"), :result => Mblox::SmsResponse::Result.new(10, "SomeResult") , :subscriber_result => Mblox::SmsResponse::Result.new(11, "SomeSubscriberResult")  } }
 
-  [:request, :result, :subscriber_result].each do |attr|
-    describe attr do
-      it "cannot be blank" do
-        expect{described_class.new(args.merge(:"#{attr}" => nil))}.to raise_error(Mblox::ValidationError, "#{attr} cannot be blank")
+    [:request, :result, :subscriber_result].each do |attr|
+      describe attr do
+        it "must be a Result" do
+          expect{described_class.new(args.merge(:"#{attr}" => 123))}.to raise_error(Mblox::ValidationError, "#{attr} must be of type Mblox::SmsResponse::Result")
+        end
       end
-      it "must be a Result" do
-        expect{described_class.new(args.merge(:"#{attr}" => 123))}.to raise_error(Mblox::ValidationError, "#{attr} must be of type Mblox::SmsResponse::Result")
+    end
+    [:request, :result].each do |attr|
+      describe attr do
+        it "cannot be blank" do
+          expect{described_class.new(args.merge(:"#{attr}" => nil))}.to raise_error(Mblox::ValidationError, "#{attr} cannot be blank")
+        end
       end
     end
-  end
 
-  it "should raise an error if request, result and subscriber_result are missing" do
-    expect{described_class.new({})}.to raise_error(Mblox::ValidationError, "The following fields cannot be blank: request, result, subscriber_result")
-  end
-  it "should raise an error if request, result and subscriber_result are the wrong types" do
-    expect{described_class.new(:request => 'A', :result => Time.now, :subscriber_result => 32)}.to raise_error(Mblox::ValidationError, "The following fields must be of type Mblox::SmsResponse::Result: request, result, subscriber_result")
+    describe :subscriber_result do
+      it "cannot be blank if result is ok" do
+        expect{described_class.new(args.merge(:subscriber_result => nil))}.to_not raise_error
+      end
+
+      it "can be blank if result is not ok" do
+        expect{described_class.new(args.merge(:subscriber_result => nil, :result => Mblox::SmsResponse::Result.new(0,'Thumbs Up!')))}.to raise_error(Mblox::ValidationError, "subscriber_result cannot be blank")
+      end
+    end
+
+
+    it "should raise an error if request, result and subscriber_result are missing" do
+      expect{described_class.new({})}.to raise_error(Mblox::ValidationError, "The following fields cannot be blank: request, result")
+    end
+    it "should raise an error if request, result and subscriber_result are the wrong types" do
+      expect{described_class.new(:request => 'A', :result => Time.now, :subscriber_result => 32)}.to raise_error(Mblox::ValidationError, "The following fields must be of type Mblox::SmsResponse::Result: request, result, subscriber_result")
+    end
+    it "should raise an error if an unrecognized attribute is present" do
+      expect{described_class.new(args.merge(:extra_attribute => 'ABC'))}.to raise_error(::ArgumentError, 'Unrecognized attributes: {:extra_attribute=>"ABC"}')
+    end
   end
-  it "should raise an error if an unrecognized attribute is present" do
-    expect{described_class.new(args.merge(:extra_attribute => 'ABC'))}.to raise_error(::ArgumentError, 'Unrecognized attributes: {:extra_attribute=>"ABC"}')
+
+  describe "ok/unroutable" do
+    let(:args) { { :request => Mblox::SmsResponse::Result.new(0, "OKRequest"), :result => Mblox::SmsResponse::Result.new(0, "OKResult") , :subscriber_result => Mblox::SmsResponse::Result.new(0, "OKSubscriberResult")  } }
+
+    it "should be ok if all attributes are ok" do
+      described_class.new(args).should be_ok
+    end
+
+    [:request, :result, :subscriber_result].each do |attr|
+      it "should not be ok if #{attr} is not ok" do
+        described_class.new(args.merge(:"#{attr}" => Mblox::SmsResponse::Result.new(1,"NotOK"))).should_not be_ok
+      end
+    end
+
+    it "should be unroutable if subscriber_result is unroutable and other attirbutes are ok" do
+      described_class.new(args.merge(:subscriber_result => Mblox::SmsResponse::Result::UNROUTABLE)).should be_unroutable
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mblox
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Isaac Betesh