oneis 1.1.0-java → 1.2.0-java

data/lib/js_syntax_test.js

@@ -38,13 +38,15 @@
     optionsBrowser.browser = true;
     
     // Predefined globals
-    var makeGlobalsServer = function() {
-        return {O:false, SCHEMA:false, HTTP:false, DBTime:false, console:false, JSON:false, '_':false, Handlebars:false, oForms:false, moment:false, XDate:false};
-    };
-    var globalsServer = makeGlobalsServer();
-    var globalsBrowser = {ONEIS:false, jQuery:false, '_':false};
-    var globalsTest = makeGlobalsServer();
-        globalsTest.T = false;  // Add in the test global
+    var globalsServer = [
+        'O',
+        'SCHEMA', 'TYPE', 'ATTR', 'ALIASED_ATTR', 'QUAL', 'LABEL', 'GROUP',
+        'HTTP', 'DBTime',
+        'console', 'JSON',
+        '_', 'Handlebars', 'oForms', 'moment', 'XDate'
+    ];
+    var globalsBrowser = ['ONEIS', 'jQuery', '_'];
+    var globalsTest = globalsServer.concat('T');
     
     // Set globals
     root.syntax_tester_globals = function(string) {
@@ -52,14 +54,19 @@
     };
 
     // Syntax tester function
-    root.syntax_tester = function(source, kind) {
-        var globals;
+    root.syntax_tester = function(source, kind, extraGlobals) {
+        var globalList;
         switch(kind) {
-            case "js":      globals = globalsServer;    break;
-            case "static":  globals = globalsBrowser;   break;
-            case "test":    globals = globalsTest;      break;
+            case "js":      globalList = globalsServer;    break;
+            case "static":  globalList = globalsBrowser;   break;
+            case "test":    globalList = globalsTest;      break;
+        }
+        if(!globalList) { return "Wrong kind of file"; }
+        var globals = {}, addGlobal = function(g) { globals[g] = false; };
+        globalList.forEach(addGlobal);
+        if(extraGlobals) {
+            JSON.parse(extraGlobals).forEach(addGlobal);
         }
-        if(!globals) { return "Wrong kind of file"; }
         var result = JSHINT(source,
             (kind !== 'static') ? optionsServer : optionsBrowser,
             globals

data/lib/new_plugin.rb

@@ -26,7 +26,7 @@ module PluginTool
   "displayName": "#{plugin_name.split('_').map {|e| e.capitalize} .join(' ')}",
   "displayDescription": "TODO Longer description of plugin",
   "installSecret": "#{install_secret}",
-  "apiVersion": 2,
+  "apiVersion": 3,
   "load": [
       "js/#{plugin_name}.js"
     ],
@@ -37,18 +37,12 @@ __E
     File.open("#{plugin_name}/js/#{plugin_name}.js",'w') do |file|
       file.write(<<__E)
 
-var #{plugin_name} = O.plugin("#{plugin_name}");
-
-(function(P) {
-
-    P.respond("GET", "/do/#{plugin_url_fragment}/example", [
-    ], function(E) {
-        E.render({
-            pageTitle: "Example page"
-        });
+P.respond("GET", "/do/#{plugin_url_fragment}/example", [
+], function(E) {
+    E.render({
+        pageTitle: "Example page"
     });
-
-})(#{plugin_name});
+});
 
 __E
     end

data/lib/syntax_checking.rb

@@ -35,23 +35,37 @@ module PluginTool
     # Load the plugin.json file
     plugin_dir = plugin.plugin_dir
     plugin_json = File.open("#{plugin_dir}/plugin.json") { |f| JSON.parse(f.read) }
+    api_version = (plugin_json["apiVersion"] || '0').to_i
     # Determine kind of file
-    file =~ /\A(\w+)\//
-    kind = $1
+    kind = (file =~ /\A(\w+)\//) ? $1 : file
     # Is this file referenced?
     report = nil
+    extra_globals = []
     unless kind != 'js' || plugin_json['load'].include?(file)
       puts "\nWARNING: #{plugin_dir}/plugin.json doesn't mention #{file} in the load directive.\n"
       report = "Couldn't check file - not mentioned in plugin.json"
     else
       # Load the file
       js = File.open("#{plugin_dir}/#{file}") { |f| f.read }
-      # If it's not the first the file, need to tell JSHint about the extra var
-      unless plugin_json['load'].first == file
-        js = "/*global #{plugin_json["pluginName"]}: false */#{js}"
+      if api_version < 3
+        # If it's not the first file, need to tell JSHint about the extra var
+        unless plugin_json['load'].first == file
+          extra_globals << plugin_json["pluginName"];
+        end
+      else
+        if kind == 'js'
+          extra_globals << plugin_json["pluginName"]
+          extra_globals << 'P'
+          locals = plugin_json["locals"]
+          if locals
+            locals.each_key { |local| extra_globals << local }
+          end
+        end
+        # global.js requires server side syntax checking, but doesn't have any extra globals, not even the plugin name.
+        kind = 'js' if kind == 'global.js'
       end
       # Do syntax checking
-      report = @@syntax_tester.call(@@cx, @@javascript_scope, @@javascript_scope, [js, kind])
+      report = @@syntax_tester.call(@@cx, @@javascript_scope, @@javascript_scope, [js, kind, JSON.generate(extra_globals)])
     end
     report
   end

data/lib/version.txt

@@ -1 +1 @@
-ef06a9244e
+2a2fcaef6e

data/oneis.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   files = Dir.glob("#{root_dir}/**/*.*").map { |x| x[root_dir.length + 1, x.length]}
 
   s.name        = 'oneis'
-  s.version     = '1.1.0'
-  s.date        = '2014-10-03'
+  s.version     = '1.2.0'
+  s.date        = '2014-11-20'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]

metadata

@@ -2,7 +2,7 @@
 name: oneis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: java
 authors: 
   - ONEIS
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-03 00:00:00 Z
+date: 2014-11-20 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: jruby-openssl