First release of /delta version

7 files changed, 45 insertions, 56 deletions

diff --git a/scripts/builder/backendBuilder.py b/scripts/builder/backendBuilder.py
index b4ee990..ad6595c 100755
--- a/scripts/builder/backendBuilder.py
+++ b/scripts/builder/backendBuilder.py
@@ -47,51 +47,54 @@ class BackendBuilder(object):
         def tempFolder (self):
                 return os.path.join(self.projectTargetDir, '.tmp', self.relativePath())
                 
 
         def frontEndTempFolder (self):
                 return self.tempFolder()
 
 
         def developmentTargetFolder (self):
                 return os.path.join(self.projectTargetDir, 'development')
 
 
         def targetFolder (self):
                 return os.path.join(self.projectTargetDir, self.relativePath())
 
                 
         # --------------------------------------------------------------------------
         
         def writeToFolder (self, folder, filename, content):
                 file = open(os.path.join(folder, filename), 'w')
                 file.write(content.encode('utf-8'))
                 file.close()
                 
 
-        def configureIndexContent (self, indexContent, requestPathPrefix = ".."):
+        #def configureIndexContent (self, indexContent, requestPathPrefix = ".."):
+        def configureIndexContent (self, indexContent):
                 result = indexContent
-                result = result.replace( '@request.path@',    requestPathPrefix + '/' + self.settings['request.path']    )
+        #       result = result.replace( '@request.path@',    requestPathPrefix + '/' + self.settings['request.path']    )
+                result = result.replace( '@request.path@',    self.settings['request.path']    )
+                result = result.replace( '@dump.path@',       self.settings['dump.path']       )
                 result = result.replace( '@should.pay.toll@', self.settings['should.pay.toll'] )
 
                 return result
         
 
         def formatMAC (self, value):
                 x = iter(value)
                 return ' '.join([reduce(add, tup) for tup in izip(x, x, x, x)])
 
 
         def logChecksums (self, content, message):
                         md5Digest       = self.formatMAC(hashlib.md5(content.encode('utf-8')).hexdigest())
                         shaDigest       = self.formatMAC(hashlib.sha1(content.encode('utf-8')).hexdigest())
                         sha256Digest= self.formatMAC(hashlib.sha256(content.encode('utf-8')).hexdigest())
                 print "-----"
                 print message + ": " + md5Digest + " (md5)"
                 print message + ": " + shaDigest + " (sha1)"
                 print message + ": " + sha256Digest + " (sha256)"
                 print "====="
                 
         
         def shouldCompileCode (self):
                 return ('debug' in self.versions) or ('install' in self.versions)
 
diff --git a/scripts/builder/backends/phpBuilder.py b/scripts/builder/backends/phpBuilder.py
index c928aa0..c928aa0 100755..100644
--- a/scripts/builder/backends/phpBuilder.py
+++ b/scripts/builder/backends/phpBuilder.py
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py
index e52c31e..b72179f 100644
--- a/scripts/builder/frontendBuilder.py
+++ b/scripts/builder/frontendBuilder.py
@@ -14,48 +14,50 @@ import main
 #===============================================================================
 
 class FrontendBuilder(object):
 
         def __init__ (self, frontend, settings, repositoryVersion):
                 if '.' in frontend:
                         moduleComponents = frontend.split('.')
                         self.module = moduleComponents[0]
                         self.submodule = moduleComponents[1]
                 else:
                         self.module = frontend
                         self.submodule = frontend
 
                 self.settings = settings
                 self.projectDir = main.projectBaseDir()
                 # self.repository = repository.repositoryWithPath(self.projectDir)
                 self.repositoryVersion = repositoryVersion
                 self.processedFiles = {}
 
         #---------------------------------------------------------------------------
 
         def name (self):
                 raise NotImplementedError()
 
+        def projectResourceTypes (self):
+                raise NotImplementedError()
 
         def copyStaticResources (self, targetFolder):
                 raise NotImplementedError()
 
         #---------------------------------------------------------------------------
 
         def log (self, message):
                 module = self.module
                 if (self.module != self.submodule):
                         module = module + "." + self.submodule
                 print "frontend [" + module + "]: " + message
         
 
         def absolutePathForSources (self):
                 return os.path.join(self.projectDir, 'frontend', self.module)
 
         
         def absolutePathForSourceFile (self, basePath, file):
                 return os.path.join(self.absolutePathForSources(), basePath, file)
         
 
         def absolutePathForTargetFile (self, folder, basePath, file):
                 return os.path.join(folder, self.module, basePath, file)
 
@@ -72,51 +74,53 @@ class FrontendBuilder(object):
                 return result
         
 
         def copyResources (self, sourceFolder, destinationFolder, fileType):
                 if fileType in self.settings:
                         for file in self.filterFiles(self.settings[fileType]):
                                 src = self.absolutePathForSourceFile(fileType, file)
                                 dst = self.absolutePathForTargetFile(destinationFolder, fileType, file)
                                 main.createFolder(os.path.dirname(dst))
                                 shutil.copy2(src, dst)
                 else:
                         srcFolder = os.path.join(self.absolutePathForSources(), fileType)
                         dstFolder = os.path.join(destinationFolder, self.module, fileType)
                         if not(os.path.exists(dstFolder)):
                                 shutil.copytree(srcFolder, dstFolder)
 
         #               try:
         #                       shutil.copytree(srcFolder, dstFolder)
         #               except:
         #                       pass
 
                 
 
         def copyResourcesToFolder (self, targetFolder):
-                self.copyResources(self.projectDir, targetFolder, 'css')
-                self.copyResources(self.projectDir, targetFolder, 'js')
-                self.copyResources(self.projectDir, targetFolder, 'images')
+        #       self.copyResources(self.projectDir, targetFolder, 'css')
+        #       self.copyResources(self.projectDir, targetFolder, 'js')
+        #       self.copyResources(self.projectDir, targetFolder, 'images')
+                for resoureceType in self.projectResourceTypes():
+                        self.copyResources(self.projectDir, targetFolder, resoureceType)
                 self.copyStaticResources(targetFolder)
         
 
         def loadFilesContent (self, basePath, files):
                 result = ""
                 
                 for file in self.filterFiles(files):
                         try:
                                 fileHandler = codecs.open(self.absolutePathForSourceFile(basePath, file), 'r', 'utf-8')
                         except:
                                 print "FILE: " + file
 
                         result += fileHandler.read() + '\n'
                         fileHandler.close()
                         
                 return result
         
 
         def template (self):
                 processedFile = 'html_template'
                 if not self.processedFiles.has_key(processedFile):
                         #self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html'])
                         self.processedFiles[processedFile] = self.loadFilesContent('html', [self.settings['html.template']])
                         
@@ -223,98 +227,51 @@ class FrontendBuilder(object):
                                 ('loginForm',                   'lf' ),
                                 ('parameters',                  'p'  ),
                                 ('inputElementValues',  'iev'),
                 ]
                 result = self.compressJS(bookmakeletCode, version + " bookmarklet")
                 
                         result = re.sub('\n', ' ', result)      #Fit all in a single line
                         # result = re.sub('\s+', ' ', result)   #Collapse "redundant" spaces. WARNING: this could have some evil side effects on constant strings used inside to code!!
                 # result = re.sub('\s?([,\+=\(\)\{\};])\s?', '\\1', result)
                 
                 for replacer in replacers:
                         result = re.sub(replacer[0], replacer[1], result)
                 
         #               <!--    escaping required to handle the bookmarklet code within the javascript code     -->
                         result = re.sub('\://',                 '%3a%2f%2f',result)
                         result = re.sub('/',            '%2f',          result)
         #               result = re.sub('"',            '%22',          result)
                         result = re.sub('"',            '\\"',          result)
                         result = re.sub('\"',           '%22',          result)
                         result = re.sub('\'',           '%22',          result)
                         result = re.sub('\\\\',                 '%5c',          result)
                 result = result.strip()
                 result = 'javascript:' + result
 
-        #       replacers = [
-        #                       ('aForm',                       '_1' ),
-        #                       ('inputFields',                 '_2' ),
-        #                       ('passwordFieldsFound','_3' ),
-        #                       ('aDocument',           '_6' ),
-        #                       ('aLevel',                      '_7' ),
-        #               #       ('result',                      '_8' ),
-        #                       ('documentForms',       '_9' ),
-        #                       ('iFrames',                     '_c' ),
-        #                       ('anInputElement',      '_d' ),
-        #                       ('options',                     '_f' ),
-        #                       ('option',                      '_12'),
-        #                       ('aLoginForm',          '_13'),
-        #               #       ('action',                      '_17'),
-        #                       ('radioValues',                 '_18'),
-        #                       ('radioValueName',      '_19'),
-        #                       ('inputElement',        '_1a'),
-        #                       ('elementValues',       '_1b'),
-        #                       ('radioValue',          '_1c'),
-        #                       ('values',                      '_1d'),
-        #                       ('objtype',                     '_21'),
-        #                       ('useKey',                      '_27'),
-        #                       ('bookmarkletDiv',      '_28'),
-        #                       ('someParameters',      '_29'),
-        #                       ('anException',                 '_2a'),
-        #                       ('newDiv',                      '_2b'),
-        #                       ('base_url',            '_2c'),
-        #                       ('help_url',            '_2d'),
-        #                       ('logo_image_url',      '_2e'),
-        #               ('background_image_url','_2f'),
-        #                       ('close_image_url',     '_30'),
-        #               #('bookmarklet_textarea','_31'),
-        #                       ('innerHTML',           '_32'),
-        #       ]
-        #       for replacer in replacers:
-        #               result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
-
-        #       replacers = [
-        #                       ('headNode',            '_1' ),
-        #                       ('clipperzScriptNode','_2' ),
-        #       ]
-        #       for replacer in replacers:
-        #               result = re.sub('([^\.])' + replacer[0], '\\1' + replacer[1], result)
-
-        #       result = re.sub(';', ';\n', result)
-                
                 return result
                 
         
-
         def bookmarklet (self):
                 cacheKey = 'bookmarklet'
                 if not self.processedFiles.has_key(cacheKey):
                         result = 'bookmarklet="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet.js']), "regular") + '";bookmarklet_ie="' + self.packBookmarklet(self.loadFilesContent('js', ['Bookmarklet_IE.js']), "IE") + '";'
                         self.processedFiles[cacheKey] = result
                 else:
                         result = self.processedFiles[cacheKey]
                 
                 return result
         
 
         def replaceTemplatePlaceholders (self, pageTitle, copyright, css, code, jsLoadMode, version, versionType):
                 result = self.template()
                 
                         result = result.replace('@page.title@',                                 pageTitle)
                         result = result.replace('@copyright@',                          copyright)
                         result = result.replace('@css@',                                        css)
                         #result = result.replace('@bookmarklet@',                       bookmarklet)
                         result = result.replace('@application.version@',        version)
                         result = result.replace('@application.version.type@',versionType)
                         result = result.replace('@js_' + jsLoadMode + '@',      code)
 
                 result = re.sub('@js_[^@]+@', '', result)
 
@@ -367,54 +324,58 @@ class FrontendBuilder(object):
                 #self.log("# cacheKey:\n" + result)
                 return result
         
 
         def assemble (self, assemblyMode='INSTALL', versionType='LIVE'):
 
                 if versionType == 'LIVE':
                         pageTitle = "Clipperz - " + self.module
                 else:
                         pageTitle = "Clipperz - " + self.module + " [" + versionType + " - " + assemblyMode +"]"
 
                 if assemblyMode == 'INSTALL':
                         copyright = self.assembleCopyrightHeader()
                                 css     =self.cssTagForContent(self.compressCSS(self.loadFilesContent('css', self.settings['css'])))
                                 js      =self.scriptTagForContent(
                                                 self.bookmarklet() +
                                                 '\n' +
                                                 self.compressJS(self.loadFilesContent('js', self.settings['js']), "application")
                                         )
                         jsLoadMode = 'EMBEDDED'
 
                 elif assemblyMode == 'DEBUG':
                         copyright = self.assembleCopyrightHeader()
                                 css     =self.cssTagsForFiles('./css', self.filterFiles(self.settings['css']))
-                                js      =self.scriptTagForContent(self.bookmarklet()) + \
+                                js      =self.scriptTagForContent(
+                                                self.bookmarklet()) + \
                                          '\n' + \
-                                        self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js']))
+                                                self.scriptTagsForFiles('./js', self.filterFiles(self.settings['js'])
+                                        )
                         jsLoadMode = 'LINKED'
 
                 elif assemblyMode == 'DEVELOPMENT':
                         copyright = ""
                                 css     =self.cssTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'css')), self.filterFiles(self.settings['css']))
-                                js      =self.scriptTagForContent(self.bookmarklet()) + \
+                                js      =self.scriptTagForContent(
+                                                self.bookmarklet()) + \
                                          '\n' + \
