gb_mapfish_appserver 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjRlYTI3YjAzNTRhM2EwMGIwOGM2Nzk1ZTE1MzUxNTJmYTBiODFhNw==
+  data.tar.gz: !binary |-
+    MDNjMGM1Mzk1NTlhMzc2ODMwYTJkMDNhMWZiMmJjMWRhNTM5ZTUwMg==
+SHA512:
+  metadata.gz: !binary |-
+    OTkyMzA0NjdlNjA3ZTc4NGZkNzM0YTI0MGYwZTNhZDA0YzIyZTMyNmJjN2Qz
+    NDIwOGViMTQ1ZWQ3NjI5NjgwNzg5ODc0NzFlYzY5MGMzZmJlYWUxZGUxY2Jk
+    ZjFlYmQ3NDMwNGU0YzkyZTQ3YzUzYTZmZDA3NWJmN2ZkNjcwZjU=
+  data.tar.gz: !binary |-
+    MTk0NmU0NGY4NWE2MmE0MGFkMzVhNzIwMzhkNWEwY2U0NjZiMWM0YzVkNzJh
+    ODFiMjBiYTMzMDE0Yzg5MDE4ZWVkZWY3YTczZGY1ZDlkNmEyOTgwYTk4NTc3
+    MmVjZTZjM2RiOTkyYmY3NmQ3OGJiOGI1MWUxYjRhNDhlN2QwOTg=

data/app/controllers/apps_controller.rb

@@ -71,7 +71,7 @@ class AppsController < ApplicationController
     if REDIRECT_APP_TO_HTTPS_IF_SIGNED_IN && user_signed_in?
       # redirect to HTTPS if user is logged in
       unless request.ssl?
-        redirect_to :protocol => 'https://', :status => :temporary_redirect
+        redirect_to params.merge({:protocol => 'https://'}), :status => :temporary_redirect
       end
     end
   end

data/app/controllers/wms_controller.rb

@@ -165,6 +165,10 @@ class WmsController < ApplicationController
           end
           true
         end
+      elsif user_signed_in?
+        # user has just signed in via basic auth or token, and there is no session yet
+        logger.info "User '#{current_user.try(:login)}' just signed in, no session yet"
+        true
       else
         logger.info "No session info! headers #{@zone}: #{request.headers.inspect}" 
         false

data/app/models/layer.rb

@@ -135,10 +135,17 @@ EOS
         #   customParams: {'tiefe': 25}
         #  }]}
         custom_query_method = query_topic['customQueries'][name] rescue nil
-        logger.debug "******** #{feature_class} ***************************************************"
+        logger.debug "******** feature_class: #{feature_class} ***************************************************"
+        logger.debug "******** Layer: #{name} ***************************************************"
+        logger.debug "******** custom_query_method: #{custom_query_method} ***************************************************"
+        logger.debug "******** query_topic: #{query_topic} ***************************************************"
         features = if custom_query_method
-          logger.debug "*** Custom query on layer #{name}: #{query_topic.inspect}"
-          feature_class.send(custom_query_method, self, query_topic, searchgeo) 
+          filter_sql_where = query_topic['customParams']['filterSqlWhere'] rescue ''
+          if filter_sql_where != ''
+            feature_class.identify_filter(searchgeo, searchdistance, nearest).where(filter_sql_where).select(query_fields(ability)).all
+          else
+            feature_class.send(custom_query_method, self, query_topic, searchgeo)
+          end
         elsif feature_class.respond_to?(:identify_query)
           logger.debug "*** Custom identify_query on layer #{name}"
           feature_class.identify_query(searchgeo, searchdistance)

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,170 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &12844980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *12844980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12844480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12844480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &12843860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12843860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &12843340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12843340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &12842820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *12842820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &12842140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *12842140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &12841660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12841660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &12841000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *12841000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &12856820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *12856820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &12856280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *12856280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &12855780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *12855780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &12855220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12855220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &12854620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *12854620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &12854060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *12854060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -424,27 +465,26 @@ files:
 - test/test_helper.rb
 homepage: http://mapfish-appserver.github.io/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mapfish application server.
 test_files:
 - test/dummy/README.rdoc
@@ -575,3 +615,4 @@ test_files:
 - test/gb_mapfish_appserver_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
+has_rdoc: