refx-engine-p3lib 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74894a71463e4e15166416934c0c23b0cd91917c
-  data.tar.gz: 90f0eafd784c64236823ecd20420f3d527755574
+  metadata.gz: 6972b7f91cc98df478cda6521325d0301ae1469f
+  data.tar.gz: e92a5501c7a5f6ab32142a1588db996849411f89
 SHA512:
-  metadata.gz: e836ddd1db763608e5ae9f7ca4a4c7696b905a05e556637ab9a25aaa2ae45698c154067182e0696d3da78c0b7f9afd857a0571aed9f307d3dc98c9bc7dca9908
-  data.tar.gz: 029b084b5ac8470234866af360b18ad8ae7a7dc9c5c49e4ebde012531bacb50fc6ce6a2cfa822838c3d41953231b3869af8ba3bff7ee135c81b6a5f47e4df46a
+  metadata.gz: 5c63d8b3ccd2f51ffaa05deab01ca59e3cb92886dc1b6c35ec882179570abe0fa8f7bdf39c8dffb95ecd623da7c775e70efad01a6f1a875c941923b6dd4de928
+  data.tar.gz: 7dc21c3d95848fa0e73fde2ddf6b84cf2310d40fd62b2815064cfb982a3bc53ce0ebeea7a5e052334300df366304144527059ed465bbddbf2b3b52ce38588efe

data/lib/refx/engine/p3lib/p3lib_hash_from_xml.rb

@@ -0,0 +1,92 @@
+require 'xmlsimple'
+# This Hash extension is needed by old pas3 engines. It's not automatically loaded. 
+# copy the line below on top of the file where from_xml is needed
+#
+# require 'refx/engine/p3lib/p3lib_hash_from_xml'
+
+class Hash
+  def self.from_xml(xml, preserve_attributes = false)
+    typecast_xml_value(self.undasherize_keys(XmlSimple.xml_in(xml,'forcearray'=>false,'forcecontent'=>true,'keeproot'=>true,'contentkey'=>'__content__')), preserve_attributes)
+  end
+
+  private
+
+  def self.undasherize_keys(params)
+    case params.class.to_s
+    when "Hash"
+      params.inject({}) do |h,(k,v)|
+        h[k.to_s.tr("-", "_")] = self.undasherize_keys(v)
+        h
+      end
+    when "Array"
+      params.map { |v| self.undasherize_keys(v) }
+    else
+      params
+    end
+  end
+
+  def self.typecast_xml_value(value, preserve_attributes = false)
+    case value.class.to_s
+    when 'Hash'
+      if value['type'] == 'array'
+        #child_key, entries = value.detect { |k,v| k != 'type' }   # child_key is throwaway
+        if entries.nil? || (c = value['__content__'] && c.nil?) || (c = value['__content__'] && c.empty?)
+          []
+        else
+          case entries.class.to_s   # something weird with classes not matching here.  maybe singleton methods breaking is_a?
+          when "Array"
+            entries.collect { |v| typecast_xml_value(v, preserve_attributes) }
+          when "Hash"
+            [typecast_xml_value(entries, preserve_attributes)]
+          else
+            raise "can't typecast #{entries.inspect}"
+          end
+        end
+      elsif value.has_key?("__content__")
+        content = value["__content__"]
+        if parser = XML_PARSING[value["type"]]
+          if parser.arity == 2
+            XML_PARSING[value["type"]].call(content, value)
+          else
+            XML_PARSING[value["type"]].call(content)
+          end
+        elsif preserve_attributes && value.keys.size > 1
+          value["content"] = value.delete("__content__")
+          value
+        else
+          content
+        end
+      elsif value['type'] == 'string' && value['nil'] != 'true'
+        ""
+        # blank or nil parsed values are represented by nil
+      elsif value.nil? || value.empty? || value['nil'] == 'true'
+        nil
+        # If the type is the only element which makes it then
+        # this still makes the value nil, except if type is
+        # a XML node(where type['value'] is a Hash)
+      elsif value['type'] && value.size == 1 && !value['type'].is_a?(::Hash)
+        nil
+      else
+        xml_value = value.inject({}) do |h,(k,v)|
+          h[k] = typecast_xml_value(v, preserve_attributes)
+          h
+        end
+
+        # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
+        # how multipart uploaded files from HTML appear
+        xml_value["file"].is_a?(StringIO) ? xml_value["file"] : xml_value
+      end
+    when 'Array'
+      value.map! { |i| typecast_xml_value(i, preserve_attributes) }
+      case value.length
+      when 0 then nil
+      when 1 then value.first
+      else value
+      end
+    when 'String'
+      value
+    else
+      raise "can't typecast #{value.class.name} - #{value.inspect}"
+    end
+  end
+end

