bosh-template 1.3202.0 → 1.3213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1ad3d84cc1e4053e22cc43929b254b3b05913f
-  data.tar.gz: eba2aceec64d8af1737997f960dff028e75a7383
+  metadata.gz: 8a2e0f6e8214ef6fe94b23e3dccc8de6f75b926e
+  data.tar.gz: 2ccf9bbb42af66e7daed05c5ff4cd49a4bc8021a
 SHA512:
-  metadata.gz: 794f91934905f8a93991152875bdf39200b1f588b522802ef9be191654d3d88d9029d272075cc20b94336c8588e5ec1a4c4fa0622124cf188b5e0c69ab95a8c5
-  data.tar.gz: 929ae1f132e637c873b65b09112aa1818d9da26aeba494a20782dcdb58e4098f8ad51246b214ffefdf594cd2959fe3fb45d415b5ec343be3d187df38250ff33a
+  metadata.gz: bcdf735a7df58356a46612b2c5de56b9341d789b67e5b511432cb5f6e7f1062d7b49647a288316d7aee044cd0a28016841b5522d9c1a806bd91307a059bb2052
+  data.tar.gz: a922bdade2b486692709411d0188adf71c45edd576dc26367b2d43f8c0889f8cfb0a0fec36dc0a880ddcfd2750963dd9883f49d17031b500ae0bec50e402a285

data/lib/bosh/template/evaluation_context.rb

@@ -3,6 +3,8 @@ require 'bosh/template/evaluation_failed'
 require 'bosh/template/unknown_property'
 require 'bosh/template/unknown_link'
 require 'bosh/template/property_helper'
+require 'bosh/template/evaluation_link_instance'
+require 'bosh/template/evaluation_link'
 
 module Bosh
   module Template
@@ -93,8 +95,14 @@ module Bosh
 
       def link(name)
         result = lookup_property(@links, name)
-        return result unless result.nil?
+        raise UnknownLink.new(name) if result.nil?
 
+        if result.has_key?("instances")
+          instance_array = result["instances"].map do |link_spec|
+            EvaluationLinkInstance.new(link_spec["name"], link_spec["index"], link_spec["id"], link_spec["az"], link_spec["address"], link_spec["properties"])
+          end
+          return EvaluationLink.new(instance_array, result["properties"])
+        end
         raise UnknownLink.new(name)
       end
 
@@ -112,6 +120,23 @@ module Bosh
         InactiveElseBlock.new
       end
 
+      # Run a block of code if the link given exists
+      # @param [String] name of the link
+      # @yield [Object] link, which is an array of instances
+      def if_link(name)
+        link_found = lookup_property(@links, name)
+        if link_found.nil? || !link_found.has_key?("instances")
+          return ActiveElseBlock.new(self)
+        else
+          instance_array = link_found["instances"].map do |link_spec|
+            EvaluationLinkInstance.new(link_spec["name"], link_spec["index"], link_spec["id"], link_spec["az"], link_spec["address"], link_spec["properties"])
+          end
+
+          yield EvaluationLink.new(instance_array, link_found["properties"])
+          InactiveElseBlock.new
+        end
+      end
+
       # @return [Object] Object representation where all hashes are unrolled
       #   into OpenStruct objects. This exists mostly for backward
       #   compatibility, as it doesn't provide good error reporting.
@@ -139,6 +164,10 @@ module Bosh
         def else_if_p(*names, &block)
           @context.if_p(*names, &block)
         end
+
+        def else_if_link(name, &block)
+          @context.if_link(name, &block)
+        end
       end
 
       class InactiveElseBlock
@@ -148,6 +177,10 @@ module Bosh
         def else_if_p(*names)
           InactiveElseBlock.new
         end
+
+        def else_if_link(name)
+          InactiveElseBlock.new
+        end
       end
     end
   end

data/lib/bosh/template/evaluation_link.rb

@@ -0,0 +1,38 @@
+module Bosh
+  module Template
+    class EvaluationLink
+      include PropertyHelper
+
+      attr_reader :instances
+      attr_reader :properties
+
+      def initialize(instances, properties)
+        @instances = instances
+        @properties = properties
+      end
+
+      def p(*args)
+        names = Array(args[0])
+
+        names.each do |name|
+          result = lookup_property(@properties, name)
+          return result unless result.nil?
+        end
+
+        return args[1] if args.length == 2
+        raise UnknownProperty.new(names)
+      end
+
+      def if_p(*names)
+        values = names.map do |name|
+          value = lookup_property(@properties, name)
+          return ActiveElseBlock.new(self) if value.nil?
+          value
+        end
+
+        yield *values
+        InactiveElseBlock.new
+      end
+    end
+  end
+end

data/lib/bosh/template/evaluation_link_instance.rb

@@ -0,0 +1,48 @@
+require 'bosh/template/property_helper'
+
+module Bosh
+  module Template
+    class EvaluationLinkInstance
+      include PropertyHelper
+
+      attr_reader :name
+      attr_reader :index
+      attr_reader :id
+      attr_reader :az
+      attr_reader :address
+      attr_reader :properties
+
+      def initialize(name, index, id, az, address, properties)
+        @name = name
+        @index = index
+        @id = id
+        @az = az
+        @address = address
+        @properties = properties
+      end
+
+      def p(*args)
+        names = Array(args[0])
+
+        names.each do |name|
+          result = lookup_property(@properties, name)
+          return result unless result.nil?
+        end
+
+        return args[1] if args.length == 2
+        raise UnknownProperty.new(names)
+      end
+
+      def if_p(*names)
+        values = names.map do |name|
+          value = lookup_property(@properties, name)
+          return ActiveElseBlock.new(self) if value.nil?
+          value
+        end
+
+        yield *values
+        InactiveElseBlock.new
+      end
+    end
+  end
+end

data/lib/bosh/template/invalid_property_type.rb

@@ -0,0 +1,6 @@
+module Bosh
+  module Template
+    class InvalidPropertyType < StandardError
+    end
+  end
+end

data/lib/bosh/template/property_helper.rb

@@ -1,3 +1,5 @@
+require 'bosh/template/invalid_property_type'
+
 module Bosh
   module Template
     module PropertyHelper
@@ -12,6 +14,10 @@ module Bosh
         dst_ref = dst
 
         keys.each do |key|
+          unless src_ref.is_a?(Hash)
+            raise Bosh::Template::InvalidPropertyType,
+              "Property '#{name}' expects a hash, but received '#{src_ref.class}'"
+          end
           src_ref = src_ref[key]
           break if src_ref.nil? # no property with this name is src
         end
@@ -28,6 +34,7 @@ module Bosh
       # @param [Hash] collection Property collection
       # @param [String] name Dot-separated property name
       def lookup_property(collection, name)
+        return nil if collection.nil?
         keys = name.split(".")
         ref = collection
 

data/lib/bosh/template/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Template
-    VERSION = '1.3202.0'
+    VERSION = '1.3213.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-template
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semi_semantic
@@ -78,6 +78,9 @@ files:
 - lib/bosh/template.rb
 - lib/bosh/template/evaluation_context.rb
 - lib/bosh/template/evaluation_failed.rb
+- lib/bosh/template/evaluation_link.rb
+- lib/bosh/template/evaluation_link_instance.rb
+- lib/bosh/template/invalid_property_type.rb
 - lib/bosh/template/property_helper.rb
 - lib/bosh/template/renderer.rb
 - lib/bosh/template/unknown_link.rb