Merge pull request #19 from geosolutions-it/master

- Version 2.14.1

Author: Alessio Fabiani

.gitignore

@@ -1,8 +1,16 @@
 *.py[cod]
 *.suo
+*.bak
 
+/build/
 RemoteWPS1.pyproj
 RemoteWPS1.sln
-Include
-Lib/
-Scripts/
+/Include
+/Lib/
+/Scripts/
+
+/RemoteWPS.pyproj
+/RemoteWPS.sln
+/.vs/config/applicationhost.config
+/dist/
+/src/wps_remote.egg-info/

setup.py

@@ -33,7 +33,7 @@
 
 setup(
     name = "wps-remote",
-    version = "2.12.0",
+    version = "2.14.1",
     author = "GeoServer Developers",
     author_email = "[email protected]",
     description = "A library that allows users to publish their executables as GeoServer WPS Processes through the XMPP protocol",

src/wps_remote.egg-info/PKG-INFO

@@ -14,13 +14,14 @@
 
 class ComputationJobInput(object):
 
-    def __init__(self, name, input_type, title, description, default=None, formatter=None):
+    def __init__(self, name, input_type, title, description, default=None, formatter=None, input_mime_type=None):
         self._name = name
         self._type = input_type
         self._default = default
         self._formatter = formatter
         self._title = title
         self._description = description
+        self._input_mime_type = input_mime_type
         self._value = None
         self._value_converted = None
         self._allowed_chars = string.printable.replace(' ','')
@@ -37,7 +38,7 @@ def _validate_and_convert(self, value):
         elif (self._type=='url'):
             if all(c in  self._allowed_chars_url for c in value):
                 return value
-        elif self._type=='application/json':
+        elif self._type in ['application/json', 'application/xml']:
             return json.loads(value)
         elif (self._type=='datetime'):
             if self._formatter:
@@ -52,15 +53,13 @@ def _validate_and_convert(self, value):
 
         raise TypeError("Cannot validate and convert value " + str(value) + " for type " + self._type)
 
-
     def _type_checking(self, value):
         try:
             self._validate_and_convert( value )
             return self._type
         except TypeError:
             return False
-        
-                
+
     def validate(self):
         if (not self.has_value()):
             raise TypeError("cannot find a value for parameter " + self.get_name())
@@ -84,14 +83,12 @@ def set_value(self, value):
 
         res = False
         try:
-            res= self.validate()
+            res = self.validate()
             if not res:
                 raise TypeError("cannot set value " + str(self._value) + " for parameter " + self.get_name() + " with type " + self._type)
         except:
             raise TypeError("cannot set value " + str(self._value) + " for parameter " + self.get_name() + " with type " + self._type)
 
-
-
     def get_value(self):
         if type(self._value_converted) is list and len(self._value_converted)==1:
             return self._value_converted[0]
@@ -101,6 +98,9 @@ def get_value(self):
     def get_type(self):
         return self._type
 
+    def get_input_mime_type(self):
+        return self._input_mime_type
+
     def get_value_string(self):
         if type(self._value) is list and len(self._value)==1:
             if type(self._value[0]) is datetime.datetime:
@@ -138,7 +138,7 @@ def get_name(self):
     def as_json_string(self):
         #{"type": "string", "description": "A persons surname", "max": 1, "default": "Meier"}
         res={}
-        attrib_to_convert = ['_type', "_title", "_default", "_description", "_min", "_max"] #missing _enum
+        attrib_to_convert = ['_type', '_title', '_default', '_description', '_min', '_max', '_input_mime_type'] #missing _enum
         attribute_list = [a for a in dir(self) if not a.startswith('__') and not callable(getattr(self, a))]
         attribute_list_filtered = [x for x in attribute_list if x in attrib_to_convert]
         for a in attribute_list_filtered:

src/wps_remote.egg-info/SOURCES.txt

@@ -44,7 +44,8 @@ def create_from_dict(paremeters_types_defs):
                     formatter = d['formatter'] if "formatter" in d else None
                     mininum = int(d['min']) if "min" in d else 1
                     maximum = int(d['max']) if "max" in d else 1
-                    input_to_add = computation_job_param.ComputationJobParam(name, d['type'], title, d['description'], default, formatter, mininum, maximum)
+                    input_mime_type = d['input_mime_type'] if "input_mime_type" in d else None
+                    input_to_add = computation_job_param.ComputationJobParam(name, d['type'], title, d['description'], default, formatter, mininum, maximum, input_mime_type)
                 elif d['class'] == 'const':
                     title = d['title'] if "title" in d else None
                     input_to_add = computation_job_const.ComputationJobConst(name, d['type'], title, d['description'], d['value'])
@@ -53,7 +54,7 @@ def create_from_dict(paremeters_types_defs):
             else:
                 raise TypeError("Cannot create computational job input without attribute class")
             cji.add_input( input_to_add )
-            
+
         return cji
 
     def __init__(self):
@@ -88,7 +89,6 @@ def names(self):
     def __getitem__(self, k):
         return self._inputs[k] 
 
-
     def as_DLR_protocol(self):
         #[('result', '{"type": "string", ...ut.xml" }')]
         res = []

src/wps_remote.egg-info/dependency_links.txt

@@ -12,8 +12,8 @@
 
 class ComputationJobParam(computation_job_input.ComputationJobInput):
 
-    def __init__(self, name, input_type, title, descr, default=None, formatter=None, min_occurencies=0, max_occurencies=1):
-        super(ComputationJobParam, self).__init__(name, input_type, title, descr, default, formatter)
+    def __init__(self, name, input_type, title, descr, default=None, formatter=None, min_occurencies=0, max_occurencies=1, input_mime_type=None):
+        super(ComputationJobParam, self).__init__(name, input_type, title, descr, default, formatter, input_mime_type)
         self._min = min_occurencies
         self._max = max_occurencies
 

src/wps_remote.egg-info/requires.txt

@@ -13,6 +13,7 @@
 import json
 
 class InputParameter(object):
+
     def __init__(self, name):
         self._name=name
         self._alias=None
@@ -23,6 +24,7 @@ def __init__(self, name):
         self._max=1
         self._default = None
         self._formatter = None
+        self._input_mime_type = None
         self._allowed_chars = string.printable.replace('-','').replace(' ','')
 
         self._value=None
@@ -90,6 +92,9 @@ def validate(self):
     def get_name(self):
         return self._alias if self._alias <> None else self._name
 
+    def get_input_mime_type(self):
+        return self._input_mime_type
+
     def get_name_no_alias(self):
         return self._name
 
@@ -99,9 +104,9 @@ def get_cmd_line(self):
     def as_json_string(self):
         #{"type": "string", "description": "A persons surname", "max": 1, "default": "Meier"}
         res={}
-        attrib_to_convert = ['_type', "_title", "_description", "_min", "_max", "_default"]
+        attrib_to_convert = ['_type', '_title', '_description', '_min', '_max', '_default', '_input_mime_type']
         attribute_list = [a for a in dir(self) if not a.startswith('__') and not callable(getattr(self, a))]
         attribute_list_filtered = [x for x in attribute_list if x in attrib_to_convert]
         for a in attribute_list_filtered:
             res[a[1:]] = getattr(self, a)
-        return  json.dumps(res)
+        return json.dumps(res)

src/wps_remote.egg-info/top_level.txt

@@ -15,14 +15,13 @@
 
 class InputParameters(object):
 
-
         @staticmethod
         def create_from_config(input_sections):
             '''Create a InputParameters object.
 
             input_sections: a dictionary such as { input1 : [( 'par1_input1_name' , par1_input1_value ), ( 'par2_input1_name' , par2_input1_value ), ...], input2 : [ .... ], ... }
             '''
-            input_sections_reshaped=OrderedDict()
+            input_sections_reshaped = OrderedDict()
             #force the order of sections in config files: [input1], [input2], etc
             for k in sorted(input_sections):
                 d=dict(input_sections[k])
@@ -88,12 +87,12 @@ def checkForCodeInsertion(self, argList):
             maliciousCommands = ['>', '<', '>>', '|', '>&', '<&']
             # Check for bad code insertion
             maliciousCode = ['eval(', 'exec(', 'execfile(', 'input(']
-        
+
             # Evaluate malicious commands
             if any(e in maliciousCommands for e in argList):
                 raise IOError('Found bad code in user input')
             # Evaluate maliciousCode
             for element in argList:
                 for code in maliciousCode:
                     if code in element:
-                        raise IOError('Found bad code in user input')
+                        raise IOError('Found bad code in user input')