tla-sbuilder 0.1.0 → 0.2.1

data/lib/cli/cli-text.rb

@@ -2,43 +2,78 @@ module Sbuilder
 
   class CliText
 
-    SBUILDER_RESOLVERS = <<-EOS
+    SBUILDER_EXTENSION = <<-EOS.unindent
+
+    # Load and configure sbuilder plugin extensions
+    #
+    # SCHEMA
+    #
+    # extend:
+    #    loaders:
+    #          - gem: <gem-name>
+    #            className: <class name>
+    #            configuration:
+    #                   <configuration-value>
+    #
+    # <gem-name>: gem name to require
+    # <class name>: name of interface loader in 'type' property in 'interfaces' array
+    # <configuration-value>: a (hash) value passed to 'className'::configure' -method
+    #
+    EOS
+    
+    SBUILDER_INVARIANTS = <<-EOS.unindent
+
+    # Activate invariant operator defines in sBuilder code repository
+    #
+    # SCHEMA:
+    # 
+    # invariants:
+    #   - <invariant-name>: <invariant description>
+    #
+    # 
+    # <invariant-name>: name of TlAplus operator defined in sBuilder code repository
+    # <invariant description>: documentantion text for the invariant
+    #
+    EOS
+
+    
+    
+    SBUILDER_RESOLVERS = <<-EOS.unindent
 
     # Define how parameter names are mapped to domain
     #
     # SCHEMA:
     #
     # resolvers: 
-    #  - type: <resolver load type>
-    #    file: <file name in cnf-dir>
+    #  - file: <file name in cnf-dir>
     #    url:  <path or url>
     #
-    # <resolver load type>: resolver loader type, valid values: [ 'resolver_yaml' ]
+    # Give either 'file' or 'url'
     # <file name in cnf-dir>: file name in cnf-directory
     # <path or url>: path relative to cwd, or http url
     #
     #
-    # COMMENTS:
-    # - give 'file' xor 'url' property
     #
 
     EOS
 
-    SBUILBER_INTERFACES = <<-EOS
+    SBUILBER_INTERFACES = <<-EOS.unindent
 
     # Define how to load interfaces configuration
     #
     # SCHEMA:
     # 
     # interfaces: 
-    #  - type: <interface loader type>
+    #  - type: <interface loader name>
     # 
     #    file: <file name in cnf-dir>
     #    infrastructureServices: <is infrastructureService>
     #    url:  <path or url>
     #    cache: <cache file path>
     #
-    # <interface loader type>: interface loader type, valid values: [ 'swagger' ]
+    # <interface loader name>: name of interface loader, 
+    #                          valid values:  'swagger' and className values 
+    #                          given in 'extend.loaders' array
     # <is infrastructureService>: true or false (default false)
     # <file name in cnf-dir> : file name in cnf-directory
     # <path or url>          : path relative to cwd, or http url, 
@@ -55,7 +90,7 @@ module Sbuilder
     EOS
 
 
-    SBUILER_SETUPS = <<-EOS
+    SBUILER_SETUPS = <<-EOS.unindent
 
     # Define environment setups
     #
@@ -67,17 +102,21 @@ module Sbuilder
     #         url:  <path or url>
     #     preferences:
     #         <hash-values>
+    #     assumptions:
+    #          <assume-op-names>
     #
     # <setupname>           : name of setup = sub directory under <gen_dir>
     # <file name in cnf-dir>: name extension configurion file in cnf-directory
     # <path or url>         : relative name or url of configurion file
     # <hash-values>         : optional properties overriding global generate preferences
+    # <assume-op-names>     : array of operator names to put into ASSUME directives
     #
     # COMMENTS:
     # - preferences property is optional
     EOS
 
-    SBUILDER_GENERATE = <<-EOS
+    SBUILDER_GENERATE = <<-EOS.unindent
+
     # Generate definitions
     #   
     # SCHEMA:
@@ -106,13 +145,14 @@ module Sbuilder
     #
     EOS
 
-    SBUILDER_PREFERENCES = <<-EOS
+    SBUILDER_PREFERENCES = <<-EOS.unindent
+
     # Generate preferences
     #
     # preferences:
     #     <hash-values>
     #
