dtk-dsl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e593bfb3fdafca2ec5659cb23d027021b12646
-  data.tar.gz: 719da019d2d90879ae54fb0cd5862644eef253fc
+  metadata.gz: d8d7e9667524d13ccf2f97b3b150a435aa81f7ad
+  data.tar.gz: 2c1f1b937882c34122b10f160387da0a158be9b6
 SHA512:
-  metadata.gz: 5180a6a6ff23dff2c813d535b04885164bef6d45e397843c06cab7f5907cea83681846f62fae3025b4800074f2b5968d1e864f5e804261cdaa5013d37be14013
-  data.tar.gz: af53ec0c65ce2625bcc8bd2548e7c3e8a66e1748697565952eb9755d99cb4f24aba8cd0a5e42f7d6d6d90537064f2461ccddbe262dc893819dae12da02881eee
+  metadata.gz: 0bf7ed5a03b682eb4b908f4a979cec62b21fb213669afc03b28be701c82a258c91c62e49a20f4e93a732e74d9324e5444c773756b869751720e8853cd74a4596
+  data.tar.gz: e9eccc9fc8a61162631461dbdfdcd6b8d63279c0a9dfe8238e6f8b25e3fe08a5263ae7e6b47bfce77af5d8c6923d6bb7d0b7ee5582cd56f933f6610a85ac0416

data/lib/dsl/input_output_common/canonical/hash_key.rb

@@ -45,16 +45,17 @@ module DTK::DSL
       OrderedComponents = :ordered_components     
 
       # Used at multiple levels
-      Name          = :name
-      Description   = :description
-      Namespace     = :namespace
-      ModuleName    = :module_name
-      ModuleVersion = :version
-      Attributes    = :attributes
-      Value         = :value
-      Nodes         = :nodes
-      Target        = :target
-      Components = :components
+      Name           = :name
+      Description    = :description
+      Namespace      = :namespace
+      ModuleName     = :module_name
+      ModuleVersion  = :version
+      Attributes     = :attributes
+      Value          = :value
+      Nodes          = :nodes
+      Target         = :target
+      Components     = :components
+      ComponentLinks = :component_links
 
       # meta info
       Import                = :import

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

@@ -80,8 +80,10 @@ module DTK::DSL
 
         def generate_component_hash
           ret = {}
+
           set_generation_hash(ret, :Attributes, generate_child_elements(:attribute, val(:Attributes)))
-          #TODO: set component_links
+          set_generation_hash(ret, :ComponentLinks, generate_child_elements(:component_link, val(:ComponentLinks)))
+
           ret
         end
         

data/lib/dsl/template/v1/component_link/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 ComponentLink
+      class SemanticParse < InputOutputCommon::SemanticParse::Hash
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,75 @@
+#
+# 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.
+#
+class DTK::DSL::Template
+  class V1
+    class ComponentLink < self
+      require_relative('component_link/semantic_parse')
+
+      module Constant
+        module Variations
+        end
+
+        extend ClassMixin::Constant
+        Value = 'value'
+      end
+
+      ### For parsing
+      def parser_output_type
+        :hash
+      end
+
+      def self.elements_collection_type
+        :hash
+      end
+
+      def self.parse_elements(input_hash, parent_info)
+        input_hash.inject(file_parser_output_hash) do |h, (name, value)|
+          h.merge(name => parse_element({ 'value' => value}, parent_info, :index => name))
+        end
+      end
+
+      def parse!
+        # using 'input_key_value?' (i.e., with '?') in case null value
+        set :Value, input_key_value?(:Value)
+      end
+
+      ### For generation
+      def self.generate_elements(component_links_content, parent)
+        component_links_content.inject({}) do |h, (component_link_name, component_link)| 
+          component_link.set(:Name, component_link_name)
+          element = generate_element?(component_link, parent)
+          element.nil? ? h : h.merge(element)
+        end
+      end
+
+      def generate!
+        value = val(:Value)
+        unless value.nil?
+          merge(req(:Name) => val(:Value))
+          self
+        end
+      end
+
+      def generate?
+        generate! unless skip_for_generation?
+      end
+
+    end
+  end
+end
+

data/lib/dsl/template/v1.rb

@@ -26,6 +26,7 @@ module DTK::DSL
       require_relative('v1/module_ref')
       require_relative('v1/assembly')
       require_relative('v1/attribute')
+      require_relative('v1/component_link')
       # attribute must go before node_attribute
       require_relative('v1/node_attribute')
       require_relative('v1/node')

data/lib/dsl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-09 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
@@ -81,6 +81,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_link.rb
+- lib/dsl/template/v1/component_link/semantic_parse.rb
 - lib/dsl/template/v1/dependency.rb
 - lib/dsl/template/v1/module_ref.rb
 - lib/dsl/template/v1/node.rb
@@ -104,17 +106,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.4.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Library for parsing DT DSL files.