posxml_parser 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922b6e903234fcc2824fb73f7b65fa4ae164de55
-  data.tar.gz: 624b36e3a15e7eefe2e356a950bfbdf9d0ac3756
+  metadata.gz: 1832f100013a8327eb5bc2af3938f37df654e8da
+  data.tar.gz: f88056150a5fbd972ded5068594da963f2ae7531
 SHA512:
-  metadata.gz: 4d10e1046ccdb6a4140a58b062be03d2aba4a1f07297ebb18c2e09f9d309dfce797ce53415ba559ea51910ec4654a15aa226b3c40907b8164e6509024746e87b
-  data.tar.gz: 8c6d97c2022face12080345117e4af0a18bd636fcfd1c5465f0bd1ba68fc050cf975a9b16d162c9b33d9e31319523f23a60a4bf53632773901db0491f87a7e3a
+  metadata.gz: b22ad44960174d80ca1c7e9bd22ccf578bd69770540c7ecd738971b34e85cf9b61e61711e44b7058cd6e1f5fd5ee3a9a5cc1336ddefb21676303fb8a8c419ac5
+  data.tar.gz: 1667e63da3a8144d14e72665536bc8c24b7a2800573f789a6cc77dd7276afdedc9dbf40adbf39583e17701c2da2d61e38334b94e8f4e441a89cb38224090a2bf

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # Posxml Parser
 
+### 2.1.0 - 2018-02-22
+
+- PosxmlCompiler refactoring VariableTypeError message.
+- PosxmlCompiler supports parameter validation.
+
 ### 2.0.0 - 2018-02-21
 
 - Bug fix interface_menu function to expect “1.” And “1 “ entry numbers.

data/Rakefile

@@ -35,6 +35,7 @@ files = [
   "lib/posxml_compiler/variable_undefined_error.rb",
   "lib/posxml_compiler/instruction_not_found_error.rb",
   "lib/posxml_compiler/variable_type_error.rb",
+  "lib/posxml_compiler/parameter_not_found_error.rb",
   "lib/posxml_translate/parser.rb",
   "lib/posxml_translate/pattern.rb",
   "lib/posxml_translate/base.rb",

data/lib/posxml_compiler/parameter_not_found_error.rb

@@ -0,0 +1,5 @@
+module PosxmlCompiler
+  class ParameterNotFoundError < PosxmlCompilerError
+  end
+end
+

data/lib/posxml_compiler/variable.rb

@@ -33,11 +33,11 @@ module PosxmlCompiler
       when :string_or_integer # match everything is ok
       when nil # not defined yet, it's ok for now
       when :string
-        raise PosxmlCompiler::VariableTypeError.new("Variable type #{variable_struct[:type]} mismatch, instruction #{instruction}, parameter #{parameter_name}, xsd type #{type}.")
+        raise PosxmlCompiler::VariableTypeError.new("Wrong argument type #{variable_struct[:type]} for instruction #{instruction}, parameter #{parameter_name} (expected #{type})")
       when :integer
-        raise PosxmlCompiler::VariableTypeError.new("Variable type #{variable_struct[:type]} mismatch, instruction #{instruction}, parameter #{parameter_name}, xsd type #{type}.")
+        raise PosxmlCompiler::VariableTypeError.new("Wrong argument type #{variable_struct[:type]} for instruction #{instruction}, parameter #{parameter_name} (expected #{type})")
       else
-        raise PosxmlCompiler::VariableTypeError.new("Variable type #{variable_struct[:type]} not recognized, instruction #{instruction}, parameter #{parameter_name}, xsd type #{type}.")
+        raise PosxmlCompiler::VariableTypeError.new("Wrong argument type #{variable_struct[:type]} for instruction #{instruction}, parameter #{parameter_name} (expected #{type})")
       end
 
       return true

data/lib/posxml_compiler/xsd_parser.rb

@@ -34,7 +34,8 @@ module PosxmlCompiler
       instruction = self.find(name) # => {:bytecode => "I", :order => ["variable", "operator", "value"], :parameters => {"variable" => :string_or_integer, "operator" => :string, "value" => :string_or_integer}
       raise InstructionNotFoundError.new("Instruction #{name.inspect} not found") unless instruction
 
-      line = instruction[:order].collect { |param| parameters[param][:value] || parameters[param][:value]}
+      parameters_validate(name, instruction, parameters)
+      line = instruction[:order].collect { |param| parameters[param][:value] }
 
       if line.empty?
         instruction[:bytecode].chr + DELIMITER_END_INSTRUCTION
@@ -47,6 +48,15 @@ module PosxmlCompiler
       self.instructions[name] # => {:bytecode => "I", :order => ["variable", "operator", "value"], :parameters => {"variable" => :string_or_integer, "operator" => :string, "value" => :string_or_integer}
     end
 
+    def parameters_validate(instruction_name, instruction, parameters)
+      parameters_valid = instruction[:parameters].keys
+      parameters.each do |name, data|
+        unless parameters_valid.include? name
+          raise ParameterNotFoundError.new("invalid parameter '#{name}' for instruction '#{instruction_name}'")
+        end
+      end
+    end
+
     private
     def string2byte(str)
       value = str.gsub(";", "").gsub("true", "").gsub("false", "")

data/lib/posxml_parser/version.rb

@@ -1,5 +1,5 @@
 
 module PosxmlParser
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posxml_parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - CloudWalk Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - "./lib/posxml_compiler/instruction_not_found_error.rb"
 - "./lib/posxml_compiler/jump.rb"
 - "./lib/posxml_compiler/jump_point.rb"
+- "./lib/posxml_compiler/parameter_not_found_error.rb"
 - "./lib/posxml_compiler/parser.rb"
 - "./lib/posxml_compiler/posxml_compiler_error.rb"
 - "./lib/posxml_compiler/string_size_error.rb"