-    # <hash-values> optional properties passes to templates in 'PREFERENCES' -property
+    # <hash-values> key-value pairs passed to mustache templates in 'PREFERENCES' -property
     #
     # Default templates use following propeties
     #     debug-output: <true/false>, output call message in interface processes, default 'true'
@@ -120,7 +160,7 @@ module Sbuilder
     EOS
     
 
-    EXTENSION_HEADER_DOM = <<-EOS
+    EXTENSION_HEADER_DOM = <<-EOS.unindent
  
     # Define extension for domains
     #
@@ -142,7 +182,7 @@ module Sbuilder
 
     EOS
     
-    EXTENSION_HEADER_IF = <<-EOS
+    EXTENSION_HEADER_IF = <<-EOS.unindent
 
     # Define name of extension point for interface
     #
@@ -158,7 +198,7 @@ module Sbuilder
 
     EOS
 
-    EXTENSION_HEADER_SETUP = <<-EOS
+    EXTENSION_HEADER_SETUP = <<-EOS.unindent
 
     # Define environment steps 
     #
@@ -194,7 +234,7 @@ module Sbuilder
     EOS
 
     
-    RESOLVER_HEADER = <<-EOS
+    RESOLVER_HEADER = <<-EOS.unindent
     # Example of an YAML resolver
     #
     # Contains array of hashes

data/lib/cli/cli.rb

@@ -184,16 +184,39 @@ module Sbuilder
     shared_options :verbosity
     shared_options :cnf_dir
     def list( what )
-      whats = [ "setups", "setup" ]
-      raise <<-EOS unless whats.include?( what )
-      Unknown command 'list #{what}'
+      validateWhats( what )                                        
+      ctrl = getCtrl
+      # puts "#{ctrl.getSetups().map { |setup| setup['setupDirectory']}.join(' ')}"
+      puts "#{getSetupNames(ctrl).join(' ')}"      
+    end
 
-      Valid list targets:  #{whats.join(',')}
-      EOS
-                                        
-      ctrl = getController( options )
-      ctrl.load
-      puts "#{ctrl.getSetups().map { |setup| setup['setupDirectory']}.join(' ')}"
+
+    desc "document [setup]", "Document configuration for all setups or for the given setup"
+    shared_options :verbosity
+    shared_options :cnf_dir
+    def document( what=nil )
+      controller = getCtrl
+      controller.load
+      
+      validateWhats( what, getSetupNames(controller) ) if what
+      
+      invariants = controller.templateData('invariants')['invariants']
+      puts "INVARIANTS:"
+      invariants.each do |invariant|
+        puts <<-EOS.unindent
+          - #{invariant[:name]}: #{invariant[:desc]}
+        EOS
+      end
+      puts "SETUPS:"      
+      controller.processSetups( what ) do |setupName, setupConf, possibilities|
+        assumptions = controller.getSetupAssumptionList( setupConf )
+        puts <<-EOS.unindent
+        - #{setupName}: #{setupConf['desc']}
+            - possibilities: #{(setupConf['possibilities'] || [] ).join( ' ' )}
+            - assumptions: #{assumptions.join( ' ' )}
+            - interfaces: #{controller.templateData('steps' )['steps'].map {|step| step[:interface_operation] }.uniq.join( ' ' )}
+        EOS
+      end
     end
 
     
@@ -202,6 +225,22 @@ module Sbuilder
     # common routines
     no_commands do
 
+      # ensure that 'what' is correct
+      def validateWhats( what, whats = [ "setups", "setup" ] )
+        raise <<-EOS unless whats.include?( what )
+              Unknown target '#{what}'
+
+              Valid targets:  #{whats.join(',')}
+        EOS
+
+      end
+
+      # @return [Sbuilder::Controller] contrller, which has loader configurations
+      def getCtrl
+        ctrl = getController( options )
+        return ctrl
+      end
+
       # Copy 'extendFile' file to 'dirPath', append {{>benchmark/basename(extendFile}}
       # 
       # @param dirPath [String] directory where extension file created
@@ -240,6 +279,12 @@ module Sbuilder
 
       end
 
