maremma 4.3 → 4.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +23 -23
  3. data/lib/maremma.rb +12 -5
  4. data/lib/maremma/version.rb +1 -1
  5. data/maremma.gemspec +4 -4
  6. metadata +24 -37
  7. data/lib/maremma/set_host.rb +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d2467e829edcd1320e3159d8f583ab4bdaefc723b0f81c01e46154c6b0828372
4
- data.tar.gz: ed4a7f2e762509c21a9bacffc443a9e0fab5ef943bf8f6d7634862dd18173609
3
+ metadata.gz: 20c99d978c91ba1d49c9ad4ecd3479d956ad6f94f97600890dc7b3683192a31c
4
+ data.tar.gz: 6471d37baf4cc60f94382b342a140f570e28bf2301503b6906281657743594c3
5
5
  SHA512:
6
- metadata.gz: 7e0138cd5c03abcc5102e352447bfa9552696fda4d8cc4a7e3f2654ee53b3dc38ca501e4e37887811644b4796ecbf3ab95750b1762050985bd3e2dcef354251b
7
- data.tar.gz: 0a392b30ef2a5565e782514551757bfad8a49867a6473b0f1ca574c348858b512e81f66a7d558954bd509ebbca679f94f489f9783ed486a5e4df68fbcf75b4c2
6
+ metadata.gz: 67e47e97da35e0470dba9a9c90586511cccf4c955f1b3c9f55ded8979be5ced35480d6be57054a13ee0a5aa9a5d756ca9cf1bb427fccb2abadb92eb32b81e4cf
7
+ data.tar.gz: c75f469c6f6d6dcb98ae32876ce7d0b300c3d8aa3f8bdd75654f1b96ea194de3bae945154206d919176de638791f2950482ecbb1d2ccebc7c4f25131f0251e94
data/Gemfile.lock CHANGED
@@ -1,14 +1,14 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- maremma (4.3)
4
+ maremma (4.4)
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, < 0.63)
9
- faraday (~> 0.14, < 0.15)
8
+ excon (~> 0.67.0)
9
+ faraday (~> 0.17.0)
10
10
  faraday-encoding (~> 0.0.4)
11
- faraday_middleware (~> 0.12.0)
11
+ faraday_middleware (~> 0.13.1)
12
12
  multi_json (~> 1.12)
13
13
  nokogiri (~> 1.10.4)
14
14
  oj (>= 2.8.3)
@@ -31,42 +31,42 @@ GEM
31
31
  safe_yaml (~> 1.0.0)
32
32
  diff-lcs (1.3)
33
33
  docile (1.1.5)
34
- excon (0.62.0)
35
- faraday (0.14.0)
34
+ excon (0.67.0)
35
+ faraday (0.17.0)
36
36
  multipart-post (>= 1.2, < 3)
37
37
  faraday-encoding (0.0.5)
38
38
  faraday
39
- faraday_middleware (0.12.2)
39
+ faraday_middleware (0.13.1)
40
40
  faraday (>= 0.7.4, < 1.0)
41
41
  hashdiff (1.0.0)
42
- i18n (1.6.0)
42
+ i18n (1.7.0)
43
43
  concurrent-ruby (~> 1.0)
44
44
  json (2.2.0)
45
45
  mini_portile2 (2.4.0)
46
- minitest (5.11.3)
46
+ minitest (5.12.2)
47
47
  multi_json (1.13.1)
48
48
  multipart-post (2.1.1)
49
49
  nokogiri (1.10.4)
50
50
  mini_portile2 (~> 2.4.0)
51
- oj (3.9.1)
51
+ oj (3.9.2)
52
52
  public_suffix (4.0.1)
53
53
  rack (2.0.7)
54
54
  rack-test (0.8.3)
55
55
  rack (>= 1.0, < 3)
56
- rake (12.3.3)
57
- rspec (3.8.0)
58
- rspec-core (~> 3.8.0)
59
- rspec-expectations (~> 3.8.0)
60
- rspec-mocks (~> 3.8.0)
61
- rspec-core (3.8.2)
62
- rspec-support (~> 3.8.0)
63
- rspec-expectations (3.8.4)
56
+ rake (13.0.0)
57
+ rspec (3.9.0)
58
+ rspec-core (~> 3.9.0)
59
+ rspec-expectations (~> 3.9.0)
60
+ rspec-mocks (~> 3.9.0)
61
+ rspec-core (3.9.0)
62
+ rspec-support (~> 3.9.0)
63
+ rspec-expectations (3.9.0)
64
64
  diff-lcs (>= 1.2.0, < 2.0)
65
- rspec-support (~> 3.8.0)
66
- rspec-mocks (3.8.1)
65
+ rspec-support (~> 3.9.0)
66
+ rspec-mocks (3.9.0)
67
67
  diff-lcs (>= 1.2.0, < 2.0)
68
- rspec-support (~> 3.8.0)
69
- rspec-support (3.8.2)
68
+ rspec-support (~> 3.9.0)
69
+ rspec-support (3.9.0)
70
70
  safe_yaml (1.0.5)
71
71
  simplecov (0.13.0)
72
72
  docile (~> 1.1.0)
@@ -77,7 +77,7 @@ GEM
77
77
  tzinfo (1.2.5)
78
78
  thread_safe (~> 0.1)
79
79
  vcr (3.0.3)
80
- webmock (3.7.0)
80
+ webmock (3.7.6)
81
81
  addressable (>= 2.3.6)
82
82
  crack (>= 0.3.2)
83
83
  hashdiff (>= 0.4.0, < 2.0.0)
data/lib/maremma.rb CHANGED
@@ -11,7 +11,6 @@ require 'uri'
11
11
  require 'addressable/uri'
12
12
  require 'maremma/xml_converter'
13
13
  require 'maremma/version'
14
- require 'maremma/set_host'
15
14
 
16
15
  module Maremma
17
16
  DEFAULT_TIMEOUT = 60
@@ -65,9 +64,18 @@ module Maremma
65
64
 
66
65
  response = case options[:method]
67
66
  when "get" then conn.get url, {}, options[:headers]
68
- when "post" then conn.post url, {}, options[:headers] { |request| request.body = options[:data] }
69
- when "put" then conn.put url, {}, options[:headers] { |request| request.body = options[:data] }
70
- when "patch" then conn.patch url, {}, options[:headers] { |request| request.body = options[:data] }
67
+ when "post" then conn.post url, {}, options[:headers] do |request|
68
+ request.body = options[:data]
69
+ request.headers['Host'] = URI.parse(url.to_s).host
70
+ end
71
+ when "put" then conn.put url, {}, options[:headers] do |request|
72
+ request.body = options[:data]
73
+ request.headers['Host'] = URI.parse(url.to_s).host
74
+ end
75
+ when "patch" then conn.patch url, {}, options[:headers] do |request|
76
+ request.body = options[:data]
77
+ request.headers['Host'] = URI.parse(url.to_s).host
78
+ end
71
79
  when "delete" then conn.delete url, {}, options[:headers]
72
80
  when "head" then conn.head url, {}, options[:headers]
73
81
  end
@@ -111,7 +119,6 @@ module Maremma
111
119
  c.headers['Accept'] = options[:headers]['Accept']
112
120
  c.headers['User-Agent'] = options[:headers]['User-Agent']
113
121
  c.use FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all if limit > 0
114
- c.use FaradayMiddleware::SetHost
115
122
  c.request :multipart
116
123
  c.request :json if options[:headers]['Accept'] == 'application/json'
117
124
  c.response :encoding
data/lib/maremma/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Maremma
2
- VERSION = "4.3"
2
+ VERSION = "4.4"
3
3
  end
data/maremma.gemspec CHANGED
@@ -19,12 +19,12 @@ 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', '< 0.15'
22
+ s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
23
+ s.add_dependency 'excon', '~> 0.67.0'
24
+ s.add_dependency 'faraday', '~> 0.17.0'
23
25
  s.add_dependency 'faraday-encoding', '~> 0.0.4'
24
- s.add_dependency 'faraday_middleware', '~> 0.12.0'
25
- s.add_dependency 'excon', '~> 0.60', '< 0.63'
26
+ s.add_dependency 'faraday_middleware', '~> 0.13.1'
26
27
  s.add_dependency 'nokogiri', '~> 1.10.4'
27
- s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
28
28
  s.add_dependency 'multi_json', '~> 1.12'
29
29
  s.add_dependency 'oj', '>= 2.8.3'
30
30
  s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
metadata CHANGED
@@ -1,117 +1,105 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maremma
3
3
  version: !ruby/object:Gem::Version
4
- version: '4.3'
4
+ version: '4.4'
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-08-31 00:00:00.000000000 Z
11
+ date: 2019-10-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: faraday
14
+ name: builder
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.14'
20
- - - "<"
19
+ version: '3.2'
20
+ - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: '0.15'
22
+ version: 3.2.2
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - "~>"
28
28
  - !ruby/object:Gem::Version
29
- version: '0.14'
30
- - - "<"
29
+ version: '3.2'
30
+ - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: '0.15'
32
+ version: 3.2.2
33
33
  - !ruby/object:Gem::Dependency
34
- name: faraday-encoding
34
+ name: excon
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - "~>"
38
38
  - !ruby/object:Gem::Version
39
- version: 0.0.4
39
+ version: 0.67.0
40
40
  type: :runtime
41
41
  prerelease: false
42
42
  version_requirements: !ruby/object:Gem::Requirement
43
43
  requirements:
44
44
  - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: 0.0.4
46
+ version: 0.67.0
47
47
  - !ruby/object:Gem::Dependency
48
- name: faraday_middleware
48
+ name: faraday
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: 0.12.0
53
+ version: 0.17.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: 0.12.0
60
+ version: 0.17.0
61
61
  - !ruby/object:Gem::Dependency
62
- name: excon
62
+ name: faraday-encoding
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: '0.60'
68
- - - "<"
69
- - !ruby/object:Gem::Version
70
- version: '0.63'
67
+ version: 0.0.4
71
68
  type: :runtime
72
69
  prerelease: false
73
70
  version_requirements: !ruby/object:Gem::Requirement
74
71
  requirements:
75
72
  - - "~>"
76
73
  - !ruby/object:Gem::Version
77
- version: '0.60'
78
- - - "<"
79
- - !ruby/object:Gem::Version
80
- version: '0.63'
74
+ version: 0.0.4
81
75
  - !ruby/object:Gem::Dependency
82
- name: nokogiri
76
+ name: faraday_middleware
83
77
  requirement: !ruby/object:Gem::Requirement
84
78
  requirements:
85
79
  - - "~>"
86
80
  - !ruby/object:Gem::Version
87
- version: 1.10.4
81
+ version: 0.13.1
88
82
  type: :runtime
89
83
  prerelease: false
90
84
  version_requirements: !ruby/object:Gem::Requirement
91
85
  requirements:
92
86
  - - "~>"
93
87
  - !ruby/object:Gem::Version
94
- version: 1.10.4
88
+ version: 0.13.1
95
89
  - !ruby/object:Gem::Dependency
96
- name: builder
90
+ name: nokogiri
97
91
  requirement: !ruby/object:Gem::Requirement
98
92
  requirements:
99
93
  - - "~>"
100
94
  - !ruby/object:Gem::Version
101
- version: '3.2'
102
- - - ">="
103
- - !ruby/object:Gem::Version
104
- version: 3.2.2
95
+ version: 1.10.4
105
96
  type: :runtime
106
97
  prerelease: false
107
98
  version_requirements: !ruby/object:Gem::Requirement
108
99
  requirements:
109
100
  - - "~>"
110
101
  - !ruby/object:Gem::Version
111
- version: '3.2'
112
- - - ">="
113
- - !ruby/object:Gem::Version
114
- version: 3.2.2
102
+ version: 1.10.4
115
103
  - !ruby/object:Gem::Dependency
116
104
  name: multi_json
117
105
  requirement: !ruby/object:Gem::Requirement
@@ -323,7 +311,6 @@ files:
323
311
  - lib/fixtures/vcr_cassettes/Maremma/get/get_json_with_params.yml
324
312
  - lib/fixtures/vcr_cassettes/Maremma/link_headers/parses_link_headers.yml
325
313
  - lib/maremma.rb
326
- - lib/maremma/set_host.rb
327
314
  - lib/maremma/version.rb
328
315
  - lib/maremma/xml_converter.rb
329
316
  - maremma.gemspec
data/lib/maremma/set_host.rb DELETED
@@ -1,12 +0,0 @@
1
- require 'faraday'
2
-
3
- module FaradayMiddleware
4
- # Request middleware that sets the "HOST" header to the URL host
5
-
6
- class SetHost < Faraday::Middleware
7
- def call(env)
8
- env[:request_headers]['Host'] = URI.parse(env[:url].to_s).host
9
- @app.call(env)
10
- end
11
- end
12
- end