vianettsms 0.0.2 → 0.0.3

data/lib/vianettsms/sms.rb

@@ -16,15 +16,8 @@ module Vianettsms
     end
 
     def deliver
-      params = {
-        :username => Vianettsms.config[:username],
-        :password => Vianettsms.config[:password],
-        :tel => @to || "",
-        :msg => @message || "",
-        :msgid => @msgid || ""
-      }
-      if valid?(params)
-        handle_response(params)
+      if valid?
+        handle_response(Net::HTTP.post_form(URI.parse(Vianettsms.url), params_hash))
       end
       delivered?
     end
@@ -33,17 +26,29 @@ module Vianettsms
       @delivered
     end
 
+    def valid?
+      raise(ArgumentError, ":to is required") if @to.nil? or @to.empty?
+      raise(ArgumentError, ":message is required") if @message.nil? or @message.empty?
+      raise(ArgumentError, ":msgid is required") if @msgid.nil? or @msgid.empty?
+      not (@to.nil? or @to.empty? or @message.nil? or @message.empty? or @msgid.nil? or @msgid.empty?)
+    end
+
     private 
 
     attr_accessor :response
 
-    def valid?(params)
-      not (params[:tel].empty? or params[:msg].empty? or params[:msgid].empty?)
+    def params_hash
+      {
+        :username => Vianettsms.config[:username],
+        :password => Vianettsms.config[:password],
+        :tel => @to || "",
+        :msg => @message || "",
+        :msgid => @msgid || ""
+      }
     end
 
-    def handle_response(params)
-      uri = URI.parse(Vianettsms.url)
-      @response = Net::HTTP.post_form(uri, params)
+    def handle_response(response)
+      @response = response
       unless @response.nil?
         @response_hash = XmlSimple.xml_in(@response.body)        
         @status = @response_hash['errorcode']

data/lib/vianettsms/version.rb

@@ -1,3 +1,3 @@
 module Vianettsms
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/integration/vianettsms_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper.rb'
 
 describe Vianettsms::Sms, "#deliver", :vianettsms => true do
 
-  puts "============ VIANETTSMS IS ENABLED  ================"
-
   let(:valid_config) { { :username => 'diego@maradona.com.ar', 
       :password => 'eldie10' } }
 
@@ -33,59 +31,6 @@ describe Vianettsms::Sms, "#deliver", :vianettsms => true do
       end
     end
     
-    context "without params" do    
-
-      let(:sms) { 
-        sms = Vianettsms::Sms.new({})
-        sms.deliver
-        sms
-      }  
-
-      it "should return errorcode 1000 (Message ID required)" do
-        sms.status.should == "1000"
-      end
-    end
-    
-    context "when msgid not sent" do    
-      
-      let(:params) do {
-          :msgid => '',
-          :to => '4711111111',
-          :message => 'Hello World' }
-      end
-
-      let(:sms) { 
-        sms = Vianettsms::Sms.new(params)
-        sms.deliver
-        sms
-    }   
-
-      it "should return errorcode 1000 (Message ID required)" do
-        sms.status.should == "1000"
-      end
-    
-    end
-    
-    context "when phone number is empty" do    
-
-      let(:params) do {
-          :msgid => '1234',
-          :to => '',
-          :message => 'Hello World' }
-      end    
-      
-      let(:sms) { 
-        sms = Vianettsms::Sms.new(params)
-        sms.deliver
-        sms
-      }
-      
-      
-      it "should return errorcode 105 (No recipients specified or invalid recipient value)" do
-        sms.status.should == "105"
-      end
-      
-    end
   end
   
   context "with invalid configuration" do

data/spec/spec_helper.rb

@@ -4,7 +4,12 @@ require 'webmock/rspec'
 WebMock.allow_net_connect!
 
 ::VIANETTSMS_ENABLED = ENV["VIANETSMS_ENABLED"] == "true"  #DISABLED BY DEFAULT
-puts "============ VIANETTSMS IS DISABLED  ================" unless ::VIANETTSMS_ENABLED
+
+if ::VIANETTSMS_ENABLED
+  puts "============ VIANETTSMS HTTP API IS ENABLED  ================"
+else
+  puts "============ VIANETTSMS HTTP API IS DISABLED  ================" 
+end
 
 RSpec.configure do |c|
   c.filter_run_excluding :vianettsms => true unless ::VIANETTSMS_ENABLED

data/spec/vianettsms_spec.rb

@@ -58,5 +58,71 @@ describe Vianettsms::Sms, "#deliver" do
 
   end
 
+  context "Without msgid" do
+
+    before { Vianettsms.config =  valid_config }
+    
+    let(:params) do {
+        :msgid => '',
+        :to => '4711111111',
+        :message => 'Hello World' }
+    end
+
+    let(:sms) { 
+      sms = Vianettsms::Sms.new(params)
+      sms.deliver
+      sms
+    }
+
+    it "should raise ArgumentError exception" do
+      expect{ sms.valid? }.to raise_error(ArgumentError)
+    end
+
+  end
+
+  context "Without message" do
+
+    before { Vianettsms.config =  valid_config }
+    
+    let(:params) do {
+        :msgid => '1234',
+        :to => '4711111111',
+        :message => '' }
+    end
+
+    let(:sms) { 
+      sms = Vianettsms::Sms.new(params)
+      sms.deliver
+      sms
+    }
+
+    it "should raise ArgumentError exception" do
+      expect{ sms.valid? }.to raise_error(ArgumentError)
+    end
+
+  end
+
+  context "Without to" do
+
+    before { Vianettsms.config =  valid_config }
+    
+    let(:params) do {
+        :msgid => '1234',
+        :to => nil,
+        :message => 'Hello World' }
+    end
+
+    let(:sms) { 
+      sms = Vianettsms::Sms.new(params)
+      sms.deliver
+      sms
+    }
+
+    it "should raise ArgumentError exception" do
+      expect{ sms.valid? }.to raise_error(ArgumentError)
+    end
+
+  end
+
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vianettsms
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Juan Pablo Taulamet
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-26 00:00:00 Z
+date: 2012-12-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec