gb_mapfish_appserver 0.9.1 → 0.9.2

data/app/controllers/wms_controller.rb

@@ -160,7 +160,7 @@ class WmsController < ApplicationController
 
   def add_filter(topic_name)
     unless params[:LAYERS].blank?
-      filters = access_filters(topic_name, params[:LAYERS].split(','))
+      filters = Wms.access_filters(current_ability, current_user, topic_name, params[:LAYERS].split(','))
       if filters.any?
         # remove existing filters
         filters.each do |key, value|
@@ -172,22 +172,6 @@ class WmsController < ApplicationController
     end
   end
 
-  def access_filters(topic_name, layers)
-    access_filters = {}
-    unless topic_name.blank?
-      layers.each do |layer|
-        access_filter = current_ability.access_filter("WMS", topic_name, layer)
-        unless access_filter.nil?
-          access_filter.each do |key, value|
-            access_filter[key] = AccessFilter.user_value(current_user, value)
-          end
-          access_filters.merge!(access_filter)
-        end
-      end
-    end
-    access_filters
-  end
-
   #Public accessible WMS
   #REMARK: permission change needs restart!
   def public?(name, zone)

data/app/models/wms.rb

@@ -8,4 +8,21 @@ class Wms
   def initialize(name)
     @name = name
   end
+
+  def self.access_filters(ability, user, topic_name, layers)
+    access_filters = {}
+    unless topic_name.blank?
+      layers.each do |layer|
+        access_filter = ability.access_filter("WMS", topic_name, layer)
+        unless access_filter.nil?
+          access_filter.each do |key, value|
+            access_filter[key] = AccessFilter.user_value(user, value)
+          end
+          access_filters.merge!(access_filter)
+        end
+      end
+    end
+    access_filters
+  end
+
 end

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26064120 !ruby/object:Gem::Requirement
+  requirement: &12419980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *26064120
+  version_requirements: *12419980
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &26063700 !ruby/object:Gem::Requirement
+  requirement: &12419560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26063700
+  version_requirements: *12419560
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &26062900 !ruby/object:Gem::Requirement
+  requirement: &12419020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *26062900
+  version_requirements: *12419020
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &26062100 !ruby/object:Gem::Requirement
+  requirement: &12418520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *26062100
+  version_requirements: *12418520
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &26061160 !ruby/object:Gem::Requirement
+  requirement: &12418020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *26061160
+  version_requirements: *12418020
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &26060420 !ruby/object:Gem::Requirement
+  requirement: &12417300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *26060420
+  version_requirements: *12417300
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &26060000 !ruby/object:Gem::Requirement
+  requirement: &12416680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26060000
+  version_requirements: *12416680
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &26059400 !ruby/object:Gem::Requirement
+  requirement: &12416100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *26059400
+  version_requirements: *12416100
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &26066080 !ruby/object:Gem::Requirement
+  requirement: &12415540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *26066080
+  version_requirements: *12415540
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &26065380 !ruby/object:Gem::Requirement
+  requirement: &12414840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *26065380
+  version_requirements: *12414840
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &26064380 !ruby/object:Gem::Requirement
+  requirement: &12414120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *26064380
+  version_requirements: *12414120
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &26063840 !ruby/object:Gem::Requirement
+  requirement: &12413720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26063840
+  version_requirements: *12413720
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &26062800 !ruby/object:Gem::Requirement
+  requirement: &12413160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *26062800
+  version_requirements: *12413160
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &26061400 !ruby/object:Gem::Requirement
+  requirement: &12412620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *26061400
+  version_requirements: *12412620
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email: