dslh 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041bb7cf886d6a16fb6be02ba6ef356bf31810c7
-  data.tar.gz: b96cb8ee97322d53745dda628eca4e8fe6ace944
+  metadata.gz: bf9e9e4937fa96b3e6896e280e24d44b63622287
+  data.tar.gz: ac2fe663b7d7c66d0a7530d6a77f57019586a525
 SHA512:
-  metadata.gz: 6753cfa8efa4438bcdfb2193bb827c4268c65bef24f302d2494c759047de84442d3b318dc79871e013214641aca7e19e99e0c102e9256c53eb47fd8dab069d0a
-  data.tar.gz: 7d43a7ca6c3633460e47e5251dbadcb7336f7f6e342965bda4404737c2426fc9fe17125d718b221de5b33860bd6c36c706670282da265e5dfd46c0fcb93b8e8c
+  metadata.gz: a58ffa0d678c4831fd55c47c27a24dea2b8f28e59aa2b5cb0a0653fe7f7ed1c76b26065f418024dc676e59ef8f3d7a6a3e2e07836b4d2a3514a9e8b5ba07422f
+  data.tar.gz: 29ab30743682fd4820dc144e5e7b7629dcd2a7bf3586f0b785302b6f8c927933a2b6830cbacb2413fc4f2df78748781d680f438201f38e2f7acd2dbe258b441b

data/README.md

@@ -3,7 +3,7 @@
 It define Hash as a DSL.
 
 [![Gem Version](https://badge.fury.io/rb/dslh.png)](http://badge.fury.io/rb/dslh)
-[![Build Status](https://drone.io/bitbucket.org/winebarrel/dslh/status.png)](https://drone.io/bitbucket.org/winebarrel/dslh/latest)
+[![Build Status](https://drone.io/github.com/winebarrel/dslh/status.png)](https://drone.io/github.com/winebarrel/dslh/latest)
 
 ## Installation
 

data/dslh.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['sugawara@cookpad.com']
   spec.summary       = %q{It define Hash as a DSL.}
   spec.description   = %q{It define Hash as a DSL.}
-  spec.homepage      = 'https://bitbucket.org/winebarrel/dslh'
+  spec.homepage      = 'https://github.com/winebarrel/dslh'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/dslh.rb

@@ -39,6 +39,8 @@ class Dslh
 
   def initialize(options = {})
     @options = options.dup
+    @options[:key_conv] ||= @options[:conv]
+    @options[:value_conv] ||= @options[:conv]
   end
 
   def eval(expr = nil, &block)
@@ -74,11 +76,11 @@ class Dslh
   def deval0(hash, depth, buf)
     indent = (INDENT_SPACES * depth)
     next_indent = (INDENT_SPACES * (depth + 1))
-    key_conv = @options[:key_conv] || @options[:conv]
-    value_conv = @options[:value_conv] || @options[:conv]
+    key_conv = @options[:key_conv]
+    value_conv = @options[:value_conv]
     nested = false
 
-    if exclude_key?(key_conv, hash.keys)
+    if exclude_key?(hash.keys)
       buf.puts('(' + ("\n" + hash.pretty_inspect.strip).gsub("\n", "\n" + indent) + ')')
       return
     end
@@ -87,7 +89,7 @@ class Dslh
       value_proc = proc do |value_buf|
         case value
         when Hash
-          if exclude_key?(key_conv, value.keys)
+          if exclude_key?(value.keys)
             value_buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
           else
             nested = true
@@ -155,12 +157,13 @@ class Dslh
     end
   end
 
-  def exclude_key?(key_conv, keys)
-    exclude_key = @options[:exclude_key] || proc {|k| k.to_s !~ /\A[_a-z]\w+\Z/i }
+  def exclude_key?(keys)
+    key_conv = @options[:key_conv]
 
-    if not @options.has_key?(:exclude_key) and key_conv
-      keys = keys.map {|k| key_conv.call(k) }
-    end
+    exclude_key = @options[:exclude_key] || proc {|k|
+      k = key_conv.call(k) if key_conv
+      k.to_s !~ /\A[_a-z]\w+\Z/i
+    }
 
     keys.any? {|k| exclude_key.call(k) }
   end
@@ -171,8 +174,8 @@ class Dslh
     end
 
     def method_missing(method_name, *args, &block)
-      key_conv = @__options__[:key_conv] || @__options__[:conv]
-      value_conv = @__options__[:value_conv] || @__options__[:conv]
+      key_conv = @__options__[:key_conv]
+      value_conv = @__options__[:value_conv]
       nested_hash = ScopeBlock.nest(binding, 'block')
       method_name = key_conv.call(method_name) if key_conv
 

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ files:
 - spec/Drupal_Multi_AZ.template
 - spec/dslh_spec.rb
 - spec/spec_helper.rb
-homepage: https://bitbucket.org/winebarrel/dslh
+homepage: https://github.com/winebarrel/dslh
 licenses:
 - MIT
 metadata: {}