flipper-cloud 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac2ac6d779943f69836c9d8c6e4bcd58d45b31947114b09c154f2045285c006
-  data.tar.gz: f80e71c83eea9aa839dc80141fb56b2e8701f0ba431b3baa62b62ac77bbfff4f
+  metadata.gz: 4a7975de45022ee964e72588441cebfcbb2381feb4657342c7423064a709d239
+  data.tar.gz: 0d707e5f5ecda9181a6673df0537696d9c8046fe3a01956bee5091e72c39e58f
 SHA512:
-  metadata.gz: 50bd6b0bf3aaa5b1a825b297a1cac4ebf6d6e849bc25dd0d1bd6d8fea38b47677da4095f3ba9c5237b622aebd5c49cb905176efb8e40d7b9a0cc2e88ba0f5a55
-  data.tar.gz: 25ab8c3a7e347383660023830a8ff46af6e14176f6875c6812b92825c7abbcd8133b56c9fb971139417f3ce2843c0925c408c7968b456864cc9af3680cf5cbb0
+  metadata.gz: 1833dab42fd2c96295317d99061a90b1e38b592bea66b4c7b672f013cd915cb09f476984545a244741cac62f37054a66e09e00eb1a0a287fd4b689153098baaa
+  data.tar.gz: 00a7ade548bf735d0cd9ca2fbca6a74e1beb6b15c4719a34b06923db6ff9a56b8a43387a6810ec5ee204fd32dab0a916cd5d3f245176473b658dad75a31eb4f9

data/examples/cloud/app.ru

@@ -1,8 +1,7 @@
 # Usage (from the repo root):
-#   env FLIPPER_CLOUD_TOKEN=<token> FLIPPER_CLOUD_SYNC_SECRET=<secret> FLIPPER_CLOUD_SYNC_METHOD=webhook bundle exec rackup examples/ui/basic.ru -p 9999
-#   env FLIPPER_CLOUD_TOKEN=<token> FLIPPER_CLOUD_SYNC_SECRET=<secret> FLIPPER_CLOUD_SYNC_METHOD=webhook bundle exec shotgun examples/ui/basic.ru -p 9999
+#   env FLIPPER_CLOUD_TOKEN=<token> FLIPPER_CLOUD_SYNC_SECRET=<secret> FLIPPER_CLOUD_SYNC_METHOD=webhook bundle exec rackup examples/cloud/app.ru -p 9999
+#   env FLIPPER_CLOUD_TOKEN=<token> FLIPPER_CLOUD_SYNC_SECRET=<secret> FLIPPER_CLOUD_SYNC_METHOD=webhook bundle exec shotgun examples/cloud/app.ru -p 9999
 #   http://localhost:9999/
-#   http://localhost:9999/webhooks
 
 require 'pathname'
 root_path = Pathname(__FILE__).dirname.join('..').expand_path

data/lib/flipper/cloud/middleware.rb

@@ -7,6 +7,8 @@ module Flipper
     class Middleware
       # Internal: The path to match for webhook requests.
       WEBHOOK_PATH = %r{\A/webhooks\/?\Z}
+      # Internal: The root path to match for requests.
+      ROOT_PATH = %r{\A/\Z}
 
       def initialize(app, options = {})
         @app = app
@@ -19,7 +21,7 @@ module Flipper
 
       def call!(env)
         request = Rack::Request.new(env)
-        if request.post? && request.path_info.match(WEBHOOK_PATH)
+        if request.post? && (request.path_info.match(ROOT_PATH) || request.path_info.match(WEBHOOK_PATH))
           status = 200
           headers = {
             "Content-Type" => "application/json",

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.20.3'.freeze
+  VERSION = '0.20.4'.freeze
 end

data/spec/flipper/cloud/middleware_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe Flipper::Cloud::Middleware do
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(200)
       expect(JSON.parse(last_response.body)).to eq({
@@ -80,7 +80,7 @@ RSpec.describe Flipper::Cloud::Middleware do
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(400)
       expect(stub).not_to have_been_requested
@@ -101,7 +101,7 @@ RSpec.describe Flipper::Cloud::Middleware do
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(402)
       expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Flipper::Adapters::Http::Error")
@@ -124,7 +124,7 @@ RSpec.describe Flipper::Cloud::Middleware do
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(500)
       expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Flipper::Adapters::Http::Error")
@@ -147,7 +147,7 @@ RSpec.describe Flipper::Cloud::Middleware do
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(500)
       expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Net::OpenTimeout")
@@ -168,7 +168,7 @@ RSpec.describe Flipper::Cloud::Middleware do
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
         'flipper' => env_flipper,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(200)
       expect(stub).to have_been_requested
@@ -187,7 +187,7 @@ RSpec.describe Flipper::Cloud::Middleware do
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
         'flipper' => env_flipper,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(200)
       expect(stub).to have_been_requested
@@ -207,7 +207,7 @@ RSpec.describe Flipper::Cloud::Middleware do
         'flipper' => flipper,
         'flipper_cloud' => env_flipper,
       }
-      post '/webhooks', request_body, env
+      post '/', request_body, env
 
       expect(last_response.status).to eq(200)
       expect(stub).to have_been_requested
@@ -218,6 +218,27 @@ RSpec.describe Flipper::Cloud::Middleware do
     let(:app) { Flipper::Cloud.app(-> { flipper }) }
 
     it 'works' do
+      stub = stub_request_for_token('regular')
+      env = {
+        "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
+      }
+      post '/', request_body, env
+
+      expect(last_response.status).to eq(200)
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context 'when using older /webhooks path' do
+    let(:app) { Flipper::Cloud.app(flipper) }
+
+    it 'uses instance to sync' do
+      Flipper.register(:admins) { |*args| false }
+      Flipper.register(:staff) { |*args| false }
+      Flipper.register(:basic) { |*args| false }
+      Flipper.register(:plus) { |*args| false }
+      Flipper.register(:premium) { |*args| false }
+
       stub = stub_request_for_token('regular')
       env = {
         "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
@@ -225,13 +246,22 @@ RSpec.describe Flipper::Cloud::Middleware do
       post '/webhooks', request_body, env
 
       expect(last_response.status).to eq(200)
+      expect(JSON.parse(last_response.body)).to eq({
+        "groups" => [
+          {"name" => "admins"},
+          {"name" => "staff"},
+          {"name" => "basic"},
+          {"name" => "plus"},
+          {"name" => "premium"},
+        ],
+      })
       expect(stub).to have_been_requested
     end
   end
 
   describe 'Request method unsupported' do
     it 'skips middleware' do
-      get '/webhooks'
+      get '/'
       expect(last_response.status).to eq(404)
       expect(last_response.content_type).to eq("application/json")
       expect(last_response.body).to eq("{}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.20.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.20.4
 description: 
 email:
 - nunemaker@gmail.com
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- docs/images/flipper_cloud.png
 - examples/cloud/app.ru
 - examples/cloud/basic.rb
 - examples/cloud/cached_in_memory.rb