Merge pull request #17 from ResultadosDigitais/add-configuration-class

Uncople Configuration to own class

lib/feature_flagger.rb

@@ -5,53 +5,20 @@
 require 'feature_flagger/control'
 require 'feature_flagger/model'
 require 'feature_flagger/feature'
+require 'feature_flagger/configuration'
 
 module FeatureFlagger
   class << self
     def configure(&block)
-      set_config
-      yield self if block_given?
+      yield config if block_given?
     end
 
-    # TODO: rename to just _config_.
     def config
-      @@config
+      @@configuration ||= Configuration.new
     end
 
     def control
-      @@control ||= Control.new(storage)
-    end
-
-    def storage=(storage)
-      set_config
-      @@config[:storage] = storage
-    end
-
-    def storage
-      set_config
-      @@config[:storage]
-    end
-
-    private
-
-    def set_config
-      @@config ||= {}
-      @@config[:storage] ||= default_client
-
-      # TODO: Provide a Rake to generate initial YAML file
-      # for new projects.
-
-      if defined?(Rails)
-        @@config[:yaml_filepath] ||= "#{Rails.root}/config/rollout.yml"
-      end
-
-      if file_path = @@config[:yaml_filepath]
-        @@config[:info] ||= YAML.load_file(file_path)
-      end
-    end
-
-    def default_client
-      Storage::Redis.default_client
+      @@control ||= Control.new(config.storage)
     end
   end
 end

lib/feature_flagger/configuration.rb

@@ -0,0 +1,20 @@
+module FeatureFlagger
+  class Configuration
+    attr_accessor :storage, :yaml_filepath
+
+    def initialize
+      @storage       ||= Storage::Redis.default_client
+      @yaml_filepath ||= default_yaml_filepath
+    end
+
+    def info
+      @info ||= YAML.load_file(yaml_filepath) if yaml_filepath
+    end
+
+    private
+
+    def default_yaml_filepath
+      "#{Rails.root}/config/rollout.yml" if defined?(Rails)
+    end
+  end
+end

lib/feature_flagger/feature.rb

@@ -2,7 +2,7 @@ module FeatureFlagger
   class Feature
     def initialize(feature_key, resource_name = nil)
       @feature_key = resolve_key(feature_key, resource_name)
-      @doc = FeatureFlagger.config[:info]
+      @doc = FeatureFlagger.config.info
       fetch_data
     end
 

spec/feature_flagger/configuration_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module FeatureFlagger
+  RSpec.describe Configuration do
+    describe '.storage' do
+      let(:configuration) { described_class.new }
+
+      context 'no storage set' do
+        it 'returns a Redis storage by default' do
+          expect(configuration.storage).to be_a(FeatureFlagger::Storage::Redis)
+        end
+      end
+
+      context 'storage set' do
+        let(:storage) { double('storage') }
+
+        before { configuration.storage = storage }
+
+        it 'returns storage' do
+          expect(configuration.storage).to eq storage
+        end
+      end
+    end
+  end
+end

spec/feature_flagger/feature_spec.rb

@@ -6,8 +6,7 @@ module FeatureFlagger
 
     before do
       filepath = File.expand_path('../../fixtures/rollout_example.yml', __FILE__)
-      info = YAML.load_file(filepath)
-      allow(FeatureFlagger).to receive(:config).and_return(info: info)
+      FeatureFlagger.config.yaml_filepath = filepath
     end
 
     describe '#initialize' do

spec/feature_flagger/model_spec.rb

@@ -15,8 +15,7 @@ def id; 14 end
 
     before do
       filepath = File.expand_path('../../fixtures/rollout_example.yml', __FILE__)
-      info = YAML.load_file(filepath)
-      allow(FeatureFlagger).to receive(:config).and_return(info: info)
+      FeatureFlagger.config.yaml_filepath = filepath
     end
 
     describe '#release' do

spec/feature_flagger_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe FeatureFlagger do
+  describe '.configure' do
+    let(:redis)   { double('redis') }
+    let(:storage) { double('storage') }
+
+    before do
+      FeatureFlagger.configure do |config|
+        config.storage = storage
+      end
+    end
+
+    it { expect(FeatureFlagger.config.storage).to eq storage }
+  end
+
+  describe '.control' do
+    let(:control) { FeatureFlagger.control }
+    it 'initializes a Control with redis storage' do
+      expect(control).to be_a(FeatureFlagger::Control)
+      expect(control.storage).to be_a(FeatureFlagger::Storage::Redis)
+    end
+  end
+end