data/lib/refx/engine/p3lib/version.rb

@@ -1,7 +1,7 @@
 module Refx
   module Engine
     module P3lib
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/refx-engine-p3lib.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.10"
   spec.add_development_dependency "minitest", "~> 5.1"
   spec.add_development_dependency "rb-appscript", "~> 0.6"
+  spec.add_runtime_dependency "xml-simple", "~> 1.1.4"
 end

data/test/p3lib_rpc_test.rb

@@ -5,6 +5,7 @@ require 'yaml'
 require 'base64'
 #require 'pp'
 require 'refx/engine/p3lib'
+require 'refx/engine/p3lib/p3lib_hash_from_xml'
 
 class P3libImageTest < Minitest::Test
   def test_imageutil_path
@@ -17,3 +18,36 @@ class P3libLoggerTest < Minitest::Test
     P3libLogger::log("test",'test')
   end
 end
+
+class P3libHashFromXML < Minitest::Test
+  def test_log_info
+
+    xml = '<?xml version="1.0" encoding="UTF-8"?>
+<document spread_count="1" page_count="1" html_prev="uploads/tx_p3ga/421/page_1_1.png" >
+  <spreads >
+    <spread215 page_count="1" index="1" id="215" >
+      <pages >
+        <page222 sourceId="222" preview="uploads/tx_p3ga/421/page_1_1.png" id="222" side="single" html_prev="uploads/tx_p3ga/421/page_1_1.png" >
+          <layerGroups >
+            <group00 >
+              <layer163 preview="uploads/tx_p3ga/421/page_1_1_layer163.png" layerID="163" html_prev="uploads/tx_p3ga/421/page_1_1_layer163.png" />
+            </group00>
+            <group01 >
+              <layer210 preview="uploads/tx_p3ga/421/page_1_1_layer210.png" layerID="210" html_prev="uploads/tx_p3ga/421/page_1_1_layer210.png" />
+            </group01>
+            <group02 >
+              <layer536 layerID="536" />
+            </group02>
+          </layerGroups>
+        </page222>
+      </pages>
+    </spread215>
+  </spreads>
+</document>
+'
+    finalHash = Hash.from_xml(xml,true)
+    assert_equal finalHash['document']['spreads']['spread215']['pages']['page222']['layerGroups'].count, 3
+    assert_equal finalHash['document']['spreads']['spread215']['pages']['page222']['html_prev'], 'uploads/tx_p3ga/421/page_1_1.png'
+    assert_equal finalHash['document']['spreads']['spread215']['pages']['page222']['id'], '222'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refx-engine-p3lib
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Pim Snel
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 description: P3 Library bundle for other Engines
 email:
 - pim@lingewoud.nl
@@ -99,6 +113,7 @@ files:
 - lib/refx/engine/p3imgutils/p3trimalpha
 - lib/refx/engine/p3imgutils/pdfrasterize
 - lib/refx/engine/p3lib.rb
+- lib/refx/engine/p3lib/p3lib_hash_from_xml.rb
 - lib/refx/engine/p3lib/p3lib_image.rb
 - lib/refx/engine/p3lib/p3lib_indesign.rb
 - lib/refx/engine/p3lib/p3lib_indesignlocalization.rb