flipper-mongo 0.20.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a3bbde8df86a16bdd7e14927f80ec4c1d6ac129422a63faec1805dc7dc222d7
-  data.tar.gz: 4fc980d1375c953520e7bec85bda5e2acd34c1dd6ce277db010926dec7c901ef
+  metadata.gz: 2fd4b4c082d607eeddc08d1ebdb206553ce1814fe9d9c8811d65aa0a3bfa8bfd
+  data.tar.gz: 5f7ac3bfbd3dfd8a397522b82a600d7a0d189d10fcb6c31b1849dcca6b6ea812
 SHA512:
-  metadata.gz: b6679503ffdfc54c0acf541f050ef9d15aa1eba7da28a74aa7a2bd610853fcd22a91c899fecfd05ddb6c9fb20ff1ca5010c8415043f8b98b2bf1619a700cddba
-  data.tar.gz: 87cea1102155330c4f923978f773b9616c7a2a1fb96c8ae3f5549e897b1533784a1175a8f38a8f9a7916c4b6f73af1aff9efd3b7e9ddddfa99271c6591c174d4
+  metadata.gz: 0f4745eade20a35ea4d016da1b3a13faf0694524255e10f1aea4d990b548c4acb1bada50d42faa44d6dc4fd3b974f9a6dd6c747f23bffb2ba4ce7cbe70c18c65
+  data.tar.gz: 838b7a4b7745bd9b10fcdee0c87294f236901e1f4263f369b0359260070fcc936333e1a310a5ab222062bf8ce5abb6264a5abc4d266c9eebec52476533820259

data/docs/mongo/README.md

@@ -18,12 +18,21 @@ Or install it yourself with:
 
 ## Usage
 
+In most cases, all you need to do is require the adapter. You must set the `MONGO_URL` or `FLIPPER_MONGO_URL` environment vairable to specify which Mongo database to connect to.
+
 ```ruby
-require 'flipper/adapters/mongo'
-collection = Mongo::Client.new(["127.0.0.1:27017"], database: 'testing')['flipper']
-adapter = Flipper::Adapters::Mongo.new(collection)
-flipper = Flipper.new(adapter)
-# profit...
+require 'flipper-mongo`
+```
+
+**If you need to customize the adapter**, you can add this to an initializer:
+
+```ruby
+Flipper.configure do |config|
+  config.adapter do
+    collection = Mongo::Client.new(ENV["MONGO_URL"])["flipper"]
+    Flipper::Adapters::Mongo.new(collection)
+  end
+end
 ```
 
 ## Internals

data/examples/mongo/basic.rb

@@ -1,27 +1,20 @@
-require 'pathname'
+require 'bundler/setup'
 require 'logger'
 
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+ENV["FLIPPER_MONGO_URL"] ||= "mongodb://127.0.0.1:#{ENV["MONGODB_PORT"] || 27017}"
 require 'flipper/adapters/mongo'
-Mongo::Logger.logger.level = Logger::INFO
-collection = Mongo::Client.new(["127.0.0.1:#{ENV["MONGODB_PORT"] || 27017}"], :database => 'testing')['flipper']
-adapter = Flipper::Adapters::Mongo.new(collection)
-flipper = Flipper.new(adapter)
 
-flipper[:stats].enable
+Flipper[:stats].enable
 
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"
 end
 
-flipper[:stats].disable
+Flipper[:stats].disable
 
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"

data/examples/mongo/internals.rb

@@ -1,16 +1,9 @@
+require 'bundler/setup'
 require 'pp'
-require 'pathname'
 require 'logger'
 
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+ENV["FLIPPER_MONGO_URL"] ||= "mongodb://127.0.0.1:#{ENV["MONGODB_PORT"] || 27017}"
 require 'flipper/adapters/mongo'
-Mongo::Logger.logger.level = Logger::INFO
-collection = Mongo::Client.new(["127.0.0.1:#{ENV["MONGODB_PORT"] || 27017}"], :database => 'testing')['flipper']
-adapter = Flipper::Adapters::Mongo.new(collection)
-flipper = Flipper.new(adapter)
 
 # Register a few groups.
 Flipper.register(:admins) { |thing| thing.admin? }
@@ -19,19 +12,19 @@ Flipper.register(:early_access) { |thing| thing.early_access? }
 # Create a user class that has flipper_id instance method.
 User = Struct.new(:flipper_id)
 
-flipper[:stats].enable
-flipper[:stats].enable_group :admins
-flipper[:stats].enable_group :early_access
-flipper[:stats].enable_actor User.new('25')
-flipper[:stats].enable_actor User.new('90')
-flipper[:stats].enable_actor User.new('180')
-flipper[:stats].enable_percentage_of_time 15
-flipper[:stats].enable_percentage_of_actors 45
+Flipper[:stats].enable
+Flipper[:stats].enable_group :admins
+Flipper[:stats].enable_group :early_access
+Flipper[:stats].enable_actor User.new('25')
+Flipper[:stats].enable_actor User.new('90')
+Flipper[:stats].enable_actor User.new('180')
+Flipper[:stats].enable_percentage_of_time 15
+Flipper[:stats].enable_percentage_of_actors 45
 
-flipper[:search].enable
+Flipper[:search].enable
 
 puts 'all docs in collection'
-pp collection.find.to_a
+pp Flipper.adapter.adapter.collection.find.to_a
 # all docs in collection
 # [{"_id"=>"stats",
 #   "actors"=>["25", "90", "180"],
@@ -44,7 +37,7 @@ pp collection.find.to_a
 puts
 
 puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
+pp Flipper.adapter.get(Flipper[:stats])
 # flipper get of feature
 # {:boolean=>"true",
 #  :groups=>#<Set: {"admins", "early_access"}>,

data/lib/flipper/adapters/mongo.rb

@@ -13,6 +13,9 @@ module Flipper
       # Public: The name of the adapter.
       attr_reader :name
 
+      # Public: The name of the collection storing the feature data.
+      attr_reader :collection
+
       def initialize(collection)
         @collection = collection
         @name = :mongo
@@ -173,3 +176,16 @@ module Flipper
     end
   end
 end
+
+Flipper.configure do |config|
+  config.adapter do
+    url = ENV["FLIPPER_MONGO_URL"] || ENV["MONGO_URL"]
+    collection = ENV["FLIPPER_MONGO_COLLECTION"] || "flipper"
+
+    unless url
+      raise ArgumentError, "The MONGO_URL environment variable must be set. For example: mongodb://127.0.0.1:27017/flipper"
+    end
+
+    Flipper::Adapters::Mongo.new(Mongo::Client.new(url)[collection])
+  end
+end

data/lib/flipper/version.rb

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

data/spec/flipper/adapters/mongo_spec.rb

@@ -11,17 +11,30 @@ RSpec.describe Flipper::Adapters::Mongo do
   let(:port) { ENV['MONGODB_PORT'] || 27017 }
 
   let(:client) do
-    Mongo::Client.new(["#{host}:#{port}"], server_selection_timeout: 1, database: 'testing')
+    logger = Logger.new('/dev/null')
+    Mongo::Client.new(["#{host}:#{port}"], server_selection_timeout: 0.01, database: 'testing', logger: logger)
   end
   let(:collection) { client['testing'] }
 
   before do
     begin
       collection.drop
+    rescue Mongo::Error::NoServerAvailable
+      ENV['CI'] ? raise : skip('Mongo not available')
     rescue Mongo::Error::OperationFailure
     end
     collection.create
   end
 
   it_should_behave_like 'a flipper adapter'
+
+  it 'configures itself on load' do
+    Flipper.configuration = nil
+    Flipper.instance = nil
+
+    load 'flipper/adapters/mongo.rb'
+
+    ENV["MONGO_URL"] ||= "mongodb://127.0.0.1:27017/testing"
+    expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::Mongo)
+  end
 end

data/test/adapters/mongo_test.rb

@@ -9,13 +9,15 @@ class MongoTest < MiniTest::Test
     port = '27017'
     logger = Logger.new('/dev/null')
     client = Mongo::Client.new(["#{host}:#{port}"],
-                               server_selection_timeout: 1,
+                               server_selection_timeout: 0.01,
                                database: 'testing',
                                logger: logger)
     collection = client['testing']
     begin
       collection.drop
       collection.create
+    rescue Mongo::Error::NoServerAvailable
+      ENV['CI'] ? raise : skip('Mongo not available')
     rescue Mongo::Error::OperationFailure
     end
     @adapter = Flipper::Adapters::Mongo.new(collection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-mongo
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.22.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-07-08 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.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement