dslh 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Zjg0MDVhNGE3MTM3YzdkZmE2ZjhhZDFiZWNkYzQzNDdlMzEzMzEzZg==
-  data.tar.gz: !binary |-
-    ODU1OWU1MmFiMDdjMjg3Mzc1OWY2MWRjMTE3NzE2Y2IwMzZhNTdlOQ==
+SHA1:
+  metadata.gz: 448c7a38e72cbc66a338013c5b594d15501675b5
+  data.tar.gz: 500c4decaa985b8682c123c8b2d58f0e82566d6a
 SHA512:
-  metadata.gz: !binary |-
-    Nzg3MTEzMjU3NzI1MGEyOGE1YTk3MWRmZTY1NDYzMGQ0NjAwNDQwNGM0OTc1
-    N2E5ZjViOTc1YzUyMmM5ZGNlZmQ1ODkyMGNhNTlmM2IyNTU3NTA3OTJmMzU4
-    NjM4ZjRlYjU4ZDMwOTVlMDY0NTYyNTllYWVmMTNlN2I0OTFiMDI=
-  data.tar.gz: !binary |-
-    MWUxNzFmMjk3Nzg2ZTcwYzZmZjljY2U1Yjk1OWRkZTJiMjk5NjhmZGU4YWE1
-    NjFlMDk2YmE4NDA5OTNkYWNhOWE5NDIyZDRkNzBjYzMwZTMyMmYzNjJhMDAy
-    NDNkMjIxNTg2YWQyNDUyNDNhOGU3NzBmMTNlMzExZTY3OGUzOWE=
+  metadata.gz: 61bdc03040f883968193fc63a7fbb4c9d7d1e9f6b1d26af00478b65266d659ab382687488940cf0d870f62d7da31323c499d704c35a9d6f0d5510d9efcc18c4e
+  data.tar.gz: 1137178d9f9b748198787b5747b63745cc09dba6baeee17836e56bb0f087dfa927e63d1894084cdcb57c8905d2ef2bbfa5f0aabde88ae7dbceeec9583af13f16

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/dslh.rb

@@ -1,27 +1,40 @@
 require 'dslh/version'
+require 'stringio'
 
 class Dslh
-  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
+  INDENT_SPACES = '  '
 
-    expr = nil
-    options ||= {}
+  class << self
+    def 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
 
-    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)"
+      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
 
-    self.new(options).eval(expr, &block)
-  end
+    def deval(hash, options = {}, &block)
+      if [hash, options].all? {|i| not i.kind_of?(Hash) }
+        raise TypeError, "wrong argument type #{options.class} (expected Hash)"
+      end
+
+      self.new(options).deval(hash, &block)
+    end
+  end # of class methods
 
   def initialize(options = {})
     @options = options.dup
@@ -49,6 +62,41 @@ class Dslh
     return retval
   end
 
+  def deval(hash)
+    buf = StringIO.new
+    deval0(hash, 0, buf)
+    buf.string
+  end
+
+  private
+
+  def deval0(hash, depth, buf)
+    hash.each do |key, value|
+      key_conv = @options[:key_conv] || @options[:conv]
+      value_conv = @options[:value_conv] || @options[:conv]
+
+      key = key_conv.call(key) if key_conv
+      indent = (INDENT_SPACES * depth)
+
+      buf.print(indent + key)
+
+      case value
+      when Hash
+        buf.puts(' do')
+        deval0(value, depth + 1, buf)
+        buf.puts(indent + 'end')
+      when Array
+        buf.puts ' ' + value.map {|v|
+          v = value_conv.call(v) if value_conv
+          v.inspect
+        }.join(', ')
+      else
+        value = value_conv.call(value) if value_conv
+        buf.puts ' ' + value.inspect
+      end
+    end
+  end
+
   class Scope
     def method_missing(method_name, *args, &block)
       key_conv = @__options__[:key_conv] || @__options__[:conv]
@@ -82,6 +130,6 @@ class Dslh
 
         return @__hash__
       end
-    end # of Scope
-  end
+    end
+  end # of Scope
 end

data/spec/dslh_spec.rb

@@ -323,4 +323,176 @@ describe Dslh do
 
     expect(h).to eq({:key1=>123, :key2=>{:key21=>123, :key22=>{:key221=>123}}})
   end
+
+  it 'should convert hash to dsl' do
+    h = {"glossary"=>
+          {"title"=>"example glossary",
+           "GlossDiv"=>
+            {"title"=>"S",
+             "GlossList"=>
+              {"GlossEntry"=>
+                {"ID"=>"SGML",
+                 "SortAs"=>"SGML",
+                 "GlossTerm"=>"Standard Generalized Markup Language",
+                 "Acronym"=>"SGML",
+                 "Abbrev"=>"ISO 8879:1986",
+                 "GlossDef"=>
+                  {"para"=>
+                    "A meta-markup language, used to create markup languages such as DocBook.",
+                   "GlossSeeAlso"=>["GML", "XML"]},
+                 "GlossSee"=>"markup"}}}}}
+
+    dsl = Dslh.deval(h)
+    expect(dsl).to eq(<<-EOS)
+glossary do
+  title "example glossary"
+  GlossDiv do
+    title "S"
+    GlossList do
+      GlossEntry do
+        ID "SGML"
+        SortAs "SGML"
+        GlossTerm "Standard Generalized Markup Language"
+        Acronym "SGML"
+        Abbrev "ISO 8879:1986"
+        GlossDef do
+          para "A meta-markup language, used to create markup languages such as DocBook."
+          GlossSeeAlso "GML", "XML"
+        end
+        GlossSee "markup"
+      end
+    end
+  end
+end
+    EOS
+  end
+
+  it 'should convert hash to dsl with conv' do
+    h = {"glossary"=>
+          {"title"=>"example glossary",
+           "GlossDiv"=>
+            {"title"=>"S",
+             "GlossList"=>
+              {"GlossEntry"=>
+                {"ID"=>"SGML",
+                 "SortAs"=>"SGML",
+                 "GlossTerm"=>"Standard Generalized Markup Language",
+                 "Acronym"=>"SGML",
+                 "Abbrev"=>"ISO 8879:1986",
+                 "GlossDef"=>
+                  {"para"=>
+                    "A meta-markup language, used to create markup languages such as DocBook.",
+                   "GlossSeeAlso"=>["GML", "XML"]},
+                 "GlossSee"=>"markup"}}}}}
+
+    dsl = Dslh.deval(h, :conv => proc {|i| i.to_s.upcase })
+    expect(dsl).to eq(<<-EOS)
+GLOSSARY do
+  TITLE "EXAMPLE GLOSSARY"
+  GLOSSDIV do
+    TITLE "S"
+    GLOSSLIST do
+      GLOSSENTRY do
+        ID "SGML"
+        SORTAS "SGML"
+        GLOSSTERM "STANDARD GENERALIZED MARKUP LANGUAGE"
+        ACRONYM "SGML"
+        ABBREV "ISO 8879:1986"
+        GLOSSDEF do
+          PARA "A META-MARKUP LANGUAGE, USED TO CREATE MARKUP LANGUAGES SUCH AS DOCBOOK."
+          GLOSSSEEALSO "GML", "XML"
+        end
+        GLOSSSEE "MARKUP"
+      end
+    end
+  end
+end
+    EOS
+  end
+
+  it 'should convert hash to dsl with key_conv' do
+    h = {"glossary"=>
+          {"title"=>"example glossary",
+           "GlossDiv"=>
+            {"title"=>"S",
+             "GlossList"=>
+              {"GlossEntry"=>
+                {"ID"=>"SGML",
+                 "SortAs"=>"SGML",
+                 "GlossTerm"=>"Standard Generalized Markup Language",
+                 "Acronym"=>"SGML",
+                 "Abbrev"=>"ISO 8879:1986",
+                 "GlossDef"=>
+                  {"para"=>
+                    "A meta-markup language, used to create markup languages such as DocBook.",
+                   "GlossSeeAlso"=>["GML", "XML"]},
+                 "GlossSee"=>"markup"}}}}}
+
+    dsl = Dslh.deval(h, :key_conv => proc {|i| i.to_s.upcase })
+    expect(dsl).to eq(<<-EOS)
+GLOSSARY do
+  TITLE "example glossary"
+  GLOSSDIV do
+    TITLE "S"
+    GLOSSLIST do
+      GLOSSENTRY do
+        ID "SGML"
+        SORTAS "SGML"
+        GLOSSTERM "Standard Generalized Markup Language"
+        ACRONYM "SGML"
+        ABBREV "ISO 8879:1986"
+        GLOSSDEF do
+          PARA "A meta-markup language, used to create markup languages such as DocBook."
+          GLOSSSEEALSO "GML", "XML"
+        end
+        GLOSSSEE "markup"
+      end
+    end
+  end
+end
+    EOS
+  end
+
+  it 'should convert hash to dsl with value_conv' do
+    h = {"glossary"=>
+          {"title"=>"example glossary",
+           "GlossDiv"=>
+            {"title"=>"S",
+             "GlossList"=>
+              {"GlossEntry"=>
+                {"ID"=>"SGML",
+                 "SortAs"=>"SGML",
+                 "GlossTerm"=>"Standard Generalized Markup Language",
+                 "Acronym"=>"SGML",
+                 "Abbrev"=>"ISO 8879:1986",
+                 "GlossDef"=>
+                  {"para"=>
+                    "A meta-markup language, used to create markup languages such as DocBook.",
+                   "GlossSeeAlso"=>["GML", "XML"]},
+                 "GlossSee"=>"markup"}}}}}
+
+    dsl = Dslh.deval(h, :value_conv => proc {|i| i.to_s.upcase })
+    expect(dsl).to eq(<<-EOS)
+glossary do
+  title "EXAMPLE GLOSSARY"
+  GlossDiv do
+    title "S"
+    GlossList do
+      GlossEntry do
+        ID "SGML"
+        SortAs "SGML"
+        GlossTerm "STANDARD GENERALIZED MARKUP LANGUAGE"
+        Acronym "SGML"
+        Abbrev "ISO 8879:1986"
+        GlossDef do
+          para "A META-MARKUP LANGUAGE, USED TO CREATE MARKUP LANGUAGES SUCH AS DOCBOOK."
+          GlossSeeAlso "GML", "XML"
+        end
+        GlossSee "MARKUP"
+      end
+    end
+  end
+end
+    EOS
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,42 +14,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: It define Hash as a DSL.
@@ -80,20 +80,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: It define Hash as a DSL.
 test_files:
 - spec/dslh_spec.rb
 - spec/spec_helper.rb
+has_rdoc: