kvx 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b505b5c13d62100140d9c7cdd00772fcdda1be48
-  data.tar.gz: 2ceec413f42836ad5e21fa39868ddd5e4bcd5498
+  metadata.gz: 9a5ce44df5b7814c9771fe7f02e068759efd213a
+  data.tar.gz: add78d344d8b9c5773e00752efc6311e7f56aaef
 SHA512:
-  metadata.gz: b9c99fc02d2243c0dad0de86ce83c562b96cdb39b13577b7529cfd07405bd90e4bcb02a2de540cc78da40faf26a9e455d5ea73d4a73f884754d62fa92b77c9a2
-  data.tar.gz: f2a95a0abd526045bdff0b5703fb65d2c87f895ef04c1aa8ed6547f4b0bbc5610488c38f058e4a2258fb4e8d1a64646617e065c19b29cd59cbf1bcc5ea2e9204
+  metadata.gz: a8ba4b20ca846227f4ed6b25cde698e5dee776ec788cd3e844d693876e1d763faff51b9168e19cec5c36740defbd2dd03c4a75b31e60436fb72f7119690e62ca
+  data.tar.gz: a77121149530bd9f72c72a519f47e929ebe3a72378d40593f89a7dc88bc2d2f7fbd8b5cb6fd548312f790fcc14933c6fce0f2b2ec00a66d0afb0b0b6efa988a6

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-R�/Af_�%s���@��l���-�H�Wr�t��qH�2�/��oc�ᇜm;���Q�7�lX�`�ˮ������if��=��âv�it���4o\�OO^
-�pBR�ʔ���so��:\Q���L��#���W��wh���b����C���V*� ��Q���-�й����L�ms?T{\�����̒+tة`��G��d_�j�z==A�jw��fR�)�%��R�rJ>hѶHM�EJ#�	q+YQ��0:
+g�ɕn��jY�)cݤ~и�J�����˾B�������T�7�����Y���B�LTb�|:rΊֶ����^W�e�`%ǡk4���CT���#2���r�G3q$�!�ԥ:e���ߗ��ðgrg��6��X��0&����	[�_�� ��`��f�D0�_n��c���\2�D_�.�����s)�>YE4.��@�KY`4LW}�n�
+��?kʶ��˺Mؒ����p�Y#
+A��cᝮ�RM0

data/lib/kvx.rb

@@ -14,48 +14,59 @@ require 'rxfhelper'
 
 class Kvx
 
-  attr_accessor :attributes
+  attr_accessor :attributes, :summary
   attr_reader :to_h
 
   def initialize(x, attributes: {})
-    
+
     @header = false
     @identifier = 'kvx'
+    @summary = {}
     @attributes = attributes
-    h = {hash: :passthru, :'rexle::element' => :hashify, string: :parse_string}
-    @h = method(h[x.class.to_s.downcase.to_sym]).call x
+    
+    h = {
+      hash: :passthru, 
+      :'rexle::element' => :xml_to_h, 
+      string: :parse_string
+    }
+    
+    @body = method(h[x.class.to_s.downcase.to_sym]).call x
 
   end
     
   def item()
-    @h
+    @body
   end
   
+  alias body item
+  
   def to_h()
-    deep_clone @h
+    deep_clone @body
   end
   
   def to_s()
     
     header = ''
     
-    if @header then
+    if @header or @summary then
       
+      attr = @attributes ? @attributes.map {|x| "%s='%s'" % x }.join(' ') : ''
       header = '<?' + @identifier
-      header += ' ' + @attributes.map {|x| "%s='%s'" % x }.join(' ')
+      header += attr
       header += "?>\n"
+      header += scan_to_s @summary
+      header += "\n----------------------------------\n\n"
     end
-    h = @to_h
     
-    header + scan_to_s(@to_h)
+    header + scan_to_s(@body)
 
   end    
 
   def to_xml(options={pretty: true})
-  
-    make_xml(@to_h)
-        
-    a = [self.class.to_s.downcase, @attributes, '', *make_xml(@to_h)]
+          
+    summary = [:summary, {}, *make_xml(@summary)]
+    body = [:body, {}, *make_xml(@body)]
+    a = [self.class.to_s.downcase, @attributes, '', summary, body]
     Rexle.new(a).xml(options)
 
   end
@@ -101,7 +112,7 @@ class Kvx
       e.text
     end
 
-    {e.name => v}
+    {e.name.to_sym => v}
   end  
 
   def make_xml(h)
@@ -117,7 +128,7 @@ class Kvx
   def parse_string(s)
     
     buffer, type = RXFHelper.read(s)
-    type == :xml ? hashify(buffer) : parse_to_h(buffer)
+    type == :xml ? xml_to_h(Rexle.new(buffer).root) : parse_to_h(buffer)
     
   end
 
@@ -141,7 +152,10 @@ class Kvx
       
       @attributes.merge! attr
       @header = true
-      a.join
+      body, summary = a.join.strip.split(/^----*$/).reverse      
+      @summary = scan_to_h summary
+      
+      body
     else
       raw_txt
     end
@@ -180,7 +194,7 @@ class Kvx
     end
     
 
-    @to_h = a.inject({}) do |r, line|
+    @body = a.inject({}) do |r, line|
            
       s = line.shift
       
@@ -237,6 +251,17 @@ class Kvx
     end
     
     @to_s = a.join("\n")
-  end  
+  end
+  
+  def xml_to_h(node)
+    
+    summary = node.element('summary')
+    if summary then
+      @summary = hashify(summary)[:summary]
+      @body = hashify(node.element('body'))[:body]
+    else
+      @body = hashify node
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kvx
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   Vo86eJaJUXJbywrm97pYB2utyzWPyxJihIh0eFuNbCk+XOWfv6vUEyuXMiCsiyrF
   azRHJ6uLeQu4hw==
   -----END CERTIFICATE-----
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -42,7 +42,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,27 +52,27 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.2.3
 description: 
 email: james@r0bertson.co.uk
 executables: []