dslh 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa7072cea6f58fcbe9e341e3cfe3e6569ac7754
-  data.tar.gz: 9c35be524118f1a0a53ddf349688fdf6780cdeb7
+  metadata.gz: 7390c52a2f651e8ae19478c3b499fd156bfe9ce8
+  data.tar.gz: a417585a38c5a06e1cdfff655c60edbe5f50cb0e
 SHA512:
-  metadata.gz: 32898eaf5f6a60ce2eaa6c5e2e87a07e80ac389c6a62b163cd947fc3be03fc8797195c4770c5f93479d909020dbe6db635f10b715cfe725a92405a924fca5e5a
-  data.tar.gz: 86d4481731ac1549e55bd1d803dffe825258c7dcb590ffcc844f98aa38f27ad8111d4fadd558a2eafd80af0a480e3fdc0af4505123545eeaa8f278434c020de6
+  metadata.gz: 9fd88853d1941b413207e4b5616e6a20f38181f805e8a9038cfefcc51f993162318d368440c8941390abec7354f5be41a5414a01eba5075928bb04b17b384ad2
+  data.tar.gz: dae0498effdc33b5086711927e6d786433ac94dbe3febab0693f9d0cc8c70d52ad4a2f34ad60daadb38b042fe3a7dbab4666b367a284f0b04b7993ea18fc27bd

data/lib/dslh.rb

@@ -146,7 +146,7 @@ class Dslh
       if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
         nested = true
 
-        if not @options[:dump_old_hash_array_format] and value.all? {|i| i.kind_of?(Hash) }
+        if not @options[:dump_old_hash_array_format] and value.all? {|i| i.kind_of?(Hash) and not exclude_keys?(i.keys) }
           value_buf.puts(@options[:use_braces_instead_of_do_end] ? ' {|*|' : ' do |*|')
 
           value.each_with_index do |v, i|
@@ -172,9 +172,13 @@ class Dslh
           value.each_with_index do |v, i|
             case v
             when Hash
-              value_buf.puts(next_indent + '_{')
-              deval0(v, depth + 2, value_buf)
-              value_buf.print(next_indent + '}')
+              if exclude_keys?(v.keys)
+                value_buf.print(INDENT_SPACES * (depth + 1) + v.pretty_inspect.strip)
+              else
+                value_buf.puts(next_indent + '_{')
+                deval0(v, depth + 2, value_buf)
+                value_buf.print(next_indent + '}')
+              end
             when Array
               value_buf.print(next_indent.slice(0...-1))
               value_proc(v, depth + 1, value_buf, false)

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/spec/dslh_spec.rb

@@ -2680,6 +2680,58 @@ end
     EOS
   end
 
+  it 'should convert hash to dsl (include hash array with exclude_key)' do
+    exclude_key = proc do |k|
+      k == :title
+    end
+
+    h = {:glossary=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC').to_s},
+          {:title=>"example glossary2",
+           :date=>Time.parse('2016/05/21 00:01 UTC').to_s}],
+         :glossary2=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC').to_s}]}
+
+    dsl = Dslh.deval(h, :exclude_key => exclude_key)
+    expect(dsl).to eq(<<-EOS)
+glossary [
+  {:title=>"example glossary", :date=>"2016-05-21 00:00:00 UTC"},
+  {:title=>"example glossary2", :date=>"2016-05-21 00:01:00 UTC"}
+]
+glossary2 [
+  {:title=>"example glossary", :date=>"2016-05-21 00:00:00 UTC"}
+]
+    EOS
+  end
+
+  it 'should convert hash to dsl (include hash array with exclude_key and dump_old_hash_array_format)' do
+    exclude_key = proc do |k|
+      k == :title
+    end
+
+    h = {:glossary=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC').to_s},
+          {:title=>"example glossary2",
+           :date=>Time.parse('2016/05/21 00:01 UTC').to_s}],
+         :glossary2=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC').to_s}]}
+
+    dsl = Dslh.deval(h, :exclude_key => exclude_key)
+    expect(dsl).to eq(<<-EOS)
+glossary [
+  {:title=>"example glossary", :date=>"2016-05-21 00:00:00 UTC"},
+  {:title=>"example glossary2", :date=>"2016-05-21 00:01:00 UTC"}
+]
+glossary2 [
+  {:title=>"example glossary", :date=>"2016-05-21 00:00:00 UTC"}
+]
+    EOS
+  end
+
   it 'should convert dsl to hash (include hash array)' do
     h = {:glossary=>[
           {:title=>"example glossary",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler