maestrano 0.12.3 → 0.12.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +6 -2
  3. data/README.md +9 -0
  4. data/lib/maestrano.rb +1 -3
  5. data/lib/maestrano/connec/client.rb +4 -1
  6. data/lib/maestrano/version.rb +1 -1
  7. data/test/maestrano/connec/client_test.rb +12 -0
  8. metadata +78 -78
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 027c20721a82e2ffaaa608c140e1145f2474e408
4
- data.tar.gz: 058be80ac7c4ddceb3a4f786799a0b93120f5a4d
3
+ metadata.gz: 33c753bffbe9a011f6fc5215302807369fc69e75
4
+ data.tar.gz: 28f6944e1200101f1261e9103fc21786649bd922
5
5
  SHA512:
6
- metadata.gz: 0d650626a4b6959204cffc47955472eb820f23d6bff56b195152b3e7f3f6f50ba627ee95202790070854b9aea7fb883241c657558f71ed80f7f704197523115d
7
- data.tar.gz: 0dc742db8608cce95ee687eeb7050f8a65ba2f2873ed96caa10ecfd473d22df52a781a15331016e719fbc0377544b673b81549650e75373d87e7a351583dbe84
6
+ metadata.gz: 6bbb19a5978f77d532c5d012bfeb1ded2fb7c993b7b53ffecd26c7bb9cb80c1e2df7c93025572ad84449de49037311750e519feb4b7dc0a1b484f302c6ea5e7a
7
+ data.tar.gz: 61f39c530d3b87fc70e7256916f9d254c959dc881b9b9d029a1a3741ca7cc469d28832ab93a617b84e924f35ec330957b16bbd0e91974df5d8a03743268d3803
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- maestrano (0.12.2)
4
+ maestrano (0.12.3)
5
5
  httparty (~> 0.13)
6
6
  json (~> 1.8)
7
7
  mime-types (~> 1.25)
@@ -12,7 +12,7 @@ PATH
12
12
  GEM
13
13
  remote: http://rubygems.org/
14
14
  specs:
15
- domain_name (0.5.20160128)
15
+ domain_name (0.5.20160310)
16
16
  unf (>= 0.0.5, < 1.0.0)
17
17
  http-cookie (1.0.2)
18
18
  domain_name (~> 0.5)
@@ -20,6 +20,7 @@ GEM
20
20
  json (~> 1.8)
21
21
  multi_xml (>= 0.5.2)
22
22
  json (1.8.3)
23
+ json (1.8.3-java)
23
24
  macaddr (1.7.1)
24
25
  systemu (~> 2.6.2)
25
26
  metaclass (0.0.4)
@@ -31,6 +32,7 @@ GEM
31
32
  netrc (0.11.0)
32
33
  nokogiri (1.6.7.2)
33
34
  mini_portile2 (~> 2.0.0.rc2)
35
+ nokogiri (1.6.7.2-java)
34
36
  rake (10.5.0)
35
37
  rest-client (1.8.0)
36
38
  http-cookie (>= 1.0.2, < 2.0)
@@ -42,11 +44,13 @@ GEM
42
44
  timecop (0.6.0)
43
45
  unf (0.1.4)
44
46
  unf_ext
47
+ unf (0.1.4-java)
45
48
  unf_ext (0.0.7.2)
46
49
  uuid (2.3.8)
47
50
  macaddr (~> 1.0)
48
51
 
49
52
  PLATFORMS
53
+ java
50
54
  ruby
51
55
 
52
56
  DEPENDENCIES
data/README.md CHANGED
@@ -682,6 +682,15 @@ Maestrano::Account::Bill
682
682
  <td>If the bill relates to a specific period then specifies when the period ended. Both period_started_at and period_ended_at need to be filled in order to appear on customer invoice.</td>
683
683
  <tr>
684
684
 
685
+ <tr>
686
+ <td><b>third_party</b></td>
687
+ <td>read/write</td>
688
+ <td>Boolean</td>
689
+ <td>-</td>
690
+ <td>-</td>
691
+ <td>Flag for third-party bills (e.g.: charge for SMS credits). Third party bills are not subject to commissions.</td>
692
+ <tr>
693
+
685
694
  </table>
686
695
 
687
696
  ##### Actions
data/lib/maestrano.rb CHANGED
@@ -297,7 +297,6 @@ module Maestrano
297
297
  'sso.name_id_format' => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
298
298
  'sso.x509_fingerprint' => '01:06:15:89:25:7d:78:12:28:a6:69:c7:de:63:ed:74:21:f9:f5:36',
299
299
  'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAOehBr+YIrhjMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMjM5\nWhcNMzMxMjMwMDUyMjM5WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVkIqo5t5Paflu\nP2zbSbzxn29n6HxKnTcsubycLBEs0jkTkdG7seF1LPqnXl8jFM9NGPiBFkiaR15I\n5w482IW6mC7s8T2CbZEL3qqQEAzztEPnxQg0twswyIZWNyuHYzf9fw0AnohBhGu2\n28EZWaezzT2F333FOVGSsTn1+u6tFwIDAQABo4HuMIHrMB0GA1UdDgQWBBSvrNxo\neHDm9nhKnkdpe0lZjYD1GzCBuwYDVR0jBIGzMIGwgBSvrNxoeHDm9nhKnkdpe0lZ\njYD1G6GBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA56EGv5giuGMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCc\nMPgV0CpumKRMulOeZwdpnyLQI/NTr3VVHhDDxxCzcB0zlZ2xyDACGnIG2cQJJxfc\n2GcsFnb0BMw48K6TEhAaV92Q7bt1/TYRvprvhxUNMX2N8PHaYELFG2nWfQ4vqxES\nRkjkjqy+H7vir/MOF3rlFjiv5twAbDKYHXDT7v1YCg==\n-----END CERTIFICATE-----",
300
- 'connec.host' => 'http://api-sandbox.maestrano.io',
301
300
  },
302
301
  'uat' => {
303
302
  'api.host' => 'https://uat.maestrano.io',
@@ -317,7 +316,7 @@ module Maestrano
317
316
  'api.host' => 'https://maestrano.com',
318
317
  'api.base' => '/api/v1/',
319
318
  'connec.enabled' => true,
320
- 'connec.host' => 'https://api-connec.maestrano.io',
319
+ 'connec.host' => 'https://api-connec.maestrano.com',
321
320
  'connec.base_path' => '/api/v2',
322
321
  'connec.v2_path' => '/v2',
323
322
  'connec.reports_path' => '/reports',
@@ -326,7 +325,6 @@ module Maestrano
326
325
  'sso.name_id_format' => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
327
326
  'sso.x509_fingerprint' => '2f:57:71:e4:40:19:57:37:a6:2c:f0:c5:82:52:2f:2e:41:b7:9d:7e',
328
327
  'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAPFpcH2rW0pyMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyNDEw\nWhcNMzMxMjMwMDUyNDEwWjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD3feNNn2xfEz5/\nQvkBIu2keh9NNhobpre8U4r1qC7h7OeInTldmxGL4cLHw4ZAqKbJVrlFWqNevM5V\nZBkDe4mjuVkK6rYK1ZK7eVk59BicRksVKRmdhXbANk/C5sESUsQv1wLZyrF5Iq8m\na9Oy4oYrIsEF2uHzCouTKM5n+O4DkwIDAQABo4HuMIHrMB0GA1UdDgQWBBSd/X0L\n/Pq+ZkHvItMtLnxMCAMdhjCBuwYDVR0jBIGzMIGwgBSd/X0L/Pq+ZkHvItMtLnxM\nCAMdhqGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA8WlwfatbSnIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQDE\nhe/18oRh8EqIhOl0bPk6BG49AkjhZZezrRJkCFp4dZxaBjwZTddwo8O5KHwkFGdy\nyLiPV326dtvXoKa9RFJvoJiSTQLEn5mO1NzWYnBMLtrDWojOe6Ltvn3x0HVo/iHh\nJShjAn6ZYX43Tjl1YXDd1H9O+7/VgEWAQQ32v8p5lA==\n-----END CERTIFICATE-----",
329
- 'connec.host' => 'https://api-connec.maestrano.com',
330
328
  }
331
329
  }
332
330
  end
