polyrex 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11eab879ad7a2dadd2b251db50e98a0cbfc60a1d
-  data.tar.gz: ec59a5ae4eb683e8bbca9575343ec066c8e2a799
+  metadata.gz: 469ae7ce023afc77672f9269e87e6489833805a6
+  data.tar.gz: 5da4aedc5655379190e6a39da6fcbab9d8a00bd5
 SHA512:
-  metadata.gz: 7e87319f23896e15bf07096cde70266ae772f33e941d87d1b9384922fe45f26167c97f7ae4daaead54ec7f04a42f88d0bd87aacb16ea07ed0d433e66b69ad349
-  data.tar.gz: 4607c4626a464d7c611eb7fbf55711b7daa1e5b8a617a2dfeffedd605640c7a8da24bc24b54063ecf6842805de3c2d3068f1dd61bdff457ec1a66daf72116ace
+  metadata.gz: 86b56aa40d93d33d21333df7dddab0b4c89539b4f9789736303e34ac3265e8312ae1c7527ef621e5b06b6891123f30d4295cc33015a79d0731d43d746e91dae2
+  data.tar.gz: a15b862f73e85bb71f6b9f0726bbdb22f04f8e6598569442e98915f468b8f3bb0d3b56e3e4fa3f1fd6f6a2d13daa26a884a99edf4050402125f668a291420acd

data/lib/polyrex.rb

@@ -62,12 +62,9 @@ class Polyrex
 
       end
 
+      @summary = RecordX.new @doc.root.xpath("summary/*")
+      @summary_fields = @summary.keys
 
-      summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text]}.flatten]      
-      #@summary = OpenStruct.new summary_h
-
-      @summary = RecordX.new summary_h
-      @summary_fields = summary_h.keys.map(&:to_sym)
     end
     
     @polyrex_xslt = RecordxXSLT.new
@@ -144,8 +141,10 @@ class Polyrex
     @format_masks
   end 
   
-  def parse(buffer='', options={})
+  def parse(x=nil, options={})
 
+    buffer, type = RXFHelper.read(x)
+    
     buffer = yield if block_given?          
     string_parse buffer.clone, options
     self
@@ -175,8 +174,8 @@ class Polyrex
   def schema=(s)
 
     openx(s)
-    summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text]}.flatten]      
-    #@summary = OpenStruct.new summary_h
+
+    summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text.to_s]}.flatten]      
 
     @summary = RecordX.new summary_h
     @summary_fields = summary_h.keys.map(&:to_sym)    
@@ -240,8 +239,8 @@ EOF
       records.map do |item|
 
         summary = item.element 'summary'
-        format_mask = summary.text 'format_mask'
-        line = format_mask.gsub(/\[![^\]]+\]/){|x| summary.text x[2..-2]}
+        format_mask = summary.text('format_mask').to_s
+        line = format_mask.gsub(/\[![^\]]+\]/){|x| summary.text(x[2..-2]).to_s}
 
         records = item.element('records').elements.to_a
         line = line + "\n" + build(records, indent + 1).join("\n") if records.length > 0
@@ -319,8 +318,8 @@ EOF
 
     # -- required for the parsing feature
     doc = PolyrexSchema.new(schema).to_doc
-
     fm = doc.root.xpath('//format_mask/text()')
+
     @format_masks = fm.zip(@format_masks).map{|x,y| y || x }
 
     schema_rpath = schema.gsub(/\[[^\]]+\]/,'')
@@ -352,7 +351,7 @@ EOF
     # get the fields
     fields = summary.elements.map do |x|
       next if %w(schema format_mask recordx_type).include? x.name 
-      r = x.text.to_s.gsub(/^[\n\s]+/,'').length > 0 ? x.text : x.cdatas.join.strip
+      r = x.text.to_s.gsub(/^[\n\s]+/,'').length > 0 ? x.text.to_s : x.cdatas.join.strip
       REXML::Text::unnormalize(r)
     end
 
@@ -369,10 +368,7 @@ 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
+
       r1 = /([\w\[\]\-]+\s*\=\s*'[^']*)'/
       r2 = /([\w\[\]\-]+\s*\=\s*"[^"]*)"/
 
@@ -395,14 +391,14 @@ EOF
 
         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
 
-    raw_lines = buffer.strip.split(/\r?\n|\r(?!\n)/)    
+    raw_lines = buffer.strip.lines.map(&:rstrip)
 
     raw_summary = schema[/^\w+\[([^\]]+)/,1]
 
@@ -422,13 +418,14 @@ EOF
     records = @parent_node.root
     @parent_node = records.parent
     records.delete
+
     lines = LineTree.new(raw_lines.join("\n").strip, ignore_label: true).to_a
     @parent_node.root.add format_line!( lines)
 
   end  
   
   def unescape(s)
-    s.gsub('&lt;', '<').gsub('&gt;','>')
+    r = s.gsub('&lt;', '<').gsub('&gt;','>')
   end
   
   def load_handlers(schema)
@@ -446,7 +443,7 @@ EOF
   end
   
   def format_line!(a, i=0)
-    
+
     records = Rexle::Element.new('records')
     
     # add code here for rowx
@@ -481,7 +478,6 @@ EOF
 
 
       line = raw_line
-
       
       if line[/\w+\s*---/] then
 
@@ -491,18 +487,16 @@ EOF
         summary.add ynode
         next
       end
-
       
       unless @format_masks[i][/^\(.*\)$/] then
 
         @field_names, field_values = RXRawLineParser.new(format_masks[i])\
-                                                            .parse(line)
-        
+                                                            .parse(line)        
       else
 
         format_masks = @format_masks[i][1..-2].split('|')
         patterns = format_masks.map do |x|
-          regexify_fmask(x) #.sub(/\[/,'\[').sub(/\]/,'\]')
+          regexify_fmask(x)
         end
 
         pattern = patterns.detect {|x| line.match(/#{x}/)}
@@ -522,14 +516,13 @@ EOF
       record.add_attribute(id: @id_counter.clone)
       summary = Rexle::Element.new('summary')
 
-      
       @field_names.zip(field_values).each do |name, value|  
         field =  Rexle::Element.new(name.to_s)
         field.text = value        
         summary.add field
       end
 
-      format_mask = @format_masks[i]
+      format_mask = @format_masks[i].to_s
 
       schema = "%s[%s]" % [tag_name, @field_names.join(', ')]
       summary.add Rexle::Element.new('format_mask').add_text(format_mask)
@@ -537,7 +530,7 @@ EOF
       summary.add Rexle::Element.new('recordx_type').add_text('polyrex')
       
       record.add summary
-      child_records = format_line!(x, i+1) #jr071213 unless x.empty?
+      child_records = format_line!(x, i+1)
 
       record.add child_records
       records.add record
@@ -578,24 +571,22 @@ EOF
     elsif s[/\[/] then  # schema
       buffer = polyrex_new s
     elsif s[/^https?:\/\//] then  # url
-      buffer = open(s, 'UserAgent' => 'Polyrex-Reader'){|x| x.read}
+      buffer = open(s, 'UserAgent' => 'Polyrex-Reader').read
     else # local file
-      buffer = File.open(s,'r').read
+      buffer = File.read s
       @local_filepath = s
     end
 
     buffer.gsub!(/<schema>[^<]+/, '<schema>' + @schema) if @schema
-
     @doc = Rexle.new buffer
 
-    schema = @doc.root.text('summary/schema')
+    schema = @doc.root.text('summary/schema').to_s
     
     if schema.nil? then
       schema = PolyrexSchema.new.parse(buffer).to_schema 
       e = @doc.root.element('summary')
       e.add Rexle::Element.new('schema').add_text(schema)
     end
-    
 
     unless @format_masks
       schema_rpath = schema.gsub(/\[[^\]]+\]/,'')
@@ -605,7 +596,7 @@ EOF
 
     id = @doc.root.xpath('max(//@id)')
     @id_counter = id.to_s.succ if id
-    
+
     if schema then
       load_handlers(schema)
       load_find_by(schema) unless schema[/^\w+[^\/]+\/\{/]
@@ -639,7 +630,8 @@ EOF
   end
   
 
-  def load_find_by(schema)  
+  def load_find_by(schema)
+
     a = PolyrexObjectMethods.new(schema).to_a
 
     methodx = a.map do |class_name, methods| 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDIyMTIyMTYzNloXDTE1MDIyMTIyMTYzNlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDMwMTAwMzcyM1oXDTE2MDIyOTAwMzcyM1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMG0VJYpvuTtAym6dLCS2xciZEQgaWjimn23YEdgDwZa2ED+iyyRwYD1V+jH
-  9H4Ok88LTST1aSkwPYfp+u6491SRm3rAhfRCNEWXaL4sYx3EOuNBImw+vi9bu/f0
-  YfJGnY43pEorT8Gmul8Y+z10LoRkxwEFCgRKcZRXTE0M1VDX0/Cv0/YuaeESMy1j
-  l7Fa88zB6ZbGLVWShAnFrIqyn28gOv/iQnwNeoy2F0pT/fus0iaU0aOU47IcdM+J
-  gCIIcch3AhTeKSwmY/24nQeeE5R8Y+9EJtuOrG/8pjf/sOMAGRm4NMPiYDub+o2A
-  3x6RqDbNvQOITkObbLdUNm3RDQkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUlCdT0IvHPWPNgGAps/LXgQ0/9FgwJgYDVR0RBB8w
+  ggEBAMkVZcmrDWOGV9CBEYIEZArXfCitREubuFxugFlH5oyzJ96fOAJkJwU8WVGf
+  8krV4owYYBXfKkDpHoMrhpaaCV081RdI9lT6sfrrf2Awhu1dk3AzvMgkdr72+zyK
+  r2sh+MBIsjqS6yZMvDGc1IzY1NrcIPJGewQFSlajtN/PJiDVhBIVFhE+0fhP8g6E
+  SdMQ3K9xAcVpC80jBYWRO5e19B4I9ObWSxOI6+q+7kBilQwlgeTOYZh7GwQN3+8l
+  GplskbyXvg4DaduLEsDA766VaVW4bIm8em/x4xgLPptHoUdDEFWhPUp/bMqytX6r
+  kkVijqopkD3aQAd9O6FGfgJ0xtsCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUJPA0MhvbOczi7gIiHa9f6wNy3ewwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAQg0q7eMS
-  Z1rPmcl6F3eycyeqNfD9r0pFUNdMtYH/L7X7VK4hRv7qNkXmijXdqOCgb5eiYFaF
-  viysSGLsXEmNz+QII0ODPTmUnwfkjANdUkl5hZhOm2l8kGfgJo7GZHttUw2Yk3Sc
-  z5ICpEhB4PAu5v+VCYtLge2wAHMjNpuWlMV8PoLRBTVkp+kpL8QZ5A/R8JRWdPs+
-  s7qQTcvKLvmnMjw49hmfeXROSl8nEawKNd9T5udpCUP0Lm9cMgoX8h6LDft9iv7C
-  wbQnaFmJMPFyXo9Yh/95QJEinnBsM0Yk8nJhmcChjdCpQL5243BjgzVEjHI1Ouxe
-  SmUIljyExpxiHQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAuECbwC99
+  4lpyCgV5nukGp4kHAP9sHWvLFaO3aE2nplBb9DpFs+s4h5gZmzZuzfrcSEhpXj2j
+  TE0Jh10eSXXUKXM763yTy9pJ0giXYVIGuKMTfQF/1A8YLkHrg7SeSoJiyqXYfIW2
+  linBUQ2SMsR2G2Y694/8s0z7bfkHdExYO4vJBweft3w57OCBAjsvAnhR/Di7tnGM
+  ayA0vQpuh7bQgMt+3OkO2+Y5k3q/k/BGFwy8M5Vi7D1m59UlW5qSlVjJ02ugD0PX
+  xutogBWBRwktcdg7bc24/mbFcXcx5WhspVwfj6isE6q3A1nNkMtk3DHHKmUrfemr
+  pWpTJQi2DFAx/g==
   -----END CERTIFICATE-----
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema
@@ -39,100 +39,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: line-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: polyrex-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: polyrex-createobject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: polyrex-object-methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: recordx-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -152,27 +152,27 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.4.1
 description: 
 email: james@r0bertson.co.uk
 executables: []

metadata.gz.sig

@@ -1,5 +1 @@
-�Lv#�J&��5m2�:����
-�
-+��,Hd�o���M�����)ގ2ۻ��D�2��CG
-7%�8R���>z{�Z�Q��
-��t�U�Wa��Zj��bN�\Q|
+(Pl݌�G��B�cK�ˮU6�j�>`�#�Y*wN0lM1�Qa��B
Vs��E./Н9�2�z�n�����%E�H�{��C��!�b�[���%�8�f��y����+��JW���)���t��bfo��p&������ڶ��`�NN��~Eu/��4���z����'��)FF��4Z�E7�F���g�h6���VM3*%��#Nm��\>Q�:��s�{|��*=A�ȅW�G!v\�/@�B