tla-sbuilder 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da5bfdebad06728053bd1d9be7b5fb8bc6bf4d5f
-  data.tar.gz: 1ac862f608a98cb6ae42e973ad9f9ca22e7c0cb2
+  metadata.gz: 5eccbde389b960d6daa3a03284489dde2c9d2b4a
+  data.tar.gz: 06d5c9ab8e969b954d6acd77e4fd5607d3b9c6e1
 SHA512:
-  metadata.gz: f511f243f72f46b30cd191ad984ef858f6a62317c81fe98f05d8c97784481c707b72e1f1f06539b56e8a19784f5e75bc88641cdf63bfd44a052aba623c852011
-  data.tar.gz: c2844d67ae0c95aa6668abf2e52bd45f84a5edbad182faef7b5493461257d6c95fa944c80b8c53e77d5ab76174ba1023c09cde671ca59df6e407b973f9973f7c
+  metadata.gz: 5b7c60c28c829383ae57e2fc9ca12deeb7d5a5052fc047dde372c032843187281ddba4ddb97514fe4e70a0d22444dcd63a932a758d45fe88a860ecac84489f75
+  data.tar.gz: 5bccdd522ab2c5b245621c9f1feeb6a95d830bb14fdf45218017fb5174563e07584e6fc43d1c0d9944981587fecbac90fec0a3d8242b7ec7107a0c26c88c7ea9

data/README.md

@@ -1,7 +1,7 @@
 <link href="../site.css" rel="stylesheet"></link>
 [Readme](README.md) [Releases](RELEASES.md)
 
-# Sbuilder - A Specification Builder for TLA+ Tools - $Release:0.3.7$
+# Sbuilder - A Specification Builder for TLA+ Tools - $Release:0.3.8$
 
 A tool to generate runnable formal models in
 [TLA+ language](http://research.microsoft.com/en-us/um/people/lamport/tla/book.html)

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/sbuilder/controller.rb

@@ -595,8 +595,9 @@ module Sbuilder
         next unless input['symbols']
         
 
-        # access model data, data array in 
-        modelData = templateData( input['modelData'] )
+        # access model data, symbol table not yet built
+        symbol_lookup=false
+        modelData = templateData( input['modelData'], symbol_lookup )
         d = modelData[input['modelData']]
         @logger.debug  "#{__method__} input['modelData']=#{input['modelData']}--> #{d}"
         next unless d && d.any? 

data/lib/sbuilder/default-sbuilder.yaml

@@ -198,7 +198,7 @@ generate:
          inputs: 
              - desc: Model interfaces
                template: interfaces/interface_mapper.mustache
-               modelData: interfaces
+               modelData: allInterfaces
 
 
        # ----------------------------------------

data/lib/sbuilder/model.rb

@@ -320,6 +320,11 @@ module Sbuilder
 
     # @param [String] domainName in data model
     #
+    # @param symbol_lookup [Boolean] true for normal operation, false
+    #        for init, when no symbol table lookup can be made
+    #      
+    #
+    #
     # @return [Hash]  dataModelElement for mustache for 'templateName' in 'interfaces', 'domains', 'variables' etc
     #
     # @option dataModelElement [String] dump to output data array
@@ -330,18 +335,18 @@ module Sbuilder
     # @option dataModelElement [String] 'domainName' data array for
     # element in model for domainName
     
-    def templateData( domainName )
+    def templateData( domainName, symbol_lookup=true )
 
+      @logger.info( "#{__method__} domainName=#{domainName}")
       case domainName
+      when 'allInterfaces'
+        # both interfaces and infrastructureServices
+        templateDataInterfaces( domainName, nil, symbol_lookup )
       when 'interfaces'
         # see domainName 'interfaces'        
-        templateDataInterfaces( domainName, false )
-      # when 'interface_types'
-      #   # see domainName 'interfaces', interface_types are not
-      #   # filtered i.e. generated model defines data types for all interfaces
-      #   templateDataInterfaces( 'interfaces', false )
+        templateDataInterfaces( domainName, false, symbol_lookup )
       when 'infrastructureServices'
-        templateDataInterfaces( domainName, true )
+        templateDataInterfaces( domainName, true, symbol_lookup )
       when 'possibility'        
         hash = {
           "dump"           => lambda { hash['possibility'].to_yaml },                    
@@ -454,24 +459,39 @@ module Sbuilder
 
     # Extract data model for interfaces 
     #
-    # @param  [Boolean] choose false --> interterfaces with 'interfaceService', true => 'infrastructureService'
+    # @param infrastructureServices [Boolean, nil]  false --> interterfaces with 'interfaceService', true => 'infrastructureService'
+    #                 nil => both interfaceService && infrastructureService
+    #
+    # @param symbol_lookup [Boolean] true for normal operation, false
+    #        for init, when no symbol table lookup can be made
     #
     # @return [Hash] for template rendering composed of interfaces, 'false' if configs
     #
-    private def templateDataInterfaces( domainName, choose )
+    private def templateDataInterfaces( domainName, infrastructureServices, symbol_lookup )
+      @logger.debug "#{__method__}, domainName=#{domainName}, infrastructureServices=#{infrastructureServices}, symbol_lookup=#{symbol_lookup}" if @logger.debug?
+
+      # Looking for interface type
+      infrastructureServiceMeta = FacadeConstants::META_MODEL_INFRA_SERVICES
       hash = {
         "dump" => lambda { hash[domainName].to_yaml },
         
         domainName => interfaces.values.select { |iface|
+
+          # both infrastructureServices && interfaceService or either
+          infrastructureServices.nil? || 
             
-          !choose && iface.interfaceService ||
-          choose && iface.infrastructureService
+          (!infrastructureServices && iface.interfaceService ||
+           infrastructureServices && iface.infrastructureService
+          )
             
         }.map { |iface |
           {
             :interface_name => iface.getName,          # e.g._pet_post_
+            :response_key => symbol_lookup && iface.infrastructureService ? getSymbolTable.lookupSymbol(iface.getId, infrastructureServiceMeta ) : false,
             :interface_operation => iface.getId,       # e.g /pet(post)
             :implementation => getImplementationExtension( iface ),
+            :interfaceService => iface.interfaceService,
+            :infrastructureService => iface.infrastructureService,
             :source => {
               :sourceModule => iface.sourceModule,
               :sourceLine => iface.sourceLine,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tla-sbuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-17 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache