smess 3.2.0 → 3.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 31b776d978966568783beada85d1b844069716f83b09486635de30efe86654e1
4
- data.tar.gz: 656698bb66974499367712120428b0b89ab0db577f62b04990bad42c77397a4f
3
+ metadata.gz: 8213c67258f3d5ff0221556f4d745752f0ef33777ef29bff1fea71b0af54c7e0
4
+ data.tar.gz: 1c4ec4caeb328ccc57942125705332b99cca87c813892f895b544e90d273b758
5
5
  SHA512:
6
- metadata.gz: b8ff3128d4344de5a848922d980ac1687948b1f0fcdc16dfb8d3bf95d9b562636eadd1f935c489eeae7a4fb75eaf6190d045a87545b79d31921788d2e30f44ff
7
- data.tar.gz: c5223cadc7a05f5aaa838af64b313f6d8e896ba1db6b8209b6b7263e2659955587a58d9a8e6c990e4c52ccc472981d6ac7b539bba2a4d59362c0e695f8d6e7af
6
+ metadata.gz: 7b3abdb19eafa71a10110712becef5ea91cfec88cec9aaadaee7ba397eed7a8b121a65aef4ba8d03a58f47525695135f3a1b021ef4709b3879c94e42168091bc
7
+ data.tar.gz: fde5083a9ac6f4128c409e56b77f08b9f074ae1d6c011cf75160697b5dbffbbe4f97af255f9387218445c00b05956f170c3fcf167ef3c1c9c1ade8eabd50561e
data/Gemfile.lock CHANGED
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- smess (3.1.2)
4
+ smess (3.3.1)
5
5
  activesupport (>= 5.2.6, < 8.0.0)
6
6
  clickatell (~> 0)
7
- httpi (~> 3.0)
7
+ httpi (~> 4.0, >= 4)
8
8
  twilio-ruby (~> 6.2)
9
9
 
10
10
  GEM
@@ -15,6 +15,7 @@ GEM
15
15
  i18n (>= 1.6, < 2)
16
16
  minitest (>= 5.1)
17
17
  tzinfo (~> 2.0)
18
+ base64 (0.2.0)
18
19
  clickatell (0.8.2)
19
20
  concurrent-ruby (1.2.2)
20
21
  diff-lcs (1.5.0)
@@ -24,13 +25,18 @@ GEM
24
25
  faraday-net_http (>= 2.0, < 3.1)
25
26
  ruby2_keywords (>= 0.0.4)
26
27
  faraday-net_http (3.0.2)
27
- httpi (3.0.1)
28
- rack
28
+ httpi (4.0.4)
29
+ base64
30
+ mutex_m
31
+ nkf
32
+ rack (>= 2.0, < 4)
29
33
  i18n (1.14.1)
30
34
  concurrent-ruby (~> 1.0)
31
35
  jwt (2.7.1)
32
36
  mini_portile2 (2.8.4)
33
37
  minitest (5.19.0)
38
+ mutex_m (0.3.0)
39
+ nkf (0.2.0)
34
40
  nokogiri (1.15.4)
35
41
  mini_portile2 (~> 2.8.2)
36
42
  racc (~> 1.4)
@@ -80,24 +80,12 @@ module Smess
80
80
 
81
81
  attr_accessor :results
82
82
 
83
- def parts
84
- @parts ||= split_parts
85
- end
86
-
87
- def split_parts
88
- Smess.separate_sms(sms.message).reject { |s| s.empty? }
89
- end
90
-
91
83
  def to
92
84
  "+#{sms.to}"
93
85
  end
94
86
 
95
87
  def sender
96
- if messaging_service_sid.present?
97
- {messaging_service_sid: messaging_service_sid}
98
- else
99
- {from: from}
100
- end
88
+ {from: from}
101
89
  end
102
90
 
103
91
  def dynamic_callback_url
@@ -121,7 +109,12 @@ module Smess
121
109
  status_callback: dynamic_callback_url,
122
110
  provide_feedback: true
123
111
  }
112
+ if message.is_a? Hash
113
+ opts.merge!(message)
114
+ opts.delete :body
115
+ end
124
116
  opts.merge!(sender)
117
+ opts.merge!({messaging_service_sid: messaging_service_sid}) if messaging_service_sid.present?
125
118
  response = create_client_message(opts)
126
119
  result = normal_result(response)
127
120
  rescue ::Twilio::REST::RestError => e
@@ -10,7 +10,11 @@ module Smess
10
10
  end
11
11
 
12
12
  def sender
13
- {from: "whatsapp:+#{from}"}
13
+ if from.present?
14
+ {from: "whatsapp:+#{from}"}
15
+ else
16
+ super
17
+ end
14
18
  end
15
19
 
16
20
  end
data/lib/smess/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Smess
2
- VERSION = '3.2.0'
2
+ VERSION = '3.3.1'
3
3
  end
data/smess.gemspec CHANGED
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
17
17
  s.add_development_dependency 'rspec', '>= 2.4.0'
18
18
  s.add_development_dependency 'simplecov'
19
19
  s.add_development_dependency 'dotenv'
20
- s.add_dependency 'httpi', '~> 3.0'
20
+ s.add_dependency 'httpi', '>=4', '~> 4.0'
21
21
  s.add_dependency 'clickatell', '~> 0'
22
22
  s.add_dependency 'twilio-ruby', '~> 6.2'
23
23
  s.add_dependency 'activesupport', '>= 5.2.6', '< 8.0.0'
@@ -25,4 +25,4 @@ Gem::Specification.new do |s|
25
25
  s.files = Dir["{lib}/**/*", "[A-Z]*", "init.rb"]
26
26
  s.required_ruby_version = ">= 2.0.0"
27
27
  s.required_rubygems_version = ">= 1.3.7"
28
- end
28
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smess
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0
4
+ version: 3.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Westin
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-06-05 00:00:00.000000000 Z
11
+ date: 2024-12-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -56,16 +56,22 @@ dependencies:
56
56
  name: httpi
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ version: '4'
59
62
  - - "~>"
60
63
  - !ruby/object:Gem::Version
61
- version: '3.0'
64
+ version: '4.0'
62
65
  type: :runtime
63
66
  prerelease: false
64
67
  version_requirements: !ruby/object:Gem::Requirement
65
68
  requirements:
69
+ - - ">="
70
+ - !ruby/object:Gem::Version
71
+ version: '4'
66
72
  - - "~>"
67
73
  - !ruby/object:Gem::Version
68
- version: '3.0'
74
+ version: '4.0'
69
75
  - !ruby/object:Gem::Dependency
70
76
  name: clickatell
71
77
  requirement: !ruby/object:Gem::Requirement