short_message 0.0.3 → 0.0.4

data/app/models/short_message/message.rb

@@ -1,5 +1,4 @@
 require "net/http"
-require "net/https"
 
 module ShortMessage
   class Message < ActiveRecord::Base
@@ -13,11 +12,11 @@ module ShortMessage
       self.sender = ShortMessage.config.default_sms_sender if self.sender.blank?
       
       unless self.recipient.blank? and self.text.blank?
-        http = Net::HTTP.new(ShortMessage.config.gateway_server)
+        http = Net::HTTP.new(ShortMessage.config.gateway_server, ShortMessage.config.gateway_port)
         response, data = http.post(ShortMessage.config.send_file_path, build_deliver_params_string)
         
         if response.code == "200"
-          # returns something like 0:200: OK (<mobilenumber>:<msgid>):<msgid>
+          # returns something like 0:200: OK (<mobilenumber>:<msgid>)
           result_set = response.body.gsub("(","").gsub(")","").split(":")
           self.status_code = result_set[0].to_i
           self.message_key = result_set[3] unless result_set[3].blank?
@@ -48,7 +47,7 @@ module ShortMessage
           # returns something like 0:Successful
           result_set = response.body.split(":")
       
-          if result_set[0] == "0"
+          if result_set[0].to_i == 0
             logger.info "SMS account successfully charged with #{amount} sms."
             Mailer.recharge_notification(amount).deliver unless ShortMessage.config.reload_notification_email.blank?
             Mailer.voucher_notification(amount).deliver unless ShortMessage.config.voucher_notification_email.blank?
@@ -58,7 +57,7 @@ module ShortMessage
             Mailer.recharge_failed_notification(amount, body).deliver unless ShortMessage.config.reload_notification_email.blank?
             false
           end
-        else                                
+        else
           "#{response.code} #{response.message}"
         end
       end
@@ -72,7 +71,8 @@ module ShortMessage
       params << "ID=#{ShortMessage.config.id_string}"
       params << "sender=#{CGI.escape(self.sender)}"
       params << "receipient=#{CGI.escape(self.recipient)}"
-      params << "message=#{CGI.escape(self.text.encode('ISO-8859-1', 'utf-8'))}"
+      params << "message=#{CGI.escape(self.text)}"
+      params << "utf-8=1"
       params.join("&")
     end
     

data/lib/generators/short_message/templates/config/initializers/short_message.rb

@@ -1,6 +1,6 @@
 ShortMessage.configure do |config|
   config.gateway_server = "www1.q-x.ch"
-  config.gateway_port = "443"
+  config.gateway_port = 80
   
   config.send_file_path = "/app/sms/gw1/cust/send.php"
   config.account_functions_path = "/app/sms/gw1/cust/accfunc.php"  
@@ -18,4 +18,4 @@ ShortMessage.configure do |config|
   
   # set a default sms sender (used if no sender is present)
   # config.default_sms_sender = ""
-end
+end

data/lib/generators/short_message/templates/config/locales/short_message.de.yml

@@ -3,5 +3,12 @@ de:
     status:
       code_1: "Empfänger abwesend"
       code_3: "anerkannt"
+      code_5: "anruf blockiert"
+      code_6: "MSC Fehler"
       code_7: "zugestellt"
       code_18: "abgewiesen"
+      code_20: "nicht verfügbar während Roaming"
+      code_21: "unerwarteter Wert"
+      code_22: "unbekannter Abonnent"
+      code_99: "Aufladen fehlgeschlagen"
+      code_999: "unkategorisierter Status"

data/lib/generators/short_message/templates/config/locales/short_message.en.yml

@@ -3,5 +3,12 @@ en:
     status:
       code_1: "absent subscriber"
       code_3: "accepted"
+      code_5: "call barred"
+      code_6: "controlling MSC failure"
       code_7: "delivered"
-      code_18: "rejected"
+      code_18: "rejected by gateway"
+      code_20: "unavailable while roaming to"
+      code_21: "unexpected data value"
+      code_22: "unknown subscriber"
+      code_99: "recharge failed"
+      code_999: "uncategorized status"

data/lib/short_message/version.rb

@@ -1,3 +1,3 @@
 module ShortMessage
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/dummy/config/locales/short_message.de.yml

@@ -3,5 +3,12 @@ de:
     status:
       code_1: "Empfänger abwesend"
       code_3: "anerkannt"
+      code_5: "anruf blockiert"
+      code_6: "MSC Fehler"
       code_7: "zugestellt"
       code_18: "abgewiesen"
+      code_20: "nicht verfügbar während Roaming"
+      code_21: "unerwarteter Wert"
+      code_22: "unbekannter Abonnent"
+      code_99: "Aufladen fehlgeschlagen"
+      code_999: "unkategorisierter Status"

data/spec/dummy/config/locales/short_message.en.yml

@@ -3,5 +3,12 @@ en:
     status:
       code_1: "absent subscriber"
       code_3: "accepted"
+      code_5: "call barred"
+      code_6: "controlling MSC failure"
       code_7: "delivered"
-      code_18: "rejected"
+      code_18: "rejected by gateway"
+      code_20: "unavailable while roaming to"
+      code_21: "unexpected data value"
+      code_22: "unknown subscriber"
+      code_99: "recharge failed"
+      code_999: "uncategorized status"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short_message
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Send short messages to a specific SMS Gateway