diff --git a/Gemfile b/Gemfile index dea3ed35c..e738bbf54 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,7 @@ gem "devise", "~> 4.7" # Flexible authentication solution for Rails gem "dogstatsd-ruby", "~> 4.7" # A client for DogStatsD, an extension of the StatsD metric server for Datadog gem "doorkeeper", "~> 5.3" # Oauth 2 provider gem "dry-struct", "~> 1.2" # Typed structs and value objects -gem "elasticsearch", "~> 7.5" # Powers DEVs core search functionality +gem "elasticsearch", "~> 7.6" # Powers DEVs core search functionality gem "email_validator", "~> 2.0" # Email validator for Rails and ActiveModel gem "emoji_regex", "~> 2.0" # A pair of Ruby regular expressions for matching Unicode Emoji symbols gem "envied", "~> 0.9" # Ensure presence and type of your app's ENV-variables @@ -67,6 +67,7 @@ gem "oj", "~> 3.10" # JSON parser and object serializer gem "omniauth", "~> 1.9" # A generalized Rack framework for multiple-provider authentication gem "omniauth-github", "~> 1.3" # OmniAuth strategy for GitHub gem "omniauth-twitter", "~> 1.4" # OmniAuth strategy for Twitter +gem "patron", "~> 0.13.3" # HTTP client library based on libcurl, used with Elasticsearch to support http keep-alive connections gem "pg", "~> 1.2" # Pg is the Ruby interface to the PostgreSQL RDBMS gem "puma", "~> 4.3" # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server gem "pundit", "~> 2.1" # Object oriented authorization for Rails applications @@ -99,9 +100,8 @@ gem "stripe", "~> 5.17" # Ruby library for the Stripe API gem "strong_migrations", "~> 0.6" # Catch unsafe migrations gem "timber", "~> 3.0" # Great Ruby logging made easy gem "timber-rails", "~> 1.0" # Timber integration for Rails -gem "twilio-ruby", "~> 5.31.1" # The official library for communicating with the Twilio REST API +gem "twilio-ruby", "~> 5.33" # The official library for communicating with the Twilio REST API gem "twitter", "~> 7.0" # A Ruby interface to the Twitter API -gem "typhoeus", "~> 1.3.1" # Used with Elasticsearch to support http keep-alive connections gem "uglifier", "~> 4.2" # Uglifier minifies JavaScript files gem "ulid", "~> 1.2" # Universally Unique Lexicographically Sortable Identifier implementation for Ruby gem "validate_url", "~> 1.0" # Library for validating urls in Rails diff --git a/Gemfile.lock b/Gemfile.lock index a1cd7a5b7..ce943e905 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -266,13 +266,13 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - elasticsearch (7.5.0) - elasticsearch-api (= 7.5.0) - elasticsearch-transport (= 7.5.0) - elasticsearch-api (7.5.0) + elasticsearch (7.6.0) + elasticsearch-api (= 7.6.0) + elasticsearch-transport (= 7.6.0) + elasticsearch-api (7.6.0) multi_json - elasticsearch-transport (7.5.0) - faraday (>= 0.14, < 1) + elasticsearch-transport (7.6.0) + faraday (~> 1) multi_json em-websocket (0.5.1) eventmachine (>= 0.12.9) @@ -294,8 +294,6 @@ GEM smart_properties errbase (0.1.1) erubi (1.9.0) - ethon (0.12.0) - ffi (>= 1.3.0) eventmachine (1.2.5) excon (0.73.0) execjs (2.7.0) @@ -307,10 +305,10 @@ GEM railties (>= 4.2.0) faker (2.11.0) i18n (>= 1.6, < 2) - faraday (0.17.3) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) fast_jsonapi (1.5) activesupport (>= 4.2) fastimage (2.1.1) @@ -540,6 +538,7 @@ GEM parallel parser (2.7.1.0) ast (~> 2.4.0) + patron (0.13.3) pg (1.2.3) polyamorous (2.3.2) activerecord (>= 5.2.1) @@ -800,8 +799,8 @@ GEM timber (~> 3.0) timber-rack (~> 1.0) timecop (0.9.1) - twilio-ruby (5.31.1) - faraday (~> 0.9) + twilio-ruby (5.33.0) + faraday (~> 1.0.0) jwt (>= 1.5, <= 2.5) nokogiri (>= 1.6, < 2.0) twitter (7.0.0) @@ -815,8 +814,6 @@ GEM multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) - typhoeus (1.3.1) - ethon (>= 0.9.0) tzinfo (1.2.7) thread_safe (~> 0.1) uber (0.1.0) @@ -910,7 +907,7 @@ DEPENDENCIES dogstatsd-ruby (~> 4.7) doorkeeper (~> 5.3) dry-struct (~> 1.2) - elasticsearch (~> 7.5) + elasticsearch (~> 7.6) email_validator (~> 2.0) emoji_regex (~> 2.0) envied (~> 0.9) @@ -955,6 +952,7 @@ DEPENDENCIES omniauth-github (~> 1.3) omniauth-twitter (~> 1.4) parallel_tests (~> 2.32) + patron (~> 0.13.3) pg (~> 1.2) pry (~> 0.12) pry-byebug (~> 3.8) @@ -1008,9 +1006,8 @@ DEPENDENCIES timber (~> 3.0) timber-rails (~> 1.0) timecop (~> 0.9) - twilio-ruby (~> 5.31.1) + twilio-ruby (~> 5.33) twitter (~> 7.0) - typhoeus (~> 1.3.1) uglifier (~> 4.2) ulid (~> 1.2) validate_url (~> 1.0) diff --git a/app/services/search/client.rb b/app/services/search/client.rb index 27f2b1022..f4c42440e 100644 --- a/app/services/search/client.rb +++ b/app/services/search/client.rb @@ -51,7 +51,7 @@ module Search url: ApplicationConfig["ELASTICSEARCH_URL"], retry_on_failure: 5, request_timeout: 30, - adapter: :typhoeus, + adapter: :patron, log: Rails.env.development?, ) end