simple-config 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c903999f63fda86117d56cde5c29b21602a2ae
-  data.tar.gz: 8cdc62b5eba092b4db60ab1c359c874c6f9b211a
+  metadata.gz: dce3c2ab92ee77d32c17b1c3abe116e4d4cba0f9
+  data.tar.gz: 9b254b3f942de43f03ff643bac88fcd703357d82
 SHA512:
-  metadata.gz: 756bdf86272c60c1caf23c76559db8f8d3217b3ac66ce7c0cb5e1b2057414efe436466a2a3a5f3a542518354d075bf5a47e97c6ca0a7c0e13b0be49553c7e894
-  data.tar.gz: ef7914457cdcaf8f12e2bc8fd48f51f5dfd0185daafe19ce7bfc71e34c9e748c6e3b7d1709eaf9af292ebac53a010e7facc56736ee0e9ad966d2fdfa8d68d7b5
+  metadata.gz: 0634a4869c480a9eb2e72cec6e2bba51f1855b2bc3b906e2c474200fe40fe45c7f89557e4787d1bea720cb020722dfca906efe3b6a057f48ee0d5f63ac86c51a
+  data.tar.gz: 6e75f0a78aac472b5f670347c96dd9844a4dc04548105a9ff7444ad7fb7f7d98d01322c490341b4ba5bfbb78336a9f0256ee48b34bf9276a8d37f0fd21ccecc2

data/lib/simple-config.rb

@@ -2,27 +2,23 @@
 
 # file: simple-config.rb
 
-require 'line-tree'
-require 'rxfhelper'
+require 'kvx'
 
 
-class SimpleConfig
+class SimpleConfig < Kvx
   
   attr_reader :to_h, :to_s
   
-  def initialize(x=nil, attributes: {})    
+  def initialize(x, attributes: {})    
 
-    @header = false
-    @attributes = attributes
-    m = {:String => :parse_to_h, :Hash => :write, :SimpleConfig => :passthru}
+    if x.is_a? SimpleConfig then
+      @to_h = x.to_h
+    elsif x
+      super(x, attributes: attributes)
+    end
     
-    method(m[x.class.to_s.to_sym]).call(x) if x
   end
-  
-  def parse(t=nil)
-    parse_to_h(t || @to_s)
-  end  
-                        
+                          
   def write(h=nil, header: @header)
     
     @to_h = h || @to_h
@@ -38,122 +34,13 @@ class SimpleConfig
     
     @to_s = header + scan_to_s(@to_h)
 
-  end
-  
-  def to_xml(options={pretty: true})
-  
-    make_xml(@to_h)
-        
-    a = ['simpleconfig', @attributes, '', *make_xml(@to_h)]
-    Rexle.new(a).xml(options)
-
-  end
+  end  
      
   private
   
-  def make_xml(h)
-
-    h.map do |name, x|
-
-      value = x.is_a?(Hash) ? make_xml(x) : x
-      [name, {}, *value]
-    end
-  end
-  
-
   def parse_to_h(s)
-
-    raw_txt, _ = RXFHelper.read(s)
-    
-    # does the raw_txt contain header information? 
-    a = s.strip.lines
-    
-    txt = if a[0][/^<\?simple-?config /] then
-      raw_header = a.shift 
-      @attributes.merge! type:  raw_header[/type=["']([^"']+)/,1]
-      @header = true
-      a.join
-    else
-      raw_txt
-    end
-    
-    scan_to_h(txt)
-  end
-  
-  def passthru(x)
-    initialize x.to_h
-  end
-  
-  def pretty_print(a, indent='')
-    
-    a.map {|x|  (x.is_a?(String) or x.nil?) ? x.to_s : pretty_print(x, indent + '  ')}\
-                                                          .join("\n" + indent)
-  end
-  
-  
-  def scan_to_h(txt)
-
-    raw_a = LineTree.new(txt.gsub(/(^-*$)|(#.*)/,'').strip, 
-                                              ignore_blank_lines: false).to_a
-    
-    # if there are any orphan lines which aren't nested underneath a 
-    #   label, they will be fixed using the following statement
-    
-    a = raw_a.chunk {|x| x[0][/^\w+:|.*/]}.inject([]) do |r,y|
-      if r.last and !y.first[/\w+:/] then
-        r.last << y.last[-1]
-      else
-        r << y.last[-1]
-      end
-      r
-    end
-    
-
-    @to_h = a.inject({}) do |r, line|
-           
-      s = line.shift
-      
-
-      if line.join.length > 0 then 
-
-        r2 = if line[0][0][/^\w+: /] then
-
-          scan_to_h(line.join("\n"))
-          
-        else
-
-          desc = pretty_print(line).split(/\n(?=\w+: )/)         
-
-          txt2, remaining = desc
-
-          h = txt2.lines.inject([]) do |r, x| 
-            x.chomp!
-            x.length > 0 ?  r << x : r
-          end
-          
-          r3 = {description: txt2, items: h}
-
-          if remaining then
-
-            r3.merge!(scan_to_h remaining + "\n ")
-          end
-          
-          r3
-        end
-
-        r.merge({s[/[^:]+/].to_sym => r2})
-        
-      else
-        
-        value, name = s.split(': ',2).reverse
-        name ||= 'description'          
-        
-        r.merge({name.to_sym => value.to_s})
-      end     
-
-    end    
-
-  end   
+    super(s, header_pattern: %r(^<\?simple-?config ))
+  end    
 
   def scan_to_s(h, indent='')    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-config
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   GOyi72Dr1XTvfW8Vje543EzUeJP4EjrtsoS0tbx5hs2J8Ey8zv39aU4aNyM1h0Fv
   1BzvTQ2PY7IAEQ==
   -----END CERTIFICATE-----
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: line-tree
+  name: kvx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.2
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -83,5 +83,6 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: simple-config
+summary: Simple-config makes it convenient to read or write a config file as simple
+  as possible
 test_files: []