maremma 4.2.1 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c304137370fc489aa2fe26c76fffaa03fc7071416981eeda04004b19ae0eaf9
-  data.tar.gz: 219bce982fb692e875be3c7444579daa9ea3299ab66161b0621e50f52cf3e4af
+  metadata.gz: 314ffe1024407f3640021c859c332ecfefed5e427049fa7536fff73ee628e59f
+  data.tar.gz: ad53b775960092cbea0043e34a16ef2b2d1b309523d1f9950a447c0f53ccbdb4
 SHA512:
-  metadata.gz: e4ffe653c9a392c11fee96a5e3e6009708f3c4897589f98cb7520417916004d4872e45f43b73ac7d878bd5c307bb9a3938920d69152f9162c2289a202d6daf98
-  data.tar.gz: 6aa7603847ed11c38ac47ec14ecdaab2c71307fef9509a7c418c6681b151b834d8eee6843f20d16a31bdaa104bbebf834b3247b1e1524d27a9970bb198d28d75
+  metadata.gz: e93a9969fbfd9d640bff442858e66c46379da35fe2a1394e6a395c334c26d96a6ed59f2baa869f68804c64587bf28ea129f566cde9755900aac7813210700641
+  data.tar.gz: b8714703994cb455e7ae1d4b211562bc72fa68865d7386a1a2e4417d9a4ad86fdfd9b2971e15cc009945e5a0665a3b79d515cbbf5f7e07465d504b87a5b4c4f8

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    maremma (4.2.1)
+    maremma (4.2.3)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
-      excon (~> 0.60)
-      faraday (~> 0.14)
+      excon (~> 0.60, < 0.63)
+      faraday (~> 0.14, < 0.15)
       faraday-encoding (~> 0.0.4)
       faraday_middleware (~> 0.12.0)
       multi_json (~> 1.12)
@@ -16,41 +16,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
     excon (0.62.0)
-    faraday (0.15.4)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.5)
       faraday
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.8)
-    i18n (1.5.1)
+    hashdiff (0.4.0)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
-    oj (3.7.6)
-    public_suffix (3.0.3)
-    rack (2.0.6)
+    oj (3.7.12)
+    public_suffix (3.1.1)
+    rack (2.0.7)
     rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rake (12.3.2)
@@ -58,16 +58,16 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    safe_yaml (1.0.4)
+    rspec-support (3.8.2)
+    safe_yaml (1.0.5)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -77,10 +77,10 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     vcr (3.0.3)
-    webmock (3.5.1)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -97,4 +97,4 @@ DEPENDENCIES
   webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "4.2.1"
+  VERSION = "4.2.3"
 end

data/lib/maremma/xml_converter.rb

@@ -8,7 +8,7 @@ module ActiveSupport
     private
 
     def become_content?(value)
-      value['type'] == 'file' || (value['__content__'] && (value.keys.size == 1 && value['__content__'].present?))
+      value['type'] == 'file' || value['type'] == 'string' || (value['__content__'] && (value.keys.size == 1 && value['__content__'].present?))
     end
   end
 end

data/maremma.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Declary dependencies here, rather than in the Gemfile
-  s.add_dependency 'faraday', '~> 0.14'
+  s.add_dependency 'faraday', '~> 0.14', '< 0.15'
   s.add_dependency 'faraday-encoding', '~> 0.0.4'
   s.add_dependency 'faraday_middleware', '~> 0.12.0'
-  s.add_dependency 'excon', '~> 0.60'
+  s.add_dependency 'excon', '~> 0.60', '< 0.63'
   s.add_dependency 'nokogiri', '~> 1.8.1'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'multi_json', '~> 1.12'

data/spec/maremma_spec.rb

@@ -573,6 +573,11 @@ describe Maremma do
       expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "__content__"=>"abc"}})
     end
 
+    it 'from_xml with attribute type string' do
+      string = '<crm-item name="publisher-name" type="string">eLife Sciences Publications, Ltd</crm-item>'
+      expect(subject.parse_success_response(string)).to eq("data"=>{"crm_item"=>"eLife Sciences Publications, Ltd"})
+    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"}})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: faraday-encoding
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.60'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.63'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.60'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.63'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Simplified network calls