consult 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 371b66af8be47b598b8ee428856c17d35864b5ba93b3bff8ad0852c4d403d2fe
-  data.tar.gz: ce70cfa1f22a21d6255ae2fd1a867b2950765ca5c3b8b3c4f8090aab8f0c28d1
+  metadata.gz: 8b95340130b792146eeee73303c8a617ef7ce1a9d4748a124e3d8b46658280a5
+  data.tar.gz: 9103d4414a1d933a82a49f917143fb3d6d2d2f0ecd6b11f79089f0d0477c6a75
 SHA512:
-  metadata.gz: f72c7410f792f22c1bdc4d095b9f2fb122943625f2be6876461f692acd378fbd4bce6ce14797fe387d59d8ffaaf827612b3a7fb908d880a07b2933dddf294d03
-  data.tar.gz: f19a08e8ec11f404c82c6344885c36cc9346d04fbdaa7de8fdb9ddb3fe7059d1cc4c7d4c472a2a2ad41a642a87e338b5aa49a4eff36b0a19cd795dc29b48ee9f
+  metadata.gz: 9047b28026836b804685e285839d58e29bd3b4cfc53ba9e29d207e27d26afe217a15d21d8b74557a17503fe958287e2b35cb3171cfa02382a93ae8846bbe761e
+  data.tar.gz: fbeacae84e7a885817ad3bc9e058ed6c83d1d27e0825466bd0dc334690a8beca29a9bc7a38e85f2136933102e3b425ff5aa70000abcd347adfb9732dfe221d0c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 0.8.1
+
+* Obey template location order as specified in consult's config
+
 #### 0.8.0
 
 * Add support for multiple sources for a single template ([#14](https://github.com/veracross/consult/pull/14))

data/lib/consult/template.rb

@@ -7,6 +7,8 @@ module Consult
     include Utilities
     include TemplateFunctions
 
+    LOCATIONS = %i[path paths consul_key consul_keys]
+
     attr_reader :name, :config
 
     def initialize(name, config)
@@ -53,23 +55,27 @@ module Consult
       dest.mtime < (Time.now - @config[:ttl].to_i)
     end
 
+    def ordered_locations
+      @config.keys & LOCATIONS
+    end
+
     private
 
     # Concatenate all the source templates together, in the order provided
-    # Disk contents go first
     def contents
-      disk_contents + consul_contents
+      ordered_locations.map do |location|
+        location.to_s.start_with?('consul') ? consul_contents(location) : disk_contents(location)
+      end.join
     end
 
-    def consul_contents
-      [@config[:consul_key], @config[:consul_keys]].compact.flatten.map do |key|
+    def consul_contents(location)
+      [@config[location]].compact.flatten.map do |key|
         Diplomat::Kv.get(key, options: nil, not_found: :return, found: :return)
       end.join
     end
 
-    # Concatenate all the source templates together, in the order provided
-    def disk_contents
-      [path, paths].compact.flatten.map do |file_path|
+    def disk_contents(location)
+      [public_send(location)].compact.flatten.map do |file_path|
         File.read file_path, encoding: 'utf-8'
       end.join
     end

data/lib/consult/version.rb

@@ -1,3 +1,3 @@
 module Consult
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consult
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Jeff Fraser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport