jsontemplate 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360933697b132664ef8783eeaa1d77a54b92ce96
-  data.tar.gz: 48601d2350b59574718f7365c788dee920e93330
+  metadata.gz: 928c018c315a90d125ccba148aca5d02e7ddec6f
+  data.tar.gz: 30e672445d4d6e52ddbc12f26d68de28f49c9226
 SHA512:
-  metadata.gz: ee3d770335b3eea0a5efae708f5e479ad67eca32cdfccc566dbb87c13a236a214ea27efefce8c46901987270a3d510326aa6585b0c4d320959252a56beb07e89
-  data.tar.gz: fb74b90da549574c75b1ecf734330478539e4660edad8c5dd2d61dc6b1a30f91fe0fbd8c87f721b268b417b6e308b3fb6f3f6ddc3ed9709b98296a5aabf4e234
+  metadata.gz: 951b22ace0afcd663612c795c5966a4b3dadec6d437edcc7e8acea8d4f9a08b7ca25e35d93a47539d1f49b2914af891842112caebb3b2ea67d04f94e2360e83a
+  data.tar.gz: 76f0b62b0d7a44cf1fe7aecfd13b34cc3848e9cb7d11e82218db65a0cf40dc788e45009f7b11c3a85b08ba43f9595a3f790b105227778cf9ecd61274116b6772

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jsontemplate (0.4.2)
+    jsontemplate (0.4.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/jsontemplate/version.rb

@@ -1,3 +1,3 @@
 class JsonTemplate
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/jsontemplate.rb

@@ -10,14 +10,15 @@ class JsonTemplate
         @path = path || (src.respond_to?(:path) ? src.path : nil)
         @dir  = File.expand_path(path ? File.dirname(path) : ".")
 
-        @properties_file = File.join(@dir,"properties.json")
-        @secrets_file    = File.join(@dir,"secrets.json")
+        @properties_file = "properties.json"
+        @secrets_file    = "secrets.json"
 
         if src.respond_to?(:read)
           @filename = "<stream>"
           data = src.read
         else
-          @filename = File.join(@dir, File.basename(src))
+          @filename = src[0] == ?/ ? src : File.join(@dir, File.basename(src))
+          p [src, @path, @dir, @filename]
           data = File.read(@filename)
         end
         @json = JSON.load(data)
@@ -26,6 +27,7 @@ class JsonTemplate
     def process_dirmerge(pattern)
         files = Dir.glob(@dir+"/"+pattern)
         files.collect do |path|
+        p path
             r = JsonTemplate.new(path,@path).process_dict
             key=File.basename(path).split(".")[0..-2].join(".")
             [key, r]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsontemplate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Vidar Hokstad