flipper-cloud 0.20.0 → 0.21.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17e92045e80beb6c0c83aa2591b75585393d0e6e922b834379fcfa0f5dc9049
-  data.tar.gz: 6943dde37bab5cadf5e8e8a2db847aa6ddb0e310fd1b7bc9c5638835ae81cfe1
+  metadata.gz: 9ba3c2db9aa7175de2301fb4fea82a25164e935b0f0fe5d7ce38911eee319cf9
+  data.tar.gz: e97f8ec07dcc20057d6934e1cf933be9517d53549317539900630e43a7ffd23e
 SHA512:
-  metadata.gz: cf7073018558fa53b8f7ada5d984b42066d0a5ae5cd81e343cd249cc2d1032ecd4c95a094c2f49027f1bf87de7ddc6c7f1a5804c5658d4700c09f0c0c7d74b8c
-  data.tar.gz: faa00d96aae37eff0559f88e8a913ff407526825b55eff2404c794b2a6aa7f1f9882d04022746468fc157c52f8cc4eafa2ffc500c11aaa213876b38d963d6cab
+  metadata.gz: 62d4f0cc6817cfa654e1980156ca7e4d9ba81d1c0bb761f37651455b20f0b4732ceafe1adbf5a30ca09f8c1f8b80b8609c9d61ef969b82be48eedd183e4a5c15
+  data.tar.gz: 4540506c2b1c4eabe0140f3757e0414977ef876454755106bedfffd8159a880ffea37b6bca24bde30e9e6b79259ad86e30afb415219f7a22104c91bcd4edfbe8

data/examples/cloud/app.ru

@@ -1,14 +1,9 @@
 # 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> bundle exec rackup examples/cloud/app.ru -p 9999
+#   env FLIPPER_CLOUD_TOKEN=<token> FLIPPER_CLOUD_SYNC_SECRET=<secret> 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
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
 
+require 'bundler/setup'
 require 'flipper/cloud'
 Flipper.configure do |config|
   config.default { Flipper::Cloud.new }

data/examples/cloud/basic.rb

@@ -1,13 +1,8 @@
 # Usage (from the repo root):
-#   env TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
-require 'pathname'
-require 'logger'
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
+require 'bundler/setup'
 require 'flipper/cloud'
-flipper = Flipper::Cloud.new(ENV.fetch('TOKEN'))
+flipper = Flipper::Cloud.new
 
 flipper[:stats].enable
 

data/examples/cloud/cached_in_memory.rb

@@ -1,16 +1,15 @@
-require File.expand_path('../../example_setup', __FILE__)
-
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/cached_in_memory.rb
+require 'bundler/setup'
 require 'flipper/cloud'
 require 'flipper/adapters/active_support_cache_store'
 require 'active_support/cache'
 require 'active_support/cache/memory_store'
 
-token = ENV.fetch("TOKEN") { abort "TOKEN environment variable not set." }
 feature_name = ENV.fetch("FEATURE") { "testing" }.to_sym
 
 Flipper.configure do |config|
   config.default do
-    Flipper::Cloud.new(token) do |cloud|
+    Flipper::Cloud.new do |cloud|
       cloud.debug_output = STDOUT
       cloud.adapter do |adapter|
         Flipper::Adapters::ActiveSupportCacheStore.new(adapter,

data/examples/cloud/import.rb

@@ -1,23 +1,15 @@
 # Usage (from the repo root):
-#   env TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
-require 'pathname'
-require 'logger'
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+#   env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/import.rb
+require 'bundler/setup'
 require 'flipper'
 require 'flipper/cloud'
 
-memory_adapter = Flipper::Adapters::Memory.new
-memory_flipper = Flipper.new(memory_adapter)
-
-memory_flipper.enable(:test)
-memory_flipper.enable(:search)
-memory_flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
-memory_flipper.enable_percentage_of_time(:logging, 5)
+Flipper.enable(:test)
+Flipper.enable(:search)
+Flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+Flipper.enable_percentage_of_time(:logging, 5)
 
-flipper = Flipper::Cloud.new(ENV.fetch('TOKEN'))
+cloud = Flipper::Cloud.new
 
-# wipes cloud clean and makes it identical to memory flipper
-flipper.import(memory_flipper)
+# makes cloud identical to memory flipper
+cloud.import(Flipper)

data/examples/cloud/local_adapter.rb

@@ -5,13 +5,12 @@
 # never raise. You could get a slow request every now and then if cloud is
 # unavailable, but we are hoping to fix that soon by doing the cloud update in a
 # background thread.
-require File.expand_path('../../example_setup', __FILE__)
-
+# env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/local_adapter.rb
+require 'bundler/setup'
 require 'logger'
 require 'flipper/cloud'
 require 'flipper/adapters/redis'
 
-token = ENV.fetch("TOKEN") { abort "TOKEN environment variable not set." }
 feature_name = ENV.fetch("FEATURE") { "testing" }.to_sym
 
 redis = Redis.new(logger: Logger.new(STDOUT))
@@ -19,7 +18,7 @@ redis.flushdb
 
 Flipper.configure do |config|
   config.default do
-    Flipper::Cloud.new(token) do |cloud|
+    Flipper::Cloud.new do |cloud|
       cloud.debug_output = STDOUT
       cloud.local_adapter = Flipper::Adapters::Redis.new(redis)
       cloud.sync_interval = 10

data/lib/flipper/cloud/configuration.rb

@@ -1,3 +1,4 @@
+require "socket"
 require "flipper/adapters/http"
 require "flipper/adapters/memory"
 require "flipper/adapters/dual_write"
@@ -12,6 +13,8 @@ module Flipper
         :webhook,
       ].freeze
 
+      DEFAULT_URL = "https://www.flippercloud.io/adapter".freeze
+
       # Public: The token corresponding to an environment on flippercloud.io.
       attr_accessor :token
 
@@ -56,10 +59,6 @@ module Flipper
       # the local in sync with cloud (default: 10).
       attr_accessor :sync_interval
 
-      # Public: The method to be used for synchronizing your local flipper
-      # adapter with cloud. (default: :poll, can also be :webhook).
-      attr_reader :sync_method
-
       # Public: The secret used to verify if syncs in the middleware should
       # occur or not.
       attr_accessor :sync_secret
@@ -71,6 +70,11 @@ module Flipper
           raise ArgumentError, "Flipper::Cloud token is missing. Please set FLIPPER_CLOUD_TOKEN or provide the token (e.g. Flipper::Cloud.new('token'))."
         end
 
+        if ENV["FLIPPER_CLOUD_SYNC_METHOD"]
+          warn "FLIPPER_CLOUD_SYNC_METHOD is deprecated and has no effect."
+        end
+        self.sync_method = options[:sync_method] if options[:sync_method]
+
         @instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
         @read_timeout = options.fetch(:read_timeout) { ENV.fetch("FLIPPER_CLOUD_READ_TIMEOUT", 5).to_f }
         @open_timeout = options.fetch(:open_timeout) { ENV.fetch("FLIPPER_CLOUD_OPEN_TIMEOUT", 5).to_f }
@@ -80,8 +84,7 @@ module Flipper
         @local_adapter = options.fetch(:local_adapter) { Adapters::Memory.new }
         @debug_output = options[:debug_output]
         @adapter_block = ->(adapter) { adapter }
-        self.sync_method = options.fetch(:sync_method) { ENV.fetch("FLIPPER_CLOUD_SYNC_METHOD", :poll).to_sym }
-        self.url = options.fetch(:url) { ENV.fetch("FLIPPER_CLOUD_URL", "https://www.flippercloud.io/adapter".freeze) }
+        self.url = options.fetch(:url) { ENV.fetch("FLIPPER_CLOUD_URL", DEFAULT_URL) }
       end
 
       # Public: Read or customize the http adapter. Calling without a block will
@@ -113,18 +116,14 @@ module Flipper
         }).call
       end
 
-      def sync_method=(new_sync_method)
-        new_sync_method = new_sync_method.to_sym
-
-        unless VALID_SYNC_METHODS.include?(new_sync_method)
-          raise ArgumentError, "Unsupported sync_method. Valid options are (#{VALID_SYNC_METHODS.to_a.join(', ')})"
-        end
-
-        if new_sync_method == :webhook && sync_secret.nil?
-          raise ArgumentError, "Flipper::Cloud sync_secret is missing. Please set FLIPPER_CLOUD_SYNC_SECRET or provide the sync_secret used to validate webhooks."
-        end
+      # Public: The method that will be used to synchronize local adapter with
+      # cloud. (default: :poll, will be :webhook if sync_secret is set).
+      def sync_method
+        sync_secret ? :webhook : :poll
+      end
 
-        @sync_method = new_sync_method
+      def sync_method=(_)
+        warn "Flipper::Cloud: sync_method is deprecated and has no effect."
       end
 
       private
@@ -153,6 +152,11 @@ module Flipper
           headers: {
             "Flipper-Cloud-Token" => @token,
             "Feature-Flipper-Token" => @token,
+            "Client-Lang" => "ruby",
+            "Client-Lang-Version" => "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
+            "Client-Platform" => RUBY_PLATFORM,
+            "Client-Engine" => defined?(RUBY_ENGINE) ? RUBY_ENGINE : "",
+            "Client-Hostname" => Socket.gethostname,
           },
         })
       end

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",
@@ -32,10 +34,20 @@ module Flipper
           begin
             message_verifier = MessageVerifier.new(secret: flipper.sync_secret)
             if message_verifier.verify(payload, signature)
