simple-config 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a6c0dbcc7748e68fe3257821892f6e15109048
-  data.tar.gz: ecbb45dd7cb791841ffdd5eb41a06cef0818ec7a
+  metadata.gz: e5577c4a063185bc438d6087e58833990fc183f4
+  data.tar.gz: 2261d405f7135e9cd244f9f6823ae997e689f9c8
 SHA512:
-  metadata.gz: 37dea24bb068948e9994181257947929e57823760341c5f6a38b9c11526a4201676b9d84447c06727e50bee206c96d9a033581fb07becabcca3c244cdbd6e1db
-  data.tar.gz: ceaa421e08721992847a9d58f0389381992f7d057b0f6c88cf644ed82237b3e4445e233ea5fda3f3f77115810f098fb97583ad6ecc7ef768bfec34c4522d38f9
+  metadata.gz: a8c6bf060bc38ec46d736a0df73c624780680fcf00970ff545a7f54bb8fb3be7b80764f91a01fbab76c4cd1d620d9b4f1814c44a6fc1b26924c588b37b4ab062
+  data.tar.gz: e557f639e6dac142c5052f6bf3af4b7702f8eaaf89aeb12c71f93a151302421ef50bfc46eb828e619cdcca98191ac1b21b9dc130909905abb01df378914f1f2a

data/lib/simple-config.rb

@@ -6,16 +6,6 @@ require 'line-tree'
 require 'rxfhelper'
 
 
-#!/usr/bin/env ruby
-
-# file: simple-config.rb
-
-require 'line-tree'
-require 'requestor'
-
-eval Requestor.read('http://rorbuilder.info/r/ruby'){|x| x.require 'rxfhelper'}
-
-
 class SimpleConfig
   
   attr_reader :to_h, :to_s
@@ -35,38 +25,53 @@ class SimpleConfig
      
   private
 
+  
+  def pretty_print(a, indent='')
+    
+    a.map {|x|  x.is_a?(String) ? x : pretty_print(x, indent + '  ')}\
+                                                          .join("\n" + indent)
+  end
+  
+  
   def scan_to_h(raw_txt)
     
     txt, _ = RXFHelper.read(raw_txt)
-
     raw_a = LineTree.new(txt.gsub(/(^-*$)|(#.*)/,'').strip).to_a
 
-    a = raw_a.map do |line|
+    @to_h = raw_a.inject({}) do |r, line|
 
       s = line.shift
 
       if line.any? then 
-        
-        r = scan_to_h(line.join("\n"))
-        [s[/[^:]+/].to_sym, r]
+                
+        r2 = if line[0][0][/^\w+:/] then
+          scan_to_h(line.join("\n"))
+        else
+
+          desc = pretty_print(line).split(/\n(?=\w+:)/)         
+          txt, remaining = desc
+
+          r3 = {description: txt, items: txt.lines.map(&:chomp)}
+
+          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'          
         
-        [name.to_sym, value.to_s.strip]
-      end
+        r.merge({name.to_sym => value.to_s})
+      end     
 
     end
-    
-    anonymous_items, remaining = a.partition {|x| x.first  == :description }
-    
-    if anonymous_items.any? then
-      return {items: anonymous_items.map(&:last)}.merge(Hash[remaining])
-    else
-      @to_h = Hash[a]
-    end
+
   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.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   GOyi72Dr1XTvfW8Vje543EzUeJP4EjrtsoS0tbx5hs2J8Ey8zv39aU4aNyM1h0Fv
   1BzvTQ2PY7IAEQ==
   -----END CERTIFICATE-----
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree