maestrano-connector-rails 2.0.0.pre.RC13 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/VERSION +1 -1
- data/app/models/maestrano/connector/rails/concerns/entity.rb +2 -1
- data/app/models/maestrano/connector/rails/exceptions/external_api_error.rb +3 -0
- data/maestrano-connector-rails.gemspec +8 -7
- data/spec/models/connec_helper_spec.rb +3 -3
- data/template/application-sample.yml +1 -1
- data/template/settings/development.yml +0 -12
- data/template/settings/production.yml +0 -1
- data/template/settings/test.yml +0 -12
- data/template/settings/uat.yml +0 -1
- metadata +7 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 36e8c6a37e11c68b3ccd1826bf62ad1c0125e6d8
|
4
|
+
data.tar.gz: 97c18f4676235c9e30582dcd9feddc47aad237f2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a2ca112ca802402e496fc20ed0457b3cc0296bd18847b2617d61dd82621526d9929abd9f4654a5e45a5a0536b2b41cfc7d975ee320e3fc761205ed17f04a23fe
|
7
|
+
data.tar.gz: efdfbcbc6d52e7f84584b36af8078dc995370088766cbb9d026a28405851b01a6cb09a815f45357350982f60f63023e39b66af8bfcfb5a6ffd0a7709f5eaa79a
|
data/Gemfile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.0.0
|
1
|
+
2.0.0
|
@@ -361,7 +361,8 @@ module Maestrano::Connector::Rails::Concerns::Entity
|
|
361
361
|
end
|
362
362
|
rescue => e
|
363
363
|
# TODO: improve the flexibility by adding the option for the developer to pass a custom/gem-dependent error
|
364
|
-
|
364
|
+
case e
|
365
|
+
when Maestrano::Connector::Rails::Exceptions::EntityNotFoundError
|
365
366
|
idmap.update!(message: "The #{external_entity_name} record has been deleted in #{Maestrano::Connector::Rails::External.external_name}. Last attempt to sync on #{Time.now}", external_inactive: true)
|
366
367
|
Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "The #{idmap.external_entity} - #{idmap.external_id} record has been deleted. It is now set to inactive.")
|
367
368
|
else
|
@@ -2,16 +2,16 @@
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
4
4
|
# -*- encoding: utf-8 -*-
|
5
|
-
# stub: maestrano-connector-rails 2.0.0
|
5
|
+
# stub: maestrano-connector-rails 2.0.0 ruby lib
|
6
6
|
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.name = "maestrano-connector-rails"
|
9
|
-
s.version = "2.0.0
|
9
|
+
s.version = "2.0.0"
|
10
10
|
|
11
|
-
s.required_rubygems_version = Gem::Requirement.new("
|
11
|
+
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
12
12
|
s.require_paths = ["lib"]
|
13
13
|
s.authors = ["Maestrano"]
|
14
|
-
s.date = "2016-11-
|
14
|
+
s.date = "2016-11-25"
|
15
15
|
s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details."
|
16
16
|
s.email = "developers@maestrano.com"
|
17
17
|
s.executables = ["rails", "rake"]
|
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
|
|
59
59
|
"app/models/maestrano/connector/rails/entity.rb",
|
60
60
|
"app/models/maestrano/connector/rails/entity_base.rb",
|
61
61
|
"app/models/maestrano/connector/rails/exceptions/entity_not_found_error.rb",
|
62
|
+
"app/models/maestrano/connector/rails/exceptions/external_api_error.rb",
|
62
63
|
"app/models/maestrano/connector/rails/external.rb",
|
63
64
|
"app/models/maestrano/connector/rails/id_map.rb",
|
64
65
|
"app/models/maestrano/connector/rails/organization.rb",
|
@@ -226,7 +227,7 @@ Gem::Specification.new do |s|
|
|
226
227
|
|
227
228
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
228
229
|
s.add_runtime_dependency(%q<rails>, ["~> 4.2"])
|
229
|
-
s.add_runtime_dependency(%q<maestrano-rails>, ["= 1.0.0
|
230
|
+
s.add_runtime_dependency(%q<maestrano-rails>, ["= 1.0.0"])
|
230
231
|
s.add_runtime_dependency(%q<hash_mapper>, [">= 0.2.2"])
|
231
232
|
s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
|
232
233
|
s.add_runtime_dependency(%q<bootstrap-sass>, [">= 0"])
|
@@ -254,7 +255,7 @@ Gem::Specification.new do |s|
|
|
254
255
|
s.add_development_dependency(%q<github_changelog_generator>, [">= 0"])
|
255
256
|
else
|
256
257
|
s.add_dependency(%q<rails>, ["~> 4.2"])
|
257
|
-
s.add_dependency(%q<maestrano-rails>, ["= 1.0.0
|
258
|
+
s.add_dependency(%q<maestrano-rails>, ["= 1.0.0"])
|
258
259
|
s.add_dependency(%q<hash_mapper>, [">= 0.2.2"])
|
259
260
|
s.add_dependency(%q<haml-rails>, [">= 0"])
|
260
261
|
s.add_dependency(%q<bootstrap-sass>, [">= 0"])
|
@@ -283,7 +284,7 @@ Gem::Specification.new do |s|
|
|
283
284
|
end
|
284
285
|
else
|
285
286
|
s.add_dependency(%q<rails>, ["~> 4.2"])
|
286
|
-
s.add_dependency(%q<maestrano-rails>, ["= 1.0.0
|
287
|
+
s.add_dependency(%q<maestrano-rails>, ["= 1.0.0"])
|
287
288
|
s.add_dependency(%q<hash_mapper>, [">= 0.2.2"])
|
288
289
|
s.add_dependency(%q<haml-rails>, [">= 0"])
|
289
290
|
s.add_dependency(%q<bootstrap-sass>, [">= 0"])
|
@@ -36,14 +36,14 @@ describe Maestrano::Connector::Rails::ConnecHelper do
|
|
36
36
|
allow(subject).to receive(:connec_version).and_return('1.1.0')
|
37
37
|
}
|
38
38
|
|
39
|
-
it 'returns
|
39
|
+
it 'returns false if the current version is gt the parameter' do
|
40
40
|
expect(subject.connec_version_lt?('1.0.1', nil)).to be false
|
41
41
|
end
|
42
42
|
|
43
|
-
it 'returns
|
43
|
+
it 'returns true if the current version is lt the parameter' do
|
44
44
|
expect(subject.connec_version_lt?('1.2.1', nil)).to be true
|
45
45
|
end
|
46
|
-
|
46
|
+
|
47
47
|
it 'returns false if the current version is eq the parameter' do
|
48
48
|
expect(subject.connec_version_lt?('1.1.0', nil)).to be false
|
49
49
|
end
|
@@ -6,7 +6,7 @@ SIDEKIQ_PASSWORD: password
|
|
6
6
|
|
7
7
|
REDIS_URL: redis://localhost:6379/0/connector-myapp
|
8
8
|
|
9
|
-
MNO_DEVPL_HOST: https://dev-platform.maestrano.
|
9
|
+
MNO_DEVPL_HOST: https://dev-platform.maestrano.io
|
10
10
|
MNO_DEVPL_API_PATH: /api/config/v1/marketplaces
|
11
11
|
MNO_DEVPL_ENV_NAME: connector-myapp
|
12
12
|
MNO_DEVPL_ENV_KEY:
|
@@ -1,12 +0,0 @@
|
|
1
|
-
app_host: 'http://localhost:3001/'
|
2
|
-
|
3
|
-
encryption_key1: 'This is a key that is 256 bits!!'
|
4
|
-
encryption_key2: 'This is a key that is 256 bits!!'
|
5
|
-
|
6
|
-
default:
|
7
|
-
api_host: 'https://maestrano.com'
|
8
|
-
connec_host: 'https://api-connec.maestrano.com'
|
9
|
-
|
10
|
-
maestrano-uat:
|
11
|
-
api_host: 'https://uat.maestrano.io'
|
12
|
-
connec_host: 'https://api-connec-uat.maestrano.io'
|
@@ -1 +0,0 @@
|
|
1
|
-
app_host: 'https://connector-xxx.herokuapp.com/'
|
data/template/settings/test.yml
CHANGED
@@ -1,12 +0,0 @@
|
|
1
|
-
app_host: 'http://localhost:3001/'
|
2
|
-
|
3
|
-
encryption_key1: 'This is a key that is 256 bits!!'
|
4
|
-
encryption_key2: 'This is a key that is 256 bits!!'
|
5
|
-
|
6
|
-
default:
|
7
|
-
environment: 'local'
|
8
|
-
api_host: 'http://localhost:3000'
|
9
|
-
|
10
|
-
maestrano-uat:
|
11
|
-
environment: 'local'
|
12
|
-
api_host: 'http://localhost:3000'
|
data/template/settings/uat.yml
CHANGED
@@ -1 +0,0 @@
|
|
1
|
-
app_host: 'https://connector-xxx-uat.herokuapp.com/'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: maestrano-connector-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.0
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Maestrano
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-11-
|
11
|
+
date: 2016-11-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.0.0
|
33
|
+
version: 1.0.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.0.0
|
40
|
+
version: 1.0.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: hash_mapper
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -438,6 +438,7 @@ files:
|
|
438
438
|
- app/models/maestrano/connector/rails/entity.rb
|
439
439
|
- app/models/maestrano/connector/rails/entity_base.rb
|
440
440
|
- app/models/maestrano/connector/rails/exceptions/entity_not_found_error.rb
|
441
|
+
- app/models/maestrano/connector/rails/exceptions/external_api_error.rb
|
441
442
|
- app/models/maestrano/connector/rails/external.rb
|
442
443
|
- app/models/maestrano/connector/rails/id_map.rb
|
443
444
|
- app/models/maestrano/connector/rails/organization.rb
|
@@ -609,9 +610,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
609
610
|
version: '0'
|
610
611
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
611
612
|
requirements:
|
612
|
-
- - "
|
613
|
+
- - ">="
|
613
614
|
- !ruby/object:Gem::Version
|
614
|
-
version:
|
615
|
+
version: '0'
|
615
616
|
requirements: []
|
616
617
|
rubyforge_project:
|
617
618
|
rubygems_version: 2.5.1
|