ldclient-rb 2.1.5 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '02280955049e36b131e2390244c8325ac209518a'
-  data.tar.gz: 93822c18a0c63b943b076ca3487709c4ede818dd
+  metadata.gz: 8e80f005cb0e766f2b7bc67ae26b9d33ef9f8df3
+  data.tar.gz: 42ce3fee3713a80d14e0f250b8e541918a50fcf0
 SHA512:
-  metadata.gz: 71009492321ac882b0daf211f0ed6f802bf9816d570e1224c08c5ccac86f8f7ecae08a1f54b8ed53aae9a8f061a9401299df0e7cd0b11074cd522085c821c5e2
-  data.tar.gz: bfe06e169dea4d8f786b916b7924ed3a903283b6594c6a3ccac99a34d2a556dcc3ae2f4a00b180e606bf7eccb7a531324b4057c50fd2f80fcf7867e7b618ccbb
+  metadata.gz: 3c40490932b362914b7383a651f1fe36736eefbcacb1c1be72018420d917bf47606d21b40da8fde3033bd645a26d2c00426dba38f6a37596006625d952f96982
+  data.tar.gz: 1fd96aa5d3c37eeb0dd6f17a69b075a300f546b1fee31ecbd82971cdf3d81ae7537b0e99c58cc41444f3e135a133f464f32d891c37d264e1b7c1cfd36b97d489

data/ldclient-rb.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-http-persistent", "~> 2.9"
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0.4"
   spec.add_runtime_dependency "hashdiff", "~> 0.2"
-  spec.add_runtime_dependency "ld-celluloid-eventsource", "~> 0.9.0"
+  spec.add_runtime_dependency "ld-celluloid-eventsource", "~> 0.10.0"
   spec.add_runtime_dependency "celluloid", "~> 0.18.0.pre" # transitive dep; specified here for more control
   
   if RUBY_VERSION >= '2.2.2'

data/lib/ldclient-rb/config.rb

@@ -56,6 +56,7 @@ module LaunchDarkly
       @stream = opts.has_key?(:stream) ? opts[:stream] : Config.default_stream
       @offline = opts.has_key?(:offline) ? opts[:offline] : Config.default_offline
       @poll_interval = opts.has_key?(:poll_interval) && opts[:poll_interval] > 1 ? opts[:poll_interval] : Config.default_poll_interval
+      @proxy = opts[:proxy] || Config.default_proxy
     end
 
     #
@@ -143,6 +144,11 @@ module LaunchDarkly
     #
     attr_reader :feature_store
 
+    
+    # The proxy configuration string
+    #
+    attr_reader :proxy
+
     #
     # The default LaunchDarkly client configuration. This configuration sets
     # reasonable defaults for most users.
@@ -184,6 +190,10 @@ module LaunchDarkly
       2
     end
 
+    def self.default_proxy
+      nil
+    end
+
     def self.default_logger
       if defined?(Rails) && Rails.respond_to?(:logger)
         Rails.logger 

data/lib/ldclient-rb/requestor.rb

@@ -30,6 +30,9 @@ module LaunchDarkly
         req.headers["User-Agent"] = "RubyClient/" + LaunchDarkly::VERSION
         req.options.timeout = @config.read_timeout
         req.options.open_timeout = @config.connect_timeout
+        if @config.proxy
+          req.options.proxy = Faraday::ProxyOptions.from @config.proxy
+        end
       end
 
       @config.logger.debug("[LDClient] Got response from uri: #{uri}\n\tstatus code: #{res.status}\n\theaders: #{res.headers}\n\tbody: #{res.body}")

data/lib/ldclient-rb/stream.rb

@@ -33,7 +33,7 @@ module LaunchDarkly
         'Authorization' => @sdk_key,
         'User-Agent' => 'RubyClient/' + LaunchDarkly::VERSION
       }
-      opts = {:headers => headers, :with_credentials => true}
+      opts = {:headers => headers, :with_credentials => true, :proxy => @config.proxy}
       @es = Celluloid::EventSource.new(@config.stream_uri + "/flags", opts) do |conn|
         conn.on(PUT) { |message| process_message(message, PUT) }
         conn.on(PATCH) { |message| process_message(message, PATCH) }

data/lib/ldclient-rb/version.rb

@@ -1,3 +1,3 @@
 module LaunchDarkly
-  VERSION = "2.1.5"
+  VERSION = "2.2.5"
 end

data/spec/requestor_spec.rb

@@ -0,0 +1,53 @@
+require "spec_helper"
+require "faraday"
+
+describe LaunchDarkly::Requestor do
+  describe ".request_all_flags" do
+    describe "with a proxy" do
+      let(:requestor) {
+        LaunchDarkly::Requestor.new(
+          "key",
+          LaunchDarkly::Config.new({
+            :proxy => "http://proxy.com",
+            :base_uri => "http://ld.com"
+          })
+        )
+      }
+      it "converts the proxy option" do
+        faraday = Faraday.new
+        requestor.instance_variable_set(:@client, faraday)
+        allow(faraday).to receive(:get) do |*args, &block|
+          req = double(Faraday::Request, :headers => {}, :options => Faraday::RequestOptions.new)
+          block.call(req)
+          expect(args).to eq ['http://ld.com/sdk/latest-flags']
+          expect(req.options.proxy[:uri]).to eq URI("http://proxy.com")
+          double(body: '{"foo": "bar"}', status: 200, headers: {})
+        end
+
+        requestor.request_all_flags()
+      end
+    end
+    describe "without a proxy" do
+      let(:requestor) {
+        LaunchDarkly::Requestor.new(
+          "key",
+          LaunchDarkly::Config.new({
+            :base_uri => "http://ld.com"
+          })
+        )
+      }
+      it "converts the proxy option" do
+        faraday = Faraday.new
+        requestor.instance_variable_set(:@client, faraday)
+        allow(faraday).to receive(:get) do |*args, &block|
+          req = double(Faraday::Request, :headers => {}, :options => Faraday::RequestOptions.new)
+          block.call(req)
+          expect(args).to eq ['http://ld.com/sdk/latest-flags']
+          expect(req.options.proxy).to eq nil
+          double(body: '{"foo": "bar"}', status: 200, headers: {})
+        end
+        requestor.request_all_flags()
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldclient-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.5
 platform: ruby
 authors:
 - LaunchDarkly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +261,7 @@ files:
 - spec/fixtures/user.json
 - spec/ldclient_spec.rb
 - spec/newrelic_spec.rb
+- spec/requestor_spec.rb
 - spec/spec_helper.rb
 - spec/store_spec.rb
 - spec/stream_spec.rb
@@ -285,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: LaunchDarkly SDK for Ruby
@@ -297,6 +298,7 @@ test_files:
 - spec/fixtures/user.json
 - spec/ldclient_spec.rb
 - spec/newrelic_spec.rb
+- spec/requestor_spec.rb
 - spec/spec_helper.rb
 - spec/store_spec.rb
 - spec/stream_spec.rb