pione 0.3.1 → 0.3.2

data/lib/pione/util/indentation.rb

@@ -12,7 +12,7 @@ module Pione
       def self.cut(text)
         line = text.lines.to_a.first
         n = line.length - line.lstrip.length
-        n > 0 ? text.gsub(/^\s{0,#{n}}/m, "") : text
+        n > 0 ? text.gsub(/^[ ]{0,#{n}}/m, "") : text
       end
     end
   end

data/lib/pione/util/last-time.rb

@@ -0,0 +1,20 @@
+module Pione
+  module Util
+    module LastTime
+      # Return last time of data locations. The criteria of last time is
+      # location's mtime and ctime.
+      def self.get(locations)
+        locations.inject(nil) do |last_time, location|
+          mtime = location.mtime            # mtime should be supported
+          ctime = location.ctime rescue nil # ctime may be not supported
+
+          # get newer time
+          this_time = [mtime, ctime].max
+
+          # compare
+          (last_time.nil? or last_time < this_time) ? this_time : last_time
+        end
+      end
+    end
+  end
+end

data/lib/pione/util/misc.rb

@@ -34,9 +34,15 @@ module Pione
 
       def parse_features(textual_features)
         stree = Lang::DocumentParser.new.expr.parse(textual_features)
-        opt = {package_name: "*feature*", filename: "*feature*"}
+        opt = {package_name: "*Feature*", filename: "*Feature*"}
         Lang::DocumentTransformer.new.apply(stree, opt)
       end
+
+      def parse_param_set(textual_param_set)
+        stree = Lang::DocumentParser.new.parameter_set.parse(textual_param_set)
+        opt = {package_name: "*ParamSet*", filename: "*ParamSet*"}
+        params = Lang::DocumentTransformer.new.apply(stree, opt)
+      end
     end
 
     extend Misc

data/lib/pione/util/pnml-compiler.rb

@@ -1,8 +1,11 @@
 module Pione
   module Util
     class PNMLCompiler
-      def initialize(src)
+      def initialize(src, name, editor, tag)
         @src = src
+        @name = name
+        @editor = editor
+        @tag = tag
       end
 
       # Compile PNML file into PIONE document as a string.
@@ -12,8 +15,18 @@ module Pione
         io_table = make_io_table(doc)
         input_table = make_input_table(doc, rule_table, io_table)
         output_table = make_output_table(doc, rule_table, io_table)
-        rules = make_flow_rules(rule_table, input_table, output_table)
-        return textize_flow_rules(rules)
+
+        annotations = []
+        if @name
+          annotations << ".@ PackageName :: \"%s\"" % @name
+          annotations << ".@ Editor :: \"%s\"" % @editor if @editor
+          annotations << ".@ Tag :: \"%s\"" % @tag if @tag
+        end
+
+        main_rule = textize_main_rule(*make_main_rule(rule_table, input_table, output_table))
+        other_rules = textize_flow_rules(make_flow_rules(rule_table, input_table, output_table))
+
+        [*annotations, "", main_rule, *other_rules].join("\n")
       end
 
       private
@@ -22,8 +35,11 @@ module Pione
       def make_rule_table(doc)
         rule_table = Hash.new
         REXML::XPath.each(doc, "/pnml/net/transition") do |elt|
+          # transition id
           id = elt.attribute("id").value
+          # transition name
           name = REXML::XPath.first(elt, "name/text").texts.map{|text| text.value}.join("")
+          # rule table (id -> name)
           rule_table[id] = name
         end
         return rule_table
@@ -33,8 +49,11 @@ module Pione
       def make_io_table(doc)
         io_table = Hash.new {|h, k| h[k] = []}
         REXML::XPath.each(doc, "/pnml/net/place") do |elt|
+          # place id
           id = elt.attribute("id").value
+          # place name
           name = REXML::XPath.first(elt, "name/text").texts.map{|text| text.value}.join("")
+          # palce table (id -> names)
           io_table[id] << name
         end
         return io_table
@@ -44,10 +63,12 @@ module Pione
       def make_input_table(doc, rule_table, io_table)
         input_table = Hash.new {|h, k| h[k] = []}
         REXML::XPath.each(doc, "/pnml/net/arc") do |elt|
-          source = elt.attribute("source").value
-          target = elt.attribute("target").value
-          name = REXML::XPath.first(elt, "inscription/text").texts.map{|text| text.value}.join("")
-          input_table[rule_table[target]] << io_table[source]
+          source = elt.attribute("source").value # source place(data) id
+          target = elt.attribute("target").value # target transition(rule) id
+          if rule_table.has_key?(target)
+            name = REXML::XPath.first(elt, "inscription/text").texts.map{|text| text.value}.join("")
+            input_table[rule_table[target]] += io_table[source]
+          end
         end
         return input_table
       end
@@ -59,11 +80,54 @@ module Pione
           source = elt.attribute("source").value
           target = elt.attribute("target").value
           name = REXML::XPath.first(elt, "inscription/text").texts.map{|text| text.value}.join("")
-          output_table[rule_table[source]] << io_table[target]
+          output_table[rule_table[source]] += io_table[target]
         end
         return output_table
       end
 
+      # Make a main rule.
+      def make_main_rule(rule_table, input_table, output_table)
+        inputs = find_main_inputs(input_table, output_table)
+        outputs = find_main_outputs(output_table)
+        constituents = find_constituents(rule_table)
+        return [inputs, outputs, constituents]
+      end
+
+      def find_main_inputs(input_table, output_table)
+        input_table.values.each_with_object([]) do |names, main_inputs|
+          inputs = names.select do |name|
+            not(output_table.values.flatten.include?(name))
+          end
+          main_inputs.concat(inputs)
+        end
+      end
+
+      def find_main_outputs(output_table)
+        output_table.values.each_with_object([]) do |names, main_outputs|
+          main_outputs.concat(names.select{|name| main_output?(name)})
+        end
+      end
+
+      def find_constituents(rule_table)
+        rule_table.values.compact.sort
+      end
+
+      MAIN_RULE_TEMPLATE = <<-RULE
+        Rule Main
+          %s
+        Flow
+          %s
+        End
+      RULE
+
+      def textize_main_rule(inputs, outputs, constituents)
+        i = inputs.map {|name| "input %s" % normalize_data_name(name)}
+        o = outputs.map {|name| "output %s" % normalize_data_name(name)}
+        conds = (i + o).join("\n  ")
+        rules = constituents.map {|c| "rule %s" % c}.join("\n  ")
+        Indentation.cut(MAIN_RULE_TEMPLATE) % [conds, rules]
+      end
+
       # Make flow rules from rule table, input table, and output table.
       def make_flow_rules(rule_table, input_table, output_table)
         rules = Array.new
@@ -79,18 +143,25 @@ module Pione
         Rule %s
           %s
           %s
-        Action
-          cp {$I[1]} {$O[1]}
         End
       RULE
 
       # Textize flow rules.
       def textize_flow_rules(rules)
         rules.map do |rule|
-          inputs = rule[1].map {|name| "input '%s'" % name}.join("\n  ")
-          outputs = rule[2].map {|name| "output '%s'" % name}.join("\n  ")
+          inputs = rule[1].map {|name| "input %s" % normalize_data_name(name)}.join("\n  ")
+          outputs = rule[2].map {|name| "output %s.touch" % normalize_data_name(name)}.join("\n  ")
           Indentation.cut(FLOW_RULE_TEMPLATE) % [rule[0], inputs, outputs]
-        end.join("\n\n")
+        end
+      end
+
+      def main_output?(name)
+        name[0] == ">"
+      end
+
+      # Normalize the data name.
+      def normalize_data_name(name)
+        main_output?(name) ? name[1..-1] : name
       end
     end
   end

data/lib/pione/util.rb

@@ -24,4 +24,5 @@ require 'pione/util/embeded-expr-expander'   # expand text embeded PIONE express
 require 'pione/util/free-thread-generator'   # generate threads free from thread group
 require 'pione/util/parslet-extension'       # parslet extension
 require 'pione/util/pnml-compiler'           # toy compiler from PNML to PIONE
+require 'pione/util/last-time'               # get last time of locations
 

data/lib/pione/version.rb

@@ -1,4 +1,4 @@
 module Pione
   # version of pione
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/pione.rb

@@ -70,6 +70,7 @@ require 'zip/filesystem'
 require 'retriable'
 require 'childprocess'
 require 'lettercase/core_ext'
+require 'kramdown'
 
 # configuration for childprcess
 ChildProcess.posix_spawn = true
@@ -78,21 +79,22 @@ ChildProcess.posix_spawn = true
 # load pione
 #
 
-require 'pione/version'     # PIONE version information
-require 'pione/util'        # various helper functions
-require 'pione/patch'       # patches for libraries
-require 'pione/location'    # location system for data and package
-require 'pione/log'         # log and format
-require 'pione/global'      # global variable manager
-require 'pione/system'      # PIONE system functions
-require 'pione/relay'       # relay connection
-require 'pione/package'     # package system
-require 'pione/lang'        # PIONE languge
-require 'pione/tuple-space' # tuple space functions
-require 'pione/rule-engine' # rule processing behaviors
-require 'pione/agent'       # agent system
-require 'pione/front'       # command front interface
-require 'pione/command'     # command definitions
+require 'pione/version'         # PIONE version information
+require 'pione/util'            # various helper functions
+require 'pione/patch'           # patches for libraries
+require 'pione/location'        # location system for data and package
+require 'pione/log'             # log and format
+require 'pione/global'          # global variable manager
+require 'pione/system'          # PIONE system functions
+require 'pione/relay'           # relay connection
+require 'pione/package'         # package system
+require 'pione/lang'            # PIONE languge
+require 'pione/tuple-space'     # tuple space functions
+require 'pione/rule-engine'     # rule processing behaviors
+require 'pione/agent'           # agent system
+require 'pione/front'           # command front interface
+require 'pione/command'         # command definitions
+require 'pione/literate-action' # literate action
 
 #
 # other settings

data/man/pione-action-list.1

@@ -0,0 +1,23 @@
+.TH pione\-action\-list 1 "" "PIONE User Manual"
+.SH NAME
+.PP
+pione\-action\-list \- execute an action in literate action document.
+.SH SYNOPSIS
+.PP
+\f[B]pione action:list\f[] [options] location
+.SH DESCRIPTION
+.PP
+\f[B]action:list\f[] command lists action names in literate action
+document.
+.SH EXAMPLES
+.TP
+.B pione action:list HelloWorld.md
+List all action names of \f[C]HelloWorld.md\f[].
+.RS
+.RE
+.SH REPORTING BUGS
+.PP
+Report bugs or feature requests to PIONE\[aq]s issue
+tracker(https://github.com/pione/pione/issues).
+.SH AUTHORS
+Keita Yamaguchi.

data/man/pione-action.1

@@ -0,0 +1,45 @@
+.TH pione\-action 1 "" "PIONE User Manual"
+.SH NAME
+.PP
+pione\-action \- execute an action in literate action document.
+.SH SYNOPSIS
+.PP
+\f[B]pione action\f[] [options] location action_name
+.SH DESCRIPTION
+.PP
+\f[B]action\f[] command execute or show an action in literate action
+document.
+.SH OPTIONS
+.TP
+.B \-\-show
+Show an action instead of execution.
+.RS
+.RE
+.TP
+.B \-d, \-\-directory PATH
+Execute an action in the directory.
+.RS
+.RE
+.SH EXAMPLES
+.TP
+.B pione action HelloWorld.md SayHello
+Execute \f[C]SayHello\f[] action of \f[C]HelloWorld.md\f[] in current
+directory.
+.RS
+.RE
+.TP
+.B pione action \-d /tmp HelloWorld.md SayHello
+Execute \f[C]SayHello\f[] action of \f[C]HelloWorld.md\f[] in /tmp.
+.RS
+.RE
+.TP
+.B pione action HelloWorld.md SayHello \-\-show
+Show \f[C]SayHello\f[] action of \f[C]HelloWorld.md\f[].
+.RS
+.RE
+.SH REPORTING BUGS
+.PP
+Report bugs or feature requests to PIONE\[aq]s issue
+tracker(https://github.com/pione/pione/issues).
+.SH AUTHORS
+Keita Yamaguchi.

data/man/pione-compiler.1

@@ -0,0 +1,48 @@
+.TH pione\-compiler 1 "" "PIONE User Manual"
+.SH NAME
+.PP
+pione\-compiler \- compile to PIONE file.
+.SH SYNOPSIS
+.PP
+\f[B]pione\-compiler\f[] [options] file
+.SH DESCRIPTION
+.PP
+pione\-compiler compiles from PNML(Petri Net Markup Language) to PIONE
+document.
+Source PNML file should be written in a manner of PIONE\[aq]s special
+notations.
+Target PIONE document is printed out to STDOUT.
+.SH OPTIONS
+.TP
+.B \-\-name=\f[I]NAME\f[]
+Set the package name.
+.RS
+.RE
+.TP
+.B \-\-editor=\f[I]NAME\f[]
+Set the package editor.
+.RS
+.RE
+.TP
+.B \-\-tag=\f[I]NAME\f[]
+Set the package tag.
+.RS
+.RE
+.SH EXAMPLES
+.TP
+.B pione\-compiler Sequence.pnml
+Compile from Sequence.pnml to PIONE document.
+.RS
+.RE
+.TP
+.B pione\-compiler \-\-name=Sequence Sequence.pnml
+Compile from Sequence.pnml to PIONE document with package name
+"Sequence".
+.RS
+.RE
+.SH REPORTING BUGS
+.PP
+Report bugs or feature requests to PIONE\[aq]s issue
+tracker(https://github.com/pione/pione/issues).
+.SH AUTHORS
+Keita Yamaguchi.

data/man/pione-update-package-info.1

@@ -0,0 +1,43 @@
+.TH pione\-update\-package\-info 1 "" "PIONE User Manual"
+.SH NAME
+.PP
+pione\-update\-package\-info \- update PIONE\[aq]s package information
+files.
+.SH SYNOPSIS
+.PP
+\f[B]pione update\-package\-info\f[] [options] pacakge\-location
+.SH DESCRIPTION
+.PP
+pione\-update\-package\-info updates PIONE\[aq]s package information
+files.
+PIONE tries to update package information files automatically, but you
+should update it by this command when you add new files or do some
+operations.
+.SS NOTE
+.PP
+This command tries to update files from criterion of file timestamps.
+If files are not updated by PIONE\[aq]s mistake, you need to set
+\f[C]\-\-force\f[] option.
+.SH OPTIONS
+.TP
+.B \-\-force
+Update all package information files ignoring the update criterion.
+.RS
+.RE
+.SH EXAMPLES
+.TP
+.B pione update\-package\-info example/HelloWorld
+Update some package information files in the path of example/HelloWorld.
+.RS
+.RE
+.TP
+.B pione update\-package\-info \-\-force example/HelloWorld
+Update all package information files in the path of example/HelloWorld.
+.RS
+.RE
+.SH REPORTING BUGS
+.PP
+Report bugs or feature requests to PIONE\[aq]s issue
+tracker(https://github.com/pione/pione/issues).
+.SH AUTHORS
+Keita Yamaguchi.

data/pione.gemspec

@@ -52,6 +52,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "childprocess", "~> 0.3.9"
   gem.add_runtime_dependency "lettercase", "~> 0.0.3"
   gem.add_runtime_dependency "rubyzip", "~> 1.0.0"
+  gem.add_runtime_dependency "kramdown", "~> 1.2.0"
 
   # for locations
   gem.add_runtime_dependency "dropbox-sdk", "~> 1.5.1"

data/test/command/spec_pione-action-list.rb

@@ -0,0 +1,15 @@
+require 'pione/test-helper'
+
+TestHelper.scope do |this|
+  this::DIR = Location[File.dirname(__FILE__)] + ".." + "literate-action" + "data"
+
+  describe Pione::Command::PioneActionList do
+    it "should show action names" do
+      args = [(this::DIR + "D1.md").path.to_s]
+      res = TestHelper::Command.succeed do
+        Pione::Command::PioneActionList.run(args)
+      end
+      res.stdout.string.chomp.should == "Name1\nName2"
+    end
+  end
+end

data/test/command/spec_pione-action.rb

@@ -0,0 +1,24 @@
+require 'pione/test-helper'
+
+TestHelper.scope do |this|
+  this::DIR = Location[File.dirname(__FILE__)] + ".." + "literate-action" + "data"
+
+  describe Pione::Command::PioneAction do
+    it "should execute action" do
+      base = Location[Temppath.mkdir]
+      args = [(this::DIR + "HelloWorld.md").path.to_s, "SayHello", "-d", base.path.to_s]
+      TestHelper::Command.succeed do
+        Pione::Command::PioneAction.run(args)
+      end
+      (base + "message.txt").read.chomp.should == "Hello, world!"
+    end
+
+    it "should show action content" do
+      args = [(this::DIR + "HelloWorld.md").path.to_s, "SayHello", "--show"]
+      res = TestHelper::Command.succeed do
+        Pione::Command::PioneAction.run(args)
+      end
+      res.stdout.string.chomp.should == "echo \"Hello, world!\" > message.txt"
+    end
+  end
+end

data/test/command/spec_pione-client.rb

@@ -63,5 +63,194 @@ TestHelper.scope do |this|
       end
       res.stdout.string.size.should > 0
     end
+
+    describe "example/Fib" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result with no parameters (default fib(3))"
+        runner.args = ["example/Fib/Fib.pione", *runner.default_arguments]
+        runner.run do |base|
+          (base + "result.txt").should.exist
+          (base + "result.txt").read.should.start_with "2"
+        end
+      end
+
+      # FIXME: this test is unstable... maybe there are bugs
+
+      # it "should get a result of fib(10)" do
+      #   path = Temppath.create
+      #   args = ["example/Fib/Fib.pione", "-o", path.to_s, "--params", "{NUM: 10}"]
+      #   res = TestHelper::Command.succeed do
+      #     Pione::Command::PioneClient.run(args)
+      #   end
+      #   Location[path + "result.txt"].should.exist
+      #   Location[path + "result.txt"].read.should.start_with "55"
+      # end
+    end
+
+    describe "example/PegasusWMS/Merge" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/PegasusWMS/Merge"
+        runner.args = ["example/PegasusWMS/Merge/", *runner.default_arguments]
+        runner.run do |base|
+          (base + "binaries.txt").should.exist
+          (base + "binaries.txt").size.should > 0
+        end
+      end
+    end
+
+    describe "example/PegasusWMS/Pipeline" do
+      if TestHelper::InternetConnectivity.ok?
+        TestHelper::PioneClientRunner.test(self) do |runner|
+          runner.title = "should get a result of example/PegasusWMS/Pipeline"
+          runner.args = ["example/PegasusWMS/Pipeline/", *runner.default_arguments]
+          runner.run do |base|
+            (base + "count.txt").should.exist
+            (base + "count.txt").size.should > 0
+          end
+        end
+      else
+        puts "    * ignored because of no internet connection"
+      end
+    end
+
+    describe "example/PegasusWMS/Split" do
+      if TestHelper::InternetConnectivity.ok?
+        TestHelper::PioneClientRunner.test(self) do |runner|
+          runner.title = "should get a result of example/PegasusWMS/Split"
+          runner.args = ["example/PegasusWMS/Split/", *runner.default_arguments]
+          runner.run do |base|
+            (base + "count.txt.a").should.exist
+            (base + "count.txt.a").size.should > 0
+            (base + "count.txt.b").should.exist
+            (base + "count.txt.b").size.should > 0
+            (base + "count.txt.c").should.exist
+            (base + "count.txt.c").size.should > 0
+            (base + "count.txt.d").should.exist
+            (base + "count.txt.d").size.should > 0
+          end
+        end
+      else
+        puts "    * ignored because of no internet connection"
+      end
+    end
+
+    describe "example/OddSelector" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/OddSelector"
+        runner.args = ["example/OddSelector", "--rehearse", *runner.default_arguments]
+        runner.run do |base|
+          (base + "1.res").should.exist
+          (base + "2.res").should.not.exist
+          (base + "3.res").should.exist
+          (base + "4.res").should.not.exist
+          (base + "5.res").should.exist
+          (base + "6.res").should.not.exist
+          (base + "7.res").should.exist
+          (base + "8.res").should.not.exist
+          (base + "9.res").should.exist
+          (base + "10.res").should.not.exist
+        end
+      end
+    end
+
+    describe "example/SerialProcessing" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/SerialProcessing"
+        runner.args = ["example/SerialProcessing", "--rehearse", *runner.default_arguments]
+        runner.run do |base|
+          (base + "1.a").should.exist
+          (base + "2.a").should.exist
+          (base + "3.a").should.exist
+          (base + "4.a").should.exist
+          (base + "1.b").should.exist
+          (base + "2.b").should.exist
+          (base + "3.b").should.exist
+          (base + "4.b").should.exist
+          (base + "1.a").mtime.should < (base + "2.a").mtime
+          (base + "2.a").mtime.should < (base + "3.a").mtime
+          (base + "3.a").mtime.should < (base + "4.a").mtime
+          (base + "4.a").mtime.should < (base + "1.b").mtime
+          (base + "1.b").mtime.should < (base + "2.b").mtime
+          (base + "2.b").mtime.should < (base + "3.b").mtime
+          (base + "3.b").mtime.should < (base + "4.b").mtime
+        end
+      end
+    end
+
+    describe "example/MakePair" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/MakePair"
+        runner.args = ["example/MakePair", "--rehearse", "case1", *runner.default_arguments]
+        runner.run do |base|
+          1.upto(5) do |i|
+            1.upto(5) do |ii|
+              comb = (base + "comb-%s-%s.pair" % [i, ii])
+              i < ii ? comb.should.exist : comb.should.not.exist
+              perm = (base + "perm-%s-%s.pair" % [i, ii])
+              i != ii ? perm.should.exist : perm.should.not.exist
+              succ = (base + "succ-%s-%s.pair" % [i, ii])
+              ii - i == 1 ? succ.should.exist : succ.should.not.exist
+            end
+          end
+        end
+      end
+    end
+
+    describe "example/SelectRuleByParam" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of scenario a of example/SelectRuleByParam"
+        runner.args = ["example/SelectRuleByParam", "--rehearse", "Select A", *runner.default_arguments]
+        runner.run do |base|
+          (base + "message.txt").should.exist
+          (base + "message.txt").read.chomp.should == "This is rule A."
+        end
+      end
+
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of scenario b of example/SelectRuleByParam"
+        runner.args = ["example/SelectRuleByParam", "--rehearse", "Select B", *runner.default_arguments]
+        runner.run do |base|
+          (base + "message.txt").should.exist
+          (base + "message.txt").read.chomp.should == "This is rule B."
+        end
+      end
+
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of scenario c of example/SelectRuleByParam"
+        runner.args = ["example/SelectRuleByParam", "--rehearse", "Select C", *runner.default_arguments]
+        runner.run do |base|
+          (base + "message.txt").should.exist
+          (base + "message.txt").read.chomp.should == "This is rule C."
+        end
+      end
+    end
+
+    describe "example/FeatureExample" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/FeatureExample"
+        runner.args = ["example/FeatureExample", "--feature", "^X", *runner.default_arguments]
+        runner.run do |base|
+          (base + "message.txt").should.exist
+          (base + "message.txt").read.chomp.should == "I can take the task."
+        end
+      end
+
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should timeout with feature `*` in processing example/FeatureExample"
+        runner.args = ["example/FeatureExample", "--feature", "*", *runner.default_arguments]
+        runner.timeout(5)
+      end
+    end
+
+    describe "example/Sum" do
+      TestHelper::PioneClientRunner.test(self) do |runner|
+        runner.title = "should get a result of example/Sum"
+        runner.args = ["example/Sum", "--rehearse", *runner.default_arguments]
+        runner.run do |base|
+          (base + "sum.txt").should.exist
+        end
+      end
+    end
+
   end
 end