polyrex 0.8.29 → 0.8.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52916136797bf571b97e16e4fe8efbdfa2b2d654
-  data.tar.gz: ebdd6171caf75db3897f1b6c1630ae1a9e949d64
+  metadata.gz: d9f780f2497eee0bb328cedbacf2d450467c5743
+  data.tar.gz: e6350fe9139dd22a8b835ee5b31562f8ab1b9e12
 SHA512:
-  metadata.gz: 206873a6085140c34a5c3445278a6ad912e258259a2517c2cba8f6ddfa4f8d0e67d09d6d3f246f6d58180178c92ba28575c9fb457dc907e92505558d5edbe146
-  data.tar.gz: d046a1855671f6d7824a334c661dda55d5ff088c81e7423845bd1713d9d9ef7c5ba90fc5c7a57280484fbdb7c5baeb3ea593e9e4d7b0dc9116f5f5692e75508b
+  metadata.gz: 4ac931a09ed9793168f8ea133ab8ca342d94f552f9bbb827c05b15303b216f655b7c4a9ec5d40829b1b066429a45ad4db5eaeb7d121d80921d2a2e635bf7b233
+  data.tar.gz: e5cecbf9dbe3b4b49965278a14cc6c5d71ffff68646d12927e265bea47fee37d5a562fbf335c08fb19b10031be5820166710c726c17562b793ec2f4c185f16c6

data/lib/polyrex.rb

@@ -107,12 +107,14 @@ class Polyrex
     @format_masks
   end 
   
-  def parse(buffer='')
+  def parse(buffer='', options={})
     buffer = yield if block_given?          
-    string_parse buffer
+    string_parse buffer, options
     self
   end    
   
+  alias import parse
+
   def element(s)
     @doc.root.element(s)
   end
@@ -124,7 +126,7 @@ class Polyrex
   end
 
   def schema=(s)
-    open s
+    open(s)
     summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text]}.flatten]      
     #@summary = OpenStruct.new summary_h
     @summary = RecordX.new summary_h
@@ -206,21 +208,34 @@ class Polyrex
     [fields, a]
   end
   
-  def string_parse(buffer)
+  def string_parse(buffer, options={})
 
     raw_header = buffer.slice!(/<\?polyrex[^>]+>/)
     
     if raw_header then
       header = raw_header[/<?polyrex (.*)?>/,1]
-      header.scan(/\w+\=["'][^"']+["']/).map{|x| r = x.split(/=/); \
-             [(r[0] + "=").to_sym, r[1][/^["'](.*)["']$/,1]] }.each do |name, value|
-                        self.method(name).call(value)
-              end
+      a = header.scan(/\w+\=["'][^"']+["']/).map do |x| 
+        r = x.split(/=/)
+        [(r[0] + "=").to_sym, r[1][/^["'](.*)["']$/,1]]
+      end
+
+      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) 
+        end
+      end
     end
 
-    raw_summary = schema[/^\w+\[([^\]]+)/,1]
+    
     raw_lines = buffer.strip.split(/\r?\n|\r(?!\n)/)    
 
+    raw_summary = schema[/^\w+\[([^\]]+)/,1]
+
     if raw_summary then
       a_summary = raw_summary.split(',').map(&:strip)
 
@@ -386,8 +401,8 @@ class Polyrex
 
     @doc = Rexle.new buffer
 
-    schema = @doc.root.text('summary/schema')
-    
+    schema = @schema ? @schema : @doc.root.text('summary/schema')
+
     unless @format_masks
       schema_rpath = schema.gsub(/\[[^\]]+\]/,'')
       @recordx = schema_rpath.split('/')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 0.8.29
+  version: 0.8.30
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   7hfiCsNv+0o/OwBNlpn8pTTpd3jV6o1Qq0Y7QiFomKd6XWlaHT4ZNtZdb/XTpC7W
   ZUZv+oXV5L4FrLlOrnTUhA+cZRntSyHs
   -----END CERTIFICATE-----
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema