dslh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzE1YzAxOTU1N2I1NTE1NGZmMjhlZGZiZWViM2QzNTMzZGNiNWZkNg==
+    N2Q4NDNjNGQ5YWEzYzA4NDVmNTU5Mzg5OTdjODk0MmFiNGFiMThiYQ==
   data.tar.gz: !binary |-
-    ODdlYWE3NGZlZjQ3NDVkYjBjYzQyZGFjMzdiMGYwMDdmMGJhZDY0OQ==
+    MTU3ZDFkYTNkNTM3ZjU1NjRmZTA2NzI5YWY3YjdhYjE4NDBlOWRiOA==
 SHA512:
   metadata.gz: !binary |-
-    ZjUzMzgwNzAxZGVhNzIxYjEyOWI4ZmUwNzdmZmEyOWMyMWE0ZmU3OGQxMzI4
-    Y2EzMGMxMjc5MmQwOWFjNTdmZGZkM2ZmMzZkMmRkNmQxNTI3NDkzNzRiOTY5
-    YjRiNDJhNGI0ODdhNjc1OGNjNGYwNjlhODExMjg2ODBkZTFiMmI=
+    MTJmYTEzZGI2NjViNmY0N2QwM2U4MmQ5Y2Q5ZDE5OTQ1MzAwOTdmNGYxYWRi
+    M2NlOTcyM2RjMmQ0MTFiMDExMjM5ZDFjMjM1NzY5ZTQwMDk1M2Y3YTJhNzMw
+    YzAxOTBhNGI4NGY5Y2RmYmYxNGUyYzJhOTFkM2QxNzVkM2NkMDk=
   data.tar.gz: !binary |-
-    Y2I2NTcxMTdkZmY3NmMyM2RiMDViM2YzNDFhYTM5YTIyYmNjMzczMTY4M2Ew
-    NzVlN2M2Njk3OWYzYmJhZDg2N2ZjMWQ3NDlkN2U5MDc2MGQzMWIxZWNmNzVi
-    YWM1YjZlNzRlMTcxYzY1MzFmNDEwMjYyYmEzNmIxYWM4NDQxZTc=
+    NWZkOGU3MDM3MTY0M2U2OTQ1OTFmYTU4YjNhNTdjNDI0OWI0Yjg2YmNjNDcx
+    NTdjMzE0NjE5NDA2NjAxMzI5NTViNzY0ODM2ZGJkYjU5MDc3NDgyYTg2NmYw
+    MThlMjBmYjJiYjZmNGUwZTVlNDM2M2NlZTIzNzdiNDc0YmQ0Zjc=

data/lib/dslh.rb

@@ -1,40 +1,77 @@
 require 'dslh/version'
 
 class Dslh
-  def self.eval(options = {}, &block)
-    self.new(options).eval(&block)
+  def self.eval(expr_or_options = nil, options = nil, &block)
+    if options and not options.kind_of?(Hash)
+      raise TypeError, "wrong argument type #{options.class} (expected Hash)"
+    end
+
+    expr = nil
+    options ||= {}
+
+    if expr_or_options
+      case expr_or_options
+      when String
+        expr = expr_or_options
+      when Hash
+        options.update(expr_or_options)
+      else
+        raise TypeError, "wrong argument type #{expr_or_options.class} (expected String or Hash)"
+      end
+    end
+
+    self.new(options).eval(expr, &block)
   end
 
   def initialize(options = {})
-    @options = options
-    @hash = {}
+    @options = options.dup
   end
 
-  def eval(&block)
-    self.instance_eval(&block)
-    return @hash
-  end
+  def eval(expr = nil, &block)
+    retval = {}
+    scope = Scope.new
+    scope.instance_variable_set(:@__options__, @options)
+    scope.instance_variable_set(:@__hash__, retval)
 
-  def method_missing(method_name, *args, &block)
-    key_conv = @options[:key_conv] || @options[:conv]
-    value_conv = @options[:value_conv] || @options[:conv]
+    if expr
+      eval_args = [expr]
 
-    nested_hash = block ? self.class.eval(@options, &block) : nil
-    method_name = key_conv.call(method_name) if key_conv
+      [:filename, :lineno].each do |k|
+        eval_args << @options[k] if @options[k]
+      end
 
-    if args.empty?
-      @hash[method_name] = nested_hash
+      scope.instance_eval(*eval_args)
     else
-      value = args.length > 1 ? args : args[0]
-      value = value_conv.call(value) if value_conv
+      scope.instance_eval(&block)
+    end
 
-      if nested_hash
-        @hash[method_name] = {
+    return retval
+  end
+
+  class Scope
+    def method_missing(method_name, *args, &block)
+      key_conv = @__options__[:key_conv] || @__options__[:conv]
+      value_conv = @__options__[:value_conv] || @__options__[:conv]
+
+      nested_hash = block ? Dslh.eval(@__options__, &block) : nil
+      method_name = key_conv.call(method_name) if key_conv
+
+      if args.empty?
+        @__hash__[method_name] = nested_hash
+      else
+        value = args.length > 1 ? args : args[0]
+        value = value_conv.call(value) if value_conv
+
+        if nested_hash
+          @__hash__[method_name] = {
           value => nested_hash
         }
-      else
-        @hash[method_name] = value
+        else
+          @__hash__[method_name] = value
+        end
+
+        return @__hash__
       end
-    end
+    end # of Scope
   end
 end

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/dslh_spec.rb

@@ -194,4 +194,69 @@ describe Dslh do
     )
   end
 
+  it 'should evalute string' do
+    expr = <<-EOS
+      key1 'value'
+      key2 100
+
+      key3 do
+        key31 "value31" do
+          key311 100
+          key312 '200'
+        end
+
+        key32 do
+          key321 "value321" do
+            key3211 'XXX'
+            key3212 :XXX
+          end
+          key322 300
+        end
+      end
+    EOS
+
+    h = Dslh.eval(expr)
+
+    expect(h).to eq(
+      {:key1=>"value",
+       :key2=>100,
+       :key3=>
+        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
+         :key32=>
+          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+    )
+  end
+
+  it 'should evalute string with filename/lineno' do
+    expr = <<-EOS
+      key1 'value'
+      key2 100
+
+      key3 do
+        key31 "value31" do
+          key311 100
+          key312 '200'
+        end
+
+        key32 do
+          key321 "value321" do
+            key3211 'XXX'
+            key3212 :XXX
+          end
+          key322 300
+        end
+      end
+    EOS
+
+    h = Dslh.eval(expr, :filename => 'my.rb', :lineno => 100)
+
+    expect(h).to eq(
+      {:key1=>"value",
+       :key2=>100,
+       :key3=>
+        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
+         :key32=>
+          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara