polyrex-createobject 0.4.15 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bc9482fde51072a9e13af95b9ad729f5fbd1a8f
-  data.tar.gz: f5cb08673251968132944f9fda23489ccbe22728
+  metadata.gz: d06a5b8d9fa6ddadaf9f2293ce65ed07c22e0d2d
+  data.tar.gz: c8a635cf6570fc68b1a15e54a7765279a3247dbc
 SHA512:
-  metadata.gz: 59732cbdae2fd29bc567c250028dd94fef953a9508d67902a3ee10e76a76af8b14a04dc7363db1bd0ace147371104a9a7bedb39ee4a446d5a4a414475d0a0584
-  data.tar.gz: 94bfab5b487f512fbd93cf66de2c190b0bc7737c3986c1395ae1319ac2692ba87eefb59630b9236234b4e3e1ed763d7661fd843e15fd5ca0f09845226dc6db8a
+  metadata.gz: 7def32cabec4f6634064638be39a5eb872e56a23d8d95ebab0904daa8c3ca5350b7915cdb04b1685fce334d0244fa72a92ad07716800d9758613884a97217dfa
+  data.tar.gz: d16b6325fe8b98fafa1e61aae27c168dadb3afab527dd552f7b0385565beb57d8bb8873f5930cd6d19b1a5f4ebf7fd3e98f3d2b92e52ab667136efc8eaff166e

data/lib/polyrex-createobject.rb

@@ -2,35 +2,50 @@
 
 # file: polyrex-createobject.rb
 
-require 'polyrex-schema'
+
 require 'rexle'
+require 'polyrex-schema'
 
 
 class PolyrexCreateObject
 
   attr_accessor :parent_node
-  
+  attr_reader :obj
+
+
   def initialize(schema, id='1')
+
     @@id = id
 
-    @schema = schema
+    raise "missing schema" unless schema
 
-    if @schema then
-      a = @schema.split('/')        
-      @rpaths = (a.length).times.inject({}) do |r| 
-        r.merge ({a.join('/').gsub(/\[[^\]]+\]/,'') => a.pop}) 
+    @schema = schema[/\/.*$/][1..-1]
+    a = PolyrexSchema.new(schema).to_a
+    @obj = attach_create_handlers(a)
+
+    @obj.class_eval do 
+      def record=(node)
+        @parent_node = node
       end
+    end
 
-      values = @rpaths.values.reverse
+    self.instance_eval " def #{@obj.name.downcase}(h, id=@@id, &blk)
 
-      @rpaths.keys.reverse.each.with_index do |key,i |
-        @rpaths[key] = values[i..-1].join('/')
-      end
+      new_parent = create_node(@parent_node, @schema, h, id).element('records')
 
-      names = @rpaths.to_a[0..-2].map {|k,v| [v[/[^\[]+/], k]}
+      obj = @obj.new
+      obj.record = new_parent
+      obj.instance_variable_set(:@schema, @schema[/\\/(.*$)/,1])
       
-      attach_create_handlers(names)
+
+      if block_given? then
+        blk.call obj
+      else
+        obj
+      end
     end
+    "    
+
   end
   
   def id=(s)  @@id = s; self end
@@ -40,51 +55,60 @@ class PolyrexCreateObject
     @parent_node = node
   end
 
-  def attach_create_handlers(names)
-    methodx = names[0..-2].map do |name, xpath|
+  private
 
-# nested records
-%Q(
-  def #{name}(params={}, id=nil,&blk) 
+  def attach_create_handlers(a)
 
-    id ||= @@id
-    orig_parent = @parent_node
-    new_parent = create_node(@parent_node, @rpaths['#{xpath}'], params, id).element('records')
+    class_name = "root".capitalize
+    parent_klass = Object.const_set(class_name,Class.new)
+    result = scan parent_klass, a
+  end
 
-    if block_given? then
-      self.record = new_parent
-      blk.call(self) 
-    end
+  def create_node(parent_node, child_schema, params={}, id=nil)
 
-    self.record = orig_parent
+    buffer = PolyrexSchema.new(child_schema[/^[^\/]+/]).to_s
+    record = Rexle.new buffer     
 
-    self
-  end
-)
+    if id then
+      @@id.succ!
+    else
+      if @@id.to_i.to_s == @@id.to_s then
+        @@id.succ!
+      else
+        @@id = @parent_node.element('count(//@id)').to_i + 2
+      end
     end
 
-    name, xpath = names[-1]
+    record.root.add_attribute({'id' => @@id.to_s.clone})
+
+    a = child_schema[/[^\[]+(?=\])/].split(',')
 
-# top record    
-    methodx << %Q(
-def #{name}(params={}, id=nil,&blk)
-  id ||= @@id
-  orig_parent = @parent_node
-  self.record = @parent_node.element('records') unless @parent_node.name == 'records'
-  self.record = create_node(@parent_node, @rpaths['#{xpath}'], params, id).element('records')        
-  blk.call(self) if block_given?
-  self.record = orig_parent
+    summary = record.root.element('summary')
+    a.each do |field_name|  
+      field = summary.element(field_name.strip)
+      field.text = params[field_name.strip.to_sym]
+    end
 
-  self
-end
-)
+    parent_node.add record.root
 
-    self.instance_eval(methodx.join("\n"))
-    
   end
 
-  def create_node(parent_node, child_schema, params={}, id=nil)
+  def scan(parent, list)
+
+    record = list.shift
+    args = list
+
+    r = []
+
+    fields = []
+    fields << args.shift while args.first.is_a? Symbol
+
+    class_name = record.capitalize
+    klass = Object.const_set(class_name,Class.new)
 
+    parent.class_eval do
+
+      define_method :create_node do |parent_node, child_schema, params={}, id=nil|
 
     buffer = PolyrexSchema.new(child_schema[/^[^\/]+/]).to_s
     record = Rexle.new buffer     
@@ -114,8 +138,69 @@ end
   end
 
 
-  def xpath_to_rpath(xpath)
-    xpath.split('/').each_slice(2).map(&:last).join('/').gsub(/\[[^\]]+\]/,'')
+      define_method record do |h, id=nil, &blk|
+
+        id ||= @@id
+        local_schema = "%s[%s]" % [record, fields.join(',')]        
+        new_parent = create_node(@parent_node, local_schema, h, id).element('records')
+        
+        obj = klass.new
+
+        def obj.record=(node)
+          @parent_node = node
+        end
+
+
+        obj.record = new_parent
+        #if block_given? then
+        if blk then
+          blk.call obj  
+        else
+          obj
+        end
+        self
+      end
+    end
+
+    return klass unless args.any?
+
+    next_rec = args.shift
+
+    if next_rec.first.is_a? Array then
+      remaining = scan(parent, *args) unless args.length < 1
+
+      next_rec.each do |x| 
+
+        child_klass = scan(klass,x)
+
+        if remaining then
+
+          child_klass.class_eval do
+
+            define_method remaining.name.downcase.to_sym do |h, id=nil, &blk|
+
+              id ||= @@id
+              local_schema = "%s[%s]" % [record, fields.join(',')]
+
+              new_parent = create_node(@parent_node, local_schema, params, id).element('records')
+
+              obj = remaining.new
+              obj.record = new_parent
+              yield obj
+
+              self
+            end
+          end
+        end
+      end
+
+    else
+      remaining = scan(klass, *list) unless args.length < 1
+      scan(klass, next_rec)
+      scan(r, remaining) if remaining
+    end
+
+    return klass
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-createobject
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.17
 platform: ruby
 authors:
 - James Robertson
@@ -10,41 +10,49 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDA0NloXDTE0MDIwNjIxMDA0NlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE0MDYxMDE4NTQyNFoXDTE1MDYxMDE4NTQyNFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALnXm9pg6RkR9VDVH8nB7j6wnJCthQE4ZopkmkSFIX3KZzfRY3QiQoR1q9Wz
-  K1PNdB9Xx0bhlFLTRNoeEnW+qkLViiN0bo79GMvwCA+LECxm+HrJiANUNKdX2qR/
-  Wt9/BBhXTRDXLANPaTyMb3lbI6IT+D8tRTLVQmH7oe6klmLOVc+u9nle27V/EQw+
-  PLYTXsTQkJEc2zPzRRrp3VtAdunqqfqrJFKwI4PNcmleQ3tStkNHTdJeOySOg2FQ
-  0u7MscYwVp68oelB9s53HicXdBEWibK9bhLwWzlx9MlDeyEv/ksGCq7SFOa2hkkD
-  uuGS9eUJJ0TgbrVSw5BLXyUPohUCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUiFdyjFbPCOEvirS/kc8UXPAuDPkwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQBTrOKtHAWF50PfHoOLt98QOuPT5/gqRmVjpSRkJwMz0fVdBsx7hNuC
-  FFVmJaqpTV0dHFagRpPLOqPFQRQAmQ9XoPZxxfpw52yenDpdB2l4+nrFRF+KSybE
-  0xvN+3wHlyim4VtcUn+PuJgOVr+m3U9FbQ3fvrcS9dWhSSGyDBeJBoF2Xvx/qliy
-  07AV9U4V5Jf9bYOnbkCejRX+DHA53GG6zQi56rV4R77/w6RuJbHaABWoTU0OV9N0
-  /uQTwOrEFUTOPchp29l7/+KRd0+d4xdI8OAlBC9K1aQn6PZYtusb3Fs0i6axJ5n+
-  8Y81iY1zRvbtkGYb43OlUoUgtMRbmjkD
+  ggEBANl/vg+k69QF/+07LT7xiONXbg1eQuOIsF8pkF++AC6b3qYjrqw8QyUWIBEj
+  4QDhbbODoUkQZ+RSncX0zyf7ss2fQ2xfqWbWwK5QAucpjMGEX7NIIOqM78tnqQm/
+  LaCUpFGYBIj5K3GmqQEk2yrZDBoqvaCCuP7BT5NKeK3wQQbTiqREf+6oyMggUAPE
+  d5XAWThFlzja93uiL5/B5vhu4xODqHXOkHqno/oPQ+Dcyn1qP7U61NLKcm1ors2Y
+  cbQglfBy1xroiGBgIdwW61q68NILVpHQsJ1AjeZw4WeqmIHZS7nOI2K2WYG0adr8
+  7Xfy3vLCwMhRjSTXj+yo2kWUSn0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUtGGpyfWCH4LJIx9manZK+J2zqk8wJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAHZjkoDAi
+  3UAg3FY+RMafVDw/0nkwYLgXtmEVk2YHuOKZKY9g+7xCG6/v+jspzgyndPl0oIeG
+  ED4p8UbmQt5wPQwhWU/6hZaVRe6n/PBtgbktCaU4bVjlE+84s11J7rHMWIUbykKs
+  8FO2zKoVjq6hCMxrYgs2u0++Ju5E1rvppHqMyrzeJzwmkW3XXsCvdR1Wqvg3cath
+  Ro9OPaTvLpSW/gRNa3cYnUAT2nbiPO2hzjzMcHkMviDtllJpwZgCLGPe8sHBzb95
+  f3O5lCaUfMDZbRHRyvXjy/4PFRQKLr6ZLbpQN+dWceS6/82/5xWEL/7Bo/86R5xN
+  JL6pGH//inbMWQ==
   -----END CERTIFICATE-----
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.16
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -64,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -72,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: polyrex-createobject