maremma 3.5 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb93b6fbd1989f0b9e4fa2ff44208c4be9df6ab
-  data.tar.gz: e3222f0a8c5325ffdba5c1062ff8a8371f195d64
+  metadata.gz: ba82a8adc41f610974a1e5f0fee1616d04e4d465
+  data.tar.gz: 4eaf91d77ceebe086c1bdeab2f068d9e143a5c68
 SHA512:
-  metadata.gz: 93d75cc7a087ea4251fc4a8a94ffbe93b697479c94094bfd5ad6d2024faa2899550c980707747abdd6ba94fab7f8ff6302e37f22c461a9824ebf8ea2449e1619
-  data.tar.gz: 59287bb7153af851dfb492ebc6cee926df4dc38c5a2e9ff4d7da204658ad08ae6f0d3dba81ddb853f71491d83abb5ef7d4855514d261d910438c470bf2842d5a
+  metadata.gz: ba82e06bd569ae40504b93c0d4327c0f53d76d06bb198d4100209e3501101de59dfa957b66ec61009b5350b1817eaa43f7c4ceb32824bade269e5bed8738736f
+  data.tar.gz: 234196702252c07ae88ba1bcd57d41b130751c8230a06056429d18171ccbe239903c8ea4db22c9dd88cb7a75ea79f1f0667bf564979426493b32e291359f2c3e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (3.5)
+    maremma (3.5.1)
       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.14.4
+   1.12.5

data/lib/maremma.rb

@@ -7,20 +7,20 @@ require 'faraday/encoding'
 require 'excon'
 require 'uri'
 require 'addressable/uri'
-require 'maremma/hash'
-
-DEFAULT_TIMEOUT = 60
-NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
-                          Faraday::TimeoutError,
-                          Faraday::SSLError,
-                          Faraday::ConnectionFailed,
-                          URI::InvalidURIError,
-                          Encoding::UndefinedConversionError,
-                          ArgumentError,
-                          NoMethodError,
-                          TypeError]
+require 'maremma/xml_converter'
 
 module Maremma
+  DEFAULT_TIMEOUT = 60
+  NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
+                            Faraday::TimeoutError,
+                            Faraday::SSLError,
+                            Faraday::ConnectionFailed,
+                            URI::InvalidURIError,
+                            Encoding::UndefinedConversionError,
+                            ArgumentError,
+                            NoMethodError,
+                            TypeError]
+                            
   def self.post(url, options={})
     is_valid_url?(url)
 

data/lib/maremma/version.rb

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

data/lib/maremma/xml_converter.rb

@@ -0,0 +1,12 @@
+# modified from http://stackoverflow.com/a/29431089
+# preserve attributes in xml
+
+module ActiveSupport
+  class XMLConverter
+    private
+
+    def become_content?(value)
+      value['type'] == 'file' || (value['__content__'] && (value.keys.size == 1 && value['__content__'].present?))
+    end
+  end
+end

data/spec/maremma_spec.rb

@@ -461,7 +461,12 @@ describe Maremma do
 
     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"}})
+      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "__content__"=>"abc"}})
+    end
+
+    it 'from_xml with mixed attribute' do
+      string = '<word type="small">abc<footnote>1</footnote></word>'
+      expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "footnote"=>"1", "__content__"=>"abc"}})
     end
 
     it 'from_string' do

metadata

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

data/lib/maremma/hash.rb

@@ -1,63 +0,0 @@
-# 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