oneis 2.0.3-java → 2.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b68f3277dbcaef02ed9fb1386d07890d556d5fa1
-  data.tar.gz: 9829008f1daebd4bc1dba87dde7d89adb2f29753
+  metadata.gz: 1d1ef4ecef67240a4415a9b2b4f7b621454e9b98
+  data.tar.gz: fd3413e5f159e192bb2ccd4aea7f5965bdb1bd82
 SHA512:
-  metadata.gz: c22f7f5300f2919e7b8b15f1715dc2c284cf3438edfb062fd2080201ddd80a67f3df21ebf4d4723fb9a05c20a3ea069c989d701055d75002d1d18df1eb3d3c89
-  data.tar.gz: 7c19c276060296924d354f26569d46a0fcd59164d6816172a46987b2005e0f8f621f3b9d008b66d4533d129beb76b75eead8f8a4c04f099009095c10e4a9d077
+  metadata.gz: 77535631e1bf9d948766c4e3e4910bd63160cfe12c7f400dcb7d182348978a5e4a13b59e65918dec2a6044f17d434e41a3015e4270acafe874f684fc24f9fd53
+  data.tar.gz: 60078eeca4ffd2bf63d9c8e95506c402ceac322044e993072d50a58ed37fb742151e57b7475e7b5a0fdce388928e955c77d94b17ef2afa018aaea42fed6f68e6

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": 3,
+  "apiVersion": 4,
   "load": [
       "js/#{plugin_name}.js"
     ],
@@ -54,17 +54,20 @@ __E
     File.open("#{plugin_name}/test/#{plugin_name}_test1.js",'w') do |file|
       file.write(<<__E)
 
-T.test(function() {
+t.test(function() {
 
     // For documentation, see
     //   http://docs.oneis.co.uk/dev/plugin/tests
-    
-    T.assert(true);
-  
+
+    t.assert(true);
+
 });
 
 __E
     end
+    File.open("#{plugin_name}/requirements.schema",'w') do |file|
+      file.write("\n\n\n")
+    end
     puts <<__E
 
 Plugin #{plugin_name} has been created. Run

data/lib/run.rb

@@ -26,6 +26,7 @@ require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/local_config.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/manifest.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/auth.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/server.rb"
+require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/schema_requirements.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/syntax_checking.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/notifications.rb"
 require "#{ONEIS_PLUGIN_ROOT_DIR}/lib/plugin.rb"

data/lib/schema_requirements.rb

@@ -0,0 +1,63 @@
+
+module PluginTool
+
+  class SchemaRequirements
+    IGNORE_LINE = /\A\s*(\#.+)?\z/m # comment or blank line
+    OBJECT_FORMAT = /\A(?<kind>\S+)\s+(?<code>[a-zA-Z0-9_:-]+)\s*(as\s+(?<name>[a-zA-Z0-9_]+))?\s*\z/m
+
+    SCHEMA_LOCALS = {
+      "type" => "T",
+      "attribute" => "A",
+      "aliased-attribute" => "AA",
+      "qualifier" => "Q",
+      "label" => "Label",
+      "group" => "Group"
+    }
+
+    def initialize(filename)
+      # Define the special attributes by default
+      @schema_names = {"A" => {
+        "Parent" => true,
+        "Type" => true,
+        "Title" => true
+      }}
+      return unless File.exist?(filename)
+      File.open(filename) do |file|
+        file.each do |line|
+          if (line !~ IGNORE_LINE) && (match = OBJECT_FORMAT.match(line))
+            kind = SCHEMA_LOCALS[match[:kind]] || 'UNUSED'
+            @schema_names[kind] ||= {}
+            name = match[:name]
+            if name && !name.empty?
+              @schema_names[kind][name] = true
+            end
+          end
+        end
+      end
+      @schema_names.delete('UNUSED')
+    end
+
+    def locals
+      @schema_names.keys.dup
+    end
+
+    FIND_USE_REGEXP = Regexp.new("\\b(#{SCHEMA_LOCALS.values.join('|')})\\.([a-zA-Z0-9]+)\\b")
+
+    def report_usage(js)
+      report = []
+      js.split(/\r?\n/).each_with_index do |line, index|
+        line.scan(FIND_USE_REGEXP) do
+          kind = $1
+          name = $2
+          lookup = @schema_names[kind]
+          unless lookup && lookup.has_key?(name)
+            report << "line #{index+1}: Schema name #{kind}.#{name} isn't declared in requirements.schema\n\n"
+          end
+        end
+      end
+      report.empty? ? nil : report.join
+    end
+  end
+
+end
+

data/lib/syntax_checking.rb

@@ -40,11 +40,12 @@ module PluginTool
     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
+      schema_requirements = (api_version < 4) ? nil : SchemaRequirements.new("#{plugin_dir}/requirements.schema")
+      extra_globals = schema_requirements ? schema_requirements.locals.dup : []
       # Load the file
       js = File.open("#{plugin_dir}/#{file}") { |f| f.read }
       if api_version < 3
@@ -53,22 +54,25 @@ module PluginTool
           extra_globals << plugin_json["pluginName"];
         end
       else
-        if kind == 'js'
+        if kind == 'js' || kind == 'test'
           extra_globals << plugin_json["pluginName"]
           extra_globals << 'P'
           locals = plugin_json["locals"]
           if locals
             locals.each_key { |local| extra_globals << local }
           end
-        elsif kind == 'test'
-          extra_globals << plugin_json["pluginName"]
-          extra_globals << 'P'
+        end
+        if kind == 'test'
+          extra_globals << 't'
         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, JSON.generate(extra_globals)])
+      lint_report = @@syntax_tester.call(@@cx, @@javascript_scope, @@javascript_scope, [js, kind, JSON.generate(extra_globals)])
+      schema_report = schema_requirements ? schema_requirements.report_usage(js) : nil
+      report = [lint_report, schema_report].compact.join("\n\n")
+      report = nil if report.empty?
     end
     report
   end

data/lib/version.txt

@@ -1 +1 @@
-6be56b5a02
+e96173eff2

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     = '2.0.3'
-  s.date        = '2015-02-20'
+  s.version     = '2.0.4'
+  s.date        = '2015-04-10'
   s.summary     = "ONEIS Tools"
   s.description = "ONEIS Developer Tools"
   s.authors     = ["ONEIS"]

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: oneis
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: java
 authors:
 - ONEIS
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jruby-openssl
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+  name: jruby-openssl
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
+  name: json
   prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
 description: ONEIS Developer Tools
 email: client.services@oneis.co.uk
 executables:
@@ -66,6 +66,7 @@ files:
 - lib/plugin.rb
 - lib/plugin_tool.rb
 - lib/run.rb
+- lib/schema_requirements.rb
 - lib/server.rb
 - lib/syntax_checking.rb
 - lib/uglifyjs/parse-js.js