-              flipper.sync
-              body = JSON.generate({
-                groups: Flipper.group_names.map { |name| {name: name}}
-              })
+              begin
+                flipper.sync
+                body = JSON.generate({
+                  groups: Flipper.group_names.map { |name| {name: name}}
+                })
+              rescue Flipper::Adapters::Http::Error => error
+                status = error.response.code.to_i == 402 ? 402 : 500
+                headers["Flipper-Cloud-Response-Error-Class"] = error.class.name
+                headers["Flipper-Cloud-Response-Error-Message"] = error.message
+              rescue => error
+                status = 500
+                headers["Flipper-Cloud-Response-Error-Class"] = error.class.name
+                headers["Flipper-Cloud-Response-Error-Message"] = error.message
+              end
             end
           rescue MessageVerifier::InvalidSignature
             status = 400

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.20.0'.freeze
+  VERSION = '0.21.0.rc1'.freeze
 end

data/spec/flipper/cloud/configuration_spec.rb

@@ -127,53 +127,30 @@ RSpec.describe Flipper::Cloud::Configuration do
     end
   end
 
-  it "defaults to sync_method to poll" do
-    memory_adapter = Flipper::Adapters::Memory.new
+  it "defaults sync_method to :poll" do
     instance = described_class.new(required_options)
 
     expect(instance.sync_method).to eq(:poll)
   end
 
-  it "can use webhook for sync_method" do
-    memory_adapter = Flipper::Adapters::Memory.new
+  it "sets sync_method to :webhook if sync_secret provided" do
     instance = described_class.new(required_options.merge({
       sync_secret: "secret",
-      sync_method: :webhook,
-      local_adapter: memory_adapter,
     }))
 
     expect(instance.sync_method).to eq(:webhook)
     expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
   end
 
-  it "raises ArgumentError for invalid sync_method" do
-    expect {
-      described_class.new(required_options.merge(sync_method: :foo))
-    }.to raise_error(ArgumentError, "Unsupported sync_method. Valid options are (poll, webhook)")
-  end
-
-  it "can use ENV var for sync_method" do
-    with_modified_env "FLIPPER_CLOUD_SYNC_METHOD" => "webhook" do
-      instance = described_class.new(required_options.merge({
-        sync_secret: "secret",
-      }))
+  it "sets sync_method to :webhook if FLIPPER_CLOUD_SYNC_SECRET set" do
+    with_modified_env "FLIPPER_CLOUD_SYNC_SECRET" => "abc" do
+      instance = described_class.new(required_options)
 
       expect(instance.sync_method).to eq(:webhook)
+      expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
     end
   end
 
-  it "can use string sync_method instead of symbol" do
-    memory_adapter = Flipper::Adapters::Memory.new
-    instance = described_class.new(required_options.merge({
-      sync_secret: "secret",
-      sync_method: "webhook",
-      local_adapter: memory_adapter,
-    }))
-
-    expect(instance.sync_method).to eq(:webhook)
-    expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
-  end
-
   it "can set sync_secret" do
     instance = described_class.new(required_options.merge(sync_secret: "from_config"))
       expect(instance.sync_secret).to eq("from_config")

data/spec/flipper/cloud/dsl_spec.rb

@@ -9,7 +9,6 @@ RSpec.describe Flipper::Cloud::DSL do
     cloud_configuration = Flipper::Cloud::Configuration.new({
       token: "asdf",
       sync_secret: "tasty",
-      sync_method: :webhook,
     })
     dsl = described_class.new(cloud_configuration)
     expect(dsl.features).to eq(Set.new)
@@ -26,7 +25,6 @@ RSpec.describe Flipper::Cloud::DSL do
     cloud_configuration = Flipper::Cloud::Configuration.new({
       token: "asdf",
       sync_secret: "tasty",
-      sync_method: :webhook,
     })
     dsl = described_class.new(cloud_configuration)
     dsl.sync
@@ -37,7 +35,6 @@ RSpec.describe Flipper::Cloud::DSL do
     cloud_configuration = Flipper::Cloud::Configuration.new({
       token: "asdf",
       sync_secret: "tasty",
-      sync_method: :webhook,
     })
     dsl = described_class.new(cloud_configuration)
     expect(dsl.sync_secret).to eq("tasty")
@@ -52,7 +49,6 @@ RSpec.describe Flipper::Cloud::DSL do
       cloud_configuration = Flipper::Cloud::Configuration.new({
         token: "asdf",
         sync_secret: "tasty",
-        sync_method: :webhook,
         local_adapter: local_adapter
       })
     end

data/spec/flipper/cloud/middleware_spec.rb

