osm 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.travis.yml +144 -24
- data/CHANGELOG.md +4 -0
- data/README.md +0 -1
- data/gemfiles/rails4 +13 -0
- data/gemfiles/rails5 +13 -0
- data/lib/osm/api.rb +1 -1
- data/osm.gemspec +2 -2
- data/spec/osm/email_spec.rb +1 -1
- data/version.rb +1 -1
- metadata +9 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: f7ef2455baec202bbbbf5d529e7ef31dc9912f53b2ccf524103b84dcab8dd5c2
|
|
4
|
+
data.tar.gz: 5a3d07898e36f55bab930c21de1f17a83c2321bc45ab1781303a6c26b599d6bd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 12dbafc1124dd65345b8d3c9919cc46a7244c6b097f0fc682bb556ff07846db0da5d31f07d6ce8b96aedcc03afeac8cc0673b2d3ad5153bc8af43187089ed832
|
|
7
|
+
data.tar.gz: f7f3d389a95ccfc08f91777475acef290d6801d34858ce81e4dc3a2137d48eccefe17f40704a012e07753da75a0867f2f3058c51f96faa6df92ee814dd38e3eb
|
data/.travis.yml
CHANGED
|
@@ -1,27 +1,147 @@
|
|
|
1
1
|
language: ruby
|
|
2
|
-
rvm:
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
gemfile:
|
|
23
|
-
|
|
24
|
-
|
|
2
|
+
#rvm:
|
|
3
|
+
#- 1.9.3
|
|
4
|
+
#- 2.0.0
|
|
5
|
+
#- 2.2.1
|
|
6
|
+
#- 2.2.2
|
|
7
|
+
#- 2.2.3
|
|
8
|
+
#- 2.2.4
|
|
9
|
+
#- 2.2.5
|
|
10
|
+
#- 2.2.6
|
|
11
|
+
#- 2.2.7
|
|
12
|
+
#- 2.2.8
|
|
13
|
+
#- 2.2.9
|
|
14
|
+
#- 2.3.0
|
|
15
|
+
#- 2.3.1
|
|
16
|
+
#- 2.3.2
|
|
17
|
+
#- 2.3.3
|
|
18
|
+
#- 2.3.4
|
|
19
|
+
#- 2.3.5
|
|
20
|
+
#- 2.3.6
|
|
21
|
+
#- jruby-1.7.20.1
|
|
22
|
+
#gemfile:
|
|
23
|
+
#- gemfiles/rails3
|
|
24
|
+
#- gemfiles/rails4
|
|
25
|
+
#- gemfiles/rails5
|
|
26
|
+
matrix:
|
|
27
|
+
include:
|
|
28
|
+
- rvm: 1.9.3
|
|
29
|
+
gemfile: gemfiles/rails3
|
|
30
|
+
- rvm: 1.9.3
|
|
31
|
+
gemfile: gemfiles/rails4
|
|
32
|
+
- rvm: 2.0.0
|
|
33
|
+
gemfile: gemfiles/rails3
|
|
34
|
+
- rvm: 2.0.0
|
|
35
|
+
gemfile: gemfiles/rails4
|
|
36
|
+
- rvm: 2.2.1
|
|
37
|
+
gemfile: gemfiles/rails3
|
|
38
|
+
- rvm: 2.2.1
|
|
39
|
+
gemfile: gemfiles/rails4
|
|
40
|
+
- rvm: 2.2.2
|
|
41
|
+
gemfile: gemfiles/rails3
|
|
42
|
+
- rvm: 2.2.2
|
|
43
|
+
gemfile: gemfiles/rails4
|
|
44
|
+
- rvm: 2.2.2
|
|
45
|
+
gemfile: gemfiles/rails5
|
|
46
|
+
- rvm: 2.2.3
|
|
47
|
+
gemfile: gemfiles/rails3
|
|
48
|
+
- rvm: 2.2.3
|
|
49
|
+
gemfile: gemfiles/rails4
|
|
50
|
+
- rvm: 2.2.3
|
|
51
|
+
gemfile: gemfiles/rails5
|
|
52
|
+
- rvm: 2.2.4
|
|
53
|
+
gemfile: gemfiles/rails3
|
|
54
|
+
- rvm: 2.2.4
|
|
55
|
+
gemfile: gemfiles/rails4
|
|
56
|
+
- rvm: 2.2.4
|
|
57
|
+
gemfile: gemfiles/rails5
|
|
58
|
+
- rvm: 2.2.5
|
|
59
|
+
gemfile: gemfiles/rails3
|
|
60
|
+
- rvm: 2.2.5
|
|
61
|
+
gemfile: gemfiles/rails4
|
|
62
|
+
- rvm: 2.2.5
|
|
63
|
+
gemfile: gemfiles/rails5
|
|
64
|
+
- rvm: 2.2.6
|
|
65
|
+
gemfile: gemfiles/rails3
|
|
66
|
+
- rvm: 2.2.6
|
|
67
|
+
gemfile: gemfiles/rails4
|
|
68
|
+
- rvm: 2.2.6
|
|
69
|
+
gemfile: gemfiles/rails5
|
|
70
|
+
- rvm: 2.2.7
|
|
71
|
+
gemfile: gemfiles/rails3
|
|
72
|
+
- rvm: 2.2.7
|
|
73
|
+
gemfile: gemfiles/rails4
|
|
74
|
+
- rvm: 2.2.7
|
|
75
|
+
gemfile: gemfiles/rails5
|
|
76
|
+
- rvm: 2.2.8
|
|
77
|
+
gemfile: gemfiles/rails3
|
|
78
|
+
before_install: gem install bundler -v '1.16.6'
|
|
79
|
+
- rvm: 2.2.8
|
|
80
|
+
gemfile: gemfiles/rails4
|
|
81
|
+
before_install: gem install bundler -v '1.16.6'
|
|
82
|
+
- rvm: 2.2.8
|
|
83
|
+
gemfile: gemfiles/rails5
|
|
84
|
+
before_install: gem install bundler -v '1.16.6'
|
|
85
|
+
- rvm: 2.2.9
|
|
86
|
+
gemfile: gemfiles/rails3
|
|
87
|
+
before_install: gem install bundler -v '1.16.6'
|
|
88
|
+
- rvm: 2.2.9
|
|
89
|
+
gemfile: gemfiles/rails4
|
|
90
|
+
before_install: gem install bundler -v '1.16.6'
|
|
91
|
+
- rvm: 2.2.9
|
|
92
|
+
gemfile: gemfiles/rails5
|
|
93
|
+
before_install: gem install bundler -v '1.16.6'
|
|
94
|
+
- rvm: 2.3.0
|
|
95
|
+
gemfile: gemfiles/rails3
|
|
96
|
+
- rvm: 2.3.0
|
|
97
|
+
gemfile: gemfiles/rails4
|
|
98
|
+
- rvm: 2.3.0
|
|
99
|
+
gemfile: gemfiles/rails5
|
|
100
|
+
- rvm: 2.3.1
|
|
101
|
+
gemfile: gemfiles/rails3
|
|
102
|
+
- rvm: 2.3.1
|
|
103
|
+
gemfile: gemfiles/rails4
|
|
104
|
+
- rvm: 2.3.1
|
|
105
|
+
gemfile: gemfiles/rails5
|
|
106
|
+
- rvm: 2.3.2
|
|
107
|
+
gemfile: gemfiles/rails3
|
|
108
|
+
- rvm: 2.3.2
|
|
109
|
+
gemfile: gemfiles/rails4
|
|
110
|
+
- rvm: 2.3.2
|
|
111
|
+
gemfile: gemfiles/rails5
|
|
112
|
+
- rvm: 2.3.3
|
|
113
|
+
gemfile: gemfiles/rails3
|
|
114
|
+
- rvm: 2.3.3
|
|
115
|
+
gemfile: gemfiles/rails4
|
|
116
|
+
- rvm: 2.3.3
|
|
117
|
+
gemfile: gemfiles/rails5
|
|
118
|
+
- rvm: 2.3.4
|
|
119
|
+
gemfile: gemfiles/rails3
|
|
120
|
+
- rvm: 2.3.4
|
|
121
|
+
gemfile: gemfiles/rails4
|
|
122
|
+
- rvm: 2.3.4
|
|
123
|
+
gemfile: gemfiles/rails5
|
|
124
|
+
- rvm: 2.3.5
|
|
125
|
+
gemfile: gemfiles/rails3
|
|
126
|
+
- rvm: 2.3.5
|
|
127
|
+
gemfile: gemfiles/rails4
|
|
128
|
+
- rvm: 2.3.5
|
|
129
|
+
gemfile: gemfiles/rails5
|
|
130
|
+
- rvm: 2.3.6
|
|
131
|
+
gemfile: gemfiles/rails3
|
|
132
|
+
- rvm: 2.3.6
|
|
133
|
+
gemfile: gemfiles/rails4
|
|
134
|
+
- rvm: 2.3.6
|
|
135
|
+
gemfile: gemfiles/rails5
|
|
136
|
+
# - rvm: jruby-1.7.20.1
|
|
137
|
+
# gemfile: gemfiles/rails3
|
|
138
|
+
# before_install: gem install bundler -v '1.16.1'
|
|
139
|
+
# - rvm: jruby-1.7.20.1
|
|
140
|
+
# gemfile: gemfiles/rails4
|
|
141
|
+
# before_install: gem install bundler -v '1.16.1'
|
|
142
|
+
# - rvm: jruby-1.7.20.1
|
|
143
|
+
# gemfile: gemfiles/rails5
|
|
144
|
+
# before_install: gem install bundler -v '1.16.1'
|
|
25
145
|
branches:
|
|
26
146
|
only:
|
|
27
147
|
- master
|
|
@@ -33,4 +153,4 @@ script: rake ci:travis
|
|
|
33
153
|
notifications:
|
|
34
154
|
slack:
|
|
35
155
|
on_success: always
|
|
36
|
-
secure:
|
|
156
|
+
secure: "F/wN7aMLwR14sLVhz5AZtQNpVQ1hi4ttW5OzvRxS7Oe0pQJtNhyGayx0SCqQ5FbDrwKUsZTHXByLUUG1eUacUwbjtlrr2d0PW1jByLlI7G4alu533mk7uKkBYCWoEa6gwSta1Ac5TYFnz/iHrkIDwh2iIiRZTM+MF9AnNIhwjE8="
|
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
[](http://badge.fury.io/rb/osm)
|
|
2
|
-
[](https://gemnasium.com/robertgauld/osm)
|
|
3
2
|
|
|
4
3
|
Master branch:
|
|
5
4
|
[](http://travis-ci.org/robertgauld/osm)
|
data/gemfiles/rails4
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
source "https://rubygems.org"
|
|
2
|
+
|
|
3
|
+
gem 'active_attr', '~> 0.12.0'
|
|
4
|
+
gem 'activemodel', '~> 4.2.11'
|
|
5
|
+
gem 'activesupport', '~> 4.2.11'
|
|
6
|
+
gem 'dirty_hashy', '~> 0.2.1'
|
|
7
|
+
gem 'httparty', '~> 0.9'
|
|
8
|
+
gem 'rake', '~> 10.5.0'
|
|
9
|
+
gem 'rspec', '>= 3.7.0', '< 4'
|
|
10
|
+
gem 'fakeweb', '~> 1.3.0'
|
|
11
|
+
gem 'osm', :path=>'../'
|
|
12
|
+
gem 'coveralls', '~> 0.7.2'
|
|
13
|
+
gem 'simplecov', '~> 0.16.1'
|
data/gemfiles/rails5
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
source "https://rubygems.org"
|
|
2
|
+
|
|
3
|
+
gem 'active_attr', '~> 0.12.0'
|
|
4
|
+
gem 'activemodel', '~> 5.2.2'
|
|
5
|
+
gem 'activesupport', '~> 5.2.2'
|
|
6
|
+
gem 'dirty_hashy', '~> 0.2.1'
|
|
7
|
+
gem 'httparty', '~> 0.16.3'
|
|
8
|
+
gem 'rake', '~> 10.5.0'
|
|
9
|
+
gem 'rspec', '>= 3.7.0', '< 4'
|
|
10
|
+
gem 'fakeweb', '~> 1.3.0'
|
|
11
|
+
gem 'osm', :path=>'../'
|
|
12
|
+
gem 'coveralls', '~> 0.7.2'
|
|
13
|
+
gem 'simplecov', '~> 0.16.1'
|
data/lib/osm/api.rb
CHANGED
|
@@ -289,7 +289,7 @@ module Osm
|
|
|
289
289
|
fail Osm::Error, osm_error if osm_error
|
|
290
290
|
end
|
|
291
291
|
return decoded
|
|
292
|
-
rescue ActiveModel::VERSION::MAJOR
|
|
292
|
+
rescue ActiveModel::VERSION::MAJOR >= 4 ? JSON::ParserError : MultiJson::ParseError
|
|
293
293
|
fail Osm::Error, result.response.body
|
|
294
294
|
end
|
|
295
295
|
when 'image/jpeg'
|
data/osm.gemspec
CHANGED
|
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
|
|
|
19
19
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
|
20
20
|
s.require_paths = ["lib"]
|
|
21
21
|
|
|
22
|
-
s.add_runtime_dependency 'activesupport', '>= 3.2', '<
|
|
22
|
+
s.add_runtime_dependency 'activesupport', '>= 3.2', '< 6' # Used to parse JSON from OSM
|
|
23
23
|
s.add_runtime_dependency 'httparty', '~> 0.10' # Used to make web requests to the API
|
|
24
24
|
s.add_runtime_dependency 'active_attr', '~> 0.8'
|
|
25
|
-
s.add_runtime_dependency 'activemodel', '>= 3.2', '<
|
|
25
|
+
s.add_runtime_dependency 'activemodel', '>= 3.2', '< 6'
|
|
26
26
|
s.add_runtime_dependency 'dirty_hashy', '~> 0.2.1' # Used to track changed data in Badge::Data and FlexiRecord::Data
|
|
27
27
|
|
|
28
28
|
s.add_development_dependency 'rake', '~> 10.0'
|
data/spec/osm/email_spec.rb
CHANGED
|
@@ -184,7 +184,7 @@ describe "Email" do
|
|
|
184
184
|
it "Empty array allowed" do
|
|
185
185
|
@report.recipients = []
|
|
186
186
|
@report.valid?.should == true
|
|
187
|
-
@report.errors.messages[:recipients].should
|
|
187
|
+
@report.errors.messages[:recipients].to_a.should be_empty
|
|
188
188
|
end
|
|
189
189
|
|
|
190
190
|
it "Invalid item in array not allowed" do
|
data/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: osm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Robert Gauld
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2019-01-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -19,7 +19,7 @@ dependencies:
|
|
|
19
19
|
version: '3.2'
|
|
20
20
|
- - "<"
|
|
21
21
|
- !ruby/object:Gem::Version
|
|
22
|
-
version: '
|
|
22
|
+
version: '6'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -29,7 +29,7 @@ dependencies:
|
|
|
29
29
|
version: '3.2'
|
|
30
30
|
- - "<"
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: '
|
|
32
|
+
version: '6'
|
|
33
33
|
- !ruby/object:Gem::Dependency
|
|
34
34
|
name: httparty
|
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -67,7 +67,7 @@ dependencies:
|
|
|
67
67
|
version: '3.2'
|
|
68
68
|
- - "<"
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
|
-
version: '
|
|
70
|
+
version: '6'
|
|
71
71
|
type: :runtime
|
|
72
72
|
prerelease: false
|
|
73
73
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -77,7 +77,7 @@ dependencies:
|
|
|
77
77
|
version: '3.2'
|
|
78
78
|
- - "<"
|
|
79
79
|
- !ruby/object:Gem::Version
|
|
80
|
-
version: '
|
|
80
|
+
version: '6'
|
|
81
81
|
- !ruby/object:Gem::Dependency
|
|
82
82
|
name: dirty_hashy
|
|
83
83
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -234,6 +234,8 @@ files:
|
|
|
234
234
|
- README.md
|
|
235
235
|
- Rakefile
|
|
236
236
|
- gemfiles/rails3
|
|
237
|
+
- gemfiles/rails4
|
|
238
|
+
- gemfiles/rails5
|
|
237
239
|
- lib/array_of_validator.rb
|
|
238
240
|
- lib/hash_validator.rb
|
|
239
241
|
- lib/osm.rb
|
|
@@ -307,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
307
309
|
version: '0'
|
|
308
310
|
requirements: []
|
|
309
311
|
rubyforge_project: osm
|
|
310
|
-
rubygems_version: 2.6
|
|
312
|
+
rubygems_version: 2.7.6
|
|
311
313
|
signing_key:
|
|
312
314
|
specification_version: 4
|
|
313
315
|
summary: Use the Online Scout Manager API
|