flipper-cloud 0.11.0.beta3 → 0.11.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4889ca37fe1e54e17b09279d064c24424f53e846
-  data.tar.gz: 58a3a0ade995565599c05f71230dd2f618a652c3
+  metadata.gz: 35b32dfc86bd5320e6e9c71472ebc882c82c197b
+  data.tar.gz: a2813c39e2b5ddddde7712ee88a48a3c4e14c919
 SHA512:
-  metadata.gz: 7a860d4f354e34b4ac22bc106cb2cff9a6487415b622ec32d5cb17e379905c87d4d8ef602b9f59267fd5f28ef538f96f56d98d4b65421ea9bfe5d08de3e24a34
-  data.tar.gz: 833f45459613aa495a705b3f512db55c6ecbd8ad231c16307d65a800523d4b31981b03686d23aec0a41b737ae0b7f46b1d041e2631090400852384ad60161af8
+  metadata.gz: 1632d38593bb9a06532729397948afb14539c00d72a636a79f2510ac501bb208159f7df87d9ed7a5d5da44c6efc79c0542ee29af6a27be644bb30544da71a761
+  data.tar.gz: f1b34ba791300fd32c0747caf9744eb278c9caccf61663eb8abc17b28d0d9b38c276e15d2afae856be71d5900223f6a0a55d57797ed66c5dd88f1b3e896bde15

data/lib/flipper/cloud.rb

@@ -1,14 +1,42 @@
 require "flipper/adapters/http"
+require "flipper/instrumenters/noop"
 
 module Flipper
   module Cloud
+    # The default adapter wrapper which doesn't wrap at all.
+    DEFAULT_ADAPTER_WRAPPER_BLOCK = ->(adapter) { adapter }
+
+    # The default url should be the one, the only, the website.
+    DEFAULT_URL = "https://www.featureflipper.com/adapter".freeze
+
+    # Public: Returns a new Flipper instance with an http adapter correctly
+    # configured for flipper cloud.
+    #
+    # token - The String token for the environment from the website.
+    # options - The Hash of options.
+    #           # :url - The url to point at (defaults to DEFAULT_URL).
+    #           # :adapter_wrapper - The adapter wrapper block. Block should
+    #                                receive an adapter and return an adapter.
+    #                                Allows you to wrap the http adapter with
+    #                                other adapters to make instrumentation and
+    #                                caching easy.
+    #           # :instrumenter - The optional instrumenter to use for the
+    #                             Flipper::DSL instance (defaults to Noop).
     def self.new(token, options = {})
-      url = options.fetch(:url) { "https://www.featureflipper.com/adapter" }
-      adapter = Flipper::Adapters::Http.new(uri: URI(url),
-                                            headers: {
-                                              "Feature-Flipper-Token" => token,
-                                            })
-      Flipper.new(adapter)
+      url = options.fetch(:url, DEFAULT_URL)
+      http_options = {
+        uri: URI(url),
+        headers: {
+          "Feature-Flipper-Token" => token,
+        },
+      }
+      adapter = Flipper::Adapters::Http.new(http_options)
+
+      adapter_wrapper = options.fetch(:adapter_wrapper, DEFAULT_ADAPTER_WRAPPER_BLOCK)
+      adapter = adapter_wrapper.call(adapter)
+
+      instrumenter = options.fetch(:instrumenter, Flipper::Instrumenters::Noop)
+      Flipper.new(adapter, instrumenter: instrumenter)
     end
   end
 end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.11.0.beta3'.freeze
+  VERSION = '0.11.0.beta4'.freeze
 end

data/spec/flipper/cloud_spec.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'flipper/cloud'
+require 'flipper/adapters/instrumented'
 
 RSpec.describe Flipper::Cloud do
   context "initialize with token" do
@@ -31,6 +32,10 @@ RSpec.describe Flipper::Cloud do
       headers = @http_client.instance_variable_get('@headers')
       expect(headers['Feature-Flipper-Token']).to eq(token)
     end
+
+    it 'uses noop instrumenter' do
+      expect(@instance.instrumenter).to be(Flipper::Instrumenters::Noop)
+    end
   end
 
   context 'initialize with token and options' do
@@ -48,4 +53,19 @@ RSpec.describe Flipper::Cloud do
       expect(uri.path).to eq('/sadpanda')
     end
   end
+
+  it 'can set instrumenter' do
+    instrumenter = Object.new
+    instance = described_class.new('asdf', instrumenter: instrumenter)
+    expect(instance.instrumenter).to be(instrumenter)
+  end
+
+  it 'allows wrapping adapter with another adapter like the instrumenter' do
+    adapter_wrapper = lambda do |adapter|
+      Flipper::Adapters::Instrumented.new(adapter)
+    end
+    instance = described_class.new('asdf', adapter_wrapper: adapter_wrapper)
+    # instance.adapter is memoizable adapter instance
+    expect(instance.adapter.adapter).to be_instance_of(Flipper::Adapters::Instrumented)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.11.0.beta3
+  version: 0.11.0.beta4
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0.beta3
+        version: 0.11.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0.beta3
+        version: 0.11.0.beta4
 description: FeatureFlipper.com adapter for Flipper
 email:
 - nunemaker@gmail.com