lib/smsified/oneapi.rb in smsified-0.1.3 vs lib/smsified/oneapi.rb in smsified-0.1.4

@@ -21,10 +21,11 @@
     # @raise [ArgumentError] if :username is not passed as an option
     # @raise [ArgumentError] if :password is not passed as an option
     # @example 
     #   one_api = OneAPI.new :username => 'user', :password => '123'
     def initialize(options)
+      raise ArgumentError, 'an options Hash is required' if !options.instance_of?(Hash)
       raise ArgumentError, ':username required' if options[:username].nil?
       raise ArgumentError, ':password required' if options[:password].nil?
       
       self.class.debug_output $stdout if options[:debug]
       self.class.base_uri options[:base_uri] || SMSIFIED_ONEAPI_PUBLIC_URI
@@ -51,10 +52,11 @@
     # @raise [ArgumentError] if :message is not provided as an option
     # @example 
     #   one_api.send_sms :address => '14155551212', :message => 'Hi there!', :sender_address => '13035551212'
     #   one_api.send_sms :address => ['14155551212', '13035551212'], :message => 'Hi there!', :sender_address => '13035551212'
     def send_sms(options)
+      raise ArgumentError, 'an options Hash is required' if !options.instance_of?(Hash)
       raise ArgumentError, ':sender_address is required' if options[:sender_address].nil? && @sender_address.nil?
       raise ArgumentError, ':address is required' if options[:address].nil?
       raise ArgumentError, ':message is required' if options[:message].nil?
       
       options[:sender_address] = options[:sender_address] || @sender_address
@@ -90,18 +92,26 @@
     
     ##
     # Builds the necessary query string
     def build_query_string(options)
       query = ''
-      
+
       options.each do |k,v|
         if k == :address
-          v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+          if RUBY_VERSION.to_f == 1.9
+            if v.instance_of?(String)
+              v.each_line { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+            else
+              v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+            end
+          else
+            v.each { |address| query += "#{ '&' if query != '' }address=#{CGI.escape address}" }
+          end
         else
           query += "#{ '&' if query != '' }#{k.to_s}=#{CGI.escape v}"
         end
       end
       
       query
     end
   end
-end
\ No newline at end of file
+end