maremma 3.1.5 → 3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4915ffe0ca6454d2cf9b8d577a50f9ae6821a38c
-  data.tar.gz: c234f8ee74ad2bc1d41a104c50f7cf1ca5652da4
+  metadata.gz: aeb93b6fbd1989f0b9e4fa2ff44208c4be9df6ab
+  data.tar.gz: e3222f0a8c5325ffdba5c1062ff8a8371f195d64
 SHA512:
-  metadata.gz: 53a4b285f838e4a49ef0b64e93a91dee9690264314ccf7158847ce4eb5c4f22be33c54b639b5831847f123d314f99c95d152d16792a2fd2f28e768b7424e2b1d
-  data.tar.gz: 7a4d14c96fa953d83c84fbeb68eb8b0d46cc8acca1951e7cf5326f24aacde23989661ed8bfbc15fe9500031358bf587366e8e6262befad40a06b919cdae75f3d
+  metadata.gz: 93d75cc7a087ea4251fc4a8a94ffbe93b697479c94094bfd5ad6d2024faa2899550c980707747abdd6ba94fab7f8ff6302e37f22c461a9824ebf8ea2449e1619
+  data.tar.gz: 59287bb7153af851dfb492ebc6cee926df4dc38c5a2e9ff4d7da204658ad08ae6f0d3dba81ddb853f71491d83abb5ef7d4855514d261d910438c470bf2842d5a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.3.5 (February 14, 2017)
+
+[maremma 3.5](https://github.com/datacite/maremma/releases/tag/v.3.5) was released on February 14, 2017:
+
+* breaking change: include attributes when parsing XML (use "text" key for node content)
+
 ## v.3.1.2 (January 29, 2017)
 
 [maremma 3.1.2](https://github.com/datacite/maremma/releases/tag/v.3.1.2) was released on January 29, 2017:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.1.5)
+    maremma (3.5)
       activesupport (~> 4.2, >= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
@@ -96,4 +96,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.12.5
+   1.14.4

data/lib/maremma.rb

@@ -7,6 +7,7 @@ require 'faraday/encoding'
 require 'excon'
 require 'uri'
 require 'addressable/uri'
+require 'maremma/hash'
 
 DEFAULT_TIMEOUT = 60
 NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
@@ -254,6 +255,7 @@ module Maremma
     (headers["X-Rate-Limit-Remaining"] || headers["X-RateLimit-Remaining"] || 100).to_i
   end
 
+  # keep XML attributes, http://stackoverflow.com/a/10794044
   def self.from_xml(string)
     if Nokogiri::XML(string).errors.empty?
       Hash.from_xml(string)

data/lib/maremma/hash.rb

@@ -0,0 +1,63 @@
+# modified from http://stackoverflow.com/questions/1230741/convert-a-nokogiri-document-to-a-ruby-hash/1231297#123129
+# https://gist.github.com/huy/819999
+
+require 'nokogiri'
+
+ActiveSupport::XmlMini.backend = 'Nokogiri'
+
+class Hash
+  class << self
+    def from_xml(xml_io)
+      begin
+        result = Nokogiri::XML(xml_io)
+        return { result.root.name => xml_node_to_hash(result.root)}
+      rescue Exception => e
+        # raise your custom exception here
+      end
+    end
+
+    def xml_node_to_hash(node)
+      # If we are at the root of the document, start the hash
+      if node.element?
+        result_hash = {}
+        if node.attributes != {}
+          attributes = {}
+          node.attributes.keys.each do |key|
+            attributes[node.attributes[key].name] = node.attributes[key].value
+          end
+        end
+        if node.children.size > 0
+          node.children.each do |child|
+            result = xml_node_to_hash(child)
+
+            if child.name == "text"
+              unless child.next_sibling || child.previous_sibling
+                return result unless attributes
+                result_hash[child.name] = result
+              end
+            elsif result_hash[child.name]
+
+              if result_hash[child.name].is_a?(Object::Array)
+                 result_hash[child.name] << result
+              else
+                 result_hash[child.name] = [result_hash[child.name]] << result
+              end
+            else
+              result_hash[child.name] = result
+            end
+          end
+          if attributes
+             #add code to remove non-data attributes e.g. xml schema, namespace here
+             #if there is a collision then node content supersets attributes
+             result_hash = attributes.merge(result_hash)
+          end
+          return result_hash
+        else
+          return attributes
+        end
+      else
+        return node.content.to_s
+      end
+    end
+  end
+end

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.1.5"
+  VERSION = "3.5"
 end

data/spec/maremma_spec.rb

@@ -459,6 +459,11 @@ describe Maremma do
       expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
     end
 
+    it 'from_xml with attribute' do
+      string = '<word type="small">abc</word>'
+      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "text"=>"abc"}})
+    end
+
     it 'from_string' do
       string = "abc"
       expect(subject.parse_success_response(string)).to eq("data"=>"abc")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: '3.5'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -303,6 +303,7 @@ files:
 - README.md
 - Rakefile
 - lib/maremma.rb
+- lib/maremma/hash.rb
 - lib/maremma/version.rb
 - maremma.gemspec
 - spec/fixtures/vcr_cassettes/Maremma/content_negotiation/redirects_to_URL.yml