short_message 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907b1e83f5941d4897cdf66427065f9698edc33c
-  data.tar.gz: dd8e79d9686c98d3ad10378639441319bf50205c
+  metadata.gz: 8c279adb74034281791d363ed71482435e27abc7
+  data.tar.gz: 3fdecf7b086165361a255c65448bf0bee39d7814
 SHA512:
-  metadata.gz: 5c46b64b56cbe6fd6e8cb901261ce9fd5e1fef11e4454d70dedab1482b26d941220022ec2987d0a38737b619d07772970845a850fad492d83fb05b25ba900377
-  data.tar.gz: c469574b1421b4c60539b7f7fb09aa211cf715276fb59e4f9ec5d202e400688c3c4c1af065aebf67975e52614923e7c04a7d8b1401a688d9b6f22a58a6a83d05
+  metadata.gz: a28908e48e31fcc3c04681a60a9ef042a475964866f99317478de60bb73070fe5b4f93696dcc2e499b5cf57f05b1abf8074f977f6e82b240cf1b3066e3f38ae7
+  data.tar.gz: 5857e907d60d7d9a213c80ffa1088e8c08c59f49a5cd8e66e35f743506e70b501295e1752128029e240b135b707155fd21e0fea52bbe5302cf741dc4556dfbcb

data/app/mailers/short_message/mailer.rb

@@ -1,16 +1,21 @@
 module ShortMessage
   class Mailer < ActionMailer::Base
+    default from: ShortMessage.config.default_mail_sender
+
     def recharge_notification amount
-      mail to: ShortMessage.config.reload_notification_email, :from => ShortMessage.config.default_mail_sender, :subject => "SMS credit recharged", :body => "Your SMS Account has automatically been recharged with #{amount} sms."
+      mail to: ShortMessage.config.reload_notification_email, :subject => "SMS credit recharged", :body => "Your SMS Account has automatically been recharged with #{amount} sms."
     end
-    
+
     def voucher_notification amount
-      mail :to => ShortMessage.config.voucher_notification_email, :from => ShortMessage.config.default_mail_sender, :subject => "SMS credit recharged, please create a voucher", :body => "Please add a voucher:\r\nCustomer: #{ShortMessage.config.user_id}\r\nAmount: #{amount} sms\r\n\r\nThank you!"
+      mail :to => ShortMessage.config.voucher_notification_email, :subject => "SMS credit recharged, please create a voucher", :body => "Please add a voucher:\r\nCustomer: #{ShortMessage.config.user_id}\r\nAmount: #{amount} sms\r\n\r\nThank you!"
     end
-    
+
     def recharge_failed_notification amount, message
-      mail :to => ShortMessage.config.reload_notification_email, :from => ShortMessage.config.default_mail_sender, :subject => "SMS credit recharge failed", :body =>"SMS account could not be recharged with #{amount} sms. Error: #{body}"
+      mail :to => ShortMessage.config.reload_notification_email, :subject => "SMS credit recharge failed", :body =>"SMS account could not be recharged with #{amount} sms. Error: #{body}"
+    end
+
+    def error_notification message, response
+      mail :to => ShortMessage.config.reload_notification_email, :subject => "Error delivering SMS to #{message.recipient}", :body =>"SMS from #{message.sender} to #{message.recipient} could not be sent!\r\n\r\nResponse: #{response.to_yaml}"
     end
-    
   end
 end

data/app/models/short_message/message.rb

@@ -3,24 +3,28 @@ require "net/http"
 module ShortMessage
   class Message < ActiveRecord::Base
     attr_accessible :message_key, :recipient, :sender, :status_code, :text
-    
+
     def status_text
       I18n.t("short_message.status.code_#{self.status_code}")
     end
-    
+
     def deliver
       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, ShortMessage.config.gateway_port)
+        if ShortMessage.config.gateway_port == Net::HTTP.https_default_port()
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
         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>)
           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?
-          
+
           if self.status_code == 3 and ShortMessage.config.default_reload_amount > 0
             if self.recharge
               self.deliver
@@ -29,24 +33,25 @@ module ShortMessage
               return false
             end
           end
-          
+
           self.save
           true
         else
+          Mailer.error_notification(self, response).deliver unless ShortMessage.config.admin_notification_email.blank?
           false
         end
       end
     end
-    
+
     def recharge amount = ShortMessage.config.default_reload_amount
       unless ShortMessage.config.account_functions_path.blank?
         http = Net::HTTP.new(ShortMessage.config.gateway_server)
         response, body = http.post(ShortMessage.config.account_functions_path, build_recharge_params_string(amount))
-      
+
         if response.code == "200"
           # returns something like 0:Successful
           result_set = response.body.split(":")
-      
+
           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?
@@ -62,7 +67,7 @@ module ShortMessage
         end
       end
     end
-    
+
     private
     def build_deliver_params_string
       params = []
@@ -75,7 +80,7 @@ module ShortMessage
       params << "utf-8=1"
       params.join("&")
     end
-    
+
     def build_recharge_params_string amount
       params = []
       params << "UserIDFS=#{ShortMessage.config.user_id}"

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

@@ -1,21 +1,22 @@
 ShortMessage.configure do |config|
   config.gateway_server = "www1.q-x.ch"
-  config.gateway_port = 80
-  
+  config.gateway_port = 443
+
   config.send_file_path = "/app/sms/gw1/cust/send.php"
-  config.account_functions_path = "/app/sms/gw1/cust/accfunc.php"  
-  
+  config.account_functions_path = "/app/sms/gw1/cust/accfunc.php"
+
   # enter your details received from provider here
   config.user_id = ""
   config.ccu_id = ""
   config.id_string = ""
-  
+
   config.default_reload_amount = 1000
-  
+
   config.default_mail_sender = "webmaster@your-domain.com"
   config.reload_notification_email = "webmaster@your-domain.com"
+  config.admin_notification_email = "webmaster@your-domain.com" # set to blank to deactivate error mailing
   config.voucher_notification_email = "give-me-money@your-domain.com" # set nil to disable voucher mailing
-  
+
   # set a default sms sender (used if no sender is present)
   # config.default_sms_sender = ""
 end

data/lib/short_message/config.rb

@@ -4,35 +4,36 @@ module ShortMessage
   def self.configure(&block)
     yield @config ||= ShortMessage::Configuration.new
   end
-  
+
   def self.config
     @config
   end
-  
+
   class Configuration #:nodoc:
     include ActiveSupport::Configurable
     config_accessor :gateway_server
     config_accessor :gateway_port
     config_accessor :send_file_path
     config_accessor :account_functions_path
-    
+
     config_accessor :user_id
     config_accessor :ccu_id
     config_accessor :id_string
-    
+
     config_accessor :default_sms_sender
     config_accessor :default_reload_amount
     config_accessor :reload_notification_email
+    config_accessor :admin_notification_email
     config_accessor :voucher_notification_email
     config_accessor :default_mail_sender
-    
+
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
     end
-    
+
     # define param_name writer (copied from AS::Configurable)
     writer, line = 'def param_name=(value); config.param_name = value; end', __LINE__
     singleton_class.class_eval writer, __FILE__, line
     class_eval writer, __FILE__, line
   end
-end
+end

data/lib/short_message/version.rb

@@ -1,3 +1,3 @@
 module ShortMessage
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: short_message
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Andi Saurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Send short messages to a specific SMS Gateway