kumogata-template 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e864c2a60e72840e4dbd4654d206ad26a537f6a
-  data.tar.gz: 42092ee39c37f1ece34f4df417bc8bc9808c1fb2
+  metadata.gz: '08cd537236edb177fd1201221693623a58998108'
+  data.tar.gz: 3c1e901ed5171b9d288f56583614f48547c1f43e
 SHA512:
-  metadata.gz: 20b12e59103fdd77b860bdf4b5d45c5481140a50abc191662662e8ae3c588376b1939d046d009ea0885d08e16cc2cfaac0b8e427d3bc703065795787f96ee88d
-  data.tar.gz: e0e8c9b6be839f6675901e136a84458b2c996338f0db834c045c3a2600ba8b7410564a79cb8a055925651689f680501fcce9a95b141bd907fae499b7173b650d
+  metadata.gz: 76c880806ec9deced00fdf572ce244cd476d8050b746f05a744b60510cba54c80ef97b2d99db7dfe370043f7f94669e56fd552560e39b83b9ed8816d42e9d579
+  data.tar.gz: ef155df939575cbb86246bb57819eeada6302df841f578b4f415034cfb9312c5e328a61e27812dd44d176c275faf6c0a491c94fbfdf618458feb8874a4606656

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.13)
+    kumogata-template (0.0.16)
       aws-sdk (~> 2.3)
-      kumogata (= 0.5.10)
+      kumogata (= 0.5.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.6.44)
-      aws-sdk-resources (= 2.6.44)
-    aws-sdk-core (2.6.44)
+    aws-sdk (2.7.7)
+      aws-sdk-resources (= 2.7.7)
+    aws-sdk-core (2.7.7)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.44)
-      aws-sdk-core (= 2.6.44)
+    aws-sdk-resources (2.7.7)
+      aws-sdk-core (= 2.7.7)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -27,12 +27,12 @@ GEM
     diffy (3.1.0)
     dslh (0.2.7)
     execjs (2.7.0)
-    hashie (3.4.6)
+    hashie (3.5.3)
     highline (1.7.8)
     jmespath (1.3.1)
-    json (1.8.5)
+    json (1.8.3)
     json5 (0.0.1)
-    kumogata (0.5.10)
+    kumogata (0.5.12)
       aws-sdk-v1
       coderay
       coffee-script
@@ -40,28 +40,29 @@ GEM
       dslh (>= 0.2.7, < 0.3)
       hashie
       highline
-      json
+      json (= 1.8.3)
       json5
       net-ssh
+      nokogiri (= 1.6.7.2)
       retryable (~> 2.0.0)
       term-ansicolor
-      therubyracer
+      therubyracer (= 0.12.2)
       uuidtools
     libv8 (3.16.14.17)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.0.0)
     minitest (5.10.1)
     net-ssh (4.0.1)
-    nokogiri (1.7.0.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     rake (11.3.0)
     ref (2.0.0)
     retryable (2.0.4)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
       ref
-    tins (1.13.0)
+    tins (1.13.2)
     uuidtools (2.1.5)
 
 PLATFORMS

data/kumogata-template.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk', '~> 2.3'
-  spec.add_dependency 'kumogata', '0.5.10'
+  spec.add_dependency 'kumogata', '0.5.12'
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 11.1'
   spec.add_development_dependency 'minitest', '~> 5.8'

data/lib/kumogata/template/ext/kumogata.rb

@@ -99,72 +99,4 @@ class Kumogata::Client
     template_path = File.join(template_path, "#{file}.rb") unless file.nil?
     template_path
   end
-
-  def evaluate_template(template, path_or_url)
-    key_converter = proc do |key|
-      key = key.to_s
-      unless @options.skip_replace_underscore?
-        key.gsub!('_', ':')
-        key.gsub!('__', '::')
-      end
-      key
-    end
-
-    value_converter = proc do |v|
-      case v
-      when Hash, Array
-        v
-      else
-        v.to_s
-      end
-    end
-
-    template = Dslh.eval(template.read, {
-      :key_conv   => key_converter,
-      :value_conv => value_converter,
-      :scope_hook => proc {|scope|
-        define_template_func(scope, path_or_url)
-      },
-      :filename   => path_or_url,
-    })
-
-    @outputs_filter.fetch!(template)
-    @post_processing.fetch!(template)
-
-    return template
-  end
-
-  def devaluate_template(template)
-    exclude_key = proc do |k|
-      k = k.to_s.gsub('::', '__')
-      k !~ /\A[_a-z]\w+\Z/i and k !~ %r|\A/\S*\Z|
-    end
-
-    key_conv = proc do |k|
-      k = k.to_s
-
-      if k =~ %r|\A/\S*\Z|
-        proc do |v, nested|
-          if nested
-            "_path(#{k.inspect}) #{v}"
-          else
-            "_path #{k.inspect}, #{v}"
-          end
-        end
-      else
-        k.gsub(':', '_')
-        k.gsub('::', '__')
-      end
-    end
-
-    value_conv = proc do |v|
-      if v.kind_of?(String) and v =~ /\A(?:0|[1-9]\d*)\Z/
-        v.to_i
-      else
-        v
-      end
-    end
-
-    Dslh.deval(template, :key_conv => key_conv, :value_conv => value_conv, :exclude_key => exclude_key)
-  end
 end

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.16'
+KUMOGATA_TEMPLATE_VERSION = '0.0.17'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.5.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.10
+        version: 0.5.12
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Template for Kumogata.