@@ -9,7 +9,6 @@ RSpec.describe Flipper::Cloud::Middleware do
     Flipper::Cloud.new("regular") do |config|
       config.local_adapter = Flipper::Adapters::OperationLogger.new(Flipper::Adapters::Memory.new)
       config.sync_secret = "regular_tasty"
-      config.sync_method = :webhook
     end
   }
 
@@ -17,7 +16,6 @@ RSpec.describe Flipper::Cloud::Middleware do
     Flipper::Cloud.new("env") do |config|
       config.local_adapter = Flipper::Adapters::OperationLogger.new(Flipper::Adapters::Memory.new)
       config.sync_secret = "env_tasty"
-      config.sync_method = :webhook
     end
   }
 
@@ -53,7 +51,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,13 +78,82 @@ 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
     end
   end
 
+  context "when flipper cloud responds with 402" do
+    let(:app) { Flipper::Cloud.app(flipper) }
+
+    it "results in 402" 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', status: 402)
+      env = {
+        "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
+      }
+      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")
+      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to include("Failed with status: 402")
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context "when flipper cloud responds with non-402 and non-2xx code" do
+    let(:app) { Flipper::Cloud.app(flipper) }
+
+    it "results in 500" 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', status: 503)
+      env = {
+        "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
+      }
+      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")
+      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to include("Failed with status: 503")
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context "when flipper cloud responds with timeout" do
+    let(:app) { Flipper::Cloud.app(flipper) }
+
+    it "results in 500" 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', status: :timeout)
+      env = {
+        "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
+      }
+      post '/', request_body, env
+
+      expect(last_response.status).to eq(500)
+      expect(last_response.headers["Flipper-Cloud-Response-Error-Class"]).to eq("Net::OpenTimeout")
+      expect(last_response.headers["Flipper-Cloud-Response-Error-Message"]).to eq("execution expired")
+      expect(stub).to have_been_requested
+    end
+  end
+
   context 'when initialized with flipper instance and flipper instance in env' do
     let(:app) { Flipper::Cloud.app(flipper) }
     let(:signature) {
@@ -99,7 +166,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
@@ -118,7 +185,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
@@ -138,7 +205,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
@@ -149,6 +216,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,
@@ -156,13 +244,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("{}")
@@ -177,12 +274,17 @@ RSpec.describe Flipper::Cloud::Middleware do
 
   private
 
-  def stub_request_for_token(token)
-    stub_request(:get, "https://www.flippercloud.io/adapter/features").
+  def stub_request_for_token(token, status: 200)
+    stub = stub_request(:get, "https://www.flippercloud.io/adapter/features").
       with({
         headers: {
           'Flipper-Cloud-Token' => token,
         },
-      }).to_return(status: 200, body: response_body, headers: {})
+      })
+    if status == :timeout
+      stub.to_timeout
+    else
+      stub.to_return(status: status, body: response_body, headers: {})
+    end
   end
 end

data/spec/flipper/cloud_spec.rb

@@ -114,4 +114,89 @@ RSpec.describe Flipper::Cloud do
       described_class.new('asdf', open_timeout: 1)
     end
   end
+
+  it 'can import' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_return(status: 200, body: "{}", headers: {})
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    cloud_flipper.import(flipper)
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect(cloud_flipper.adapter.get_all).to eq(get_all)
+  end
+
+  it 'raises error for failure while importing' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_return(status: 500, body: "{}")
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect { cloud_flipper.import(flipper) }.to raise_error(Flipper::Adapters::Http::Error)
+    expect(flipper.adapter.get_all).to eq(get_all)
+  end
+
+  it 'raises error for timeout while importing' do
+    stub_request(:post, /www\.flippercloud\.io\/adapter\/features.*/).
+      with(headers: {
+          'Feature-Flipper-Token'=>'asdf',
+          'Flipper-Cloud-Token'=>'asdf',
+      }).to_timeout
+
+    flipper = Flipper.new(Flipper::Adapters::Memory.new)
+
+    flipper.enable(:test)
+    flipper.enable(:search)
+    flipper.enable_actor(:stats, Flipper::Actor.new("jnunemaker"))
+    flipper.enable_percentage_of_time(:logging, 5)
+
+    cloud_flipper = Flipper::Cloud.new("asdf")
+
+    get_all = {
+      "logging" => {actors: Set.new, boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: "5"},
+      "search" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "stats" => {actors: Set["jnunemaker"], boolean: nil, groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+      "test" => {actors: Set.new, boolean: "true", groups: Set.new, percentage_of_actors: nil, percentage_of_time: nil},
+    }
+
+    expect(flipper.adapter.get_all).to eq(get_all)
+    expect { cloud_flipper.import(flipper) }.to raise_error(Net::OpenTimeout)
+    expect(flipper.adapter.get_all).to eq(get_all)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0.rc1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2021-05-01 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.0
+        version: 0.21.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0.rc1
 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
@@ -65,9 +66,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: