polyrex-objects 0.9.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b8434f164aa4e2628a78c4fa5e294b1c869498
-  data.tar.gz: e8c7156c27a25fc5cea2e412d0e7dac1ea4a7da1
+  metadata.gz: 1acdaea24860535ed620cd454e7487e9ab4c2cc9
+  data.tar.gz: 1c66171b97eff79522e3b3a31aaba93d72ac905d
 SHA512:
-  metadata.gz: 3d702cc22105d9717206b384a24374cd1bbae24d378b14e27800367097101126b3f224cd973862965b2e1aa3f982de14eb461e813427b008cbf1afa4c112cf7c
-  data.tar.gz: 34227d46a258030d4ca441b5e9bcddbfb52c0e640eaa88b4697b73657973a2f8c3c0c3b89daace3bfc15b5ae3427c14dded38c3fe7c2b01ec626ffbbfeb120d4
+  metadata.gz: 6e82afb248958a8e9f64afd3e16a80f81a28152f7c3926cee8f79a18a2c4496bc1eff5f7d17127f44a3a8cb47919ab6a2051cb6a9dda03d36db48157236b3e63
+  data.tar.gz: c5b5202f30fade92f4583848ebe7b34f06e2cce2b5baa6cbfc8e26623c99ff747fcf227fd7a95b13f7ba7c2e747ecb7147d9bfe32eaf11f009ca1b4ae4b13c64

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-GH���WbT:���ɾ%���HEov�]�!QP��U
-�5����e~{g'sv�AU躲�X�s;
-�SY)����SBݐ�rZUʪ��4�Sa���, �Q��`
��LU��V���$���\�N�&$)�X|�p����j���0�2�h��w������"gf�^�+�Wh���uj?�˸��`/1���Žp7L:�"%����Z�W�����ËOg�5IE���$�����͛O�I-o��ti�xm
+R����;X��]�FG[�:������w^�T�1�7��z!Z�g�����
+��z@X܂

data/lib/polyrex-objects.rb

@@ -9,20 +9,28 @@ require 'rexle'
 
 class PolyrexObjects
 
-
   class PolyrexObject
 
-    attr_reader :node, :id
+    def initialize(node, id: '0', debug: true)
 
-    def initialize(node, id: '0', objects: nil)
-      
-      @@id = id
-      @node = node
+      @id = id
       @fields =[]
-      @objects = objects
+      @node, @debug = node, debug
+
+      e = node.element('summary')
+      @schema = e.text('schema')
+      @child_schema = @schema =~ /\// ? @schema[/(?<=\/).*/] : @schema
+      puts '@child_schema:' + @child_schema.inspect if @debug
+      @record = @schema[/^[^\[]+/]
+      @fields = @schema[/(?<=\[)[^\]]+/].split(/ *, */)
       
+      attr = @fields.map {|x| [x, e.text(x)] }
+      build_attributes attr
+
+      define_singleton_method(@record.to_sym) { self.records}
+
     end
-    
+
     def add(pxobj)
       @node.element('records').add pxobj.node
     end
@@ -40,14 +48,9 @@ class PolyrexObjects
       self.records.length
     end
 
-    def create(id: '0')
-      id ||=@@id
-
-      id.succ!
-      @create.id = id         
+    def create(id: @id)      
 
-      @create.record = @node.element('records')
-      @create
+      PolyrexCreateObject.new(id: id, record: @node)
     end
     
     def css(s)
@@ -83,7 +86,7 @@ class PolyrexObjects
     end
 
     def inspect()
-      "#<PolyrexObject:%s" % __id__
+      "#<%s:%s" % [self.class.name, __id__]
     end
 
     def [](n)
@@ -93,8 +96,9 @@ class PolyrexObjects
     def parent()
 
       parent_node = self.node.parent.parent
-      @objects[parent_node.name]\
-          .new(parent_node, id: parent_node.attributes[:id], objects: @objects)
+
+      Kernel.const_get(parent_node.name.capitalize)\
+        .new(parent_node, id: parent_node.attributes[:id])
 
     end
     
@@ -105,7 +109,15 @@ class PolyrexObjects
       
       node.parent.parent.parent.parent ? true : false
     end
-    
+
+    def records()
+
+      @node.xpath('records/*').map do |node|
+        Kernel.const_get(node.name.capitalize).new node
+      end
+
+    end
+
     def to_doc()
       Rexle.new @node.to_a
     end
@@ -129,25 +141,25 @@ class PolyrexObjects
 xsl_buffer =<<EOF
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output encoding="UTF-8"
-            indent="yes"
-            omit-xml-declaration="yes"/>
-
-  <xsl:template match="*">
-    <xsl:element name="{name()}">
-    <xsl:element name="summary">
-      <xsl:for-each select="summary/*">
-        <xsl:copy-of select="."/>
-      </xsl:for-each>
-    </xsl:element>
-    <xsl:element name="records">
-      <xsl:for-each select="records/*">
-        <xsl:element name="{name()}">
-          <xsl:copy-of select="summary/*"/>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:element>
-    </xsl:element>
-  </xsl:template>
+          indent="yes"
+          omit-xml-declaration="yes"/>
+
+<xsl:template match="*">
+  <xsl:element name="{name()}">
+  <xsl:element name="summary">
+    <xsl:for-each select="summary/*">
+      <xsl:copy-of select="."/>
+    </xsl:for-each>
+  </xsl:element>
+  <xsl:element name="records">
+    <xsl:for-each select="records/*">
+      <xsl:element name="{name()}">
+        <xsl:copy-of select="summary/*"/>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:element>
+  </xsl:element>
+</xsl:template>
 </xsl:stylesheet>
 EOF
 
@@ -165,13 +177,12 @@ EOF
 
     end
 
-
     def to_h()
       @fields.inject({}) do |r, field|
         r.merge(field=> self.method(field).call)
       end
     end
-    
+
     def to_s()
       
       if self.respond_to? :records then
@@ -199,9 +210,28 @@ EOF
     def xpath(s)
       @node.xpath(s)
     end
-    
+
     private
-    
+
+    def build_attributes(attr=[])
+
+      attr.each do |name, value|
+
+        var = name.to_s
+        get, set = var.to_sym, (var + '=').to_sym
+
+        define_singleton_method(get) do
+          @node.element("summary/#{__callee__}/text()").to_s
+        end
+
+        define_singleton_method(set) do |v|
+          @node.element("summary/#{(__callee__).to_s.chop}").text = v.to_s
+        end
+
+      end
+
+    end
+
     def build(records, indent=0)
 
       records.map do |item|
@@ -217,157 +247,29 @@ EOF
         end
         ('  ' * indent) + line
       end
-    end    
-  end
-  
-  def initialize(schema, node=nil, id: '0')
-
-    @node = node
-    @@id = id
+    end   
 
-    @schema = schema
+  end
 
-    if schema then
-  
-      @class_names = []
+  def initialize(schema, debug: false)
 
-      h = PolyrexSchema.new(schema).to_h
-  
-      scan = -> (a) do
-        a.each do |x|
-          make_class(x[:name], x[:fields], x[:schema])
-          scan.call(x[:children]) if x[:children]
-        end
-      end
+    @debug = debug
+    record_names = schema.scan(/(?<=\/)\w+/)
+    puts 'record_names: ' + record_names.inspect if @debug
 
-      scan.call h
-
-      if @class_names.length < 2 then
-        make_def_records(@class_names.first)
-      else
-        # implement the child_object within each class object
-        @class_names[0..-2].reverse.each_with_index do |class_name, k|    
-
-          i = @class_names.length - (k + 1)
-          make_def_records(class_name,i)
-        end
-      end      
-      @class_names[1..-1].each_with_index do |class_name, k|    
-        eval "#{class_name}.class_eval {        
-          def parent()
-            #{@class_names[k]}.new(@node.parent.parent, id: @@id)
-          end                
-        }"
-      end
-      
-      methodx = @class_names.map do |name|
-        %Q(def #{name.downcase}(); #{name}.new(@node, id: @@id); end)
-      end
-      
-      self.instance_eval(methodx.join("\n"))
+    @classes = record_names.inject({}) do |r, name|
+      puts 'name: ' + name.inspect if @debug
+      r.merge!({name.to_sym => \
+                (Object.const_set name.capitalize, Class.new(PolyrexObject))})
     end
-  end
 
-  def to_a
-    @class_names.map {|x| eval(x.to_s)}
   end
-  
-  def to_h
-    Hash[self.to_a.map {|x| [x.name[/\w+$/], x]}]
-  end
-  
-  private
-
-  def make_class(name, fields, schema=@schema)
-
-    if fields then
-
-      @class_names << name.capitalize
-
-      classx = []  
-      classx << "class #{name.capitalize} < PolyrexObject"
-      classx << "def initialize(node=nil, id: '0', objects: nil)"
-      classx << "  @id = id"
-      classx << "  node ||= Rexle.new('<#{name}><summary/><records/></#{name}>').root"
-      classx << "  super(node, id: id, objects: objects)"
-
-      classx << "  a = node.xpath('summary/*',&:name)"
-      classx << "  yaml_fields = a - (#{fields}  + %w(format_mask))"
-      classx << "yaml_fields.each do |field|"
-      classx << %q( "def self.#{field})
-      classx << %q(    s = @node.element('summary/#{field}/text()'))
-      classx << %q(    s[/^---/] ? YAML.load(s) : s)
-      classx << %q(  end")
-      classx << "end"
-
-      classx << "@fields = %i(#{fields.join(' ')})"          
-      classx << "@create = PolyrexCreateObject.new('#{@schema[/\/(.*)/,1]}', id: '#{@id}')"
-      classx << "end"
-
-      fields.each do |field|
-        classx << "def #{field}"
-        classx << "  if @node.element('summary/#{field}').nil? then"
-        classx << "    @node.element('summary').add Rexle::Element.new('#{field}')"
-        classx << "  end"
-        classx << "  node = @node.element('summary/#{field}/text()')"
-        classx << "  node ? node.clone : ''"
-        classx << "end"
-        classx << "def #{field}=(text)"
-        classx << "  if @node.element('summary/#{field}').nil? then"
-        classx << "    @node.element('summary').add Rexle::Element.new('#{field}', value: text)"
-        classx << "  else"
-        classx << "    @node.element('summary/#{field}').text = text"
-        classx << "  end"
-        classx << "end"
-      end
 
-      classx << "end"          
-
-      eval classx.join("\n")
-    end
+  def to_h
+    @classes
   end
 
-  def make_def_records(class_name, i=0)
-    
-    eval "#{class_name}.class_eval { 
-      def records()
-
-        classes = {#{@class_names.map{|x| %Q(%s: %s) % [x[/[^:]+$/].downcase,x]}.join(',')} }
-
-        objects = @node.xpath('records/*').map do |record| 
-          classes[record.name.to_sym].new(record, id: '#{@@id}')
-        end
-
-        def objects.records=(node); @node = node; end
-        def objects.records(); @node; end
-
-        def objects.sort_by!(&element_blk)
-          a = @node.xpath('records/*').sort_by &element_blk
-          records = @node.xpath('records')
-          records.delete
-          records = Rexle::Element.new 'records'
-          a.each {|record| records.add record}
-          @node.add records
-          @node.xpath('records/*').map {|record| #{@class_names[i]}.new(record)}
-        end
-
-        objects.records = @node
-
-        def objects.remove_all()
-          e = @node.element('records')
-          e.insert_before Rexle::Element.new('records')
-          e.delete
-        end
-
-        objects
-      end        
-              
-      alias #{@class_names[i].downcase} records
-      
-    }"
-
+  def to_a
+    @classes.to_a
   end
-
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-objects
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDkxOTE0MjE1MVoXDTE3MDkxOTE0MjE1MVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMVBwxta9lcbi5Knax5F2M5wmzEaMpIBWtmhCVncFWkE6/I9t7nIwgXGXxie
-  sG8hvFYCTmvP16jjHF4N9onSXSxmfRG+KfVegD98WY9Mwpn4LrzfmptP0jkknySS
-  3RXBVyvhuIdV/Y1fqTUfoCwmOzj+5shIq0ITYDK1ps3cbj54Q9pcqfAsMSA3X0ji
-  z+W5OgD6VHgQSPgtnhEnaenTYWPOwXJC2PPzlyToR2RIma+4GD/elpXtlfta130D
-  98ZSyNMGv49j90rYC2bcLaufd0iv1TZr3qTHCWPantpAKLbuaZcAreT/9xpOzCNX
-  ZucWCsC2bYfR6it7l3W3esMAwyUCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUVKQOcV8R19bHs8Ssu6oudV720akwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAfuynl6sE
-  moDCwW1vVh3v+gjThrAbrxdwZonbw9hSvOCcetaxm3CqrpLlLcTwoG8bbejXc//f
-  oQ62xVA9R6xaLYR90XyEo/KjMl194mr1x0kfMhDX9OdAOPUgvQosr2UsNsxk3Qqe
-  28jXhYkFFuHDncZGzXP/hqZgDpDUQiIuRbKzaBbJrTMBQq5zz5QH0IVsMQdB4mLF
-  PVHqVku7CAVFCfSOCdmP9gjcOGejaOORiCbvlO3eS15zXtAUhU8Q9z/Bj1TQIvWm
-  oXSdIUkeIE8xMnBo9hsYRTxYptr4zHbWPTQqtm/3qYXr4Fcsmov4E7uE/IPqzajB
-  s9lI00OyqNZ3ww==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzI5MjIyMjM4WhcN
+  MTkwMzI5MjIyMjM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2IJ/P
+  FkDr7HIhebYeCG4rgWoPCdyYEa/PimPVzStI57EMrQXoxpNKrd+B6B8utB3wDJO9
+  SedSqfQMDcToKtbf93uqTdB5+uD3jd20zu77T0aO6Zh6ZiVBumyVhah1DAPltdy0
+  2LiVR1wRFGLw1+cXYr4zCbN0QPOf7Y/d62Nozr4yNFWcz8fPnX9jFgEYXe3u6Jz5
+  fR4xJ2fP/j1OwpDf6ZvxuzYB6MuYRwaO1gBss5HP2BMu3XNhYMLM/c0ol5GIzSgi
+  d50IxhHZ50oaNv3iUKa0Sm57uoXwKKbED0Ngr06R34jdZ47+I30lY99Srnizid2o
+  q2o5eA0j21eTiY/JAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFDHTcDlJHSGUxHRByi2TUwXDTk1xMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBADy14YRcdKLPPHPaY062
+  /BX61dSbO7EDW0e3S06K0mC2vz/GgB4EAy7InOugbEiruN+b9d2easbxxOADoRD3
+  L6lL0ueVRJjEScdVRDKHbf/GDctXe1dVTK1Tg8LaMcwp+HAQTtd83eZi6sxrw5xK
+  9ERjlZVvXcNHuz9jWHUHj7HbYOS9vryaLbD+S9G72VPj/n1F/eAnUpnvZdqE/kxM
+  Ub/kjgBxH7GEfO1fPRZxK1+xOKc7oVr7y4Hpxm1+AVC6OpMCbn+5QTG1VrzSgPxb
+  ACBQhlVD3BfBw9Dgn9grd+SUOEmogOVDxNTXoL3fdgzYlSbv9YnK3csMPjzbMR6y
+  3O0=
   -----END CERTIFICATE-----
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-createobject
@@ -39,22 +38,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Polyrex-objects automically builds objects from a Polyrex schema

metadata.gz.sig

@@ -1 +1 @@
-��8��A�g���.f�0$��~�rW Nh�;�{=��{�@���S��
+P7�M[�1�F����O�vp5�5&���J�|�/��r��|�@n7ٞ�w�W΅ߜy��+��3X�qˮKPZmwY 5����Iq)�]�fiU�	�"�B곿�Z�\X��qdW��+�k	�d��=Μ)����גy�����'>���HT�F5RE<�����z��4oVĵ��pߪ񟴁���!�&9�f�Xo��<7g϶�SN��})����㪁&��ۑsڊU�W+o��ʌJ�;�y