data/lib/maestrano/connec/client.rb CHANGED
@@ -57,7 +57,10 @@ module Maestrano
57
57
  default_options.merge(body: body.to_json).merge(options)
58
58
  )
59
59
  end
60
+
61
+ def batch(body, options = {})
62
+ self.class.post("#{Maestrano[self.class.preset].param('connec.host')}/batch", default_options.merge(body: body.to_json).merge(options))
63
+ end
60
64
  end
61
-
62
65
  end
63
66
  end
data/lib/maestrano/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Maestrano
2
- VERSION = '0.12.3'
2
+ VERSION = '0.12.4'
3
3
  end
data/test/maestrano/connec/client_test.rb CHANGED
@@ -91,6 +91,18 @@ module Maestrano
91
91
  assert_equal resp, @client.put(path,body,opts)
92
92
  end
93
93
  end
94
+
95
+ context 'batch' do
96
+ setup { @client = Maestrano::Connec::Client.new("cld-123") }
97
+
98
+ should "perform the right query" do
99
+ body = { some: 'data'}
100
+ opts = { foo: 'bar' }
101
+ resp = mock('resp')
102
+ Maestrano::Connec::Client.expects(:post).with("#{Maestrano.param('connec.host')}/batch",@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
103
+ assert_equal resp, @client.batch(body,opts)
104
+ end
105
+ end
94
106
  end
95
107
 
96
108
  context 'with preset' do
metadata CHANGED
@@ -1,171 +1,170 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maestrano
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.3
4
+ version: 0.12.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arnaud Lachaume
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-15 00:00:00.000000000 Z
11
+ date: 2016-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rest-client
15
- requirement: !ruby/object:Gem::Requirement
15
+ version_requirements: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.4'
20
- type: :runtime
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
20
+ requirement: !ruby/object:Gem::Requirement
23
21
  requirements:
24
- - - "~>"
22
+ - - ~>
25
23
  - !ruby/object:Gem::Version
26
24
  version: '1.4'
25
+ prerelease: false
26
+ type: :runtime
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mime-types
29
- requirement: !ruby/object:Gem::Requirement
29
+ version_requirements: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '1.25'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
34
+ requirement: !ruby/object:Gem::Requirement
37
35
  requirements:
38
- - - "~>"
36
+ - - ~>
39
37
  - !ruby/object:Gem::Version
40
38
  version: '1.25'
39
+ prerelease: false
40
+ type: :runtime
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: json
43
- requirement: !ruby/object:Gem::Requirement
43
+ version_requirements: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ~>
46
46
  - !ruby/object:Gem::Version
47
47
  version: '1.8'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
51
49
  requirements:
52
- - - "~>"
50
+ - - ~>
53
51
  - !ruby/object:Gem::Version
54
52
  version: '1.8'
53
+ prerelease: false
54
+ type: :runtime
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: httparty
57
- requirement: !ruby/object:Gem::Requirement
57
+ version_requirements: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ~>
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0.13'
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
62
+ requirement: !ruby/object:Gem::Requirement
65
63
  requirements:
66
- - - "~>"
64
+ - - ~>
67
65
  - !ruby/object:Gem::Version
68
66
  version: '0.13'
67
+ prerelease: false
68
+ type: :runtime
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: test-unit
71
- requirement: !ruby/object:Gem::Requirement
71
+ version_requirements: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
75
  version: '2'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
76
+ requirement: !ruby/object:Gem::Requirement
79
77
  requirements:
80
- - - "~>"
78
+ - - ~>
81
79
  - !ruby/object:Gem::Version
82
80
  version: '2'
81
+ prerelease: false
82
+ type: :development
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: mocha
85
- requirement: !ruby/object:Gem::Requirement
85
+ version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - "~>"
87
+ - - ~>
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0.13'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
90
+ requirement: !ruby/object:Gem::Requirement
93
91
  requirements:
94
- - - "~>"
92
+ - - ~>
95
93
  - !ruby/object:Gem::Version
96
94
  version: '0.13'
95
+ prerelease: false
96
+ type: :development
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: shoulda
99
- requirement: !ruby/object:Gem::Requirement
99
+ version_requirements: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - "~>"
101
+ - - ~>
102
102
  - !ruby/object:Gem::Version
103
103
  version: '2.11'
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
104
+ requirement: !ruby/object:Gem::Requirement
107
105
  requirements:
108
- - - "~>"
106
+ - - ~>
109
107
  - !ruby/object:Gem::Version
110
108
  version: '2.11'
109
+ prerelease: false
110
+ type: :development
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: timecop
113
- requirement: !ruby/object:Gem::Requirement
113
+ version_requirements: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - "<="
115
+ - - <=
116
116
  - !ruby/object:Gem::Version
117
117
  version: 0.6.0
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
118
+ requirement: !ruby/object:Gem::Requirement
121
119
  requirements:
122
- - - "<="
120
+ - - <=
123
121
  - !ruby/object:Gem::Version
124
122
  version: 0.6.0
123
+ prerelease: false
124
+ type: :development
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rake
127
- requirement: !ruby/object:Gem::Requirement
127
+ version_requirements: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - "~>"
129
+ - - ~>
130
130
  - !ruby/object:Gem::Version
131
131
  version: '10'
132
- type: :development
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
132
+ requirement: !ruby/object:Gem::Requirement
135
133
  requirements:
136
- - - "~>"
134
+ - - ~>
137
135
  - !ruby/object:Gem::Version
138
136
  version: '10'
137
+ prerelease: false
138
+ type: :development
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: uuid
141
- requirement: !ruby/object:Gem::Requirement
141
+ version_requirements: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - "~>"
143
+ - - ~>
144
144
  - !ruby/object:Gem::Version
145
145
  version: '2.3'
146
- type: :runtime
147
- prerelease: false
148
- version_requirements: !ruby/object:Gem::Requirement
146
+ requirement: !ruby/object:Gem::Requirement
149
147
  requirements:
150
- - - "~>"
148
+ - - ~>
151
149
  - !ruby/object:Gem::Version
152
150
  version: '2.3'
151
+ prerelease: false
152
+ type: :runtime
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: nokogiri
155
- requirement: !ruby/object:Gem::Requirement
155
+ version_requirements: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: 1.5.0
160
- type: :runtime
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
160
+ requirement: !ruby/object:Gem::Requirement
163
161
  requirements:
164
- - - ">="
162
+ - - '>='
165
163
  - !ruby/object:Gem::Version
166
164
  version: 1.5.0
167
- description: Maestrano is the next generation marketplace for SME applications. See
168
- https://maestrano.com for details.
165
+ prerelease: false
166
+ type: :runtime
167
+ description: Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details.
169
168
  email:
170
169
  - arnaud.lachaume@maestrano.com
171
170
  executables:
@@ -173,7 +172,7 @@ executables:
173
172
  extensions: []
174
173
  extra_rdoc_files: []
175
174
  files:
176
- - ".gitignore"
175
+ - .gitignore
177
176
  - DEVELOPER.md
178
177
  - Gemfile
179
178
  - Gemfile.lock
@@ -272,24 +271,24 @@ homepage: https://maestrano.com
272
271
  licenses:
273
272
  - MIT
274
273
  metadata: {}
275
- post_install_message:
274
+ post_install_message:
276
275
  rdoc_options: []
277
276
  require_paths:
278
277
  - lib
279
278
  required_ruby_version: !ruby/object:Gem::Requirement
280
279
  requirements:
281
- - - ">="
280
+ - - '>='
282
281
  - !ruby/object:Gem::Version
283
282
  version: '0'
284
283
  required_rubygems_version: !ruby/object:Gem::Requirement
285
284
  requirements:
286
- - - ">="
285
+ - - '>='
287
286
  - !ruby/object:Gem::Version
288
287
  version: '0'
289
288
  requirements: []
290
- rubyforge_project:
291
- rubygems_version: 2.4.6
292
- signing_key:
289
+ rubyforge_project:
290
+ rubygems_version: 2.4.5
291
+ signing_key:
293
292
  specification_version: 4
294
293
  summary: Ruby bindings for the Maestrano API
295
294
  test_files:
@@ -338,3 +337,4 @@ test_files:
338
337
  - test/support/saml/responses/starfield_response.xml.base64
339
338
  - test/support/saml/responses/wrapped_response_2.xml.base64
340
339
  - test/test_helper.rb
340
+ has_rdoc: