maremma 4.2.1 → 4.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +22 -22
  3. data/lib/maremma/version.rb +1 -1
  4. data/lib/maremma/xml_converter.rb +1 -1
  5. data/maremma.gemspec +2 -2
  6. data/spec/maremma_spec.rb +5 -0
  7. metadata +15 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3c304137370fc489aa2fe26c76fffaa03fc7071416981eeda04004b19ae0eaf9
4
- data.tar.gz: 219bce982fb692e875be3c7444579daa9ea3299ab66161b0621e50f52cf3e4af
3
+ metadata.gz: 314ffe1024407f3640021c859c332ecfefed5e427049fa7536fff73ee628e59f
4
+ data.tar.gz: ad53b775960092cbea0043e34a16ef2b2d1b309523d1f9950a447c0f53ccbdb4
5
5
  SHA512:
6
- metadata.gz: e4ffe653c9a392c11fee96a5e3e6009708f3c4897589f98cb7520417916004d4872e45f43b73ac7d878bd5c307bb9a3938920d69152f9162c2289a202d6daf98
7
- data.tar.gz: 6aa7603847ed11c38ac47ec14ecdaab2c71307fef9509a7c418c6681b151b834d8eee6843f20d16a31bdaa104bbebf834b3247b1e1524d27a9970bb198d28d75
6
+ metadata.gz: e93a9969fbfd9d640bff442858e66c46379da35fe2a1394e6a395c334c26d96a6ed59f2baa869f68804c64587bf28ea129f566cde9755900aac7813210700641
7
+ data.tar.gz: b8714703994cb455e7ae1d4b211562bc72fa68865d7386a1a2e4417d9a4ad86fdfd9b2971e15cc009945e5a0665a3b79d515cbbf5f7e07465d504b87a5b4c4f8
data/Gemfile.lock CHANGED
@@ -1,12 +1,12 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- maremma (4.2.1)
4
+ maremma (4.2.3)
5
5
  activesupport (>= 4.2.5, < 6)
6
6
  addressable (>= 2.3.6)
7
7
  builder (~> 3.2, >= 3.2.2)
8
- excon (~> 0.60)
9
- faraday (~> 0.14)
8
+ excon (~> 0.60, < 0.63)
9
+ faraday (~> 0.14, < 0.15)
10
10
  faraday-encoding (~> 0.0.4)
11
11
  faraday_middleware (~> 0.12.0)
12
12
  multi_json (~> 1.12)
@@ -16,41 +16,41 @@ PATH
16
16
  GEM
17
17
  remote: https://rubygems.org/
18
18
  specs:
19
- activesupport (5.2.2)
19
+ activesupport (5.2.3)
20
20
  concurrent-ruby (~> 1.0, >= 1.0.2)
21
21
  i18n (>= 0.7, < 2)
22
22
  minitest (~> 5.1)
23
23
  tzinfo (~> 1.1)
24
- addressable (2.5.2)
24
+ addressable (2.6.0)
25
25
  public_suffix (>= 2.0.2, < 4.0)
26
26
  builder (3.2.3)
27
27
  codeclimate-test-reporter (1.0.9)
28
28
  simplecov (<= 0.13)
29
- concurrent-ruby (1.1.4)
29
+ concurrent-ruby (1.1.5)
30
30
  crack (0.4.3)
31
31
  safe_yaml (~> 1.0.0)
32
32
  diff-lcs (1.3)
33
33
  docile (1.1.5)
34
34
  excon (0.62.0)
35
- faraday (0.15.4)
35
+ faraday (0.14.0)
36
36
  multipart-post (>= 1.2, < 3)
37
37
  faraday-encoding (0.0.5)
38
38
  faraday
39
39
  faraday_middleware (0.12.2)
40
40
  faraday (>= 0.7.4, < 1.0)
41
- hashdiff (0.3.8)
42
- i18n (1.5.1)
41
+ hashdiff (0.4.0)
42
+ i18n (1.6.0)
43
43
  concurrent-ruby (~> 1.0)
44
- json (2.1.0)
44
+ json (2.2.0)
45
45
  mini_portile2 (2.3.0)
46
46
  minitest (5.11.3)
47
47
  multi_json (1.13.1)
48
- multipart-post (2.0.0)
48
+ multipart-post (2.1.1)
49
49
  nokogiri (1.8.5)
50
50
  mini_portile2 (~> 2.3.0)
51
- oj (3.7.6)
52
- public_suffix (3.0.3)
53
- rack (2.0.6)
51
+ oj (3.7.12)
52
+ public_suffix (3.1.1)
53
+ rack (2.0.7)
54
54
  rack-test (0.8.3)
55
55
  rack (>= 1.0, < 3)
56
56
  rake (12.3.2)
@@ -58,16 +58,16 @@ GEM
58
58
  rspec-core (~> 3.8.0)
59
59
  rspec-expectations (~> 3.8.0)
60
60
  rspec-mocks (~> 3.8.0)
61
- rspec-core (3.8.0)
61
+ rspec-core (3.8.2)
62
62
  rspec-support (~> 3.8.0)
63
- rspec-expectations (3.8.2)
63
+ rspec-expectations (3.8.4)
64
64
  diff-lcs (>= 1.2.0, < 2.0)
65
65
  rspec-support (~> 3.8.0)
66
- rspec-mocks (3.8.0)
66
+ rspec-mocks (3.8.1)
67
67
  diff-lcs (>= 1.2.0, < 2.0)
68
68
  rspec-support (~> 3.8.0)
69
- rspec-support (3.8.0)
70
- safe_yaml (1.0.4)
69
+ rspec-support (3.8.2)
70
+ safe_yaml (1.0.5)
71
71
  simplecov (0.13.0)
72
72
  docile (~> 1.1.0)
73
73
  json (>= 1.8, < 3)
@@ -77,10 +77,10 @@ GEM
77
77
  tzinfo (1.2.5)
78
78
  thread_safe (~> 0.1)
79
79
  vcr (3.0.3)
80
- webmock (3.5.1)
80
+ webmock (3.6.0)
81
81
  addressable (>= 2.3.6)
82
82
  crack (>= 0.3.2)
83
- hashdiff
83
+ hashdiff (>= 0.4.0, < 2.0.0)
84
84
 
85
85
  PLATFORMS
86
86
  ruby
@@ -97,4 +97,4 @@ DEPENDENCIES
97
97
  webmock (~> 3.0, >= 3.0.1)
98
98
 
99
99
  BUNDLED WITH
100
- 1.17.2
100
+ 1.17.3
data/lib/maremma/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Maremma
2
- VERSION = "4.2.1"
2
+ VERSION = "4.2.3"
3
3
  end
data/lib/maremma/xml_converter.rb CHANGED
@@ -8,7 +8,7 @@ module ActiveSupport
8
8
  private
9
9
 
10
10
  def become_content?(value)
11
- value['type'] == 'file' || (value['__content__'] && (value.keys.size == 1 && value['__content__'].present?))
11
+ value['type'] == 'file' || value['type'] == 'string' || (value['__content__'] && (value.keys.size == 1 && value['__content__'].present?))
12
12
  end
13
13
  end
14
14
  end
data/maremma.gemspec CHANGED
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  # Declary dependencies here, rather than in the Gemfile
22
- s.add_dependency 'faraday', '~> 0.14'
22
+ s.add_dependency 'faraday', '~> 0.14', '< 0.15'
23
23
  s.add_dependency 'faraday-encoding', '~> 0.0.4'
24
24
  s.add_dependency 'faraday_middleware', '~> 0.12.0'
25
- s.add_dependency 'excon', '~> 0.60'
25
+ s.add_dependency 'excon', '~> 0.60', '< 0.63'
26
26
  s.add_dependency 'nokogiri', '~> 1.8.1'
27
27
  s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
28
28
  s.add_dependency 'multi_json', '~> 1.12'
data/spec/maremma_spec.rb CHANGED
@@ -573,6 +573,11 @@ describe Maremma do
573
573
  expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "__content__"=>"abc"}})
574
574
  end
575
575
 
576
+ it 'from_xml with attribute type string' do
577
+ string = '<crm-item name="publisher-name" type="string">eLife Sciences Publications, Ltd</crm-item>'
578
+ expect(subject.parse_success_response(string)).to eq("data"=>{"crm_item"=>"eLife Sciences Publications, Ltd"})
579
+ end
580
+
576
581
  it 'from_xml with mixed attribute' do
577
582
  string = '<word type="small">abc<footnote>1</footnote></word>'
578
583
  expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>{"type"=>"small", "footnote"=>"1", "__content__"=>"abc"}})
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maremma
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.1
4
+ version: 4.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Fenner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-10 00:00:00.000000000 Z
11
+ date: 2019-07-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -17,6 +17,9 @@ dependencies:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0.14'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '0.15'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
29
  version: '0.14'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '0.15'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: faraday-encoding
29
35
  requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
59
65
  - - "~>"
60
66
  - !ruby/object:Gem::Version
61
67
  version: '0.60'
68
+ - - "<"
69
+ - !ruby/object:Gem::Version
70
+ version: '0.63'
62
71
  type: :runtime
63
72
  prerelease: false
64
73
  version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
66
75
  - - "~>"
67
76
  - !ruby/object:Gem::Version
68
77
  version: '0.60'
78
+ - - "<"
79
+ - !ruby/object:Gem::Version
80
+ version: '0.63'
69
81
  - !ruby/object:Gem::Dependency
70
82
  name: nokogiri
71
83
  requirement: !ruby/object:Gem::Requirement
@@ -346,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
346
358
  - !ruby/object:Gem::Version
347
359
  version: '0'
348
360
  requirements: []
349
- rubygems_version: 3.0.2
361
+ rubygems_version: 3.0.4
350
362
  signing_key:
351
363
  specification_version: 4
352
364
  summary: Simplified network calls