short_message 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/app/models/short_message/message.rb +6 -6
- data/lib/generators/short_message/templates/config/initializers/short_message.rb +2 -2
- data/lib/generators/short_message/templates/config/locales/short_message.de.yml +7 -0
- data/lib/generators/short_message/templates/config/locales/short_message.en.yml +8 -1
- data/lib/short_message/version.rb +1 -1
- data/spec/dummy/config/locales/short_message.de.yml +7 -0
- data/spec/dummy/config/locales/short_message.en.yml +8 -1
- metadata +3 -3
@@ -1,5 +1,4 @@
|
|
1
1
|
require "net/http"
|
2
|
-
require "net/https"
|
3
2
|
|
4
3
|
module ShortMessage
|
5
4
|
class Message < ActiveRecord::Base
|
@@ -13,11 +12,11 @@ module ShortMessage
|
|
13
12
|
self.sender = ShortMessage.config.default_sms_sender if self.sender.blank?
|
14
13
|
|
15
14
|
unless self.recipient.blank? and self.text.blank?
|
16
|
-
http = Net::HTTP.new(ShortMessage.config.gateway_server)
|
15
|
+
http = Net::HTTP.new(ShortMessage.config.gateway_server, ShortMessage.config.gateway_port)
|
17
16
|
response, data = http.post(ShortMessage.config.send_file_path, build_deliver_params_string)
|
18
17
|
|
19
18
|
if response.code == "200"
|
20
|
-
# returns something like 0:200: OK (<mobilenumber>:<msgid>)
|
19
|
+
# returns something like 0:200: OK (<mobilenumber>:<msgid>)
|
21
20
|
result_set = response.body.gsub("(","").gsub(")","").split(":")
|
22
21
|
self.status_code = result_set[0].to_i
|
23
22
|
self.message_key = result_set[3] unless result_set[3].blank?
|
@@ -48,7 +47,7 @@ module ShortMessage
|
|
48
47
|
# returns something like 0:Successful
|
49
48
|
result_set = response.body.split(":")
|
50
49
|
|
51
|
-
if result_set[0] ==
|
50
|
+
if result_set[0].to_i == 0
|
52
51
|
logger.info "SMS account successfully charged with #{amount} sms."
|
53
52
|
Mailer.recharge_notification(amount).deliver unless ShortMessage.config.reload_notification_email.blank?
|
54
53
|
Mailer.voucher_notification(amount).deliver unless ShortMessage.config.voucher_notification_email.blank?
|
@@ -58,7 +57,7 @@ module ShortMessage
|
|
58
57
|
Mailer.recharge_failed_notification(amount, body).deliver unless ShortMessage.config.reload_notification_email.blank?
|
59
58
|
false
|
60
59
|
end
|
61
|
-
else
|
60
|
+
else
|
62
61
|
"#{response.code} #{response.message}"
|
63
62
|
end
|
64
63
|
end
|
@@ -72,7 +71,8 @@ module ShortMessage
|
|
72
71
|
params << "ID=#{ShortMessage.config.id_string}"
|
73
72
|
params << "sender=#{CGI.escape(self.sender)}"
|
74
73
|
params << "receipient=#{CGI.escape(self.recipient)}"
|
75
|
-
params << "message=#{CGI.escape(self.text
|
74
|
+
params << "message=#{CGI.escape(self.text)}"
|
75
|
+
params << "utf-8=1"
|
76
76
|
params.join("&")
|
77
77
|
end
|
78
78
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
ShortMessage.configure do |config|
|
2
2
|
config.gateway_server = "www1.q-x.ch"
|
3
|
-
config.gateway_port =
|
3
|
+
config.gateway_port = 80
|
4
4
|
|
5
5
|
config.send_file_path = "/app/sms/gw1/cust/send.php"
|
6
6
|
config.account_functions_path = "/app/sms/gw1/cust/accfunc.php"
|
@@ -18,4 +18,4 @@ ShortMessage.configure do |config|
|
|
18
18
|
|
19
19
|
# set a default sms sender (used if no sender is present)
|
20
20
|
# config.default_sms_sender = ""
|
21
|
-
end
|
21
|
+
end
|
@@ -3,5 +3,12 @@ de:
|
|
3
3
|
status:
|
4
4
|
code_1: "Empfänger abwesend"
|
5
5
|
code_3: "anerkannt"
|
6
|
+
code_5: "anruf blockiert"
|
7
|
+
code_6: "MSC Fehler"
|
6
8
|
code_7: "zugestellt"
|
7
9
|
code_18: "abgewiesen"
|
10
|
+
code_20: "nicht verfügbar während Roaming"
|
11
|
+
code_21: "unerwarteter Wert"
|
12
|
+
code_22: "unbekannter Abonnent"
|
13
|
+
code_99: "Aufladen fehlgeschlagen"
|
14
|
+
code_999: "unkategorisierter Status"
|
@@ -3,5 +3,12 @@ en:
|
|
3
3
|
status:
|
4
4
|
code_1: "absent subscriber"
|
5
5
|
code_3: "accepted"
|
6
|
+
code_5: "call barred"
|
7
|
+
code_6: "controlling MSC failure"
|
6
8
|
code_7: "delivered"
|
7
|
-
code_18: "rejected"
|
9
|
+
code_18: "rejected by gateway"
|
10
|
+
code_20: "unavailable while roaming to"
|
11
|
+
code_21: "unexpected data value"
|
12
|
+
code_22: "unknown subscriber"
|
13
|
+
code_99: "recharge failed"
|
14
|
+
code_999: "uncategorized status"
|
@@ -3,5 +3,12 @@ de:
|
|
3
3
|
status:
|
4
4
|
code_1: "Empfänger abwesend"
|
5
5
|
code_3: "anerkannt"
|
6
|
+
code_5: "anruf blockiert"
|
7
|
+
code_6: "MSC Fehler"
|
6
8
|
code_7: "zugestellt"
|
7
9
|
code_18: "abgewiesen"
|
10
|
+
code_20: "nicht verfügbar während Roaming"
|
11
|
+
code_21: "unerwarteter Wert"
|
12
|
+
code_22: "unbekannter Abonnent"
|
13
|
+
code_99: "Aufladen fehlgeschlagen"
|
14
|
+
code_999: "unkategorisierter Status"
|
@@ -3,5 +3,12 @@ en:
|
|
3
3
|
status:
|
4
4
|
code_1: "absent subscriber"
|
5
5
|
code_3: "accepted"
|
6
|
+
code_5: "call barred"
|
7
|
+
code_6: "controlling MSC failure"
|
6
8
|
code_7: "delivered"
|
7
|
-
code_18: "rejected"
|
9
|
+
code_18: "rejected by gateway"
|
10
|
+
code_20: "unavailable while roaming to"
|
11
|
+
code_21: "unexpected data value"
|
12
|
+
code_22: "unknown subscriber"
|
13
|
+
code_99: "recharge failed"
|
14
|
+
code_999: "uncategorized status"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: short_message
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-03-
|
12
|
+
date: 2013-03-22 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
223
223
|
version: '0'
|
224
224
|
requirements: []
|
225
225
|
rubyforge_project:
|
226
|
-
rubygems_version: 1.8.
|
226
|
+
rubygems_version: 1.8.25
|
227
227
|
signing_key:
|
228
228
|
specification_version: 3
|
229
229
|
summary: Send short messages to a specific SMS Gateway
|