polyrex 0.8.33 → 0.8.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92235d2d1902a3c7102e6aa83415ef6787e02082
-  data.tar.gz: facb8e958cf9a0ffe7ae9394a3eb7206f05b9e4e
+  metadata.gz: f22bfea02d697da5897d487fe3174e92b1505f9f
+  data.tar.gz: e2381385c4388dc4c40e612d219aa15b38a9a97d
 SHA512:
-  metadata.gz: 78dd49747c22f4ab8b501c6dc0d70ff32f4b96b138f8caa4ee9ce60e971e8651aa475c5d7726d072f7e379f06ef870e7fd029fcf1f4cb2f45e275d4bb4ca2f1d
-  data.tar.gz: 863514cf1dddbd5b4d7b81090b188badb1423a9c228d0fa3e21403f18b714ac25109d34f6537b976bf4f6af9d30c534e29d17e39513db6c50db519bde6b93180
+  metadata.gz: 37f84775b83c3fc0c4d9e0a6056b9764adb3525f888eaaa8199cc74e7e9f15435dd4a7fdf9b1131938d0d703ab58259d6b5b899075b79bde81e319ce5fc93dbf
+  data.tar.gz: e62a494eff2b7e6a6a12544d3974e5a4176e7f2458e0a5521449c227b8792569a62ce83b37bc2a7cf15e7bb521f862fc1a3900c6f149fa0aafd9cee4b628b9e1

data/lib/polyrex.rb

@@ -39,12 +39,21 @@ end
 class Polyrex
   attr_accessor :summary_fields, :xslt_schema, :id_counter, :schema, :type
 
-  def initialize(location=nil, id_counter='1')
+  def initialize(location=nil, opt={})
 
-    @id_counter = id_counter
+    options = {id_counter: '1'}.merge opt
+    @id_counter = options[:id_counter]
     
     if location then
+      self.method(:schema=).call(options[:schema]) if options[:schema]
       open(location)
+
+      if options[:schema] then
+        fields = @schema[/\/.*/].scan(/\[([^\]]+)/).map \
+          {|x| x.first.split(',').map(&:strip)}
+        refresh_records self.records, fields, 0
+      end
+
       summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text]}.flatten]      
       #@summary = OpenStruct.new summary_h
       @summary = RecordX.new summary_h
@@ -185,7 +194,8 @@ xsl_buffer =<<EOF
 </xsl:stylesheet>
 EOF
     xslt  = Nokogiri::XSLT(xsl_buffer)
-    Dynarex.new xslt.transform(Nokogiri::XML(root.xml)).to_s
+    buffer = xslt.transform(Nokogiri::XML(root.xml)).to_s
+    Dynarex.new buffer
 
   end
 
@@ -210,6 +220,20 @@ EOF
 
   private
 
+  def refresh_records(records, fields, level)
+
+    records.each do |record|
+
+      level -= 1 unless fields[level]
+      fields[level].each {|x| record.method(x).call }
+
+      if record.records.any? then
+        refresh_records record.records, fields, level+1
+      end
+    end
+
+  end
+
   def polyrex_new(schema)
     # -- required for the parsing feature
     doc = PolyrexSchema.new(schema).to_doc
@@ -446,10 +470,12 @@ EOF
       @local_filepath = s
     end
 
-    @doc = Rexle.new buffer
+    buffer.gsub!(/<schema>[^<]+/, '<schema>' + @schema) if @schema
 
-    schema = @schema ? @schema : @doc.root.text('summary/schema')
+    @doc = Rexle.new buffer
 
+    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.33
+  version: 0.8.34
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   7hfiCsNv+0o/OwBNlpn8pTTpd3jV6o1Qq0Y7QiFomKd6XWlaHT4ZNtZdb/XTpC7W
   ZUZv+oXV5L4FrLlOrnTUhA+cZRntSyHs
   -----END CERTIFICATE-----
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema