can-do 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ea512e8449c21e74af8d3d8f0d025b549c43e5
-  data.tar.gz: ba1daeabb76c50d8337a36a1833b7bf3394f8ed3
+  metadata.gz: bff3d57eaf45561bc031a0fc69b6204ee12fc95f
+  data.tar.gz: ae8b80fee8aff5b8faab98e34b7d91724fe1c3ce
 SHA512:
-  metadata.gz: 66bf959f3b5f28b13f11589c2b485066b28d3d493bd2d2ddf675de2290640bc6c49579083c3b5fdc738216fe71adb1bf2d6c5bc51874b2f26830f2dbbeb36631
-  data.tar.gz: d1a7991590354dd293c68608163437fdad126bc9ebd5138363279c26ddeeb9fdda6830244fb946ce170a310d9ef0642d332b9240ee455bc418b50a0e900d9df6
+  metadata.gz: 24b18790e7043f62fc2171b689f285e5a9953af0b2127c8d20618621e96c6a813650229b4a452715e975911983521abf914d8243b06710b312546036c6c78633
+  data.tar.gz: 9d05c3df6ba44e2e5c2b790bc071f3e443c7152f45b87a3d6c6e50b4d9f7ec4ad2ef414450103bf090a5f238fa9fc3f2632f8c9cd6d7d9647091086cd0035552

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+services:
+  - redis-server
 before_script:
   - bundle install
 script:

data/can_do.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "can-do"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Blacklane"]
 
   spec.summary       = %q{Simple feature flags.}

data/lib/can_do.rb

@@ -1,6 +1,5 @@
 require "connection_pool"
 require "redis"
-require "singleton"
 require "yaml"
 
 # Flips your features based on either a redis key, a config/features.yml file or environment variables.
@@ -27,8 +26,6 @@ require "yaml"
 #   end
 #
 class CanDo
-  include Singleton
-  FEATURE_KEY_PREFIX = "features:"
   CONNECTION_POOL_SIZE = ENV.fetch("CANDO_CONNECTION_POOL_SIZE", 5)
   CONNECTION_POOL = ConnectionPool.new(size: CONNECTION_POOL_SIZE, timeout: 5) do
     Redis.new(url: ENV["CANDO_REDIS_URL"])
@@ -37,66 +34,71 @@ class CanDo
   THE_TRUTH = /^(true|t|yes|y|1)$/i
   DEFAULT_NAMESPACE = "defaults".freeze
 
-  attr_reader :features
+  class << self
+    def feature?(feature)
+      is_enabled = read(feature)
+      # If no block is passed, return true or false
+      return is_enabled unless block_given?
+      # If a block is passed, return block or nil
+      yield if is_enabled
+    end
 
-  def self.features
-    instance.features
-  end
+    def read(feature)
+      name = feature.to_s
+      shared_feature = pool.with { |redis| redis.get(redis_key(name)) }
+
+      fallback_value = fallback.fetch(name, false)
 
-  def self.shared_features(name)
-    CONNECTION_POOL.with do |redis|
-      begin
-        redis.get(FEATURE_KEY_PREFIX + name.to_s)
-      rescue Redis::BaseError
-        nil
-      end
+      return !!(shared_feature =~ THE_TRUTH) unless shared_feature.nil?
+      write(name, fallback_value)
+      fallback_value
+    rescue Redis::CannotConnectError
+      fallback_value
     end
-  end
 
-  def self.feature?(name)
-    name     = name.to_s
-    env_name = name.upcase
-    shared_feature = shared_features(name)
-
-    is_enabled =
-      if !shared_feature.nil?
-        !!(shared_feature =~ THE_TRUTH)
-      elsif ENV.key?(env_name)
-        !!(ENV[env_name] =~ THE_TRUTH)
-      else
-        features[name] == true
-      end
-
-    # If no block is passed, return true or false
-    return is_enabled unless block_given?
-
-    # If a block is passed, return block or nil
-    yield if is_enabled
-  end
+    def write(name, val)
+      pool.with { |redis| redis.set(redis_key(name), val) } == "OK"
+    rescue Redis::CannotConnectError
+      false
+    end
 
-  private
+    def features
+      keys = pool.with { |redis| redis.keys(redis_key("*")) }
+      keys.map { |key| key.sub(redis_key(nil), "") }
+    rescue Redis::CannotConnectError
+      []
+    end
 
-  def initialize
-    yaml_file = File.expand_path("config/features.yml", Dir.pwd)
+    private
 
-    @features =
-      if File.exist?(yaml_file)
-        data = YAML.safe_load(File.read(yaml_file))
-        data.fetch(DEFAULT_NAMESPACE, {}).merge(data.fetch(env, {}))
-      else
-        {}
-      end
-  end
+    def redis_key(name)
+      "#{redis_namespace}:#{name}"
+    end
 
-  def env
-    rails_env || rack_env
-  end
+    def pool
+      CONNECTION_POOL
+    end
 
-  def rails_env
-    defined?(Rails) ? Rails.env : ENV["RAILS_ENV"]
-  end
+    def fallback
+      @fallback ||= load_yaml_features
+    end
+
+    def yaml_file_path
+      File.expand_path("config/features.yml", Dir.pwd)
+    end
 
-  def rack_env
-    ENV["RACK_ENV"]
+    def load_yaml_features
+      return {} unless File.exist?(yaml_file_path)
+      data = YAML.safe_load(File.read(yaml_file_path))
+      data.fetch(DEFAULT_NAMESPACE, {}).merge(data.fetch(env, {}))
+    end
+
+    def env
+      ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+    end
+
+    def redis_namespace
+      "features"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can-do
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Blacklane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis