flipper-cloud 0.22.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69bb21ad2d5ae7944825472e2d16fead9a99e3136331f2b9ad1b3a58a84d0340
-  data.tar.gz: 7b049a433a94cb80aa8077507837b449bca2fef71d05153a6ea45a6959cbaded
+  metadata.gz: bdc9bab38dc9eda1a623130fc95ef4ea352b3acaaf83f8c36cdc013c8a5bc3c4
+  data.tar.gz: cea3e86dd52a6c74fbd01e93782456f42b5058631b377c58f7d7610b22d81cb3
 SHA512:
-  metadata.gz: 050d427a9fcbe50168de8b46c822249bb71a843e55e24720ccbb7a13e075c0ebff0f8592a9cfa59e6fbbdcb2877afd21336c4f863f297e4ec41b0d7b71753027
-  data.tar.gz: 3d671ce575cd6f50fe456cd372faa81de5cbe6ca39a397403d1801e8adb7e4b2fa1b035df69028144c8e22a77b04b0d232e34530e8068225f779a918b1516b51
+  metadata.gz: 6c5a1104978d3f190687d4374c44a1887953b2955c803eecb995d597662420d2b4edb5d4d5bcb420c444167669c709b8718d7966916034dcee1ddca408b6d6b3
+  data.tar.gz: 3e195dd488dcd230d0dd8f19162b05cac2b663f893b1f3509ffc681557ee3cd79e019d499d78295227d3603899e575daaad2a94c5878de2291ccac60dabcad45

data/examples/cloud/basic.rb

@@ -1,5 +1,7 @@
 # Usage (from the repo root):
 # env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/basic.rb
+
+require_relative "./cloud_setup"
 require 'bundler/setup'
 require 'flipper/cloud'
 

data/examples/cloud/cloud_setup.rb

@@ -0,0 +1,4 @@
+if ENV["FLIPPER_CLOUD_TOKEN"].nil? || ENV["FLIPPER_CLOUD_TOKEN"].empty?
+  warn "FLIPPER_CLOUD_TOKEN missing so skipping cloud example."
+  exit
+end

data/examples/cloud/import.rb

@@ -1,5 +1,7 @@
 # Usage (from the repo root):
 #   env FLIPPER_CLOUD_TOKEN=<token> bundle exec ruby examples/cloud/import.rb
+
+require_relative "./cloud_setup"
 require 'bundler/setup'
 require 'flipper'
 require 'flipper/cloud'

data/lib/flipper/cloud/configuration.rb

@@ -151,15 +151,11 @@ module Flipper
           debug_output: @debug_output,
           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
     end
   end
 end
+
+# "FLIPPER_TIMESTAMP".freeze => Flipper::Timestamp.generate.to_s,

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.22.0'.freeze
+  VERSION = '0.23.1'.freeze
 end

data/spec/flipper/cloud/configuration_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'flipper/cloud/configuration'
 require 'flipper/adapters/instrumented'
 
@@ -13,10 +12,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set token from ENV var" do
-    with_modified_env "FLIPPER_CLOUD_TOKEN" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :token })
-      expect(instance.token).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_TOKEN"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :token })
+    expect(instance.token).to eq("from_env")
   end
 
   it "can set instrumenter" do
@@ -31,10 +29,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set read_timeout from ENV var" do
-    with_modified_env "FLIPPER_CLOUD_READ_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
-      expect(instance.read_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_READ_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :read_timeout })
+    expect(instance.read_timeout).to eq(9)
   end
 
   it "can set open_timeout" do
@@ -43,10 +40,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set open_timeout from ENV var" do
-    with_modified_env "FLIPPER_CLOUD_OPEN_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
-      expect(instance.open_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_OPEN_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :open_timeout })
+    expect(instance.open_timeout).to eq(9)
   end
 
   it "can set write_timeout" do
@@ -55,10 +51,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set write_timeout from ENV var" do
-    with_modified_env "FLIPPER_CLOUD_WRITE_TIMEOUT" => "9" do
-      instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
-      expect(instance.write_timeout).to eq(9)
-    end
+    ENV["FLIPPER_CLOUD_WRITE_TIMEOUT"] = "9"
+    instance = described_class.new(required_options.reject { |k, v| k == :write_timeout })
+    expect(instance.write_timeout).to eq(9)
   end
 
   it "can set sync_interval" do
@@ -67,10 +62,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can set sync_interval from ENV var" do
-    with_modified_env "FLIPPER_CLOUD_SYNC_INTERVAL" => "5" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
-      expect(instance.sync_interval).to eq(5)
-    end
+    ENV["FLIPPER_CLOUD_SYNC_INTERVAL"] = "5"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_interval })
+    expect(instance.sync_interval).to eq(5)
   end
 
   it "passes sync_interval into sync adapter" do
@@ -121,10 +115,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override URL using ENV var" do
-    with_modified_env "FLIPPER_CLOUD_URL" => "https://example.com" do
-      instance = described_class.new(required_options.reject { |k, v| k == :url })
-      expect(instance.url).to eq("https://example.com")
-    end
+    ENV["FLIPPER_CLOUD_URL"] = "https://example.com"
+    instance = described_class.new(required_options.reject { |k, v| k == :url })
+    expect(instance.url).to eq("https://example.com")
   end
 
   it "defaults sync_method to :poll" do
@@ -143,12 +136,11 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   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)
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "abc"
+    instance = described_class.new(required_options)
 
-      expect(instance.sync_method).to eq(:webhook)
-      expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
-    end
+    expect(instance.sync_method).to eq(:webhook)
+    expect(instance.adapter).to be_instance_of(Flipper::Adapters::DualWrite)
   end
 
   it "can set sync_secret" do
@@ -157,10 +149,9 @@ RSpec.describe Flipper::Cloud::Configuration do
   end
 
   it "can override sync_secret using ENV var" do
-    with_modified_env "FLIPPER_CLOUD_SYNC_SECRET" => "from_env" do
-      instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
-      expect(instance.sync_secret).to eq("from_env")
-    end
+    ENV["FLIPPER_CLOUD_SYNC_SECRET"] = "from_env"
+    instance = described_class.new(required_options.reject { |k, v| k == :sync_secret })
+    expect(instance.sync_secret).to eq("from_env")
   end
 
   it "can sync with cloud" do

data/spec/flipper/cloud/dsl_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'flipper/cloud/configuration'
 require 'flipper/cloud/dsl'
 require 'flipper/adapters/operation_logger'

data/spec/flipper/cloud/engine_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'rails'
 require 'flipper/cloud'
 
@@ -19,6 +18,8 @@ RSpec.describe Flipper::Cloud::Engine do
 
   before do
     Rails.application = nil
+    ActiveSupport::Dependencies.autoload_paths = ActiveSupport::Dependencies.autoload_paths.dup
+    ActiveSupport::Dependencies.autoload_once_paths = ActiveSupport::Dependencies.autoload_once_paths.dup
 
     # Force loading of flipper to configure itself
     load 'flipper/cloud.rb'
@@ -27,12 +28,11 @@ RSpec.describe Flipper::Cloud::Engine do
   it "initializes cloud configuration" do
     stub_request(:get, /flippercloud\.io/).to_return(status: 200, body: "{}")
 
-    with_modified_env env do
-      application.initialize!
+    ENV.update(env)
+    application.initialize!
 
-      expect(Flipper.instance).to be_a(Flipper::Cloud::DSL)
-      expect(Flipper.instance.instrumenter).to be(ActiveSupport::Notifications)
-    end
+    expect(Flipper.instance).to be_a(Flipper::Cloud::DSL)
+    expect(Flipper.instance.instrumenter).to be(ActiveSupport::Notifications)
   end
 
   context "with CLOUD_SYNC_SECRET" do
@@ -57,42 +57,39 @@ RSpec.describe Flipper::Cloud::Engine do
     }
 
     it "configures webhook app" do
-      with_modified_env env do
-        application.initialize!
+      ENV.update(env)
+      application.initialize!
 
-        stub = stub_request(:get, "https://www.flippercloud.io/adapter/features").with({
-          headers: { "Flipper-Cloud-Token" => ENV["FLIPPER_CLOUD_TOKEN"] },
-        }).to_return(status: 200, body: JSON.generate({ features: {} }), headers: {})
+      stub = stub_request(:get, "https://www.flippercloud.io/adapter/features").with({
+        headers: { "Flipper-Cloud-Token" => ENV["FLIPPER_CLOUD_TOKEN"] },
+      }).to_return(status: 200, body: JSON.generate({ features: {} }), headers: {})
 
-        post "/_flipper", request_body, { "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value }
+      post "/_flipper", request_body, { "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value }
 
-        expect(last_response.status).to eq(200)
-        expect(stub).to have_been_requested
-      end
+      expect(last_response.status).to eq(200)
+      expect(stub).to have_been_requested
     end
   end
 
   context "without CLOUD_SYNC_SECRET" do
     it "does not configure webhook app" do
-      with_modified_env env do
-        application.initialize!
+      ENV.update(env)
+      application.initialize!
 
-        post "/_flipper"
-        expect(last_response.status).to eq(404)
-      end
+      post "/_flipper"
+      expect(last_response.status).to eq(404)
     end
   end
 
   context "without FLIPPER_CLOUD_TOKEN" do
     it "gracefully skips configuring webhook app" do
-      with_modified_env "FLIPPER_CLOUD_TOKEN" => nil do
-        application.initialize!
-        expect(silence { Flipper.instance }).to match(/Missing FLIPPER_CLOUD_TOKEN/)
-        expect(Flipper.instance).to be_a(Flipper::DSL)
-
-        post "/_flipper"
-        expect(last_response.status).to eq(404)
-      end
+      ENV["FLIPPER_CLOUD_TOKEN"] = nil
+      application.initialize!
+      expect(silence { Flipper.instance }).to match(/Missing FLIPPER_CLOUD_TOKEN/)
+      expect(Flipper.instance).to be_a(Flipper::DSL)
+
+      post "/_flipper"
+      expect(last_response.status).to eq(404)
     end
   end
 end

data/spec/flipper/cloud/message_verifier_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'flipper/cloud/message_verifier'
 
 RSpec.describe Flipper::Cloud::MessageVerifier do

data/spec/flipper/cloud/middleware_spec.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'helper'
 require 'flipper/cloud'
 require 'flipper/cloud/middleware'
 require 'flipper/adapters/operation_logger'

data/spec/flipper/cloud_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'flipper/cloud'
 require 'flipper/adapters/instrumented'
 require 'flipper/instrumenters/memory'
@@ -68,9 +67,8 @@ RSpec.describe Flipper::Cloud do
   end
 
   it 'can initialize with no token explicitly provided' do
-    with_modified_env "FLIPPER_CLOUD_TOKEN" => "asdf" do
-      expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
-    end
+    ENV['FLIPPER_CLOUD_TOKEN'] = 'asdf'
+    expect(described_class.new).to be_instance_of(Flipper::Cloud::DSL)
   end
 
   it 'can set instrumenter' do
@@ -117,10 +115,7 @@ RSpec.describe Flipper::Cloud do
 
   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: {})
+      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_return(status: 200, body: "{}", headers: {})
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)
 
@@ -146,10 +141,7 @@ RSpec.describe Flipper::Cloud do
 
   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: "{}")
+      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_return(status: 500, body: "{}")
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)
 
@@ -174,10 +166,7 @@ RSpec.describe Flipper::Cloud do
 
   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
+      with(headers: {'Flipper-Cloud-Token'=>'asdf'}).to_timeout
 
     flipper = Flipper.new(Flipper::Adapters::Memory.new)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-cloud
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
 description: 
 email:
 - nunemaker@gmail.com
@@ -34,6 +34,7 @@ files:
 - docs/images/flipper_cloud.png
 - examples/cloud/app.ru
 - examples/cloud/basic.rb
+- examples/cloud/cloud_setup.rb
 - examples/cloud/import.rb
 - flipper-cloud.gemspec
 - lib/flipper-cloud.rb
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FlipperCloud.io adapter for Flipper