omcms-ruby-client 1.0.2 → 1.1.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 564703b3ad7a65d0bf5b3f546a2a8c44611e5372774ee69f50f5a70509ae433e
4
- data.tar.gz: e80e38e2632b34e986ccb8d7072aa9681e86fa57264fce0cd01613b57f5b9fb4
3
+ metadata.gz: 486c879393ce195be83ee8ada89010f426cafd4370cb507f61c8f9811648526b
4
+ data.tar.gz: 464298d9dcd752ca1a456518c2a0ba88c1b23f962a7c170c27cca584ea415791
5
5
  SHA512:
6
- metadata.gz: 1b1efd463dc54fa5181f82e9c1336c1b726dff0b9439ed5582e2419b132f5b516f7d47782c33f73e75d773dd32916ee0ca7093bf89264edb1d2b4a37651d670f
7
- data.tar.gz: a1c52b5e3c33bed4c40afe9fab04e41ab7ecd3ed8993d5604195f7f291da53a45bb57a1fbf168873c189e8a28ca0f11ad22afc1549675e228f8a6ef8f1eff9d2
6
+ metadata.gz: 82dc8d0d1db64df172f23275d82a4e30c51df260e233b53b02853ecad580e3a7df2b64f76a09cb554b34911f5d5a32d3af5fdbff8f2638703d6618233fd1f4f8
7
+ data.tar.gz: dd72cf8dc05bf78827a61dfbd91c9f96828a870e1d5fedb092a8cec2925b9528ceb46e00cc1422c79573b90c679f6dff9a5de0eb6e31c3cf36ec350028beb93a
data/README.md CHANGED
@@ -32,7 +32,9 @@ Create a client using your OMCMS connector's public key and private key
32
32
  $omcms = OMCMS::Client.new(
33
33
  host: ENV["OMCMS_API_HOST"], # https://www.example.com
34
34
  public_key: ENV["OMCMS_PUBLIC_KEY"],
35
- private_key: ENV["OMCMS_PRIVATE_KEY"]
35
+ private_key: ENV["OMCMS_PRIVATE_KEY"],
36
+ open_timeout: ENV["OMCMS_OPEN_TIMEOUT"], # optional default to 10 seconds
37
+ timeout: ENV["OMCMS_TIMEOUT"] # optional default to 20 seconds
36
38
  )
37
39
  ```
38
40
 
data/lib/omcms/client.rb CHANGED
@@ -15,10 +15,10 @@ module OMCMS
15
15
  def configure_client
16
16
  @client ||= Faraday.new do |f|
17
17
  f.request :basic_auth, @username, @password
18
- f.options[:open_timeout] = 2
19
- f.options[:timeout] = 5
20
- f.use SetHeader
21
- f.use ParseResponse
18
+ f.options[:open_timeout] = @open_timeout
19
+ f.options[:timeout] = @timeout
20
+ f.request :omcms_set_header
21
+ f.response :omcms_parse_response
22
22
  f.response :json, :content_type => /\bjson$/
23
23
  faraday.call(f) if faraday
24
24
  f.adapter Faraday.default_adapter unless faraday
@@ -39,6 +39,8 @@ module OMCMS
39
39
  @username = opts[:public_key]
40
40
  @password = opts[:private_key]
41
41
  @host = opts[:host]
42
+ @open_timeout = opts[:open_timeout] || 10
43
+ @timeout = opts[:timeout] || 20
42
44
  end
43
45
  end
44
46
  end
@@ -1,19 +1,20 @@
1
1
  module OMCMS
2
- class ParseResponse
2
+ class ParseResponse < Faraday::Middleware
3
3
  def initialize app
4
+ super app
4
5
  @app = app
5
6
  end
6
7
 
7
- def call request_env
8
- @app.call(request_env).on_complete do |response_env|
9
- if response_env.status >= 400
10
- return OMCMS::Response::Error.new(response_env)
11
- else
12
- return response_env.body
13
- end
8
+ def on_complete response_env
9
+ if response_env.status >= 400
10
+ return OMCMS::Response::Error.new(response_env)
11
+ else
12
+ return response_env.body
14
13
  end
15
14
  rescue => error
16
15
  return OMCMS::Response::Error.new(error)
17
16
  end
18
17
  end
19
18
  end
19
+
20
+ Faraday::Response.register_middleware(omcms_parse_response: OMCMS::ParseResponse)
@@ -1,16 +1,18 @@
1
1
  module OMCMS
2
- class SetHeader
2
+ class SetHeader < Faraday::Middleware
3
3
  HEADERS = {
4
4
  :"user-agent" => "omcms/ruby/client/#{VERSION}"
5
5
  }
6
6
 
7
7
  def initialize app
8
+ super app
8
9
  @app = app
9
10
  end
10
11
 
11
- def call request_env
12
+ def on_request request_env
12
13
  request_env[:request_headers].merge! HEADERS
13
- @app.call(request_env)
14
14
  end
15
15
  end
16
16
  end
17
+
18
+ Faraday::Request.register_middleware(omcms_set_header: OMCMS::SetHeader)
@@ -5,7 +5,7 @@ module OMCMS
5
5
 
6
6
  def initialize(client, response, host)
7
7
  @client = client
8
- @body = response
8
+ @body = response.body
9
9
  @host = host
10
10
  end
11
11
 
data/lib/omcms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OMCMS
2
- VERSION = "1.0.2"
2
+ VERSION = "1.1.0"
3
3
  end
data/lib/omcms.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  require "faraday"
2
- require "faraday_middleware"
3
2
 
4
3
  require "omcms/client"
5
4
  require "omcms/resource"
@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
24
24
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
25
25
  spec.require_paths = ["lib"]
26
26
 
27
- spec.add_dependency "faraday", "~> 0.15"
28
- spec.add_dependency "faraday_middleware", "~> 0.13"
27
+ spec.add_dependency "faraday", "~> 1.0"
29
28
 
30
29
  spec.add_development_dependency "bundler", "~> 2.0"
31
30
  spec.add_development_dependency "rake", "~> 10.0"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omcms-ruby-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pradeep Rawat
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-01-10 00:00:00.000000000 Z
11
+ date: 2023-02-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
@@ -16,28 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.15'
19
+ version: '1.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0.15'
27
- - !ruby/object:Gem::Dependency
28
- name: faraday_middleware
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - "~>"
32
- - !ruby/object:Gem::Version
33
- version: '0.13'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "~>"
39
- - !ruby/object:Gem::Version
40
- version: '0.13'
26
+ version: '1.0'
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: bundler
43
29
  requirement: !ruby/object:Gem::Requirement
@@ -116,7 +102,7 @@ licenses: []
116
102
  metadata:
117
103
  homepage_uri: https://github.com/equitymultiple/omcms-ruby-client
118
104
  source_code_uri: https://github.com/equitymultiple/omcms-ruby-client
119
- post_install_message:
105
+ post_install_message:
120
106
  rdoc_options: []
121
107
  require_paths:
122
108
  - lib
@@ -131,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
131
117
  - !ruby/object:Gem::Version
132
118
  version: '0'
133
119
  requirements: []
134
- rubygems_version: 3.0.6
135
- signing_key:
120
+ rubygems_version: 3.2.3
121
+ signing_key:
136
122
  specification_version: 4
137
123
  summary: A Ruby SDK for OMCMS APIs
138
124
  test_files: []