omcms-ruby-client 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564703b3ad7a65d0bf5b3f546a2a8c44611e5372774ee69f50f5a70509ae433e
-  data.tar.gz: e80e38e2632b34e986ccb8d7072aa9681e86fa57264fce0cd01613b57f5b9fb4
+  metadata.gz: 486c879393ce195be83ee8ada89010f426cafd4370cb507f61c8f9811648526b
+  data.tar.gz: 464298d9dcd752ca1a456518c2a0ba88c1b23f962a7c170c27cca584ea415791
 SHA512:
-  metadata.gz: 1b1efd463dc54fa5181f82e9c1336c1b726dff0b9439ed5582e2419b132f5b516f7d47782c33f73e75d773dd32916ee0ca7093bf89264edb1d2b4a37651d670f
-  data.tar.gz: a1c52b5e3c33bed4c40afe9fab04e41ab7ecd3ed8993d5604195f7f291da53a45bb57a1fbf168873c189e8a28ca0f11ad22afc1549675e228f8a6ef8f1eff9d2
+  metadata.gz: 82dc8d0d1db64df172f23275d82a4e30c51df260e233b53b02853ecad580e3a7df2b64f76a09cb554b34911f5d5a32d3af5fdbff8f2638703d6618233fd1f4f8
+  data.tar.gz: dd72cf8dc05bf78827a61dfbd91c9f96828a870e1d5fedb092a8cec2925b9528ceb46e00cc1422c79573b90c679f6dff9a5de0eb6e31c3cf36ec350028beb93a

data/README.md

@@ -32,7 +32,9 @@ Create a client using your OMCMS connector's public key and private key
 $omcms = OMCMS::Client.new(
   host: ENV["OMCMS_API_HOST"], # https://www.example.com
   public_key: ENV["OMCMS_PUBLIC_KEY"],
-  private_key: ENV["OMCMS_PRIVATE_KEY"]
+  private_key: ENV["OMCMS_PRIVATE_KEY"],
+  open_timeout: ENV["OMCMS_OPEN_TIMEOUT"], # optional default to 10 seconds
+  timeout: ENV["OMCMS_TIMEOUT"] # optional default to 20 seconds
 )
 ```
 

data/lib/omcms/client.rb

@@ -15,10 +15,10 @@ module OMCMS
     def configure_client
       @client ||= Faraday.new do |f|
         f.request :basic_auth, @username, @password
-        f.options[:open_timeout] = 2
-        f.options[:timeout] = 5
-        f.use SetHeader
-        f.use ParseResponse
+        f.options[:open_timeout] = @open_timeout
+        f.options[:timeout] = @timeout
+        f.request :omcms_set_header
+        f.response :omcms_parse_response
         f.response :json, :content_type => /\bjson$/
         faraday.call(f) if faraday
         f.adapter Faraday.default_adapter unless faraday
@@ -39,6 +39,8 @@ module OMCMS
       @username = opts[:public_key]
       @password = opts[:private_key]
       @host = opts[:host]
+      @open_timeout = opts[:open_timeout] || 10
+      @timeout = opts[:timeout] || 20
     end
   end
 end

data/lib/omcms/middleware/parse_response.rb

@@ -1,19 +1,20 @@
 module OMCMS
-  class ParseResponse
+  class ParseResponse < Faraday::Middleware
     def initialize app
+      super app
       @app = app
     end
 
-    def call request_env
-      @app.call(request_env).on_complete do |response_env|
-        if response_env.status >= 400
-          return OMCMS::Response::Error.new(response_env)
-        else
-          return response_env.body
-        end
+    def on_complete response_env
+      if response_env.status >= 400
+        return OMCMS::Response::Error.new(response_env)
+      else
+        return response_env.body
       end
     rescue => error
       return OMCMS::Response::Error.new(error)
     end
   end
 end
+
+Faraday::Response.register_middleware(omcms_parse_response: OMCMS::ParseResponse)

data/lib/omcms/middleware/set_header.rb

@@ -1,16 +1,18 @@
 module OMCMS
-  class SetHeader
+  class SetHeader < Faraday::Middleware
     HEADERS = {
       :"user-agent" => "omcms/ruby/client/#{VERSION}"
     }
 
     def initialize app
+      super app
       @app = app
     end
 
-    def call request_env
+    def on_request request_env
       request_env[:request_headers].merge! HEADERS
-      @app.call(request_env)
     end
   end
 end
+
+Faraday::Request.register_middleware(omcms_set_header: OMCMS::SetHeader)

data/lib/omcms/response/body.rb

@@ -5,7 +5,7 @@ module OMCMS
 
       def initialize(client, response, host)
         @client = client
-        @body = response
+        @body = response.body
         @host = host
       end
 

data/lib/omcms/version.rb

@@ -1,3 +1,3 @@
 module OMCMS
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/omcms.rb

@@ -1,5 +1,4 @@
 require "faraday"
-require "faraday_middleware"
 
 require "omcms/client"
 require "omcms/resource"

data/omcms-ruby-client.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.15"
-  spec.add_dependency "faraday_middleware", "~> 0.13"
+  spec.add_dependency "faraday", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omcms-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Pradeep Rawat
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +102,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/equitymultiple/omcms-ruby-client
   source_code_uri: https://github.com/equitymultiple/omcms-ruby-client
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A Ruby SDK for OMCMS APIs
 test_files: []