jsontemplate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6bb416c8e7f40f34ce5b4d98cf739dd2e63ba2
-  data.tar.gz: a3d9d6d43d1f0f06d93c676433409a86a0f86e00
+  metadata.gz: 341367051a162f6aa01706ffa58ea3a298870438
+  data.tar.gz: db0ebf309531391d9b8de428582202bbd1cbb746
 SHA512:
-  metadata.gz: 6380a11c7a4cca159cb8f7a97457cc30e86a76c78ed92820f286943889fdb577deeacd51dc067df827f0dc100f7da76288cc3bf367cd3e7763eefecae82d97d5
-  data.tar.gz: 84b91beaf683adebd9562088334dcb954b23bdf20ae6910d4870b350a68adcf810331ddba849750ca811703456e2942da0bbae9b7f92a56a8c68e1d8d9fddf01
+  metadata.gz: 49d81e57206b00c714e20f17c88b10089f9f877f41f07469076c09f17b869f7752426151a63e27b68939bd7ddd6e18cd90e20f3e3836f88d51fa2b3117e8ac1e
+  data.tar.gz: b2de6bc3d5f681e751e9ff5e0b2bfbb22ee4627aa4f8ce99a93435128d43717a77e69f553d4634fb0c952ba9762172c7ea642aa90a53d61b5f26fdb972f9adda

data/Dockerfile

@@ -0,0 +1,9 @@
+# -*- sh -*-
+FROM ruby:2.2
+
+RUN gem install -n /usr/bin bundler
+RUN gem install -n /usr/bin rake
+ADD bundle_config /usr/local/bundle/config
+
+WORKDIR /app
+

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    jsontemplate (0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.1)
+    diff-lcs (1.2.5)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.4.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.9)
+  jsontemplate!
+  pry
+  rake (~> 10.0)
+  rspec
+
+BUNDLED WITH
+   1.12.5

data/Makefile

@@ -0,0 +1,4 @@
+NAME=jsontemplate
+IMAGE=dev-${NAME}
+
+include Rules.mk

data/Rules.mk

@@ -0,0 +1,35 @@
+DR=docker run -t -i -v ${PWD}:/app ${IMAGE}
+B=${DR} bundle
+BE=${B} exec
+
+build: container
+	echo Building gem
+	rm -f pkg/*
+	${BE} rake build
+
+push: build spec
+	gem push `/bin/ls -q pkg/* | tail -n1`
+
+container: Dockerfile
+	docker build -t ${IMAGE} .
+
+update: container
+	${B} update
+
+bundle: container
+	${B} install --binstubs ./bin --path=./vendor/bundle
+
+rdoc: container
+	rm -rf doc
+	${BE} rdoc --main=README.md -O -U -x'~' README.md lib
+
+.PHONY: spec
+spec: container
+	${BE} rspec ./spec
+
+
+cli:
+	${DR} /bin/bash -l
+
+pry:
+	${BE} pry -r bundler/setup -r jsontemplate

data/bundle_config

@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: "./vendor/bundle"
+BUNDLE_DISABLE_SHARED_GEMS: true

data/jsontemplate.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/jsontemplate/version.rb

@@ -1,3 +1,3 @@
 class JsonTemplate
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/jsontemplate.rb

@@ -2,21 +2,31 @@ require 'json'
 require "jsontemplate/version"
 
 class JsonTemplate
-    def initialize(path)
-        @path = path
-        @dir  = File.dirname(path)
-        @json = JSON.load(File.read(path))
+    attr_reader :json
+
+    def initialize(src, path=nil)
+        path ||= src.kind_of?(String) ? src : nil
+        @path = path || (src.respond_to?(:path) ? src.path : nil)
+        @dir  = File.expand_path(path ? File.dirname(path) : ".")
+
+        data = src.respond_to?(:read) ? src.read : File.read(src)
+        @json = JSON.load(data)
     end
 
     def process_dirmerge(pattern)
         files = Dir.glob(@dir+"/"+pattern)
         files.collect do |path|
-            r = JsonTemplate.new(path).process_dict
+            r = JsonTemplate.new(path,@path).process_dict
             key=File.basename(path).split(".")[0..-2].join(".")
             [key, r]
         end.flatten(1)
     end
 
+    def process_flookup(file, v)
+        map = JsonTemplate.new(file,@path).process_dict
+        map[v]
+    end
+
     def process_dict(root=nil)
         root ||= @json
 
@@ -27,13 +37,19 @@ class JsonTemplate
 
             if k == "$DirMerge"
                 process_dirmerge(v)
+            elsif k == "$FLookup"
+                process_flookup(*v)
             elsif k[0] == "$"
                 raise "Unknown directive #{k}"
             else
-                [[k,v]]
+                [k,v]
             end
         end
-        Hash[*pairs.flatten(2)]
+        if pairs.length == 1 && !pairs.first.kind_of?(Array)
+            pairs.first
+        else
+            Hash[*pairs.flatten(1)]
+        end
     end
 end
 

data/parameters.json

@@ -0,0 +1,3 @@
+{
+    "key1": "value1"
+}

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jsontemplate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -63,16 +77,22 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
+- Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
+- Rules.mk
 - bin/console
 - bin/setup
+- bundle_config
 - exe/jsontemplate
 - jsontemplate.gemspec
 - lib/jsontemplate.rb
 - lib/jsontemplate/version.rb
+- parameters.json
 homepage: https://github.com/hokstadconsulting/jsontemplate
 licenses: []
 metadata: {}