rgeoserver 0.7.10 → 0.8.0

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +5 -4
  3. data/VERSION +1 -1
  4. data/lib/rgeoserver/rest_api_client.rb +25 -25
  5. data/rgeoserver.gemspec +9 -9
  6. metadata +57 -57
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2f2b67d93cb60edde03dc8a5d92491c0389ea5d6
4
- data.tar.gz: c7c04d5fe100d2972a3569df7cc8920d1cedfa11
3
+ metadata.gz: 7277eca568129db1b93293c153d8ad794b4e1119
4
+ data.tar.gz: 5329054b177140d7c1e7dc5bb639147b6ff5d872
5
5
  SHA512:
6
- metadata.gz: cdc3c99ceca28f9237ce12f84919bf2bcab446fa76c3a0b53bcb3aeb5858cbbf3c0c3a1a97347b5ba4481d8c24a05323b8550b93e1e23cf0dae114973f5f210d
7
- data.tar.gz: 7ad766d7197264bc82852bfb2d1bc895cf113dee58cde3e0e53866dea402c9a86061b9e2863713b4764268da3d8b805cdc0c83a4bf8005ea648d0aaeec9bc4d1
6
+ metadata.gz: b1383533ed80f47f43a8c3913de1aed85e71c7828ae1123cc728533a7caaf8a0be89f889ac0edd5f1e50d7d6cc5039326cedc427a477652fcd34f47e4fce835e
7
+ data.tar.gz: 8368404ae75edbcbeea39a6e4fa6ef4cb0306a44449b5090c80274417a91505413e43a264d660b40049f4c8bd0db72f46469206ea288ecb7f6862e0176bb8254
data/.travis.yml CHANGED
@@ -1,9 +1,10 @@
1
+ language: ruby
2
+
1
3
  notifications:
2
4
  email: false
3
5
 
4
- language: ruby
5
6
  rvm:
6
- - 1.9.3
7
- - 2.0.0
8
- - 2.1.6
9
7
  - 2.2.2
8
+
9
+ sudo: false
10
+ cache: bundler
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.7.10
1
+ 0.8.0
data/lib/rgeoserver/rest_api_client.rb CHANGED
@@ -9,15 +9,15 @@ module RGeoServer
9
9
  include ActiveSupport::Benchmarkable
10
10
 
11
11
  # Instantiates a rest client with passed configuration
12
- # @param [Hash] c configuration
12
+ # @param [Hash] c configuration
13
13
  # return [RestClient::Resource]
14
14
  def rest_client c
15
15
  ap({:rest_client => c}) if $DEBUG
16
16
  raise ArgumentError, "#rest_client requires :url" if c[:url].nil?
17
- RestClient::Resource.new(c[:url],
18
- :user => c[:user],
19
- :password => c[:password],
20
- :headers => c[:headers],
17
+ RestClient::Resource.new(c[:url],
18
+ :user => c[:user],
19
+ :password => c[:password],
20
+ :headers => c[:headers],
21
21
  :timeout => (c[:timeout] || 300).to_i,
22
22
  :open_timeout => (c[:open_timeout] || 60).to_i)
23
23
  end
@@ -63,25 +63,25 @@ module RGeoServer
63
63
  end
64
64
  end
65
65
 
66
- # Do an action on an arbitrary URL path within the catalog
67
- # Default method is GET
68
- # @param [String] sub_url
69
- # @param [String] method
70
- # @param [String] data payload
71
- # @param [Hash] options for request
72
- def do_url sub_url, method = :get, data = nil, options = {}, client = client
66
+ # Do an action on an arbitrary URL path within the catalog
67
+ # Default method is GET
68
+ # @param [String] sub_url
69
+ # @param [String] method
70
+ # @param [String] data payload
71
+ # @param [Hash] options for request
72
+ def do_url sub_url, method = :get, data = nil, options = {}, client = @client
73
73
  sub_url.slice! client.url
74
- fetcher = client[sub_url]
74
+ fetcher = client[sub_url]
75
75
  fetcher.options.merge(options)
76
76
  begin
77
- return fetcher.get if method == :get
78
- fetcher.send method, data
79
- rescue RestClient::InternalServerError => e
80
- $logger.error e.response
81
- $logger.flush if $logger.respond_to? :flush
82
- raise GeoServerInvalidRequest, "Error fetching URL: #{sub_url}. See $logger for details"
83
- end
84
- end
77
+ return fetcher.get if method == :get
78
+ fetcher.send method, data
79
+ rescue RestClient::InternalServerError => e
80
+ $logger.error e.response
81
+ $logger.flush if $logger.respond_to? :flush
82
+ raise GeoServerInvalidRequest, "Error fetching URL: #{sub_url}. See $logger for details"
83
+ end
84
+ end
85
85
 
86
86
  # Add resource to the catalog
87
87
  # @param [String] what
@@ -93,7 +93,7 @@ module RGeoServer
93
93
  request = client[url_for(what, options)]
94
94
  request.options[:headers] = h
95
95
  $logger.debug "Adding: \n #{message}"
96
- begin
96
+ begin
97
97
  ap({:add_request => request, :add_message => Nokogiri::XML(message)}) if $DEBUG
98
98
  return request.send method, message
99
99
  rescue RestClient::InternalServerError => e
@@ -101,7 +101,7 @@ module RGeoServer
101
101
  $logger.flush if $logger.respond_to? :flush
102
102
  raise GeoServerInvalidRequest, "Error adding #{what.inspect}. See logger for details"
103
103
  end
104
-
104
+
105
105
  end
106
106
 
107
107
  # Modify resource in the catalog
@@ -122,7 +122,7 @@ module RGeoServer
122
122
  $logger.flush if $logger.respond_to? :flush
123
123
  raise GeoServerInvalidRequest, "Error modifying #{what.inspect}. See $logger for details"
124
124
  end
125
-
125
+
126
126
  end
127
127
 
128
128
  # Purge resource from the catalog. Options can include recurse=true or false
@@ -134,7 +134,7 @@ module RGeoServer
134
134
  begin
135
135
  ap({:purge_request => request}) if $DEBUG
136
136
  return request.delete
137
- rescue RestClient::InternalServerError => e
137
+ rescue RestClient::InternalServerError => e
138
138
  $logger.error e.response
139
139
  $logger.flush if $logger.respond_to? :flush
140
140
  raise GeoServerInvalidRequest, "Error deleting #{what.inspect}. See $logger for details"
data/rgeoserver.gemspec CHANGED
@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
3
3
  s.name = 'rgeoserver'
4
4
  s.version = RGeoServer::VERSION
5
5
  s.platform = Gem::Platform::RUBY
6
- s.required_ruby_version = '>= 1.9.3'
6
+ s.required_ruby_version = '>= 2.2'
7
7
  s.authors = ['Renzo Sanchez-Silva', 'Bess Sadler', 'Darren Hardy']
8
8
  s.email = ['drh@stanford.edu']
9
9
  s.summary = 'GeoServer REST API Ruby library'
@@ -17,20 +17,20 @@ Gem::Specification.new do |s|
17
17
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
18
18
  s.require_paths = ['lib']
19
19
 
20
- s.add_dependency 'activemodel', '~> 3.2.0'
21
- s.add_dependency 'activesupport', '~> 3.2.0'
22
- s.add_dependency 'confstruct', '~> 0.2.0'
23
- s.add_dependency 'nokogiri', '~> 1.6.0'
20
+ s.add_dependency 'activemodel', '~> 3.2'
21
+ s.add_dependency 'activesupport', '~> 3.2'
22
+ s.add_dependency 'confstruct', '~> 0.2'
23
+ s.add_dependency 'nokogiri', '~> 1.6'
24
24
  s.add_dependency 'rest-client', '~> 1.6'
25
- s.add_dependency 'rgeo', '~> 0.3.0'
26
- s.add_dependency 'rgeo-shapefile', '~> 0.2.0'
27
- s.add_dependency 'rubyzip', '~> 0.9.0'
25
+ s.add_dependency 'rgeo', '~> 0.3.20'
26
+ s.add_dependency 'rgeo-shapefile', '~> 0.2'
27
+ s.add_dependency 'rubyzip', '~> 0.9'
28
28
 
29
29
  s.add_development_dependency 'bundler'
30
30
  s.add_development_dependency 'equivalent-xml'
31
31
  s.add_development_dependency 'jettywrapper'
32
32
  s.add_development_dependency 'pry'
33
- s.add_development_dependency 'rake'
33
+ s.add_development_dependency 'rake', '~> 10.0'
34
34
  s.add_development_dependency 'rspec'
35
35
  s.add_development_dependency 'version_bumper'
36
36
  s.add_development_dependency 'yard'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rgeoserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.10
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Renzo Sanchez-Silva
@@ -10,230 +10,230 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-07-06 00:00:00.000000000 Z
13
+ date: 2016-03-10 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: activemodel
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - ~>
19
+ - - "~>"
20
20
  - !ruby/object:Gem::Version
21
- version: 3.2.0
21
+ version: '3.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - ~>
26
+ - - "~>"
27
27
  - !ruby/object:Gem::Version
28
- version: 3.2.0
28
+ version: '3.2'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: activesupport
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - ~>
33
+ - - "~>"
34
34
  - !ruby/object:Gem::Version
35
- version: 3.2.0
35
+ version: '3.2'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - ~>
40
+ - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: 3.2.0
42
+ version: '3.2'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: confstruct
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ~>
47
+ - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: 0.2.0
49
+ version: '0.2'
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - ~>
54
+ - - "~>"
55
55
  - !ruby/object:Gem::Version
56
- version: 0.2.0
56
+ version: '0.2'
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: nokogiri
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - ~>
61
+ - - "~>"
62
62
  - !ruby/object:Gem::Version
63
- version: 1.6.0
63
+ version: '1.6'
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - ~>
68
+ - - "~>"
69
69
  - !ruby/object:Gem::Version
70
- version: 1.6.0
70
+ version: '1.6'
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rest-client
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - ~>
75
+ - - "~>"
76
76
  - !ruby/object:Gem::Version
77
77
  version: '1.6'
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - ~>
82
+ - - "~>"
83
83
  - !ruby/object:Gem::Version
84
84
  version: '1.6'
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: rgeo
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - ~>
89
+ - - "~>"
90
90
  - !ruby/object:Gem::Version
91
- version: 0.3.0
91
+ version: 0.3.20
92
92
  type: :runtime
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - ~>
96
+ - - "~>"
97
97
  - !ruby/object:Gem::Version
98
- version: 0.3.0
98
+ version: 0.3.20
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: rgeo-shapefile
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
- - - ~>
103
+ - - "~>"
104
104
  - !ruby/object:Gem::Version
105
- version: 0.2.0
105
+ version: '0.2'
106
106
  type: :runtime
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
- - - ~>
110
+ - - "~>"
111
111
  - !ruby/object:Gem::Version
112
- version: 0.2.0
112
+ version: '0.2'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rubyzip
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - ~>
117
+ - - "~>"
118
118
  - !ruby/object:Gem::Version
119
- version: 0.9.0
119
+ version: '0.9'
120
120
  type: :runtime
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - ~>
124
+ - - "~>"
125
125
  - !ruby/object:Gem::Version
126
- version: 0.9.0
126
+ version: '0.9'
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: bundler
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - '>='
131
+ - - ">="
132
132
  - !ruby/object:Gem::Version
133
133
  version: '0'
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - '>='
138
+ - - ">="
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: equivalent-xml
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - '>='
145
+ - - ">="
146
146
  - !ruby/object:Gem::Version
147
147
  version: '0'
148
148
  type: :development
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
- - - '>='
152
+ - - ">="
153
153
  - !ruby/object:Gem::Version
154
154
  version: '0'
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: jettywrapper
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - '>='
159
+ - - ">="
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  type: :development
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
- - - '>='
166
+ - - ">="
167
167
  - !ruby/object:Gem::Version
168
168
  version: '0'
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: pry
171
171
  requirement: !ruby/object:Gem::Requirement
172
172
  requirements:
173
- - - '>='
173
+ - - ">="
174
174
  - !ruby/object:Gem::Version
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
178
  version_requirements: !ruby/object:Gem::Requirement
179
179
  requirements:
180
- - - '>='
180
+ - - ">="
181
181
  - !ruby/object:Gem::Version
182
182
  version: '0'
183
183
  - !ruby/object:Gem::Dependency
184
184
  name: rake
185
185
  requirement: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - '>='
187
+ - - "~>"
188
188
  - !ruby/object:Gem::Version
189
- version: '0'
189
+ version: '10.0'
190
190
  type: :development
191
191
  prerelease: false
192
192
  version_requirements: !ruby/object:Gem::Requirement
193
193
  requirements:
194
- - - '>='
194
+ - - "~>"
195
195
  - !ruby/object:Gem::Version
196
- version: '0'
196
+ version: '10.0'
197
197
  - !ruby/object:Gem::Dependency
198
198
  name: rspec
199
199
  requirement: !ruby/object:Gem::Requirement
200
200
  requirements:
201
- - - '>='
201
+ - - ">="
202
202
  - !ruby/object:Gem::Version
203
203
  version: '0'
204
204
  type: :development
205
205
  prerelease: false
206
206
  version_requirements: !ruby/object:Gem::Requirement
207
207
  requirements:
208
- - - '>='
208
+ - - ">="
209
209
  - !ruby/object:Gem::Version
210
210
  version: '0'
211
211
  - !ruby/object:Gem::Dependency
212
212
  name: version_bumper
213
213
  requirement: !ruby/object:Gem::Requirement
214
214
  requirements:
215
- - - '>='
215
+ - - ">="
216
216
  - !ruby/object:Gem::Version
217
217
  version: '0'
218
218
  type: :development
219
219
  prerelease: false
220
220
  version_requirements: !ruby/object:Gem::Requirement
221
221
  requirements:
222
- - - '>='
222
+ - - ">="
223
223
  - !ruby/object:Gem::Version
224
224
  version: '0'
225
225
  - !ruby/object:Gem::Dependency
226
226
  name: yard
227
227
  requirement: !ruby/object:Gem::Requirement
228
228
  requirements:
229
- - - '>='
229
+ - - ">="
230
230
  - !ruby/object:Gem::Version
231
231
  version: '0'
232
232
  type: :development
233
233
  prerelease: false
234
234
  version_requirements: !ruby/object:Gem::Requirement
235
235
  requirements:
236
- - - '>='
236
+ - - ">="
237
237
  - !ruby/object:Gem::Version
238
238
  version: '0'
239
239
  description: GeoServer REST API Ruby library
@@ -244,9 +244,9 @@ executables:
244
244
  extensions: []
245
245
  extra_rdoc_files: []
246
246
  files:
247
- - .gitignore
248
- - .rspec
249
- - .travis.yml
247
+ - ".gitignore"
248
+ - ".rspec"
249
+ - ".travis.yml"
250
250
  - Gemfile
251
251
  - README.rdoc
252
252
  - Rakefile
@@ -326,17 +326,17 @@ require_paths:
326
326
  - lib
327
327
  required_ruby_version: !ruby/object:Gem::Requirement
328
328
  requirements:
329
- - - '>='
329
+ - - ">="
330
330
  - !ruby/object:Gem::Version
331
- version: 1.9.3
331
+ version: '2.2'
332
332
  required_rubygems_version: !ruby/object:Gem::Requirement
333
333
  requirements:
334
- - - '>='
334
+ - - ">="
335
335
  - !ruby/object:Gem::Version
336
336
  version: '0'
337
337
  requirements: []
338
338
  rubyforge_project:
339
- rubygems_version: 2.4.5
339
+ rubygems_version: 2.4.8
340
340
  signing_key:
341
341
  specification_version: 4
342
342
  summary: GeoServer REST API Ruby library