rx_sliml 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c1f8f1fcead4bf7693a60cf2b9f7774ebff188b828c2f9ff59809aeef2dc12
-  data.tar.gz: 3c82a4f0985a140682fe3bc70742469d418627bdfbbc0a23a776044b7c709bea
+  metadata.gz: 409e781c8b7b5b538cc1ee0225bd3b609e2bd9007a9b7310e11ba728c8cbb430
+  data.tar.gz: db7558b934c4dbdac2c3b0bafa57ec2b99fc1100b6902d3b81d4c6939d0090df
 SHA512:
-  metadata.gz: 9e28510956d986d75447f99c55bc0af19dce4694946dd5985684c17e1f96b98668c1412c9e50ea9893b4b9692ac04a3fa49eaac692d71568bf9b3feea8785a41
-  data.tar.gz: d7651779526be5a87b2ad10ef5ee1a59af29065a7ee3062c06b4d8b5143b38217adf4457e9feebf1c90301f57689067e0e9fc93c68e9a82da9fe2ac0be028134
+  metadata.gz: bcc428f429bc0e0f6cafb0be06c1ff896864e9eae9b3e33020a7bde0032b362ef0fd44fa2f75f6c80e520aa9c76d79d62c75aa43d08e28ddecdbae18dd61767e
+  data.tar.gz: 7c6ac30d13c7abd7436fb50455e791e2001f63fe078c6cf7bb5759210f02d3583910c9af2ae95899c80fc3dac3cb40233f9969b57f6b9c109ad59eeb1f9f9b31

data/lib/rx_sliml.rb

@@ -7,16 +7,33 @@ require 'rexle-builder'
 require 'nokogiri'
 
 
+class RxSlimlException < Exception 
+end
+
 class RxSliml
 
   attr_reader :to_xslt, :to_html
 
-  def initialize(sliml=nil, rx=nil, fields: nil)
+  def initialize(sliml=nil, obj=nil, fields: nil)
 
-    @rx = (rx.is_a?(Kvx) ? rx : rx.to_kvx) if rx
+    # assumes the obj is either a Kvx object or responds to :to_kvx
+    #
+    @rx = if obj then
+    
+      if obj.is_a? Kvx then
+        obj
+      elsif obj.respond_to? :to_kvx
+        obj.to_kvx
+      elsif obj.respond_to? :to_xml
+        obj
+      else
+        raise RxSlimlException, 'reference object not recognised'
+      end
+    end
     
     if sliml.nil? and fields.nil? then
-      raise 'RxSliml: please enter a sliml string or an array of fields' 
+      raise RxSlimlException, 'RxSliml: please enter a sliml string or ' + 
+          'an array of fields' 
     end
     
     sliml ||= create_sliml(fields)
@@ -33,7 +50,7 @@ class RxSliml
     @to_xslt = build_xslt
 
     xslt  = Nokogiri::XSLT(@to_xslt)
-    @to_html = xslt.transform(Nokogiri::XML(@rx.to_xml)) if rx
+    @to_html = xslt.transform(Nokogiri::XML(@rx.to_xml)) if @rx
     
   end
   
@@ -111,4 +128,4 @@ class RxSliml
     
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rx_sliml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   k8AGLEdGamYYeNF1PX6Q8n1k34S0m5Ty0Jns92XI3ohbcdH9LFweWw4i1qCFqQC8
   cz+lZHiCYH6ZIHv/0vgLU2Tx
   -----END CERTIFICATE-----
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri