dynarex 1.2.69 → 1.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2ea07ef7c9fd67bf4e46e093e7a3cf92f74bea
-  data.tar.gz: 0bb056ad0eaa4fe8ae7a338eaf721ed5b66042b3
+  metadata.gz: d9f360b95bf319e679a611beaf83c6a3c4a005e0
+  data.tar.gz: b62a391947c25a71c5407cf75dab224394658b1e
 SHA512:
-  metadata.gz: 4899ded695527a106d10e44794a40ced3f1fd3549222116872097f1df8befe4b0406e34d94dd1dbdc8b558cb40ef743a281576ce0f837b1d5820b1dd40cae7eb
-  data.tar.gz: 5316dcd03c943420cab2067db4d1b962d834eaf7a9e48a027e33739e64051a1253162f7214f5f58379f2f5ba39b647fd9231a339fd7dadf1a244ec8baf559064
+  metadata.gz: 21d419e6729c9327ab672df7ace69418710d236f05651089ef057e01712409f2d81c89f94b339e0610e8319e8d2e7ec80e62887f8a58d08c6563c1dbfb154d31
+  data.tar.gz: 9da3609f0ee8a90f16eab8b89541b7e014de38c33e6e806178943ea6bfbeae6239f3612864ad64d308110673285ad37b040007e78f4e5d1c871cce4d14103e4c

data/lib/dynarex.rb

@@ -386,7 +386,7 @@ EOF
 
           xml.send key, value.gsub('>','>')\
             .gsub('<','&lt;')\
-            .gsub(/&\w*./) {|x| x[-1] == ';' ? x : x.sub('&','&amp;')}
+            .gsub(/(&\s|&[a-zA-Z\.]+;?)/) {|x| x[-1] == ';' ? x : x.sub('&','&amp;')}
 
         end
       end
@@ -409,8 +409,10 @@ EOF
                 val = value.send(value.is_a?(String) ? :to_s : :to_yaml)                
                 xml.send(name, val.gsub('>','&gt;')\
                   .gsub('<','&lt;')\
-                  .gsub(/&\w*./) {|x| x[-1] == ';' ? x : x.sub('&','&amp;')}
-)
+                  .gsub(/(&\s|&[a-zA-Z\.]+;?)/) do |x| 
+                    x[-1] == ';' ? x : x.sub('&','&amp;')
+                  end
+                )
               end
             end
           end
@@ -769,7 +771,7 @@ EOF
   def dynarex_new(s)
     @schema = s
     ptrn = %r((\w+)\[?([^\]]+)?\]?\/(\w+)\(([^\)]+)\))
-    
+
     if s.match(ptrn) then
       @root_name, raw_summary, record_name, raw_fields = s.match(ptrn).captures 
       summary, fields = [raw_summary || '',raw_fields].map {|x| x.split(/,/).map &:strip}  
@@ -802,8 +804,9 @@ EOF
   end
   
   def open(s)
-    
+
     if s[/</] then # xml
+
       buffer = s
     elsif s[/[\[\(]/] # schema
       dynarex_new(s)
@@ -815,6 +818,7 @@ EOF
     end
 
     @doc = Rexle.new(buffer) unless @doc
+
     @schema = @doc.root.text('summary/schema')
     @root_name = @doc.root.name
     @summary = summary_to_h
@@ -903,7 +907,8 @@ EOF
         
         if node then
           text = node.text.unescape
-          r.merge node.name.to_sym => (text[/^--- /] ? YAML.load(text) : text)
+
+          r.merge node.name.to_sym => (text[/^--- |^\[/] ? YAML.load(text) : text)
         else
           r
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.69
+  version: 1.2.70
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle