polyrex 0.9.13 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932bd632891aad9d704f28c577f0d74bd87e8086
-  data.tar.gz: 6ddd40237513fe41bac1d99d3ea2a14536156dd1
+  metadata.gz: 5a2953db7261e10bbc6a7102da0cebc30087cbb5
+  data.tar.gz: 6a8cab7d36cb59382e3595652dc39aa5ad1c9b09
 SHA512:
-  metadata.gz: 9a7e3560650802d78f827fcf4777507c2dc437caae1b9d1aab97c85fef1e63fb0a853d791a4c00bbe3cf1f09c5316396a00ae7e40a58e46cbc62d23509651139
-  data.tar.gz: 5a7c2cec07f4a06d30c4053b6ae4cffcff9ac5910a0a4c235e459e81ec886d1128f500b5e07888dbae51aa387b870b2e5a7971dd005e76e4736d44ef7ad2056a
+  metadata.gz: 82a27a1a6e9c43929d0afb11e1dbe4ee9b1ae527b1e9fcfdd6e36ed1afdfbf55bf874987cf127ae0a9486c80cd748de77300caf7015aff2ea4ff21f1b0a5a26a
+  data.tar.gz: cf675f5a88e46e01a795c7e1689c530e5614255c01117f0d8049679265c1a3da050a97aec3d12eca5b4bb41bce968dc5d5c1bb2f4a15ea67e6988d67ff64da5b

data/lib/polyrex.rb

@@ -360,19 +360,35 @@ EOF
     
     if @raw_header then
       header = @raw_header[/<?polyrex (.*)?>/,1]
-      a = header.scan(/\w+\=["'][^"']+["']/).map do |x| 
-        r = x.split(/=/)
-        [(r[0] + "=").to_sym, r[1][/^["'](.*)["']$/,1]]
-      end
+      #a = header.scan(/[\w\[\]]+\=["'][^"']+["']/).map do |x| 
+      #  r = x.split(/=/)
+      #  [(r[0] + "=").to_sym, r[1][/^["'](.*)["']$/,1]]
+      #end
+      r1 = /([\w\[\]\-]+\s*\=\s*'[^']*)'/
+      r2 = /([\w\[\]\-]+\s*\=\s*"[^"]*)"/
+
+      a = header.scan(/#{r1}|#{r2}/).map(&:compact).flatten            
 
       if options[:schema] then
         a.delete a.assoc(:schema)
         self.method(:schema=).call(options[:schema])
       end
 
-      a.each do |name, value|
-        unless options.keys.include? name[0..-2].to_sym then
-          self.method(name).call(value) 
+      a.each do |x|
+        
+        attr, val = x.split(/\s*=\s*["']/,2)
+
+        i = attr[/format_masks?\[(\d+)/,1]        
+
+        if i then
+
+          @format_masks[i.to_i] = val
+
+        else
+          unless options.keys.include? attr[0..-2].to_sym then
+            #self.method(name).call(value) 
+            self.method((attr + '=').to_sym).call(unescape val)
+          end
         end
       end
     end
@@ -400,7 +416,11 @@ EOF
     @parent_node.root.add format_line!( LineTree.new(raw_lines.join("\n").strip).to_a)
 
   end  
-
+  
+  def unescape(s)
+    s.gsub('&lt;', '<').gsub('&gt;','>')
+  end
+  
   def load_handlers(schema)
 
     @create = PolyrexCreateObject.new(schema, id: @id_counter)
@@ -438,7 +458,7 @@ EOF
   # -- end of full text edit methods
     
   def horizontal_fieldparse(records, a, i)
-    
+
     a.each do |x|          
 
       unless @recordx[i] then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   wbQnaFmJMPFyXo9Yh/95QJEinnBsM0Yk8nJhmcChjdCpQL5243BjgzVEjHI1Ouxe
   SmUIljyExpxiHQ==
   -----END CERTIFICATE-----
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema