lib/openwfe/expool/def_parser.rb test/functional/ft_5_process_uri.rb @@ -1,2 +1,3 @@ logs/ work/ +tmp/ .gitignore @@ -50,7 +50,7 @@ require 'openwfe/workitem' require 'openwfe/util/irb' require 'openwfe/util/workqueue' require 'openwfe/util/treechecker' -require 'openwfe/expool/parser' +require 'openwfe/expool/def_parser' require 'openwfe/expool/wfidgen' require 'openwfe/expool/expressionpool' require 'openwfe/expool/expstorage' lib/openwfe/engine/engine.rb @@ -175,7 +175,7 @@ module OpenWFE else - [ read_uri(wfdurl), false ] + [ get_def_parser.read_uri(wfdurl), false ] end raise( @@ -183,7 +183,7 @@ module OpenWFE ) unless definition raise( - ":definition_in_launchitem_allowed not set to true, cannot launch." + ':definition_in_launchitem_allowed not set to true, cannot launch.' ) if in_launchitem and ac[:definition_in_launchitem_allowed] != true raw_expression = get_expression_pool.build_raw_expression( lib/openwfe/engine/launch_methods.rb @@ -48,12 +48,11 @@ require 'openwfe/flowexpressionid' require 'openwfe/util/observable' require 'openwfe/expool/errors' require 'openwfe/expool/expool_pause_methods' -require 'openwfe/expool/parser' require 'openwfe/expool/representation' require 'openwfe/expressions/environment' require 'openwfe/expressions/raw' -require 'rufus/verbs' # gem 'rufus-verbs' +require 'rufus/verbs' # sudo gem install 'rufus-verbs' module OpenWFE @@ -615,17 +614,6 @@ module OpenWFE end # - # Gets the process definition (if necessary) and turns into - # into an expression tree (for storing into a RawExpression). - # - def determine_rep (param) - - param = read_uri(param) if param.is_a?(URI) - - get_def_parser.parse(param) - end - - # # Returns true if the process instance to which the expression # belongs is currently paused. # @@ -638,12 +626,14 @@ module OpenWFE # Builds the RawExpression instance at the root of the flow # being launched. # - # The param can be a template or a definition (anything - # accepted by the determine_representation() method). + # The param can be a template or a definition (or a URI). # def build_raw_expression (param, launchitem=nil) - procdef = determine_rep(param) + procdef = get_def_parser.determine_rep(param) + + # procdef is a nested [ name, attributes, children ] structure now + atts = procdef[1] h = { @@ -783,29 +773,6 @@ module OpenWFE end # - # This is the only point in the expression pool where an URI - # is read, so this is where the :remote_definitions_allowed - # security check is enforced. - # - def read_uri (uri) - - uri = URI.parse(uri.to_s) - - raise ":remote_definitions_allowed is set to false" \ - if (ac[:remote_definitions_allowed] != true and - uri.scheme and - uri.scheme != 'file') - - #open(uri.to_s).read - - f = Rufus::Verbs.fopen(uri) # Rufus::Verbs is OK with redirections - result = f.read - f.close if f.respond_to?(:close) - - result - end - - # # This is the method called [asynchronously] by the WorkQueue # upon apply/reply. # lib/openwfe/expool/expressionpool.rb @@ -252,7 +252,7 @@ module OpenWFE ldebug { "apply() def is >#{df}<" } - tree = get_expression_pool.determine_rep(df) + tree = get_def_parser.determine_rep(df) get_expression_pool.substitute_and_apply(self, tree, workitem) end lib/openwfe/expressions/fe_misc.rb @@ -150,13 +150,10 @@ module OpenWFE # def OpenWFE.parse_uri (string) - return nil if string.split("\n").size > 1 + return nil if string.index("\n") + # cheap initial test - begin - URI::parse(string) - rescue Exception => e - nil - end + URI.parse(string) rescue nil end # @@ -166,7 +163,7 @@ module OpenWFE # def OpenWFE.parse_known_uri (ref) - uri = OpenWFE::parse_uri(ref.to_s) + uri = OpenWFE.parse_uri(ref.to_s) return nil unless uri lib/openwfe/utils.rb @@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/../test_helper.rb' require 'openwfe/def' -require 'openwfe/expool/parser' +require 'openwfe/expool/def_parser' class ParserRubyTest < Test::Unit::TestCase test/unit/ut_7_parser_ruby.rb @@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/../test_helper.rb' require 'openwfe/def' -require 'openwfe/expool/parser' +require 'openwfe/expool/def_parser' class ParserRubyTestB < Test::Unit::TestCase test/unit/ut_7b_parser_ruby.rb @@ -9,7 +9,7 @@ require File.dirname(__FILE__) + '/../test_helper.rb' -require 'openwfe/expool/parser' +require 'openwfe/expool/def_parser' class ParserDescriptionTest < Test::Unit::TestCase test/unit/ut_8_parser_description.rb lib/openwfe/expool/parser.rb 86ec3070831a224dca687023590b3898299d2170 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote/commit/f85073fda9246911e36d20cf32ab636c904fa2ec f85073fda9246911e36d20cf32ab636c904fa2ec 2009-02-25T18:00:45-08:00 2009-02-25T18:00:45-08:00 bug #24136 : read_uri issue during restruct. Fixed. 6418037d26c3e6c22b640912b1551c3f303dc9d5 John Mettraux jmettraux@gmail.com