simple-config 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8109bab781fdf4a5494770dfe9991d0105182d1b
-  data.tar.gz: 42e44175a2172282ec114405797f9887fc6d98ec
+  metadata.gz: a97c9005bf678e8a459dcbe845bc31126def3a17
+  data.tar.gz: 3eb5ec3dd8ed8be990ca2780a0e2b1d7d5df90f2
 SHA512:
-  metadata.gz: 7df19a144f1c934f52d292064a76efff1436a9e619149c9f5b542a8516b5e0be890ea4f83dba537e7cc9fcf42e8276e92acceb8e4eb50cf2123b2d688bbc2b55
-  data.tar.gz: 96de7d1c081467272129c4f6cd787118866e210360a3c2ce2a2425aca9e986d92b7ae13e17a51854fbc74987bfd388037007c37c817fb540906a0cb6f9930c93
+  metadata.gz: c97cf4ae4f67be93506335b04b16956c25da41d84aca2a7327dec5d1b1cc59355837d78d92b55676a68f1d4d831a89e90dae99fad3875a8149cca9038d9ad9ab
+  data.tar.gz: 6d71f3c284926189843faadddd6ecbe2f5dfae726ab398d0059e17356c5a6ca5c9f44ded28319bb8acb74a4df549d63e5cc9e2178038bcbb23cff31f271c989d

data/lib/simple-config.rb

@@ -5,24 +5,58 @@
 require 'line-tree'
 
 class SimpleConfig
+  
+  attr_reader :to_h, :to_s
+  
+  def initialize(x=nil)    
+    m = {:String => :scan_to_h, :Hash => :scan_to_s}
+    method(m[x.class.to_s.to_sym]).call(x) if x
+  end
+  
+  def parse(t=nil)
+    scan_to_h(t || @to_s)
+  end  
+                        
+  def write(h=nil)
+    scan_to_s h || @to_h
+  end
+     
+  private
 
-  def self.parse(txt)
-
-    raw_a = LineTree.new(txt.gsub(/^-*$/m,'')).to_a
+  def scan_to_h(txt)
+    
+    raw_a = LineTree.new(txt.gsub(/(^-*$)|(#.*)/,'').strip).to_a
 
     a = raw_a.map do |line|
 
-      s = line.is_a?(Array) ? line[0] : line
-      value, name = s.split(':',2).reverse
-      name ||= 'description'
-        
-      [name.to_sym, value.to_s.strip]
+      s = line.shift
+
+      if line.any? then 
+        r = scan_to_h(line.join("\n"))
+        [s[/[^:]+/].to_sym, r]
+      else
+        value, name = s.split(':',2).reverse
+        name ||= 'description'
+          
+        [name.to_sym, value.to_s.strip]
+      end
 
     end
 
-    Hash[a]
-  end
-                    
-  def self.write(h) h.map{|key, value| "%s: %s" % [key, value]}.join("\n") end
+    @to_h = Hash[a]
+  end   
+
+  def scan_to_s(h, indent='')
+
+    a = h.inject([]) do |r, x|
+      if x.last.is_a? Hash then
+        r << x.first.to_s + ":\n" + scan_to_s(x.last, '  ')
+      else
+        r << "%s%s: %s" % [indent, *x]
+      end
+    end
     
+    @to_s = a.join("\n")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-config
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Robertson
@@ -10,41 +10,49 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDU0NVoXDTE0MDIwNjIxMDU0NVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE0MDkwODIwNDQwOFoXDTE1MDkwODIwNDQwOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMd6/ssNONISjza/04VINII8sKmntX5/iYMhvN8sveKDQiLyuI7texbosxL7
-  xoAbiMUta2vdJja1uGsbnaIj5opBROsS2C+n3DGXIthHRMhlOoc2RC/tyuv3XFdx
-  yyU7Ar8VDyDK+jK86JmK0PRN2G2hFdQ2tgz97IKAuYpw0ITaPRyR05yhv2o5SWu0
-  Rz4/O6FEq3r9PzJuLh3Ip1L3fFgDth7d5QMSqE82KOSJc6FZOa8eUtVYqI6X5n/m
-  K1xIgmd8+rgEN/h96jPbXaxhiJlVkva954qqgb/7NZt85EwwzkAwrHxYcqX6PkGK
-  M6ScrMEvqWquase8yZsKlPfoKGcCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUiAOQhh1VsiUml7R06kVLPMTEzNAwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQCGYCsUWvc82iPnCe2n87DREICCi5P+j23pi/jqr1pMJaRPYOKQh1VF
-  NwjWZOrmhY0i01UHTHDwx8khmot7H53n9VzkdcZ7xonKzbfmLLre3cfGU4c9Ewlf
-  gEgv3ZL3f/KAn9lIxQUm9ns6A//yzHjWbutu77L4Lx7fP7FFKKFOQrzgJEWog6RV
-  q13v5ROCerCeWr48ukde/C3YBp/Rc6jwwBec6LgMxuepCQc6hY0GRlJaWSVM+Pfe
-  7cFdDmAeYHWy9AgYCKzqq3fgMLMvdgPjQ+zwYmCZa10a5QzvyUuTLq06hV0RiKlY
-  pZLFyW05+uJDC09hel6L61CYjTPkruMT
+  ggEBAJ3pJORss1nAja50P52vx8II0cnmjbFbZTMKUjg4Ni/I5Z3Hh8IDYFruNPoQ
+  Q2pm/WyzqwLP0v4UbASO7eDtxRbpyyI70EIjCNVntN4x175VNEe6Lb6NqiEm3l/O
+  nIIkH59iv3HnnZDjYt4cGuzglisVkormjZxMX8pKR1KH1l8BvYjtWln91xR/rxmn
+  v5vigkoB/ZnGVjzQkPPe1axHDqYG1Z18cc59qJ6kLcg5cXoVmIF7tshiY8m9B5Pv
+  x0eDTnTmhvOEnDL9Gw6WcTsUfSwb1QxwmQo50kh8NxXGQ0xxFyyGzxuvUDIqUhgY
+  VDktuQIqF1jLM/rUZBHHB2dn9ukCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUdJCVNn95OstRdNIk/fqpyt8UyD0wJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEACEqU1+gF
+  Dov8vMZNPqVC/zppZSyJ0yRPUswyZxKIfNzyKxf/INZALOTPmanEf8pkkIgrlBcC
+  CH1voFZjIeCcQHvC8ETkBME9v1KYXHTDKeRoI4L1HGHGovbg/CbzLPivTQiuQYp3
+  mRUkt0MKSiotFMyhrvxDV6vb/RMp5YmHry2vJVyEsl+1AhiHziQQttJasQf5ZTQq
+  4AZY8Ma1hAC/K2Jh4ATkIaxDITR/DiZtF7bIFIBEauHynPnxSBz+HFp3nvQjhEie
+  GOyi72Dr1XTvfW8Vje543EzUeJP4EjrtsoS0tbx5hs2J8Ey8zv39aU4aNyM1h0Fv
+  1BzvTQ2PY7IAEQ==
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.17
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -62,17 +70,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: simple-config