+      # @param controller [Sbuilder::Controller] controller to read the setups
+      # @return [String:Array] names of setups defined in 'ctrl'
+      def getSetupNames( ctrl )
+        ctrl.getSetups().map { |setup| setup['setupDirectory'] }
+      end
+
       # ------------------------------------------------------------------
       
       def init_files( options )
@@ -247,7 +292,8 @@ module Sbuilder
         [
           { :file => "#{options[:cnf_dir]}/#{Sbuilder::Constants::CNF_FILE }.example", :content => [ Sbuilder::CliCustomer::SBUILDER_YAML_CUSTOMER] },
           { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_RESOLVER_CUSTOMER}.example", :content => [ Sbuilder::CliCustomer::RESOLVER_CUSTOMER] },
-          { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_EXTENSIONS_CUSTOMER_COMMON}.exmaple", :content => [Sbuilder::CliCustomer::EXTENSIONS_CUSTOMER_COMMON] },
+          { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_EXTENSIONS_CUSTOMER_COMMON}.example", :content => [Sbuilder::CliCustomer::EXTENSIONS_CUSTOMER_COMMON] },
+          { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_EXTENSIONS_CUSTOMER_IF}.example", :content => [Sbuilder::CliCustomer::EXTENSIONS_CUSTOMER_IF] },          
           { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_EXTENSIONS_CUSTOMER_RUN1}.example", :content => [Sbuilder::CliCustomer::EXTENSIONS_CUSTOMER_RUN1] },
           { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_EXTENSIONS_CUSTOMER_RUN2}.example", :content => [Sbuilder::CliCustomer::EXTENSIONS_CUSTOMER_RUN2] },                    
           { :file => "#{options[:cnf_dir]}/#{Sbuilder::CliCustomer::FILE_INTERFACE_CUSTOMER}.example", :content => [Sbuilder::CliCustomer::INTERFACE_CUSTOMER_SWAGGER] },

data/lib/sbuilder.rb

@@ -4,6 +4,7 @@ require_relative "utils/string_inject"
 
 require_relative "utils/version"
 require_relative "utils/logger"
+require_relative "utils/cache_lines"
 require_relative "utils/netio"
 
 require_relative "sbuilder/constants.rb"
@@ -36,7 +37,7 @@ require_relative "sbuilder/resolver.rb"
 require_relative "sbuilder/resolver_loader.rb"
 require_relative "sbuilder/resolver_loader_yaml.rb"
 
-require_relative "sbuilder/param_set_loader.rb"
+
 require_relative "sbuilder/param_set_loader_swagger.rb"
 
 require_relative "sbuilder/model.rb"
@@ -46,6 +47,7 @@ require_relative "sbuilder/extension_loader.rb"
 require_relative "sbuilder/factory.rb"
 require_relative "sbuilder/controller.rb"
 
+require_relative "sbuilder/facade/api_loader.rb"
 
 require_relative "sbuilder/mustache/template_reader"
 require_relative "sbuilder/mustache/template_reader_context"

data/lib/sbuilder/constants.rb

@@ -11,10 +11,13 @@ module Sbuilder
     EXTENSION_LOADER_YAML = "default-yaml"
     
     # supported paramter set types
-    SWAGGER = "swagger"
+    INTERFACE_OPERATION = "operation"
     SWAGGER_DEFINITION="definition"
     PARAM_SET_STEPS = "steps"
 
+    # supported interfa loader
+    LOADER_SWAGGER = "swagger"
+
     # supported mapper types
     MAPPER_YAML = "resolver_yaml"
 
@@ -47,7 +50,7 @@ module Sbuilder
     CNF_FILE="sbuilder.yaml"
 
     # directory to cache loaded files
-    CACHE_DIR = "tmp"
+    CACHE_DIR = "cache"
 
     # direcotory where to output rendered templates
     GEN_DIR = "gen"

data/lib/sbuilder/controller.rb

@@ -13,8 +13,8 @@ module Sbuilder
 
     # model parts
     attr_reader   :model                      # which contain values loaded
-    def_delegators :model, :extendDomain, :extendInterface, :interfaceEncountered, :definitionEncountered,
-                   :domainEncountered, :templateData, :getInterface, :extendStep
+    def_delegators :model, :extendDomain, :extendInterface, :modelInterface, :modelDefinition,
+                   :domainEncountered, :templateData, :getInterface, :extendStep, :defineSetup
     
     def_delegators :factory, :createParameter, :createParamSet
 
@@ -30,16 +30,35 @@ module Sbuilder
     
 
     @@validSetups_required    = [ "setupDirectory", ]
-    @@validSetups_allowed    = @@validSetups_required + [ 'extensions', "desc", "preferences", "possibilities" ]
+    @@validSetups_allowed    = @@validSetups_required + [ 'extensions', "desc", "preferences", "possibilities", 'assumptions', 'configuration']
+    @@validSetupConfiguration_required  = []
+    @@validSetupConfiguration_allowed  = ['allow_domain_nil_values']
 
-    @@extensionLoaderDef_required = ['type' ]
-    @@extensionLoaderDef_oneof = ["url", "file"]
-    @@extensionLoaderDef_allowed = @@extensionLoaderDef_required + @@extensionLoaderDef_oneof
+    
+    @@extensionLoaderDef_required = [ ]
+    @@extensionLoaderDef_oneof = ["url", "file",]
+    @@extensionLoaderDef_defaults = {
+      'type' => Sbuilder::Constants::EXTENSION_LOADER_YAML
+    }
+    @@extensionLoaderDef_allowed = @@extensionLoaderDef_required + @@extensionLoaderDef_oneof + ['type']
 
-    @@interfaceLoaderDef_required = ['type',]
-    @@interfaceLoaderDef_oneof = [  'url', "file", ]
-    @@interfaceLoaderDef_allowed = @@interfaceLoaderDef_required + ["cache", "infrastructureServices" ]  + @@interfaceLoaderDef_oneof
+
+    @@resolverLoader_required = [ ]
+    @@resolverLoader_oneof = ["url", "file",]
+    @@resolverLoader_defaults = {
+      'type' => Sbuilder::Constants::MAPPER_YAML
+    }
+    @@resolverLoader_allowed = @@resolverLoader_required + @@resolverLoader_oneof + ['type']    
     
+    @@interfaceLoaderDef_required = [ ]
+    @@interfaceLoaderDef_oneof = [  'url', "file", ]
+    @@interfaceLoaderDef_oneof2 = [  'type', "className", ]    
+    @@interfaceLoaderDef_allowed = @@interfaceLoaderDef_required + ["cache", "infrastructureServices", "namespace" ]  + @@interfaceLoaderDef_oneof  + @@interfaceLoaderDef_oneof2
+
+    @@validExtendLoader = %w( gem className configuration )
+
+    @@validConfig = %w( generate )
+    @@allowConfig = @@validConfig + %w( extend extensions setups preferences resolvers interfaces invariants ) 
     
     @@validGenerateConfigs = ["output", "inputs"]
     @@allowedGenerateConfigs       = @@validGenerateConfigs + ['category']
@@ -69,10 +88,17 @@ module Sbuilder
                 :filter_src => options[:filter_src] || false,
                 :templates => options[:templates],
               } #.merge( options[PROGNAME] || {} )
-      @factory = factory
+      setFactory( factory )
       start
     end
 
+    # @param factory [Sbuilder::Factory] to build objects
+    def setFactory( factory )
+      @factory = factory
+      # add loaders configured in 'sbuilder.yaml'
+      factory.addLoaders( getConfiguredLoaders )
+    end
+    
     # @param possibilities [String:Array] possibilities defined in setup
     def start
       # init state
@@ -81,11 +107,62 @@ module Sbuilder
 
     end
 
+    # Iterate 'assumptions' and add to model assumption descritptions.
+    # Issue a warning if assumptions not defined
+    # 
+    # @param assumption [String:Array] name of assumption to activate
+
+    
+    def loadAssumptions( assumptions )
+
+      @logger.info "#{__method__}: assumptions=#{assumptions}"
+      assumptions.each do |assumption|
+        model.addAssumption( { :name => assumption, :desc => "Assume #{assumption}" } ) 
+      end # else - not nil
+    end
+
+    # Iterate 'invariants' and add to model invariant descritptions.
+    # Isse a warning if invarients not defined
+    # 
+    # @param invariants [Hash:Array] with properties 'key'=>'description'
+
+    def loadInvariants( invariants )
+
+      if invariants.nil? then
+        msg = <<-EOS
+        No invariants section defined in #{getConfigFilePath}. 
+
+        Suggestion add section 'invariants' defining invariants.
+        For example:
+
+        invariants:
+        - MustNotHappen: Invariant 'MustNotHappen' verified in the model
+      
+        EOS
+        warn msg
+      else
+        @logger.info "#{__method__}: invariants=#{invariants}"
+        invariants = [invariants] if invariants.is_a?( Hash )
+        invariants.each do |invariant|
+          invariant.each do |k,v|
+            model.addInvariant( { :name => k, :desc => v } ) 
+          end
+        end
+      end # else - not nil
+    end
+
     # ------------------------------------------------------------------
     # build controller: load (domain) resolvers
+    # @param arrOfmappersTypePath [Hash:Array] of :type,:url 
     
     def loadResolvers( arrOfmappersTypePath )
       !arrOfmappersTypePath.nil? && arrOfmappersTypePath.each do |mapperDef|
+        # add defaults to 'mapperDef'
+        mapperDef = defaultProps( mapperDef, @@resolverLoader_defaults )
+        validateProperties( mapperDef, @@resolverLoader_required, @@resolverLoader_allowed )
+        validateOne( mapperDef, @@resolverLoader_oneof )
+        
+        
         @logger.debug( "#{__method__} mapperDef=#{mapperDef} " )      
         
         # find correct loader based on type
@@ -112,12 +189,21 @@ module Sbuilder
     # ------------------------------------------------------------------
     # load extensions
 
-    # create load && add let it load
-    def loadExtensions( arrayOfExtensionDefs )
+    # Load exntesion for setup
+    #
+    # @param setupName [String] name of setup, currently = extensionDirectory
+    # def loadExtensions( arrayOfExtensionDefs )
+    def loadExtensions( setupName )
+
+      # access sbuilder.yaml configuration
+      arrayOfExtensionDefs = getSetupExtensions( setupName )
 
+      # iteratio
       arrayOfExtensionDefs && arrayOfExtensionDefs.each do |extensionLoaderDef|
         validateProperties( extensionLoaderDef, @@extensionLoaderDef_required, @@extensionLoaderDef_allowed )
         validateOne( extensionLoaderDef, @@extensionLoaderDef_oneof )
+        # ensure defaults in properties
+        extensionLoaderDef = defaultProps( extensionLoaderDef, @@extensionLoaderDef_defaults )
         
 
         @logger.info( "#{__method__} extensionLoaderDef=#{extensionLoaderDef}" )
@@ -127,7 +213,7 @@ module Sbuilder
         rescue Exception => ee
           msg = "Error #{ee} caused by #{ee.backtrace.join("\n")} when loading '#{extensionLoaderDef['url']}'\n\n"
           @logger.error( "#{__method__} #{msg}" )        
-          raise ControllerException.new msg
+          raise ControllerException.new,  msg, ee.backtrace
         end
       end
       # domainLoader = factory.get
@@ -135,26 +221,73 @@ module Sbuilder
 
     # ------------------------------------------------------------------
     # load interfaces
+
+    # @param arrOfparamsetTypePath [Hash:Array] of :type,:file|:url,:cache properties
     
     def loadInterfaces( arrOfparamsetTypePath )
       !arrOfparamsetTypePath.nil? && arrOfparamsetTypePath.each do |interfaceParamsetDef|
 
-        validateProperties( interfaceParamsetDef, @@interfaceLoaderDef_required, @@interfaceLoaderDef_allowed )
-        validateOne( interfaceParamsetDef, @@interfaceLoaderDef_oneof )
-        
+        begin 
+          validateProperties( interfaceParamsetDef, @@interfaceLoaderDef_required, @@interfaceLoaderDef_allowed )
+          validateOne( interfaceParamsetDef, @@interfaceLoaderDef_oneof )
+          validateOne( interfaceParamsetDef, @@interfaceLoaderDef_oneof2 )
+        rescue ControllerException => e
+          msg = <<-EOS
+          Error:
+
+          #{e} 
+
+          in
+
+          #{interfaceParamsetDef.to_yaml}
+
+
+          EOS
+          @logger.error( "#{__method__} #{msg}" )                    
+          raise ControllerException.new,  msg, e.backtrace
+        end
+        warn <<-EOS if interfaceParamsetDef['type']
+        Interface loader configuration 
+
+        #{interfaceParamsetDef.to_yaml}
+
+        uses property 'type', which is depracted.
+
+
+
+        Use property 'className' instead.
+
+        Particularly 
+
+           type: #{Sbuilder::Constants::LOADER_SWAGGER}
+
+        should be replaced with
+
+           className: Sbuilder::ParamSetLoaderSwagger
+
+        EOS
         
         # find correct loader based on type & configure it
         loader = factory.getParamSetLoader( getParamsetType( interfaceParamsetDef ))