-                                        self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js']))
+                                                self.scriptTagsForFiles('file://' + str(os.path.join(self.absolutePathForSources(), 'js')), self.filterFiles(self.settings['js'])
+                                        )
                         jsLoadMode = 'LINKED'
                         versionType = 'development'
 
                 else:
                         raise NotImplementedError()
 
                 return self.assembleVersion(
                                 pageTitle       = pageTitle,
                                 copyright       = copyright,
                                 css                     = css,
                                 js                      = js,
                                 jsLoadMode      = jsLoadMode,
                                 version                 = self.repositoryVersion,
                                 versionType     = versionType
                 )
 
 
 
 
diff --git a/scripts/builder/frontends/betaBuilder.py b/scripts/builder/frontends/betaBuilder.py
index c5a3e76..9b32404 100644
--- a/scripts/builder/frontends/betaBuilder.py
+++ b/scripts/builder/frontends/betaBuilder.py
@@ -1,14 +1,17 @@
 from frontendBuilder import FrontendBuilder
 import shutil
 
 class BetaBuilder(FrontendBuilder):
 
         def name(self):
                 return "/beta builder"
 
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
+
         def copyStaticResources (self, targetFolder):
                 for file in self.filterFiles(self.settings['staticResources']):
                         src = self.absolutePathForSourceFile('staticResources', file)
                         dst = self.absolutePathForTargetFile(targetFolder, '', file)
                         shutil.copy2(src, dst)
 
diff --git a/scripts/builder/frontends/deltaBuilder.py b/scripts/builder/frontends/deltaBuilder.py
new file mode 100644
index 0000000..a341a83
--- a/dev/null
+++ b/scripts/builder/frontends/deltaBuilder.py
@@ -0,0 +1,16 @@
+from frontendBuilder import FrontendBuilder
+import shutil
+
+class DeltaBuilder(FrontendBuilder):
+
+        def name(self):
+                return "/delta builder"
+
+        def projectResourceTypes (self):
+                return ['js', 'css']
+
+        def copyStaticResources (self, targetFolder):
+                pass
+
+        def bookmarklet (self):
+                return ""
\ No newline at end of file
diff --git a/scripts/builder/frontends/gammaBuilder.py b/scripts/builder/frontends/gammaBuilder.py
index a6ecb7b..c56fb1b 100644
--- a/scripts/builder/frontends/gammaBuilder.py
+++ b/scripts/builder/frontends/gammaBuilder.py
@@ -1,27 +1,30 @@
 from frontendBuilder import FrontendBuilder
 import shutil
 
 class GammaBuilder(FrontendBuilder):
 
         def name(self):
                 return "/gamma builder"
 
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
+
         def copyStaticResources (self, targetFolder):
                 resourcesToCopy = [
         #                       {'folder': 'html',      'source': 'exit_template.html','target': 'exit.html'},
                                 {'folder': 'html',      'source': 'exit_template.html','target': 'logout.html'},
                                 {'folder': 'css',       'source': 'static.css',                 'target': 'static.css'}
                 ]
 
                 for resource in resourcesToCopy:
                         src = self.absolutePathForSourceFile(resource['folder'], resource['source'])
                         dst = self.absolutePathForTargetFile(targetFolder, '', resource['target'])
                         shutil.copy2(src, dst)
 
                 # src = self.absolutePathForSourceFile('html', 'exit_template.html')
                 # dst = self.absolutePathForTargetFile(targetFolder, '', 'exit.html')
                 # shutil.copy2(src, dst)
 
                 # src = self.absolutePathForSourceFile('css', 'static.css')
                 # dst = self.absolutePathForTargetFile(targetFolder, '', 'static.css')
                 # shutil.copy2(src, dst)
diff --git a/scripts/builder/frontends/gamma_mobileBuilder.py b/scripts/builder/frontends/gamma_mobileBuilder.py
index f2e80c9..677a2b0 100644
--- a/scripts/builder/frontends/gamma_mobileBuilder.py
+++ b/scripts/builder/frontends/gamma_mobileBuilder.py
@@ -1,9 +1,12 @@
 from frontendBuilder import FrontendBuilder
 
 class Gamma_MobileBuilder(FrontendBuilder):
 
         def name(self):
                 return "/gamma.mobile builder"
 
+        def projectResourceTypes (self):
+                return ['js', 'css', 'images']
+
         def copyStaticResources (self, targetFolder):
                 pass