dtk-dsl 1.0.0 → 1.0.1

data/lib/dsl/template/v1/workflow.rb

@@ -15,50 +15,120 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class DTK::DSL::Template
-  class V1
-    class Workflow < self
-      require_relative('workflow/semantic_parse')
-
-      module Constant
-        module Variations
+module DTK::DSL
+  class Template
+    class V1
+      class Workflow < self
+        # TODO: do we want workflow/semantic_parse
+        require_relative('workflow/semantic_parse')
+        
+        module Constant
+          module Variations
+          end
+          
+          extend ClassMixin::Constant
+          Import       = 'import'
+          Name         = 'name'
+          SubtaskOrder = 'subtask_order'
+          Subtasks     = 'subtasks'
+          Flatten      = 'flatten'
         end
         
-        extend ClassMixin::Constant
-      end
-      
-      def parser_output_type
-        :hash
-      end
-      
-      def self.parse_elements(input_hash, parent_info)
-        input_hash.inject(file_parser_output_hash) do |h, (name, workflow)|
-          h.merge(name => parse_element(workflow, parent_info, :index => name))
+        ### For parsing
+        
+        def parser_output_type
+          :hash
         end
-      end
-      
-      def parse!
-        merge parse_workflow(input_hash)
-      end
-
-      ### For generation
-      def self.generate_elements(workflows_content, parent)
-        workflows_content.inject({}) do |h, (name, workflow)| 
-          h.merge(name => generate_element(workflow, parent))
+        
+        def self.parse_elements(input_hash, parent_info)
+          input_hash.inject(file_parser_output_hash) do |h, (name, workflow)|
+            h.merge(name => parse_element(workflow, parent_info, :index => name))
+          end
+        end
+        
+        def parse!
+          remove_processed_keys_from_input_hash! do
+            set? :Import, input_key_value?(:Import)
+            set? :Flatten, input_key_value?(:Flatten)
+            set? :Name, input_key_value?(:Name)
+            set? :SubtaskOrder, input_key_value?(:SubtaskOrder)
+            set? :Subtasks, parse_subtasks?
+          end
+          # handle keys not processed
+          merge change_strings_to_symbols(input_hash) unless input_hash.empty?
+        end
+        
+        ### For generation
+        def self.generate_elements(workflows_content, parent)
+          workflows_content.inject({}) do |h, (name, workflow)| 
+            h.merge(name => generate_element(workflow, parent))
+          end
+        end
+        
+        def generate!
+          set? :Name, val(:Name)
+          set? :SubtaskOrder, val(:SubtaskOrder)
+          if subtasks = val(:Subtasks)
+            generated_subtasks = subtasks.map do |subtask|
+              generated_subtask = generate_subtask(subtask)
+              generated_subtask.empty? ? nil : generated_subtask
+            end.compact
+            set :Subtasks, generated_subtasks unless generated_subtasks.empty?
+          end
+          merge(uninterpreted_keys)
+        end
+        
+        private
+        
+        def parse_subtasks?
+          if subtasks = input_key_value?(:Subtasks)
+            ret = file_parser_output_array
+            subtasks.each_with_index do |subtask, i| 
+              # TODO: should parent_info instead be Parsing::ParentInfo.new(self, :subtasks)
+              parent_info = Parsing::ParentInfo.new(self, :workflow)
+              ret << self.class.parse_element(subtask, parent_info, :index => i) 
+            end
+            ret
+          end
+        end
+        
+        def generate_subtask(subtask)
+          self.class.create_for_generation(subtask, :top => @top, :filter => @filter).generate_yaml_object
         end
-      end
 
-      def generate!
-        merge(@content)
-      end
-      
-      private
-      
-      def parse_workflow(workflow_hash)
-        # TODO: put in fine grain parsing of workflow_hash
-        workflow_hash
+        module Hashkey
+          include InputOutputCommon::Canonical::HashKey 
+        end
+        INTERPRETED_KEYS = [Hashkey::Name, Hashkey::SubtaskOrder, Hashkey::Subtasks, Hashkey::Flatten, Hashkey::Import, Hashkey::HiddenImportStatement]
+        def uninterpreted_keys
+          (@content.keys - INTERPRETED_KEYS).inject({}) do |h, k| 
+            h.merge(k.to_s => change_symbols_to_strings(@content[k]))
+          end
+        end
+        
+        def change_symbols_to_strings(obj)
+          if obj.kind_of?(::Hash)
+          obj.inject({}) { |h, (k, v)| h.merge(k.to_s => change_symbols_to_strings(v)) }
+          elsif obj.kind_of?(::Array)
+            obj.map { |el| change_symbols_to_strings(el) }
+          elsif obj.kind_of?(::Symbol)
+            obj.to_s
+          else
+            obj
+          end
+        end
+        
+        def change_strings_to_symbols(obj)
+          if obj.kind_of?(::Hash)
+            obj.inject({}) { |h, (k, v)| h.merge(k.to_sym => change_strings_to_symbols(v)) }
+          elsif obj.kind_of?(::Array)
+            obj.map { |el| change_strings_to_symbols(el) }
+          else
+            obj
+          end
+        end
+        
       end
-
     end
   end
 end

data/lib/dsl/template/v1.rb

@@ -37,6 +37,10 @@ module DTK::DSL
       def template_version
         VERSION
       end
+
+      def dsl_version
+        '1.0.0'
+      end
     end
   end
 end

data/lib/dsl/template.rb

@@ -20,12 +20,15 @@ module DTK::DSL
     require_relative('template/constant_class_mixin')
     require_relative('template/parsing')
     require_relative('template/generation')
+    require_relative('template/nested_dsl_file')
     require_relative('template/loader')
 
     include Parsing::Mixin
     extend Parsing::ClassMixin
     include Generation::Mixin
     extend Generation::ClassMixin
+    include NestedDSLFile::Mixin
+
 
     # opts can have keys
     #   :file_obj

data/lib/dsl/version.rb

@@ -1,6 +1,6 @@
 module DTK
   module DSL
-    VERSION = '1.0.0'
+    VERSION="1.0.1"
   end
 end
 

data/lib/dtk_dsl.rb

@@ -18,6 +18,7 @@
 
 module DTK
   module DSL    
+    require_relative('dsl/aux')
     require_relative('dsl/error')
     require_relative('dsl/dsl_version')
     require_relative('dsl/file_type')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing DT DSL files.
 email: support@reactor8.com
@@ -21,9 +21,9 @@ files:
 - Gemfile
 - README.md
 - dtk-dsl.gemspec
+- lib/dsl/aux.rb
 - lib/dsl/directory_generator.rb
 - lib/dsl/directory_parser.rb
-- lib/dsl/directory_parser/path_info.rb
 - lib/dsl/dsl_version.rb
 - lib/dsl/error.rb
 - lib/dsl/error/subclasses.rb
@@ -33,7 +33,9 @@ files:
 - lib/dsl/file_generator/content_input/hash.rb
 - lib/dsl/file_generator/content_input/mixin.rb
 - lib/dsl/file_generator/content_input/string.rb
-- lib/dsl/file_generator/content_input/tags.rb
+- lib/dsl/file_generator/content_input/tag.rb
+- lib/dsl/file_generator/content_input/tag/assignment.rb
+- lib/dsl/file_generator/content_input/tag/simple.rb
 - lib/dsl/file_generator/yaml_object.rb
 - lib/dsl/file_obj.rb
 - lib/dsl/file_parser.rb
@@ -42,6 +44,9 @@ files:
 - lib/dsl/file_parser/input/hash.rb
 - lib/dsl/file_parser/output.rb
 - lib/dsl/file_type.rb
+- lib/dsl/file_type/match.rb
+- lib/dsl/file_type/matching_files.rb
+- lib/dsl/file_type/subclasses.rb
 - lib/dsl/input_output_common.rb
 - lib/dsl/input_output_common/array.rb
 - lib/dsl/input_output_common/canonical.rb
@@ -60,6 +65,8 @@ files:
 - lib/dsl/template/generation/class_mixin.rb
 - lib/dsl/template/generation/mixin.rb
 - lib/dsl/template/loader.rb
+- lib/dsl/template/nested_dsl_file.rb
+- lib/dsl/template/nested_dsl_file/mixin.rb
 - lib/dsl/template/parsing.rb
 - lib/dsl/template/parsing/class_mixin.rb
 - lib/dsl/template/parsing/mixin.rb

data/lib/dsl/directory_parser/path_info.rb

@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2010-2016 dtk contributors
-#
-# This file is part of the dtk project.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module DTK::DSL
-  class DirectoryParser    
-    class PathInfo
-      attr_reader :regexp, :depth, :base_dir
-      # opts can have keys
-      #  :depth - used for pruning when a git directory
-      def initialize(regexp_or_string, opts = {})
-        @regexp   = ret_regexp(regexp_or_string)
-        @depth    = opts[:depth]
-        @base_dir = opts[:base_dir]
-      end
-
-      # opts can have keys:
-      #  :exact - Booelan (default: false) - meaning regexp completely matches file_path
-      def matches?(file_path, opts = {})
-        self.class.matches?(file_path, @regexp, opts)
-      end
-      def self.matches?(file_path, regexp, opts = {})
-        if opts[:exact]
-          file_path =~ Regexp.new("^#{regexp.source}$")
-        else
-          # extra check to see if regexp is just for file part or has '/' seperators
-          if '/' =~ regexp
-            file_path.split('/').last =~ Regexp.new("^#{regexp.source}$")
-          else
-            file_path =~ Regexp.new("#{regexp.source}$")
-          end
-        end
-      end
-
-      private
-
-      def ret_regexp(regexp_or_string)
-        if regexp_or_string.kind_of?(String)
-          Regexp.new(regexp_or_string)
-        elsif regexp_or_string.kind_of?(Regexp)
-          regexp_or_string
-        else
-          raise Error, "Unexpected class '#{regexp_or_string.class}'"
-        end
-      end
-    end
-  end
-end