dslh 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee7c54ea949ae371f63dccec99e030e724782cf
-  data.tar.gz: 2600505830a26c4d8679dcba4e46590cec3453e6
+  metadata.gz: 22c5f3ef5ed8d62be6f01f66185d03c69746a21f
+  data.tar.gz: 07f1988d59dd1f91dde43e9dcc7b9412122dc3b0
 SHA512:
-  metadata.gz: 9ae3e9132526fb7f9755bfd7014563bd719e081fb936cfa815f706039b90a1d0ad58e2b02a2e3ec1cb7e77e5b00397608296d5781c4d1a4ba23de021fab6458e
-  data.tar.gz: 6e7893c3bd777f65989828bd8f8d262e5a4e25baef78ddb9bda1ab23ea832f92193482a66f50bfcb2c0c01b766e5994ec570dd8c5b4e848ad91901e26e61edaf
+  metadata.gz: 7c6d12ec8eed101cd59bf56c8bf452086c224196428f38275769bc89ef688c3db64f120d907b3d9737542e379c4ec33bac13dd512a9b5c3e301aab0d38637090
+  data.tar.gz: 4278f2189e6ca73c321b5d341835b4e6e0b645f337ca288ad016481bf90f241f27fe2129fb207866c08c61b5f4b9d85490bc3ec739258373c8d1b90415b2ca68

data/lib/dslh.rb

@@ -76,10 +76,9 @@ class Dslh
     next_indent = (INDENT_SPACES * (depth + 1))
     key_conv = @options[:key_conv] || @options[:conv]
     value_conv = @options[:value_conv] || @options[:conv]
-    exclude_key = @options[:exclude_key] || proc {|k| k.to_s !~ /\A[_a-z]\w+\Z/i }
 
-    if exclude_key and (key_conv ? hash.keys.map {|k| key_conv.call(k) } : hash.keys).any? {|k| exclude_key.call(k) }
-      buf.puts '(' + ("\n" + hash.pretty_inspect.strip).gsub("\n", "\n" + indent) + ')'
+    if exclude_key?(key_conv, hash.keys)
+      buf.puts('(' + ("\n" + hash.pretty_inspect.strip).gsub("\n", "\n" + indent) + ')')
       return
     end
 
@@ -89,8 +88,8 @@ class Dslh
 
       case value
       when Hash
-        if exclude_key and (key_conv ? value.keys.map {|k| key_conv.call(k) } : value.keys).any? {|k| exclude_key.call(k) }
-          buf.puts '(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')'
+        if exclude_key?(key_conv, value.keys)
+          buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
         else
           buf.puts(' do')
           deval0(value, depth + 1, buf)
@@ -98,9 +97,25 @@ class Dslh
         end
       when Array
         if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
-          buf.puts '(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')'
+          buf.puts(' [')
+
+          value.each_with_index do |v, i|
+            if v.kind_of?(Hash)
+              buf.puts(next_indent + '_{')
+              deval0(v, depth + 2, buf)
+              buf.print(next_indent + '}')
+            else
+              buf.print(next_indent + v.pretty_inspect.strip.gsub("\n", "\n" + next_indent))
+            end
+
+            buf.puts(i < (value.length - 1) ? ',' : '')
+          end
+
+          buf.puts(indent + ']')
+        elsif value.length == 1
+          buf.puts(' ' + value.inspect)
         else
-          buf.puts ' ' + value.map {|v|
+          buf.puts(' ' + value.map {|v|
             v = value_conv.call(v) if value_conv
 
             if v.kind_of?(Hash)
@@ -108,16 +123,32 @@ class Dslh
             else
               v.inspect
             end
-          }.join(', ')
+          }.join(', '))
         end
       else
         value = value_conv.call(value) if value_conv
-        buf.puts ' ' + value.inspect
+        buf.puts(' ' + value.inspect)
       end
     end
   end
 
+  def exclude_key?(key_conv, keys)
+    exclude_key = @options[:exclude_key] || proc {|k| k.to_s !~ /\A[_a-z]\w+\Z/i }
+    exclude_key and (key_conv ? keys.map {|k| key_conv.call(k) } : keys).any? {|k| exclude_key.call(k) }
+  end
+
   class Scope
+    def _(&block)
+      if block
+        hash_orig = @__hash__
+        @__hash__ = {}
+        self.instance_eval(&block)
+        nested_hash = @__hash__
+        @__hash__ = hash_orig
+        return nested_hash
+      end
+    end
+
     def method_missing(method_name, *args, &block)
       key_conv = @__options__[:key_conv] || @__options__[:conv]
       value_conv = @__options__[:value_conv] || @__options__[:conv]

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler