gb_mapfish_appserver 1.0.1 → 1.0.2

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 +15 -0
  2. data/app/controllers/apps_controller.rb +1 -1
  3. data/app/controllers/wms_controller.rb +4 -0
  4. data/app/models/layer.rb +10 -3
  5. data/lib/gb_mapfish_appserver/version.rb +1 -1
  6. metadata +93 -52
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ MjRlYTI3YjAzNTRhM2EwMGIwOGM2Nzk1ZTE1MzUxNTJmYTBiODFhNw==
5
+ data.tar.gz: !binary |-
6
+ MDNjMGM1Mzk1NTlhMzc2ODMwYTJkMDNhMWZiMmJjMWRhNTM5ZTUwMg==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ OTkyMzA0NjdlNjA3ZTc4NGZkNzM0YTI0MGYwZTNhZDA0YzIyZTMyNmJjN2Qz
10
+ NDIwOGViMTQ1ZWQ3NjI5NjgwNzg5ODc0NzFlYzY5MGMzZmJlYWUxZGUxY2Jk
11
+ ZjFlYmQ3NDMwNGU0YzkyZTQ3YzUzYTZmZDA3NWJmN2ZkNjcwZjU=
12
+ data.tar.gz: !binary |-
13
+ MTk0NmU0NGY4NWE2MmE0MGFkMzVhNzIwMzhkNWEwY2U0NjZiMWM0YzVkNzJh
14
+ ODFiMjBiYTMzMDE0Yzg5MDE4ZWVkZWY3YTczZGY1ZDlkNmEyOTgwYTk4NTc3
15
+ MmVjZTZjM2RiOTkyYmY3NmQ3OGJiOGI1MWUxYjRhNDhlN2QwOTg=
data/app/controllers/apps_controller.rb CHANGED
@@ -71,7 +71,7 @@ class AppsController < ApplicationController
71
71
  if REDIRECT_APP_TO_HTTPS_IF_SIGNED_IN && user_signed_in?
72
72
  # redirect to HTTPS if user is logged in
73
73
  unless request.ssl?
74
- redirect_to :protocol => 'https://', :status => :temporary_redirect
74
+ redirect_to params.merge({:protocol => 'https://'}), :status => :temporary_redirect
75
75
  end
76
76
  end
77
77
  end
data/app/controllers/wms_controller.rb CHANGED
@@ -165,6 +165,10 @@ class WmsController < ApplicationController
165
165
  end
166
166
  true
167
167
  end
168
+ elsif user_signed_in?
169
+ # user has just signed in via basic auth or token, and there is no session yet
170
+ logger.info "User '#{current_user.try(:login)}' just signed in, no session yet"
171
+ true
168
172
  else
169
173
  logger.info "No session info! headers #{@zone}: #{request.headers.inspect}"
170
174
  false
data/app/models/layer.rb CHANGED
@@ -135,10 +135,17 @@ EOS
135
135
  # customParams: {'tiefe': 25}
136
136
  # }]}
137
137
  custom_query_method = query_topic['customQueries'][name] rescue nil
138
- logger.debug "******** #{feature_class} ***************************************************"
138
+ logger.debug "******** feature_class: #{feature_class} ***************************************************"
139
+ logger.debug "******** Layer: #{name} ***************************************************"
140
+ logger.debug "******** custom_query_method: #{custom_query_method} ***************************************************"
141
+ logger.debug "******** query_topic: #{query_topic} ***************************************************"
139
142
  features = if custom_query_method
140
- logger.debug "*** Custom query on layer #{name}: #{query_topic.inspect}"
141
- feature_class.send(custom_query_method, self, query_topic, searchgeo)
143
+ filter_sql_where = query_topic['customParams']['filterSqlWhere'] rescue ''
144
+ if filter_sql_where != ''
145
+ feature_class.identify_filter(searchgeo, searchdistance, nearest).where(filter_sql_where).select(query_fields(ability)).all
146
+ else
147
+ feature_class.send(custom_query_method, self, query_topic, searchgeo)
148
+ end
142
149
  elsif feature_class.respond_to?(:identify_query)
143
150
  logger.debug "*** Custom identify_query on layer #{name}"
144
151
  feature_class.identify_query(searchgeo, searchdistance)
data/lib/gb_mapfish_appserver/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GbMapfishAppserver
2
- VERSION = "1.0.1"
2
+ VERSION = "1.0.2"
3
3
  end
metadata CHANGED
@@ -1,170 +1,211 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gb_mapfish_appserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
5
- prerelease:
4
+ version: 1.0.2
6
5
  platform: ruby
7
6
  authors:
8
7
  - Pirmin Kalberer
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2014-12-15 00:00:00.000000000 Z
11
+ date: 2015-02-04 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
- requirement: &12844980 !ruby/object:Gem::Requirement
17
- none: false
15
+ requirement: !ruby/object:Gem::Requirement
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
21
19
  version: 3.2.13
22
20
  type: :runtime
23
21
  prerelease: false
24
- version_requirements: *12844980
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ~>
25
+ - !ruby/object:Gem::Version
26
+ version: 3.2.13
25
27
  - !ruby/object:Gem::Dependency
26
28
  name: json
27
- requirement: &12844480 !ruby/object:Gem::Requirement
28
- none: false
29
+ requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
31
  - - ! '>='
31
32
  - !ruby/object:Gem::Version
32
33
  version: '0'
33
34
  type: :runtime
34
35
  prerelease: false
35
- version_requirements: *12844480
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ! '>='
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
36
41
  - !ruby/object:Gem::Dependency
37
42
  name: acts_as_tree
38
- requirement: &12843860 !ruby/object:Gem::Requirement
39
- none: false
43
+ requirement: !ruby/object:Gem::Requirement
40
44
  requirements:
41
- - - =
45
+ - - '='
42
46
  - !ruby/object:Gem::Version
43
47
  version: 0.2.0
44
48
  type: :runtime
45
49
  prerelease: false
46
- version_requirements: *12843860
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - '='
53
+ - !ruby/object:Gem::Version
54
+ version: 0.2.0
47
55
  - !ruby/object:Gem::Dependency
48
56
  name: devise
49
- requirement: &12843340 !ruby/object:Gem::Requirement
50
- none: false
57
+ requirement: !ruby/object:Gem::Requirement
51
58
  requirements:
52
59
  - - ~>
53
60
  - !ruby/object:Gem::Version
54
61
  version: 2.2.0
55
62
  type: :runtime
56
63
  prerelease: false
57
- version_requirements: *12843340
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: 2.2.0
58
69
  - !ruby/object:Gem::Dependency
59
70
  name: cancan
60
- requirement: &12842820 !ruby/object:Gem::Requirement
61
- none: false
71
+ requirement: !ruby/object:Gem::Requirement
62
72
  requirements:
63
- - - =
73
+ - - '='
64
74
  - !ruby/object:Gem::Version
65
75
  version: 1.6.8
66
76
  type: :runtime
67
77
  prerelease: false
68
- version_requirements: *12842820
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - '='
81
+ - !ruby/object:Gem::Version
82
+ version: 1.6.8
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: rails_admin
71
- requirement: &12842140 !ruby/object:Gem::Requirement
72
- none: false
85
+ requirement: !ruby/object:Gem::Requirement
73
86
  requirements:
74
87
  - - ~>
75
88
  - !ruby/object:Gem::Version
76
89
  version: 0.4.9
77
90
  type: :runtime
78
91
  prerelease: false
79
- version_requirements: *12842140
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: 0.4.9
80
97
  - !ruby/object:Gem::Dependency
81
98
  name: fastercsv
82
- requirement: &12841660 !ruby/object:Gem::Requirement
83
- none: false
99
+ requirement: !ruby/object:Gem::Requirement
84
100
  requirements:
85
101
  - - ! '>='
86
102
  - !ruby/object:Gem::Version
87
103
  version: '0'
88
104
  type: :runtime
89
105
  prerelease: false
90
- version_requirements: *12841660
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
91
111
  - !ruby/object:Gem::Dependency
92
112
  name: sass
93
- requirement: &12841000 !ruby/object:Gem::Requirement
94
- none: false
113
+ requirement: !ruby/object:Gem::Requirement
95
114
  requirements:
96
115
  - - ~>
97
116
  - !ruby/object:Gem::Version
98
117
  version: 3.2.12
99
118
  type: :runtime
100
119
  prerelease: false
101
- version_requirements: *12841000
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ~>
123
+ - !ruby/object:Gem::Version
124
+ version: 3.2.12
102
125
  - !ruby/object:Gem::Dependency
103
126
  name: GeoRuby
104
- requirement: &12856820 !ruby/object:Gem::Requirement
105
- none: false
127
+ requirement: !ruby/object:Gem::Requirement
106
128
  requirements:
107
129
  - - ! '>='
108
130
  - !ruby/object:Gem::Version
109
131
  version: 0.1.4
110
132
  type: :runtime
