dynarex 1.2.77 → 1.2.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fa2bf729702e0577aa9477cc97d9d4063fac0c
-  data.tar.gz: e69185901f33825a52a89beebec881cedf682cfd
+  metadata.gz: 27b5308dc3d2dda89ebd2ea5a05a5d76a2f558f0
+  data.tar.gz: 9b9022fddb5d3b5fea15272804f636b86dfcfab8
 SHA512:
-  metadata.gz: 90d0fdf881687702da73548fa44db1e887f4c806c1dcd66e9656f2fe9ab50de50a63e7f170498601b1cbf205af086a57839b8ff96e6a6204db07fe0709166ed4
-  data.tar.gz: 360b6348028f51a584c06e72b07fb695a6e6e30cde68125f3260174abe2b908b1fe67ffd11ef9f630f534e055794fd696e1f44d2b625a997def74db77fb865b0
+  metadata.gz: d4c160e217984299eb5d5167cd9359daf8d5b4ab429013d81fed3ed6c6530b66d181e28af525cc8a6636feb78963cc122b8cd2d02e3d0daed4438da098be5d5f
+  data.tar.gz: c23164e20bb9c4d79faf04fcb05d74e38a05fbe5b681108664d68b79cab6f809c263e74102c714688958b97d4d1b760342ab3adaea84c31e91fd452edbe8b2bd

data/lib/dynarex.rb

@@ -35,7 +35,7 @@ class Dynarex
   def initialize(location=nil)
     #puts Rexle.version
     @delimiter = ''   
-    open(location) if location
+    openx(location) if location
     if @order == 'descending' then
       @records = records_to_h(:descending) 
       rebuild_doc
@@ -68,7 +68,7 @@ class Dynarex
     h = {xml: o[:xml], schema: @schema, foreign_schema: o[:schema]}
     buffer = DynarexImport.new(h).to_xml
 
-    open(buffer)
+    openx(buffer)
     self
   end
   
@@ -103,7 +103,7 @@ class Dynarex
   end
   
   def schema=(s)
-    open s
+    openx s
   end
   
   def type=(v)
@@ -203,7 +203,7 @@ EOF
       s = smry_fields.map {|x| "%s=\"%s\"" % \
         [x, self.send(x).gsub('"', '\"') ]}.join ' '
       #declaration = "<?dynarex %s ?>" % s
-      declaration = %Q(<?dynarex %s ?>\n) % s
+      declaration = %Q(<?dynarex %s?>\n) % s
     end
 
     header = declaration + sumry
@@ -756,7 +756,13 @@ EOF
     
     a = lines.map.with_index do |x,i| 
       created = Time.now.to_s
-      h = Hash[@fields.zip(x.map{|t| t.to_s[/^---/] ? YAML.load(t) : t})]
+      h = Hash[
+        @fields.zip(
+          x.map do |t| 
+            t.to_s[/^---/] ? YAML.load(t) : unescape(t)
+          end
+        )
+      ]
       h[@fields.last] = checked[i].to_s if @type == 'checklist'
       [h[@default_key], {id: '', created: created, last_modified: '', body: h}]
     end
@@ -790,6 +796,10 @@ EOF
     self
   end
 
+  def unescape(s)
+    s.gsub('&lt;', '<').gsub('&gt;','>')
+  end
+
   def dynarex_new(s)
     @schema = s
     ptrn = %r((\w+)\[?([^\]]+)?\]?\/(\w+)\(([^\)]+)\))
@@ -825,7 +835,7 @@ EOF
     create_find @fields
   end
   
-  def open(s)
+  def openx(s)
 
     if s[/</] then # xml
 
@@ -926,7 +936,7 @@ EOF
       body = @fields.inject({}) do |r,field|
         
         node = row.element field.to_s
-        
+
         if node then
           text = node.text.unescape
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.77
+  version: 1.2.78
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: The Dynarex gem can create, read, update or delete rows of Dynarex flavoured