xmlregistry_objects 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617c355f443a3804be6220e2c8b1c4ff56d147c7
-  data.tar.gz: 3da106e336c6ded540a4981e30e433f8d81620bd
+  metadata.gz: b667141471cbe8f34c1d0c0d88209df77b36261f
+  data.tar.gz: e6440b8f3e37684e61e9c23a1d62e28b2dacd15a
 SHA512:
-  metadata.gz: d435d116cd01d0c2bcd8a727ae1492cc65ee1edba84aa08c5f66621ae88b3a013fa2e3e802d59e3280ce6ef7d9defdd4aabb952ca821f222fde583b78f6af2c9
-  data.tar.gz: c77b0b61f217e138fec81a32011eb8e94c0cd3a7c01e7fac9823add60f4567d51d94caebbe8a8a189647dc725c1b7c395b0083891cb3b63aa4c703e99ee99ae2
+  metadata.gz: 2000ce0f3619121f9ec33e6906fdfd07caeb49a95970d50c53c3bbdf787e48f8e6a9236f2c3a7ee397d683fd2a36cb5b8f588997d56354df3423c154ae1fe370
+  data.tar.gz: aa61a4337c942eaa06bac20e38f368dff761076d65fdd647ca616c00ef99efb3a50494f856ced545e09376b6e7fbeeb8db626534d3489c6dcf88cccd50138035

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-x~拠t�%�k���%S/Wj�Snm�D�䧇Ju=A�� �W��ؿ��3��/҂޸8�}�(7E�pب��Z�����U���������J?@��%��Q�:�kw���;�k�HY}�E
-�L`�7��er�u���.��	��ǀaN�$�K!z(��/4���j���Ij�I��P��E�Ɇ��f���E���Wߛͦ/5c�>�b߲k&w�E�
+�`�N�C�L%|c-��$'�+�8w��5=�K���\=�+�A�L�;6a2S�#�ԥ�3M�v@�)��8�Nk�0_2j=R�`�O�yk��yZ�wyZ�����	Y"�h��0-$��ɯ���Q�������_Q?�������C,�~/B|v<=���1k�"�7���?F!MlSȅ��6>	���뾶Ǜ���M���|,��E��<��4
+�(�H����6¥QI�\d��,�Vj^�e�
+�

data/lib/xmlregistry_objects.rb

@@ -15,53 +15,61 @@ class XMLRegistryObjects
 
   def initialize(reg, list)
 
-
     patterns = [
       [:root, /(\w+)\s+=\s+\[([^\]]+)\]/, :object],  
         [:object, /([\w\?]+)\s+=\s+(.*)/, :attribute]
     ]
 
-
     lp = LineParser.new patterns
     r = lp.parse list
 
-
     @to_h = r.inject({}) do |rtn, row|
 
       name, path = row[1][:captures]
       class_name = name.capitalize
       klass = Object.const_set(class_name,Class.new)
 
+      s = "
+        def initialize(reg)
+          @reg = reg
+        end
+      "
 
-      row[3].each do |attr|
-
-        attr_name, x = attr[1][:captures]
+      s = if row[3].any? then
 
-        subkey, type = x.split(/\s/).reverse
+        row[3].inject(s) do |r, attr|
 
-        s = "
+          attr_name, x = attr[1][:captures]
+          subkey, type = x.split(/\s/).reverse
 
-        def initialize(reg)
-
-          @reg = reg
+          r << make_def(path, subkey, attr_name, type)
 
         end
 
-        def #{attr_name}      
+      else
 
-          text = @reg.get_key('#{[path, attr_name].join('/')}/text()')
-          #{'text == %q(true) ? true : false' if type == 'Bool'}
+        names = reg.xpath("#{path}/*/name()")
+        
+        names.inject(s) do |r, subkey| 
+          r << make_def(path, subkey)
         end
-        "
-
-        klass.class_eval s
-
       end
 
+      klass.class_eval s
       rtn.merge name.to_sym => klass.new(reg)
 
     end
+  end
+
+  private
 
+  def make_def(path, subkey, method_name=subkey, type=nil)
+"
+    def #{method_name}      
+      text = @reg.get_key('#{[path, subkey].join('/')}/text()')
+      #{'text == %q(true) ? true : false' if type == 'Bool'}
+    end
+"
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlregistry_objects
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   wqxRKfbBOqXm+dGN+8ORUi9zTMOCo8Ga+cAbwYouf3Rzoq8gZMo6o1ZuAyEu1Vjl
   u2W9v1mcGY4/Vw==
   -----END CERTIFICATE-----
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-registry
@@ -39,40 +39,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: line-tree
+  name: lineparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.17
+        version: 0.1.13
 description: 
 email: james@r0bertson.co.uk
 executables: []