-        loader.configure( interfaceParamsetDef )
+
+        # configure facade && pass it to loader
+        facade = factory.getFacade(self)
+        # facada loading instrcture services
+        facade.configureInfrastructureService( interfaceParamsetDef['infrastructureServices'] == true )
+        # facade creates definitions in 'namespace' (default nil = no group)
+        facade.configureNamespace( interfaceParamsetDef['namespace'] ) 
+        facade.setInterfaceCacheFilePath(getParamsetCacheFilePath(interfaceParamsetDef))
+        loader.setFacade( facade )
+        
         # load an put array
-        loader.load( self, getFileUrlOrPath( interfaceParamsetDef ), getParamsetCacheFilePath(interfaceParamsetDef) )
+        loader.load( getFileUrlOrPath( interfaceParamsetDef ),  )
         # @paramSets = paramSets.concat( loaded ) if loaded && loaded.any?
       end
     end
 
     # # accept parameters set to model
-    # def interfaceEncountered( paramSet )
-    #   model.interfaceEncountered( paramSet )
+    # def modelInterface( paramSet )
+    #   model.modelInterface( paramSet )
     # end
 
     # def paramSets
@@ -180,12 +313,13 @@ module Sbuilder
       @logger.info( "#{__method__} load started" )      
       loadResolvers( getResolversConfig )
       loadInterfaces( getInterfaceConfig   )
+      loadInvariants( getInvariantConfig )
     end
     
 
-    def extend
-      loadExtensions( getExtensionConfigs  )
-    end
+    # def extend
+    #   loadExtensions( getExtensionConfigs  )
+    # end
 
     # ------------------------------------------------------------------
     # iterate setups
@@ -201,14 +335,15 @@ module Sbuilder
         
         validateProperties( setupDef, @@validSetups_required, @@validSetups_allowed )
         @logger.info( "#{__method__} -->next" ) if setupDirectory && (setupDef['setupDirectory'] != setupDirectory)
-        next if setupDirectory && setupDef['setupDirectory'] != setupDirectory 
+        next if setupDirectory && setupDef['setupDirectory'] != setupDirectory
+        validateProperties( setupDef['configuration'], @@validSetupConfiguration_required, @@validSetupConfiguration_allowed ) if setupDef['configuration']
           
         # process one setupDirectory
         @logger.info( "#{__method__} start to generate setupDirectory=#{setupDirectory} for #{setupDef}" )
 
         output( 1, "------------------------------------------------------------------" ) if isOptFilterSrc
         output( 1, "generate setup: #{setupDef['setupDirectory']}" )
-        generate( setupDef['setupDirectory'], setupDef['setupDirectory'], setupDef['extensions'], setupDef['possibilities']  )
+        generate( setupDef['setupDirectory'], setupDef['setupDirectory'] )
         @logger.info( "#{__method__} done to generate setupDirectory=#{setupDirectory} for #{setupDef}" )                      
         output( 2, "\n" ) 
         
@@ -253,6 +388,10 @@ module Sbuilder
         # delegate action
         begin
           resolver.resolveDomains( paramSet, model )
+          
+          # resolve also response
+          resolver.resolveDomains( paramSet.response, model ) if  paramSet.respond_to?( :response )
+          
          rescue ResolverException => e
           msg = "Error '#{e}' when mapping domains for parameter set '#{paramSet.getId}'"
           puts msg
@@ -272,11 +411,48 @@ module Sbuilder
     #
     # @param setupName [String] name of setup, currently = extensionDirectory
     # @param extensionDirectory [String]  directory where setup generated
-    # @arrayOfExtensionDefs [Hash:Array] of extenstions to load
     
-    def generate( setupName="default", extensionDirectory="default", arrayOfExtensionDefs=[], possibilities=[] )
+    def generate( setupName="default", extensionDirectory="default" )
       @logger.info( "#{__method__} setupName=#{setupName}, extensionDirectory=#{extensionDirectory}" )
-      @logger.debug( "#{__method__} arrayOfExtensionDefs=#{arrayOfExtensionDefs}, possibilities=#{possibilities}" )      
+
+      processSetup( setupName )  do |name, setupConf, possibilities|
+      
+        # config && get renderes
+        mustache = prepareRender( setupName )
+
+        # path to directory where setup output is done
+        directoryPath = prepareSetupDir( extensionDirectory )
+        
+        # output 'normal templates' - one generate def/one output
+        generateCase( setupName, directoryPath, nil, mustache )
+
+        # For 'possibities': map array of possibilities to array
+        # of filenames created using an output -property on
+        # 'generate' definition
+        possibilities && possibilities.any? && generateCase( setupName, directoryPath, 'possibility', mustache ) do |output|
+          # use output as template rendering
+          possibilities.map do |p|
+            {
+              :possibility => p,
+              :outputFile => mustache.render_str( output, { "possibility" =>  p } ),
+            }
+          end # map
+        end
+      
+      end
+      
+    end
+
+    # @param chosenSetup [String] optional string for the setup to process
+    def processSetups(chosenSetup=nil, &blk )
+      setups = Marshal.load( Marshal.dump( getSetups ) || [] ).select { |s| chosenSetup.nil? || s['setupDirectory'] == chosenSetup }
+      setups.each do |setup|
+        setupName = setup['setupDirectory']
+        processSetup( setupName, &blk )
+      end
+    end
+
+    def processSetup( setupName, &blk )
 
       # init state
       start
@@ -287,35 +463,24 @@ module Sbuilder
       # resolve domain
       resolve
 
+      # access config && put to model
+      setupConf = getSetup( setupName )
+      defineSetup( setupConf )
+
+      # add assumptions to model
+      loadAssumptions( getSetupAssumptionList( setupConf ) )
+
       # extensions
-      loadExtensions( arrayOfExtensionDefs )
+      loadExtensions( setupName )      
 
       # config model - before config rendering
+      possibilities= getSetupPossibilitiesList( setupName )      
       model.setPossibilities( possibilities )
-      
-      # config && get renderes
-      mustache = prepareRender( setupName )
 
-      # path to directory where setup output is done
-      directoryPath = prepareSetupDir( extensionDirectory )
-      
-      # output 'normal templates' - one generate def/one output
-      generateCase( setupName, directoryPath, nil, mustache )
-
-      # For 'possibities': map array of possibilities to array
-      # of filenames created using an output -property on
-      # 'generate' definition
-      possibilities && generateCase( setupName, directoryPath, 'possibility', mustache ) do |output|
-        # use output as template rendering
-        possibilities.map do |p|
-          {
-            :possibility => p,
-            :outputFile => mustache.render_str( output, { "possibility" =>  p } ),
-          }
-        end # map
-      end
+      yield setupName, setupConf, possibilities
       
     end
+      
 
 
     # Ensure that directory 'extensionDirectory' exists under
@@ -505,7 +670,7 @@ module Sbuilder
     #
     # @param modelData [String] type of data (see model#templateData)
     #
-    # @param d [Hash] data element, content depends on 'modelData'
+    # @param renderData [Hash] data element to filter, content depends on 'modelData'
     #
     # @return [Boolean] true when show the elmement
     def setupFilter( modelData, renderData )
@@ -582,10 +747,24 @@ module Sbuilder
       return setupPossis
     end
 
-    # create data to pass to template generateion
-    # def templateData
-    #   return model.templateData
-    # end
+    
+
+    # Return model invariant defined in sbuilder
+    # 
+    # @return [String:Array] of invariant names
+    def getModelInvariants
+      names = []
+      getInvariantConfig.each { |invariant| names += invariant.keys }
+      @logger.info "#{__method__} invariants=#{names.join(',')}"
+      return names
+    end
+
+    
+    # @return [String:Array] names of setup assumes from
+    # 'setups.{supet}.assumptions' property
+    def getSetupAssumes
+      model.assumptions.map{|a| a[:name] }
+    end
 
     # ------------------------------------------------------------------
     # configuration