111
133
  prerelease: false
112
- version_requirements: *12856820
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ! '>='
137
+ - !ruby/object:Gem::Version
138
+ version: 0.1.4
113
139
  - !ruby/object:Gem::Dependency
114
140
  name: rgeo
115
- requirement: &12856280 !ruby/object:Gem::Requirement
116
- none: false
141
+ requirement: !ruby/object:Gem::Requirement
117
142
  requirements:
118
143
  - - ~>
119
144
  - !ruby/object:Gem::Version
120
145
  version: 0.3.20
121
146
  type: :runtime
122
147
  prerelease: false
123
- version_requirements: *12856280
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ~>
151
+ - !ruby/object:Gem::Version
152
+ version: 0.3.20
124
153
  - !ruby/object:Gem::Dependency
125
154
  name: rgeo-geojson
126
- requirement: &12855780 !ruby/object:Gem::Requirement
127
- none: false
155
+ requirement: !ruby/object:Gem::Requirement
128
156
  requirements:
129
157
  - - ~>
130
158
  - !ruby/object:Gem::Version
131
159
  version: 0.2.3
132
160
  type: :runtime
133
161
  prerelease: false
134
- version_requirements: *12855780
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ~>
165
+ - !ruby/object:Gem::Version
166
+ version: 0.2.3
135
167
  - !ruby/object:Gem::Dependency
136
168
  name: hpricot
137
- requirement: &12855220 !ruby/object:Gem::Requirement
138
- none: false
169
+ requirement: !ruby/object:Gem::Requirement
139
170
  requirements:
140
171
  - - ! '>='
141
172
  - !ruby/object:Gem::Version
142
173
  version: '0'
143
174
  type: :runtime
144
175
  prerelease: false
145
- version_requirements: *12855220
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - ! '>='
179
+ - !ruby/object:Gem::Version
180
+ version: '0'
146
181
  - !ruby/object:Gem::Dependency
147
182
  name: pg
148
- requirement: &12854620 !ruby/object:Gem::Requirement
149
- none: false
183
+ requirement: !ruby/object:Gem::Requirement
150
184
  requirements:
151
185
  - - ~>
152
186
  - !ruby/object:Gem::Version
153
187
  version: 0.14.0
154
188
  type: :runtime
155
189
  prerelease: false
156
- version_requirements: *12854620
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - ~>
193
+ - !ruby/object:Gem::Version
194
+ version: 0.14.0
157
195
  - !ruby/object:Gem::Dependency
158
196
  name: activerecord-postgis-adapter
159
- requirement: &12854060 !ruby/object:Gem::Requirement
160
- none: false
197
+ requirement: !ruby/object:Gem::Requirement
161
198
  requirements:
162
- - - =
199
+ - - '='
163
200
  - !ruby/object:Gem::Version
164
201
  version: 0.4.1
165
202
  type: :runtime
166
203
  prerelease: false
167
- version_requirements: *12854060
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - '='
207
+ - !ruby/object:Gem::Version
208
+ version: 0.4.1
168
209
  description: Mapfish Appserver is a framework for web mapping applications using OGC
169
210
  standards and the Mapfish protocol.
170
211
  email:
@@ -424,27 +465,26 @@ files:
424
465
  - test/test_helper.rb
425
466
  homepage: http://mapfish-appserver.github.io/
426
467
  licenses: []
468
+ metadata: {}
427
469
  post_install_message:
428
470
  rdoc_options: []
429
471
  require_paths:
430
472
  - lib
431
473
  required_ruby_version: !ruby/object:Gem::Requirement
432
- none: false
433
474
  requirements:
434
475
  - - ! '>='
435
476
  - !ruby/object:Gem::Version
436
477
  version: '0'
437
478
  required_rubygems_version: !ruby/object:Gem::Requirement
438
- none: false
439
479
  requirements:
440
480
  - - ! '>='
441
481
  - !ruby/object:Gem::Version
442
482
  version: '0'
443
483
  requirements: []
444
484
  rubyforge_project:
445
- rubygems_version: 1.8.11
485
+ rubygems_version: 2.2.2
446
486
  signing_key:
447
- specification_version: 3
487
+ specification_version: 4
448
488
  summary: Mapfish application server.
449
489
  test_files:
450
490
  - test/dummy/README.rdoc
@@ -575,3 +615,4 @@ test_files:
575
615
  - test/gb_mapfish_appserver_test.rb
576
616
  - test/integration/navigation_test.rb
577
617
  - test/test_helper.rb
618
+ has_rdoc: