moceansdk 1.0.0 → 1.0.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 +4 -4
- data/LICENSE.txt +21 -21
- data/README.md +74 -74
- data/lib/moceansdk.rb +27 -27
- data/lib/moceansdk/auth/abstract_auth.rb +15 -15
- data/lib/moceansdk/auth/basic.rb +29 -29
- data/lib/moceansdk/client.rb +62 -62
- data/lib/moceansdk/exceptions/mocean_error.rb +18 -18
- data/lib/moceansdk/exceptions/required_field_exception.rb +8 -8
- data/lib/moceansdk/modules/abstact_client.rb +53 -53
- data/lib/moceansdk/modules/account/balance.rb +26 -26
- data/lib/moceansdk/modules/account/pricing.rb +37 -37
- data/lib/moceansdk/modules/message/channel.rb +11 -11
- data/lib/moceansdk/modules/message/message_status.rb +29 -29
- data/lib/moceansdk/modules/message/sms.rb +74 -74
- data/lib/moceansdk/modules/message/verify_request.rb +81 -81
- data/lib/moceansdk/modules/message/verify_validate.rb +33 -33
- data/lib/moceansdk/modules/number_lookup/number_lookup.rb +34 -34
- data/lib/moceansdk/modules/response_factory.rb +49 -49
- data/lib/moceansdk/modules/transmitter.rb +91 -91
- data/lib/moceansdk/utils.rb +9 -9
- data/lib/moceansdk/version.rb +3 -3
- data/moceansdk.gemspec +26 -25
- metadata +27 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: baa2fbc9440d656aee7a53d85dd3bac6be392cae9ac8559f41cf5e5c25694500
|
4
|
+
data.tar.gz: bb6c25ba828434a22b301decc6d5e1edb5f3c1e82c85182415dc09a8169a4564
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 516771c7d9ce1a9fa24ee023db3427e266abd89336bc15743f49f0877bffd5c03141eafa5867941cb95a8828d89647a7eef48232c185acb5b8b23c4fea80d270
|
7
|
+
data.tar.gz: cda8a8545f864c4717cc3efec9fcd29afe7b585b33c8bb99ddd9c7f69a0f44b13e6cfbc76c8d3883ef55bbffaaa1513ebb92bf0a8d86adba1b754c574a8447ee
|
data/LICENSE.txt
CHANGED
@@ -1,21 +1,21 @@
|
|
1
|
-
The MIT License (MIT)
|
2
|
-
|
3
|
-
Copyright (c) 2018-2019 Micro Ocean Technologies Sdn Bhd
|
4
|
-
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
7
|
-
in the Software without restriction, including without limitation the rights
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
10
|
-
furnished to do so, subject to the following conditions:
|
11
|
-
|
12
|
-
The above copyright notice and this permission notice shall be included in
|
13
|
-
all copies or substantial portions of the Software.
|
14
|
-
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
21
|
-
THE SOFTWARE.
|
1
|
+
The MIT License (MIT)
|
2
|
+
|
3
|
+
Copyright (c) 2018-2019 Micro Ocean Technologies Sdn Bhd
|
4
|
+
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
7
|
+
in the Software without restriction, including without limitation the rights
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
10
|
+
furnished to do so, subject to the following conditions:
|
11
|
+
|
12
|
+
The above copyright notice and this permission notice shall be included in
|
13
|
+
all copies or substantial portions of the Software.
|
14
|
+
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
21
|
+
THE SOFTWARE.
|
data/README.md
CHANGED
@@ -1,74 +1,74 @@
|
|
1
|
-
MoceanAPI Client Library for Ruby
|
2
|
-
============================
|
3
|
-
[](https://rubygems.org/gems/moceansdk)
|
4
|
-
[](https://travis-ci.com/MoceanAPI/mocean-sdk-ruby)
|
5
|
-
[](https://codecov.io/gh/MoceanAPI/mocean-sdk-ruby)
|
6
|
-
[](http://opensource.org/licenses/MIT)
|
8
|
-
[](https://rubygems.org/gems/moceansdk)
|
9
|
-
|
10
|
-
This is the Ruby client library for use Mocean's API. To use this, you'll need a Mocean account. Sign up [for free at
|
11
|
-
moceanapi.com][signup].
|
12
|
-
|
13
|
-
* [Installation](#installation)
|
14
|
-
* [Usage](#usage)
|
15
|
-
* [Example](#example)
|
16
|
-
|
17
|
-
## Installation
|
18
|
-
|
19
|
-
To use the client library you'll need to have [created a Mocean account][signup].
|
20
|
-
|
21
|
-
To install the Ruby client library using Gem.
|
22
|
-
|
23
|
-
```bash
|
24
|
-
gem install moceansdk
|
25
|
-
```
|
26
|
-
|
27
|
-
## Usage
|
28
|
-
|
29
|
-
Create a client with your API key and secret:
|
30
|
-
|
31
|
-
```ruby
|
32
|
-
require 'moceansdk'
|
33
|
-
|
34
|
-
credential = Moceansdk::Auth::Basic.new("API_KEY_HERE", "API_SECRET_HERE")
|
35
|
-
mocean = Moceansdk::Client.new(credential)
|
36
|
-
```
|
37
|
-
|
38
|
-
## Example
|
39
|
-
|
40
|
-
To use [Mocean's SMS API][doc_sms] to send an SMS message, call the `mocean.sms.send()` method.
|
41
|
-
|
42
|
-
The API can be called directly, using a simple array of parameters, the keys match the [parameters of the API][doc_sms].
|
43
|
-
|
44
|
-
```ruby
|
45
|
-
res = mocean.sms.send({
|
46
|
-
"mocean-text": 'Hello World',
|
47
|
-
"mocean-from": 'MOCEAN',
|
48
|
-
"mocean-to": '60123456789'
|
49
|
-
})
|
50
|
-
|
51
|
-
puts res
|
52
|
-
```
|
53
|
-
|
54
|
-
### Responses
|
55
|
-
|
56
|
-
For your convenient, the API response has been parsed to `Hash` using [hash_dot](https://github.com/adsteel/hash_dot) package.
|
57
|
-
```ruby
|
58
|
-
puts res # show full response string
|
59
|
-
puts res.status # show response status, '0' in this case
|
60
|
-
puts res['status'] # same as above
|
61
|
-
```
|
62
|
-
|
63
|
-
## Documentation
|
64
|
-
|
65
|
-
Kindly visit [MoceanApi Docs][doc_main] for more usage
|
66
|
-
|
67
|
-
## License
|
68
|
-
|
69
|
-
This library is released under the [MIT License][license]
|
70
|
-
|
71
|
-
[signup]: https://dashboard.moceanapi.com/register?medium=github&campaign=sdk-ruby
|
72
|
-
[doc_main]: https://moceanapi.com/docs/?ruby
|
73
|
-
[doc_sms]: https://moceanapi.com/docs/?ruby#send-sms
|
74
|
-
[license]: LICENSE.txt
|
1
|
+
MoceanAPI Client Library for Ruby
|
2
|
+
============================
|
3
|
+
[](https://rubygems.org/gems/moceansdk)
|
4
|
+
[](https://travis-ci.com/MoceanAPI/mocean-sdk-ruby)
|
5
|
+
[](https://codecov.io/gh/MoceanAPI/mocean-sdk-ruby)
|
6
|
+
[](https://app.codacy.com/project/MoceanAPI/mocean-sdk-ruby/dashboard)
|
7
|
+
[](http://opensource.org/licenses/MIT)
|
8
|
+
[](https://rubygems.org/gems/moceansdk)
|
9
|
+
|
10
|
+
This is the Ruby client library for use Mocean's API. To use this, you'll need a Mocean account. Sign up [for free at
|
11
|
+
moceanapi.com][signup].
|
12
|
+
|
13
|
+
* [Installation](#installation)
|
14
|
+
* [Usage](#usage)
|
15
|
+
* [Example](#example)
|
16
|
+
|
17
|
+
## Installation
|
18
|
+
|
19
|
+
To use the client library you'll need to have [created a Mocean account][signup].
|
20
|
+
|
21
|
+
To install the Ruby client library using Gem.
|
22
|
+
|
23
|
+
```bash
|
24
|
+
gem install moceansdk
|
25
|
+
```
|
26
|
+
|
27
|
+
## Usage
|
28
|
+
|
29
|
+
Create a client with your API key and secret:
|
30
|
+
|
31
|
+
```ruby
|
32
|
+
require 'moceansdk'
|
33
|
+
|
34
|
+
credential = Moceansdk::Auth::Basic.new("API_KEY_HERE", "API_SECRET_HERE")
|
35
|
+
mocean = Moceansdk::Client.new(credential)
|
36
|
+
```
|
37
|
+
|
38
|
+
## Example
|
39
|
+
|
40
|
+
To use [Mocean's SMS API][doc_sms] to send an SMS message, call the `mocean.sms.send()` method.
|
41
|
+
|
42
|
+
The API can be called directly, using a simple array of parameters, the keys match the [parameters of the API][doc_sms].
|
43
|
+
|
44
|
+
```ruby
|
45
|
+
res = mocean.sms.send({
|
46
|
+
"mocean-text": 'Hello World',
|
47
|
+
"mocean-from": 'MOCEAN',
|
48
|
+
"mocean-to": '60123456789'
|
49
|
+
})
|
50
|
+
|
51
|
+
puts res
|
52
|
+
```
|
53
|
+
|
54
|
+
### Responses
|
55
|
+
|
56
|
+
For your convenient, the API response has been parsed to `Hash` using [hash_dot](https://github.com/adsteel/hash_dot) package.
|
57
|
+
```ruby
|
58
|
+
puts res # show full response string
|
59
|
+
puts res.status # show response status, '0' in this case
|
60
|
+
puts res['status'] # same as above
|
61
|
+
```
|
62
|
+
|
63
|
+
## Documentation
|
64
|
+
|
65
|
+
Kindly visit [MoceanApi Docs][doc_main] for more usage
|
66
|
+
|
67
|
+
## License
|
68
|
+
|
69
|
+
This library is released under the [MIT License][license]
|
70
|
+
|
71
|
+
[signup]: https://dashboard.moceanapi.com/register?medium=github&campaign=sdk-ruby
|
72
|
+
[doc_main]: https://moceanapi.com/docs/?ruby
|
73
|
+
[doc_sms]: https://moceanapi.com/docs/?ruby#send-sms
|
74
|
+
[license]: LICENSE.txt
|
data/lib/moceansdk.rb
CHANGED
@@ -1,28 +1,28 @@
|
|
1
|
-
require 'http'
|
2
|
-
require 'json'
|
3
|
-
require 'hash_dot'
|
4
|
-
require 'xmlsimple'
|
5
|
-
|
6
|
-
require 'moceansdk/auth/abstract_auth'
|
7
|
-
require 'moceansdk/auth/basic'
|
8
|
-
require 'moceansdk/exceptions/mocean_error'
|
9
|
-
require 'moceansdk/exceptions/required_field_exception'
|
10
|
-
|
11
|
-
require 'moceansdk/modules/abstact_client'
|
12
|
-
require 'moceansdk/modules/response_factory'
|
13
|
-
require 'moceansdk/modules/transmitter'
|
14
|
-
|
15
|
-
require 'moceansdk/modules/account/balance'
|
16
|
-
require 'moceansdk/modules/account/pricing'
|
17
|
-
|
18
|
-
require 'moceansdk/modules/message/channel'
|
19
|
-
require 'moceansdk/modules/message/message_status'
|
20
|
-
require 'moceansdk/modules/message/sms'
|
21
|
-
require 'moceansdk/modules/message/verify_request'
|
22
|
-
require 'moceansdk/modules/message/verify_validate'
|
23
|
-
|
24
|
-
require 'moceansdk/modules/number_lookup/number_lookup'
|
25
|
-
|
26
|
-
require 'moceansdk/utils'
|
27
|
-
require 'moceansdk/version'
|
1
|
+
require 'http'
|
2
|
+
require 'json'
|
3
|
+
require 'hash_dot'
|
4
|
+
require 'xmlsimple'
|
5
|
+
|
6
|
+
require 'moceansdk/auth/abstract_auth'
|
7
|
+
require 'moceansdk/auth/basic'
|
8
|
+
require 'moceansdk/exceptions/mocean_error'
|
9
|
+
require 'moceansdk/exceptions/required_field_exception'
|
10
|
+
|
11
|
+
require 'moceansdk/modules/abstact_client'
|
12
|
+
require 'moceansdk/modules/response_factory'
|
13
|
+
require 'moceansdk/modules/transmitter'
|
14
|
+
|
15
|
+
require 'moceansdk/modules/account/balance'
|
16
|
+
require 'moceansdk/modules/account/pricing'
|
17
|
+
|
18
|
+
require 'moceansdk/modules/message/channel'
|
19
|
+
require 'moceansdk/modules/message/message_status'
|
20
|
+
require 'moceansdk/modules/message/sms'
|
21
|
+
require 'moceansdk/modules/message/verify_request'
|
22
|
+
require 'moceansdk/modules/message/verify_validate'
|
23
|
+
|
24
|
+
require 'moceansdk/modules/number_lookup/number_lookup'
|
25
|
+
|
26
|
+
require 'moceansdk/utils'
|
27
|
+
require 'moceansdk/version'
|
28
28
|
require 'moceansdk/client'
|
@@ -1,15 +1,15 @@
|
|
1
|
-
module Moceansdk
|
2
|
-
module Auth
|
3
|
-
|
4
|
-
class AbstractAuth
|
5
|
-
def auth_method
|
6
|
-
raise NotImplementedError, 'AbstractAuth is a abstract class'
|
7
|
-
end
|
8
|
-
|
9
|
-
def params
|
10
|
-
raise NotImplementedError, 'AbstractAuth is a abstract class'
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
end
|
15
|
-
end
|
1
|
+
module Moceansdk
|
2
|
+
module Auth
|
3
|
+
|
4
|
+
class AbstractAuth
|
5
|
+
def auth_method
|
6
|
+
raise NotImplementedError, 'AbstractAuth is a abstract class'
|
7
|
+
end
|
8
|
+
|
9
|
+
def params
|
10
|
+
raise NotImplementedError, 'AbstractAuth is a abstract class'
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
end
|
15
|
+
end
|
data/lib/moceansdk/auth/basic.rb
CHANGED
@@ -1,29 +1,29 @@
|
|
1
|
-
module Moceansdk
|
2
|
-
module Auth
|
3
|
-
|
4
|
-
class Basic < AbstractAuth
|
5
|
-
def initialize(api_key = nil, api_secret = nil)
|
6
|
-
@params = {}
|
7
|
-
@params['mocean-api-key'] = api_key unless api_key.nil?
|
8
|
-
@params['mocean-api-secret'] = api_secret unless api_secret.nil?
|
9
|
-
end
|
10
|
-
|
11
|
-
def api_key=(api_key)
|
12
|
-
@params['mocean-api-key'] = api_key
|
13
|
-
end
|
14
|
-
|
15
|
-
def api_secret=(api_secret)
|
16
|
-
@params['mocean-api-secret'] = api_secret
|
17
|
-
end
|
18
|
-
|
19
|
-
def auth_method
|
20
|
-
'basic'
|
21
|
-
end
|
22
|
-
|
23
|
-
def params
|
24
|
-
@params
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
end
|
29
|
-
end
|
1
|
+
module Moceansdk
|
2
|
+
module Auth
|
3
|
+
|
4
|
+
class Basic < AbstractAuth
|
5
|
+
def initialize(api_key = nil, api_secret = nil)
|
6
|
+
@params = {}
|
7
|
+
@params['mocean-api-key'] = api_key unless api_key.nil?
|
8
|
+
@params['mocean-api-secret'] = api_secret unless api_secret.nil?
|
9
|
+
end
|
10
|
+
|
11
|
+
def api_key=(api_key)
|
12
|
+
@params['mocean-api-key'] = api_key
|
13
|
+
end
|
14
|
+
|
15
|
+
def api_secret=(api_secret)
|
16
|
+
@params['mocean-api-secret'] = api_secret
|
17
|
+
end
|
18
|
+
|
19
|
+
def auth_method
|
20
|
+
'basic'
|
21
|
+
end
|
22
|
+
|
23
|
+
def params
|
24
|
+
@params
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
end
|
29
|
+
end
|
data/lib/moceansdk/client.rb
CHANGED
@@ -1,62 +1,62 @@
|
|
1
|
-
module Moceansdk
|
2
|
-
|
3
|
-
class Client
|
4
|
-
def initialize(obj_auth, options = nil)
|
5
|
-
unless obj_auth.is_a? Auth::AbstractAuth
|
6
|
-
raise Exceptions::MoceanError, 'auth object must extend AbstractAuth'
|
7
|
-
end
|
8
|
-
|
9
|
-
if obj_auth.auth_method.casecmp('basic').zero?
|
10
|
-
if Utils.nil_or_empty?(obj_auth.params['mocean-api-key']) || Utils.nil_or_empty?(obj_auth.params['mocean-api-secret'])
|
11
|
-
raise Exceptions::RequiredFieldException, "api key and api secret for client object can't be empty"
|
12
|
-
end
|
13
|
-
else
|
14
|
-
raise Exceptions::MoceanError, 'unsupported auth method'
|
15
|
-
end
|
16
|
-
|
17
|
-
@transmitter = if options.is_a? Modules::Transmitter
|
18
|
-
options
|
19
|
-
else
|
20
|
-
Modules::Transmitter.new(options)
|
21
|
-
end
|
22
|
-
|
23
|
-
@obj_auth = obj_auth
|
24
|
-
end
|
25
|
-
|
26
|
-
def sms
|
27
|
-
Modules::Message::Sms.new(@obj_auth, @transmitter)
|
28
|
-
end
|
29
|
-
|
30
|
-
def flash_sms
|
31
|
-
sms = Modules::Message::Sms.new(@obj_auth, @transmitter)
|
32
|
-
sms.mclass = 1
|
33
|
-
sms.alt_dcs = 1
|
34
|
-
sms
|
35
|
-
end
|
36
|
-
|
37
|
-
def pricing
|
38
|
-
Modules::Account::Pricing.new(@obj_auth, @transmitter)
|
39
|
-
end
|
40
|
-
|
41
|
-
def balance
|
42
|
-
Modules::Account::Balance.new(@obj_auth, @transmitter)
|
43
|
-
end
|
44
|
-
|
45
|
-
def message_status
|
46
|
-
Modules::Message::MessageStatus.new(@obj_auth, @transmitter)
|
47
|
-
end
|
48
|
-
|
49
|
-
def verify_request
|
50
|
-
Modules::Message::VerifyRequest.new(@obj_auth, @transmitter)
|
51
|
-
end
|
52
|
-
|
53
|
-
def verify_validate
|
54
|
-
Modules::Message::VerifyValidate.new(@obj_auth, @transmitter)
|
55
|
-
end
|
56
|
-
|
57
|
-
def number_lookup
|
58
|
-
Modules::NumberLookup::NumberLookup.new(@obj_auth, @transmitter)
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
end
|
1
|
+
module Moceansdk
|
2
|
+
|
3
|
+
class Client
|
4
|
+
def initialize(obj_auth, options = nil)
|
5
|
+
unless obj_auth.is_a? Auth::AbstractAuth
|
6
|
+
raise Exceptions::MoceanError, 'auth object must extend AbstractAuth'
|
7
|
+
end
|
8
|
+
|
9
|
+
if obj_auth.auth_method.casecmp('basic').zero?
|
10
|
+
if Utils.nil_or_empty?(obj_auth.params['mocean-api-key']) || Utils.nil_or_empty?(obj_auth.params['mocean-api-secret'])
|
11
|
+
raise Exceptions::RequiredFieldException, "api key and api secret for client object can't be empty"
|
12
|
+
end
|
13
|
+
else
|
14
|
+
raise Exceptions::MoceanError, 'unsupported auth method'
|
15
|
+
end
|
16
|
+
|
17
|
+
@transmitter = if options.is_a? Modules::Transmitter
|
18
|
+
options
|
19
|
+
else
|
20
|
+
Modules::Transmitter.new(options)
|
21
|
+
end
|
22
|
+
|
23
|
+
@obj_auth = obj_auth
|
24
|
+
end
|
25
|
+
|
26
|
+
def sms
|
27
|
+
Modules::Message::Sms.new(@obj_auth, @transmitter)
|
28
|
+
end
|
29
|
+
|
30
|
+
def flash_sms
|
31
|
+
sms = Modules::Message::Sms.new(@obj_auth, @transmitter)
|
32
|
+
sms.mclass = 1
|
33
|
+
sms.alt_dcs = 1
|
34
|
+
sms
|
35
|
+
end
|
36
|
+
|
37
|
+
def pricing
|
38
|
+
Modules::Account::Pricing.new(@obj_auth, @transmitter)
|
39
|
+
end
|
40
|
+
|
41
|
+
def balance
|
42
|
+
Modules::Account::Balance.new(@obj_auth, @transmitter)
|
43
|
+
end
|
44
|
+
|
45
|
+
def message_status
|
46
|
+
Modules::Message::MessageStatus.new(@obj_auth, @transmitter)
|
47
|
+
end
|
48
|
+
|
49
|
+
def verify_request
|
50
|
+
Modules::Message::VerifyRequest.new(@obj_auth, @transmitter)
|
51
|
+
end
|
52
|
+
|
53
|
+
def verify_validate
|
54
|
+
Modules::Message::VerifyValidate.new(@obj_auth, @transmitter)
|
55
|
+
end
|
56
|
+
|
57
|
+
def number_lookup
|
58
|
+
Modules::NumberLookup::NumberLookup.new(@obj_auth, @transmitter)
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
end
|