dslh 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 069a25cadfe07e5fb94b13999c621805b209934f
-  data.tar.gz: 61352ba15ae2c64775f6ee6498142cf4343f3004
+  metadata.gz: eb022da4335f23ff59901ac5652400831dd13c6f
+  data.tar.gz: 1e257ec574e65f1d24409001864aed67be2c8d84
 SHA512:
-  metadata.gz: cee130b7d63b7288c7b4db402117562d290fc1d29dbf9a94a494d7f27d7ef992685df441b8510a050b40b3f3f6db66a9766cc40262d3de617b239895c391acbf
-  data.tar.gz: 2d76120513c6ce2b5fdff0236b1c3e4160d548f8523c30d61ed70c623c9611f640a8983b47639150336da8a0d3632fb590237db5ef4d7cd350eb5b7f2ca73437
+  metadata.gz: 90d4d8d730e57bab79f1e438996f6d0e1de4d7c5a5701b0affb0bb9da9ecc056633426d8c204d48f00ea7029ac2ee725c42673761161a6fc5493f558658aee57
+  data.tar.gz: 78e73bcd8b3686b8dbfc6d8dff8a0e9d56a0f53d77730d991fef01270bde4b0ac5a7ed0a5c432d631e3115b2d8df1fb1f50dac79ff689d3c13a158c8ca08ac4a

data/lib/dslh.rb

@@ -38,7 +38,10 @@ class Dslh
   end # of class methods
 
   def initialize(options = {})
-    @options = options.dup
+    @options = {
+      :time_inspecter => method(:inspect_time)
+    }.merge(options)
+
     @options[:key_conv] ||= (@options[:conv] || proc {|i| i.to_s })
     @options[:value_conv] ||= @options[:conv]
   end
@@ -176,7 +179,13 @@ class Dslh
       end
     else
       value = value_conv.call(value) if value_conv
-      value_buf.puts(' ' + value.inspect)
+
+      if @options[:time_inspecter] and value.kind_of?(Time)
+        value = @options[:time_inspecter].call(value)
+        value_buf.puts(' ' + value)
+      else
+        value_buf.puts(' ' + value.inspect)
+      end
     end
 
     return nested
@@ -193,6 +202,14 @@ class Dslh
     keys.any? {|k| exclude_key.call(k) }
   end
 
+  def inspect_time(time)
+    if Time.respond_to?(:parse)
+      "Time.parse(#{time.to_s.inspect})"
+    else
+      "Time.at(#{time.tv_sec}, #{time.tv_usec})"
+    end
+  end
+
   class Scope
     def _(key = nil, &block)
       nested_hash = ScopeBlock.nest(binding, 'block')

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/dslh_spec.rb

@@ -2531,6 +2531,18 @@ end
     )
   end
 
+  it 'include time"' do
+    h = Dslh.eval do
+      key1 'value'
+      key2 Time.parse('2016/05/21 00:00 UTC')
+    end
+
+    expect(h).to eq(
+      {"key1"=>"value",
+       "key2"=>Time.parse('2016/05/21 00:00 UTC')}
+    )
+  end
+
   it 'should convert hash to dsl (symbol key)' do
     h = {:glossary=>
           {:title=>"example glossary",
@@ -2570,6 +2582,54 @@ glossary do
       end
     end
   end
+end
+    EOS
+  end
+
+  it 'should convert hash to dsl (inclute Time)' do
+    h = {:glossary=>
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')}}
+
+    parse_method = Time.method(:parse)
+    time_cc = (class << Time; self; end)
+    time_cc.send(:undef_method, :parse)
+
+    dsl = Dslh.deval(h)
+    expect(dsl).to eq(<<-EOS)
+glossary do
+  title "example glossary"
+  date Time.at(1463788800, 0)
+end
+    EOS
+
+    time_cc.send(:define_method, :parse, &parse_method)
+  end
+
+  it 'should convert hash to dsl (inclute Time / use Time#parse)' do
+    h = {:glossary=>
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')}}
+
+    dsl = Dslh.deval(h)
+    expect(dsl).to eq(<<-EOS)
+glossary do
+  title "example glossary"
+  date Time.parse("2016-05-21 00:00:00 UTC")
+end
+    EOS
+  end
+
+  it 'should convert hash to dsl (inclute Time / pass time_inspecter)' do
+    h = {:glossary=>
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')}}
+
+    dsl = Dslh.deval(h, :time_inspecter => proc {|i| i.to_s.inspect })
+    expect(dsl).to eq(<<-EOS)
+glossary do
+  title "example glossary"
+  date "2016-05-21 00:00:00 UTC"
 end
     EOS
   end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'dslh'
 require 'json'
+require 'time'

metadata

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