dtk-dsl 1.0.2 → 1.0.3

data/lib/dsl/service_and_component_info/transform_to/parser/service_module.rb

@@ -0,0 +1,28 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser
+      # parse to form component module files
+      module ServiceModule
+        require_relative('service_module/top_dsl')
+        require_relative('service_module/module_refs')
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser/top_dsl.rb

@@ -0,0 +1,36 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser
+      class TopDSL < self
+        require_relative('top_dsl/module_info')
+        require_relative('top_dsl/assemblies')
+        require_relative('top_dsl/components')
+        require_relative('top_dsl/dependencies')
+      end
+
+      private
+
+      def module_ref
+        info_object.module_ref
+      end
+
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to/parser.rb

@@ -0,0 +1,39 @@
+#
+# 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 ServiceAndComponentInfo::TransformTo
+    class Parser < ServiceAndComponentInfo::Parser
+      require_relative('parser/module_refs')
+      require_relative('parser/component_module')
+      require_relative('parser/service_module')
+
+      private
+      def update_output_hash__dependencies?
+        if component_dsl_canonical_hash = input_file_hash?(:module)
+          if dependencies = component_dsl_canonical_hash['dependencies']
+            add_dependencies_to_output_hash!(dependencies)
+            output_hash
+          end
+        end
+      end
+
+      def add_dependencies_to_output_hash!(dependencies)
+      end
+    end
+  end
+end

data/lib/dsl/service_and_component_info/transform_to.rb

@@ -0,0 +1,25 @@
+#
+# 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 ServiceAndComponentInfo
+    class TransformTo < self
+      require_relative('transform_to/info')
+      require_relative('transform_to/parser')
+    end
+  end
+end

data/lib/dsl/service_and_component_info.rb

@@ -0,0 +1,55 @@
+#
+# 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
+  module DSL
+    class ServiceAndComponentInfo
+      require_relative('service_and_component_info/module_ref')
+      require_relative('service_and_component_info/info')
+      require_relative('service_and_component_info/parser')
+      # info and parser must be before transform_from and transform_to
+      require_relative('service_and_component_info/transform_from')
+      require_relative('service_and_component_info/transform_to')
+
+      attr_reader :module_ref, :output_path_hash_pairs
+      def initialize(namespace, module_name, version = nil)
+        @module_ref = ModuleRef.new(namespace, module_name, version)
+
+        # dynamically computed
+        @output_path_hash_pairs = {} 
+      end
+
+      def info_processor(info_type)
+        case info_type 
+        when :service_info then self.class::Info::Service.new(self)
+        when :component_info then self.class::Info::Component.new(self)
+        else
+          fail Error, "Unexpected info_type '#{info_type}'"
+        end
+      end
+
+      def output_path_text_pairs
+        @output_path_hash_pairs.inject({}) { |h, (path, hash_content)| h.merge(path => YamlHelper.generate(hash_content)) }
+      end
+
+
+      def update_or_add_output_hash!(path, hash_content)
+        @output_path_hash_pairs.merge!(path => hash_content)
+      end
+    end
+  end
+end

data/lib/dsl/template/parsing/mixin.rb

@@ -139,11 +139,12 @@ module DTK::DSL
         #   :input_hash
         def input_key_and_value?(constant, opts = {})
           input_hash = opts[:input_hash] || input_hash()
-          constant_class.matching_key_and_value?(input_hash, constant)
-          if ret = constant_class.matching_key_and_value?(input_hash, constant)
-            add_found_key?(ret.keys.first)
+          if kv = constant_class.matching_key_and_value?(input_hash, constant)
+            unless kv.values.first.nil? # check if value is nil and if so nil is returned
+              add_found_key?(kv.keys.first)
+              kv
+            end
           end
-          ret
         end
 
         def parsing_set(constant, val)
@@ -200,7 +201,7 @@ module DTK::DSL
         #   :key
         # correct_ruby_types can also be scalar
         def raise_input_error(correct_ruby_types, opts = {})
-          input = opts[:input] || @input
+          input = (opts.has_key?(:input) ? opts[:input] : @input)
           raise parsing_error_with_opts([:WrongObjectType, input, correct_ruby_types], opts)
         end
         

data/lib/dsl/template/parsing/parsing_error/subclasses.rb

@@ -34,26 +34,26 @@ module DTK::DSL; class Template
             else
               "The key's value should be one of the types (#{correct_ruby_types.join(' ')})"
             end
-          error_msg << ", but has type #{input_class_string(obj)}"
+          error_msg << (obj.nil? ? ", but has null value" : ", but has type #{input_class_string(obj)}")
           super(error_msg, opts)
         end
         
         private
         
         def input_class_string(obj)
-          klass = 
-            if obj.kind_of?(::Hash) 
-              ::Hash 
-            elsif obj.kind_of?(::Array)
-              ::Array
-            elsif obj.kind_of?(::String)
-              ::String
-            else
-              obj.class
-            end
-          # demodularize
-          klass.to_s.split('::').last
+          if obj.kind_of?(::Hash) 
+            'Hash'
+          elsif obj.kind_of?(::Array)
+            'Array'
+          elsif obj.kind_of?(::String)
+            'String'
+          # elesif ..TODO: should we handle Booleans in special way
+          else
+            # demodularize
+            obj.class.to_s.split('::').last
+          end
         end
+
       end
     end
   end

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

@@ -26,12 +26,14 @@ class DTK::DSL::Template
         end
 
         extend ClassMixin::Constant
-        Assemblies = 'assemblies'
+        Assemblies    = 'assemblies'
+        ComponentDefs = 'component_defs' 
       end
 
       def parse!
         super
-        set :Assemblies, parse_child_elements(:assembly, :Assemblies)
+        set :Assemblies, parse_child_elements?(:assembly, :Assemblies)
+        set :ComponentDefs, parse_child_elements?(:component_def, :ComponentDefs)
       end
     end
   end

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

@@ -60,7 +60,7 @@ module DTK::DSL
 
         ### For generation
         def self.generate_elements(components_content, parent)
-          components_content.map do |name, component| 
+          components_content.map do |name, component|
             if component_hash = generate_element?(component, parent)
               component_hash.empty? ? name : { name => component_hash }
             end
@@ -112,11 +112,20 @@ module DTK::DSL
           unless input_hash.size == 1 and input_hash.values.first.kind_of?(::Hash)
             raise parsing_error("Component is ill-formed; it must be string or hash")
           end
+
           properties = input_hash.values.first
-          set? :Attributes, parse_child_elements?(:attribute, :Attributes, :input_hash => properties)
+          if attributes = properties['attributes']
+            set? :Attributes, parse_child_elements?(:attribute, :Attributes, :input_hash => { 'attributes' => attributes })
+          end
+
+          if component_links = properties['component_links']
+            set? :ComponentLinks, parse_child_elements?(:component_link, :ComponentLinks, :input_hash => { 'component_links' => component_links})
+          end
 
           # handle keys not processed
           properties.delete(Constant::Attributes)
+          properties.delete(Constant::ComponentLinks)
+
           merge properties unless properties.empty?
         end
 

data/lib/dsl/template/v1/component_def/semantic_parse.rb

@@ -0,0 +1,26 @@
+#
+# 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 Template::V1
+    class ComponentDef
+      class SemanticParse < InputOutputCommon::SemanticParse::Hash
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,52 @@
+#
+# 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 Template
+    class V1
+      class ComponentDef < self
+        require_relative('component_def/semantic_parse')
+
+        module Constant
+          module Variations
+          end
+          
+          extend ClassMixin::Constant
+        end
+
+        ### For parsing
+        def parser_output_type 
+          :hash
+        end
+
+        def self.parse_elements(input_hash, parent_info)
+          input_hash.inject(file_parser_output_hash) do |h, (name, component_def)|
+            h.merge(name => parse_element(component_def, parent_info, :index => name))
+          end
+        end
+
+        def parse!
+          # TODO: This does not parse and just passes through; parse routines from dtk-server will be migrated
+          # here
+          merge input_hash
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -19,7 +19,6 @@ module DTK::DSL
   class Template
     class V1
       class Workflow < self
-        # TODO: do we want workflow/semantic_parse
         require_relative('workflow/semantic_parse')
         
         module Constant

data/lib/dsl/template/v1.rb

@@ -24,6 +24,7 @@ module DTK::DSL
       require_relative('v1/common_module')
       require_relative('v1/service_instance')
       require_relative('v1/module_ref')
+      require_relative('v1/component_def')
       require_relative('v1/assembly')
       require_relative('v1/attribute')
       require_relative('v1/component_link')

data/lib/dsl/version.rb

@@ -1,6 +1,6 @@
 module DTK
   module DSL
-    VERSION="1.0.2"
+    VERSION="1.0.3"
   end
 end
 

data/lib/dsl/yaml_helper.rb

@@ -27,6 +27,7 @@ module DTK::DSL
       end
     end
 
+    # yaml_object can be a ::Hash or child of a ::Hash
     def self.generate(yaml_object)
       ::YAML.dump(convert_for_yaml_dump(yaml_object))
     end

data/lib/dtk_dsl.rb

@@ -32,6 +32,8 @@ module DTK
     require_relative('dsl/file_parser')
     require_relative('dsl/file_generator')
     require_relative('dsl/template')
+    # file_type needs to go before service_and_component_info
+    require_relative('dsl/service_and_component_info')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Library for parsing DT DSL files.
 email: support@reactor8.com
@@ -16,8 +16,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .byebug_history
-- .gitignore
+- ".byebug_history"
+- ".gitignore"
 - Gemfile
 - README.md
 - dtk-dsl.gemspec
@@ -59,6 +59,38 @@ files:
 - lib/dsl/input_output_common/semantic_parse/hash.rb
 - lib/dsl/input_output_common/semantic_parse/mixin.rb
 - lib/dsl/qualified_key.rb
+- lib/dsl/service_and_component_info.rb
+- lib/dsl/service_and_component_info/info.rb
+- lib/dsl/service_and_component_info/info/input_files.rb
+- lib/dsl/service_and_component_info/module_ref.rb
+- lib/dsl/service_and_component_info/parser.rb
+- lib/dsl/service_and_component_info/transform_from.rb
+- lib/dsl/service_and_component_info/transform_from/info.rb
+- lib/dsl/service_and_component_info/transform_from/info/component.rb
+- lib/dsl/service_and_component_info/transform_from/info/input_files.rb
+- lib/dsl/service_and_component_info/transform_from/info/service.rb
+- lib/dsl/service_and_component_info/transform_from/parser.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/assemblies.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/assemblies/node_bindings.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/assemblies/workflows.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/components.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/dependencies.rb
+- lib/dsl/service_and_component_info/transform_from/parser/top_dsl/module_info.rb
+- lib/dsl/service_and_component_info/transform_to.rb
+- lib/dsl/service_and_component_info/transform_to/info.rb
+- lib/dsl/service_and_component_info/transform_to/info/component.rb
+- lib/dsl/service_and_component_info/transform_to/info/input_files.rb
+- lib/dsl/service_and_component_info/transform_to/info/service.rb
+- lib/dsl/service_and_component_info/transform_to/parser.rb
+- lib/dsl/service_and_component_info/transform_to/parser/component_module.rb
+- lib/dsl/service_and_component_info/transform_to/parser/component_module/module_refs.rb
+- lib/dsl/service_and_component_info/transform_to/parser/component_module/top_dsl.rb
+- lib/dsl/service_and_component_info/transform_to/parser/module_refs.rb
+- lib/dsl/service_and_component_info/transform_to/parser/service_module.rb
+- lib/dsl/service_and_component_info/transform_to/parser/service_module/module_refs.rb
+- lib/dsl/service_and_component_info/transform_to/parser/service_module/top_dsl.rb
+- lib/dsl/service_and_component_info/transform_to/parser/top_dsl.rb
 - lib/dsl/template.rb
 - lib/dsl/template/constant_class_mixin.rb
 - lib/dsl/template/generation.rb
@@ -81,6 +113,8 @@ files:
 - lib/dsl/template/v1/common_module_summary.rb
 - lib/dsl/template/v1/component.rb
 - lib/dsl/template/v1/component/semantic_parse.rb
+- lib/dsl/template/v1/component_def.rb
+- lib/dsl/template/v1/component_def/semantic_parse.rb
 - lib/dsl/template/v1/component_link.rb
 - lib/dsl/template/v1/component_link/semantic_parse.rb
 - lib/dsl/template/v1/dependency.rb
@@ -106,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library for parsing DT DSL files.