@@ -611,7 +790,8 @@ module Sbuilder
 
       @logger.debug( "#{__method__} config in #{getInternalConfigFilePath} internal_config= #{internal_config.to_yaml}" )      
       @controller_config['generate'] = @controller_config['generate'] + internal_config['generate']
-      @logger.debug( "#{__method__} @controller_config=#{@controller_config.to_yaml}" )            
+      @logger.debug( "#{__method__} @controller_config=#{@controller_config.to_yaml}" )
+      validateProperties( @controller_config, @@validConfig, @@allowConfig  )
       @controller_config
     end
 
@@ -626,6 +806,25 @@ module Sbuilder
       @logger.debug( "#{__method__} setupName=#{setupName}, setup=#{setup} " )      
       setup
     end
+
+    # @return [Hash:Array] of 'type', 'url'|'file' properties
+    def getSetupExtensions( setupName )
+      @logger.debug( "#{__method__} setupName=#{setupName}" )            
+      getSetup( setupName )['extensions'] || []
+    end
+    
+    # @return [String:Array] of setup possibilities
+    def getSetupPossibilitiesList( setupName )
+      @logger.debug( "#{__method__} setupName=#{setupName}" )            
+      getSetup( setupName )['possibilities'] || []
+    end
+
+    # @param setupDef [Hash] setup configuration
+    # @return [String:Array] name of assumption in setup, [] if none
+    def getSetupAssumptionList( setupDef )
+      return setupDef['assumptions'] || []
+    end
+    
     
 
     def getPreferencesData( setupName )
@@ -680,11 +879,34 @@ module Sbuilder
       getConfig()['extensions']
     end
 
+    # @return [Hash] of extension properties
+    def getExtensions
+      getConfig()['extend'] || {}
+    end
+
+    # Api loaders configured in sbuilder.yaml['extend']['loaders']
+    #
+    # @return [Hash:Array] with :name,:className,:configuration properties
+    def getConfiguredLoaders
+      loaders = getExtensions()['loaders'] || []
+      loaders.each do |loader|
+        validateProperties( loader, @@validExtendLoader )
+      end
+      loaders      
+    end
 
     def getResolversConfig
       getConfig()['resolvers']
     end
 
+    # @return [Hash:Array] of invariants defined
+    def getInvariantConfig
+      invariants = getConfig()['invariants']
+      invariants = [invariants] if invariants.is_a?( Hash )
+      return invariants || []
+    end
+    
+
     # @param generateCategory [Nil|String] choose templates in
     # 'generateCategory', @return [Hash:Array] of {'output', 'inputs'}
     # defining a file to render using templates in 'inputs'
@@ -717,15 +939,16 @@ module Sbuilder
         
     end
 
-    # return optional cacheFilePath from paramSetDef, nil if no 'cache' -property
+    # @return [String] path to cacheFilePath, if no 'cache' -property
     def getParamsetCacheFilePath( paramSetDef )
       return "#{getOpt(:cache_dir)}/#{paramSetDef['cache']}" if paramSetDef['cache'] && getOpt(:cache_dir)
       return paramSetDef['cache']  if paramSetDef['cache']
       return nil
     end
-    
+
+    # @return [String] loader type (className/type) 
     def getParamsetType( paramSetDef )
-      paramSetDef['type']
+      paramSetDef['className'] ? paramSetDef['className'] : paramSetDef['type']
     end
 
     # def getResolverDefPath( mapperDef )
@@ -790,6 +1013,13 @@ module Sbuilder
     private def validateOne( defintionHash, propList )
       raise ControllerException.new "Must give one  #{propList} in #{defintionHash}" unless propList.select {|prop| defintionHash.has_key?(prop) }.length == 1
     end
+
+    # add default properties in 'defaults' to 'defintionHash' 
+    private def defaultProps( defintionHash, defaults )
+      defintionHash = defintionHash.merge( defaults ) do |k,orig,default|
+        orig.nil? ? default : orig
+      end
+    end