rack-flags 0.2.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 030accbc9290006cd0fd32c0b783197aba732931
+  data.tar.gz: 449cdfc9a26ab58d7e392899775fd200e2050ccb
+SHA512:
+  metadata.gz: 49a6f1149f461095dd315f5a97e8c4405798d2297819ce2a0fe0a1e1b59eba2bed1e673a2a1ef2c0d5cb485f07ee89a2d4fd15b78bb8cff671286df8533214e5
+  data.tar.gz: 6c02ae4688ae33a4857f2bce118d26840c1531f61b79813dfef04840e553328a394f14da8eac38beb58d04f4d8bfa4e2b42d2acf17319875e69c0f41d4ddf3d3

data/lib/rack-flags/rack_middleware.rb

@@ -4,16 +4,22 @@ module RackFlags
 
     def initialize( app, args )
       @app = app
-      yaml_path = args.fetch( :yaml_path ){ raise ArgumentError.new( 'yaml_path must be provided' ) }
-      @config = Config.load( yaml_path )
+      @disable_config_caching = args.fetch(:disable_config_caching, false)
+      @yaml_path = args.fetch( :yaml_path ){ raise ArgumentError.new( 'yaml_path must be provided' ) }
     end
 
     def call( env )
       overrides = CookieCodec.new.overrides_from_env( env )
-      reader = Reader.new( @config.flags, overrides )
+      reader = Reader.new( config.flags, overrides )
       env[ENV_KEY] = reader
 
       @app.call(env)
     end
+
+    private
+    def config
+      @config = nil if @disable_config_caching
+      @config ||= Config.load(@yaml_path)
+    end
   end
 end

data/lib/rack-flags/version.rb

@@ -1,3 +1,3 @@
 module RackFlags
-  VERSION = "0.2.0"
+  VERSION = '0.3.1'
 end

data/spec/acceptance/administering_feature_flags_spec.rb

@@ -38,16 +38,16 @@ describe 'displaying flags in admin app' do
   it 'renders the feature flag name, default and description' do
     AdminPage.visiting do |page|
       on_flag_section = page.section_for_flag_named('on_by_default')
-      on_flag_section.should_not be_nil
-      on_flag_section.find('h3').text.should == 'on_by_default'
-      on_flag_section.find('p').text.should == 'this flag on by default'
-      on_flag_section.find('label.default').text.should include('Default (On)')
+      expect(on_flag_section).to_not be_nil
+      expect(on_flag_section.find('h3').text).to eq 'on_by_default'
+      expect(on_flag_section.find('p').text).to eq 'this flag on by default'
+      expect(on_flag_section.find('label.default').text).to include('Default (On)')
 
       off_flag_section = page.section_for_flag_named('off_by_default')
-      off_flag_section.should_not be_nil
-      off_flag_section.find('h3').text.should == 'off_by_default'
-      off_flag_section.find('p').text.should == 'this flag off by default'
-      off_flag_section.find('label.default').text.should include('Default (Off)')
+      expect(off_flag_section).to_not be_nil
+      expect(off_flag_section.find('h3').text).to eq 'off_by_default'
+      expect(off_flag_section.find('p').text).to eq 'this flag off by default'
+      expect(off_flag_section.find('label.default').text).to include('Default (Off)')
     end
   end
 

data/spec/acceptance/reading_feature_flags_spec.rb

@@ -23,7 +23,7 @@ describe 'reading feature flags in an app' do
   context 'no base flags, no overrides' do
     it 'should interpret both foo and bar as off by default' do
       get '/'
-      last_response.body.should == 'foo is off; bar is off'
+      expect(last_response.body).to eql 'foo is off; bar is off'
     end
   end
 
@@ -36,7 +36,7 @@ describe 'reading feature flags in an app' do
 
     it 'should interpret foo as on and bar as off' do
       get '/'
-      last_response.body.should == 'foo is on; bar is off'
+      expect(last_response.body).to eql 'foo is on; bar is off'
     end
   end
 
@@ -50,7 +50,7 @@ describe 'reading feature flags in an app' do
 
     it 'should interpret foo as off and bar as on' do
       get '/'
-      last_response.body.should == 'foo is off; bar is on'
+      expect(last_response.body).to eql 'foo is off; bar is on'
     end
   end
 
@@ -66,7 +66,7 @@ describe 'reading feature flags in an app' do
 
     it 'should interpret foo as on and bar as off' do
       get '/'
-      last_response.body.should == 'foo is on; bar is off'
+      expect(last_response.body).to eql 'foo is on; bar is off'
     end
   end
 

data/spec/acceptance/support/page_objects/admin_page.rb

@@ -20,14 +20,14 @@ class AdminPage
     section_for_flag_named(flag_name).choose('On')
     update_button.click
   end
-  
+
   def turn_off_flag_name(flag_name)
     section_for_flag_named(flag_name).choose('Off')
     update_button.click
   end
 
 
-  def update_button 
+  def update_button
     page.find('input[type="submit"]')
   end
 
@@ -40,27 +40,26 @@ class AdminPage
 
     case expected_state.to_sym
     when :default
-      section.find('label.default input').should be_checked
+      expect(section.find('label.default input')).to be_checked
 
-      section.find('label.on input').should_not be_checked
-      section.find('label.off input').should_not be_checked
+      expect(section.find('label.on input')).to_not be_checked
+      expect(section.find('label.off input')).to_not be_checked
     when :on
-      section.find('label.on input').should be_checked
+      expect(section.find('label.on input')).to be_checked
 
-      section.find('label.default input').should_not be_checked
-      section.find('label.off input').should_not be_checked
+      expect(section.find('label.default input')).to_not be_checked
+      expect(section.find('label.off input')).to_not be_checked
     when :off
-      section.find('label.off input').should be_checked
+      expect(section.find('label.off input')).to be_checked
 
-      section.find('label.default input').should_not be_checked
-      section.find('label.on input').should_not be_checked
-    else 
+      expect(section.find('label.default input')).to_not be_checked
+      expect(section.find('label.on input')).to_not be_checked
+    else
       raise "unrecognized state '#{expected_state}'"
     end
   end
 
   def verify_status_code_is(expected_status_code)
-    status_code.should == expected_status_code
+    expect(status_code).to eql expected_status_code
   end
-
-end
+end

data/spec/acceptance/support/page_objects/reader_page.rb

@@ -17,11 +17,11 @@ class ReaderPage
   end
 
   def verify_flag_is_off(flag_name)
-    page.should have_content("#{flag_name} is off")
+    expect(page).to have_content("#{flag_name} is off")
   end
 
   def verify_flag_is_on(flag_name)
-    page.should have_content("#{flag_name} is on")
+    expect(page).to have_content("#{flag_name} is on")
   end
 
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rr'
 require 'pry'
 require 'rack'
 require 'rack/test'
+require 'rspec/its'
+require 'rspec/collection_matchers'
 
 require_relative '../lib/rack-flags'
 

data/spec/unit/config_spec.rb

@@ -1,7 +1,7 @@
 require_relative 'spec_helper'
 
 module RackFlags
- 
+
   describe Config do
     let( :config_file ) { Tempfile.new('rack-flags-config-unit-test') }
     let( :yaml ) { raise NotImplementedError }
@@ -21,7 +21,7 @@ module RackFlags
     context 'regular yaml' do
       let(:yaml) do
         <<-EOS
-        foo: 
+        foo:
           description: the description
           default: true
         bar:
@@ -31,33 +31,33 @@ module RackFlags
       end
 
       it 'loads a set of BaseFlags' do
-        config.should have(2).flags
-        config.flags.map(&:name) .should =~ [:foo,:bar]
-        config.flags.map(&:description).should =~ ["the description","another description"]
-        config.flags.map(&:default).should =~ [true,false]
+        expect(config).to have(2).flags
+        expect(config.flags.map(&:name)).to include(:foo, :bar)
+        expect(config.flags.map(&:description)).to include('the description', 'another description')
+        expect(config.flags.map(&:default)).to include(true, false)
       end
     end
 
     context 'empty file' do
       let(:yaml){ "" }
       it 'loads as an empty config' do
-        config.should have(0).flags
+        expect(config).to have(0).flags
       end
     end
 
     context 'symbolized yaml' do
       let :yaml do
         <<-EOS
-          :foo: 
+          :foo:
             :default: true
             :description: a description
         EOS
       end
 
-      subject(:flag){ config.flags.first } 
+      subject(:flag){ config.flags.first }
 
       it { should_not be_nil }
-      its(:default) { should be_true }
+      its(:default) { should be_truthy }
       its(:description) { should == "a description" }
     end
   end

data/spec/unit/middleware_spec.rb

@@ -1,32 +1,46 @@
 require_relative 'spec_helper'
 
 module RackFlags
-
   describe RackMiddleware do
-
     def mock_out_config_loading
       stub(Config).load(anything){ OpenStruct.new( flags: {} ) }
     end
 
+    def create_middleware(fake_app = false, additional_args = {})
+      args = {yaml_path: 'blah'}.merge additional_args
+      fake_app ||= Proc.new {}
+      RackMiddleware.new( fake_app, args )
+    end
+
     it 'raise an exception if no yaml path is provided' do
-      lambda{
+      expect {
         RackMiddleware.new( :fake_app, {} )
-      }.should raise_error( ArgumentError, 'yaml_path must be provided' )
+      }.to raise_error( ArgumentError, 'yaml_path must be provided' )
     end
 
     it 'loads the config from the specified yaml file' do
-      mock(Config).load('some/config/path')
-      RackMiddleware.new( :fake_app, yaml_path: 'some/config/path' )
+      mock(Config).load('some/config/path'){ OpenStruct.new flags: {} }
+      middleware = create_middleware(false, yaml_path: 'some/config/path')
+      middleware.call({})
     end
 
-    describe '#call' do
+    it 'caches configuration by default' do
+      mock(Config).load(anything){ OpenStruct.new( flags: {} ) }
+
+      middleware = create_middleware()
+      middleware.call({})
+      middleware.call({})
+    end
 
-      def create_middleware( fake_app = false)
-        fake_app ||= Proc.new {}
+    it 'does not cache if specified' do
+      mock(Config).load(anything).times(2){ OpenStruct.new( flags: {} ) }
 
-        RackMiddleware.new( fake_app, yaml_path: 'blah' )
-      end
+      middleware = create_middleware(false, disable_config_caching: true)
+      middleware.call({})
+      middleware.call({})
+    end
 
+    describe '#call' do
       it 'creates a Reader using the config flags when called' do
         stub(Config).load(anything){ OpenStruct.new( flags: 'fake flags from config' ) }
         mock(Reader).new( 'fake flags from config', anything )
@@ -43,7 +57,7 @@ module RackFlags
         middleware = create_middleware()
         fake_env = {}
         middleware.call( fake_env )
-        fake_env[RackMiddleware::ENV_KEY].should == 'fake derived flags'
+        expect(fake_env[RackMiddleware::ENV_KEY]).to eq 'fake derived flags'
       end
 
       it 'reads overrides from cookies' do
@@ -51,7 +65,6 @@ module RackFlags
 
         fake_env = { fake: 'env' }
 
-
         fake_cookie_codec = mock( Object.new )
         mock(CookieCodec).new{ fake_cookie_codec }
 
@@ -73,15 +86,14 @@ module RackFlags
         mock_out_config_loading
 
         fake_app ||= Proc.new do
-          "downstream app response"
+          'downstream app response'
         end
 
         middleware = create_middleware( fake_app )
         middleware_response = middleware.call( {} )
 
-        middleware_response.should == "downstream app response"
+        expect(middleware_response).to eq 'downstream app response'
       end
     end
   end
-
 end

data/spec/unit/rack_flags_module_methods_spec.rb

@@ -4,14 +4,14 @@ module RackFlags
   describe '.for_env' do
     it 'should return the flags which the middleware stuffed in the env' do
       fake_env = {RackMiddleware::ENV_KEY => 'fake flags from env'}
-      RackFlags.for_env(fake_env).should == 'fake flags from env'
+      expect(RackFlags.for_env(fake_env)).to eq 'fake flags from env'
     end
 
     it 'returns a generic empty reader if none is in the env' do
       fake_env = {}
       reader = RackFlags.for_env(fake_env)
-      reader.should_not be_nil
-      reader.should respond_to(:on?)
+      expect(reader).to_not be_nil
+      expect(reader).to respond_to(:on?)
     end
   end
 end

data/spec/unit/reader_spec.rb

@@ -29,11 +29,11 @@ module RackFlags
 
         expect(full_flags[0].name).to eq(:usually_on)
         expect(full_flags[0].description).to eq('a flag')
-        expect(full_flags[0].default).to be_true
+        expect(full_flags[0].default).to be_truthy
 
         expect(full_flags[1].name).to eq(:usually_off)
         expect(full_flags[1].description).to eq('another flag')
-        expect(full_flags[1].default).to be_false
+        expect(full_flags[1].default).to be_falsey
       end
 
     end
@@ -44,15 +44,15 @@ module RackFlags
       its(:base_flags){ should == {usually_on: true, usually_off: false} }
 
       specify 'on? is true for a flag which is on by default' do
-        subject.on?( :usually_on ).should be_true
+        expect(reader.on?(:usually_on)).to be_truthy
       end
 
       specify 'on? is false for a flag which is off by default' do
-        subject.on?( :usually_off ).should be_false
+        expect(reader.on?(:usually_off)).to be_falsey
       end
 
       specify 'on? is false for unknown flags' do
-        subject.on?( :unknown_flag ).should be_false
+        expect(reader.on?(:unknown_flag)).to be_falsey
       end
 
       it_behaves_like 'full flags that mimic the base flags'
@@ -68,7 +68,7 @@ module RackFlags
       let( :overrides ){ {usually_on: false} }
 
       specify 'on? is false' do
-        subject.on?( :usually_on ).should be_false
+        expect(reader.on?(:usually_on)).to be_falsey
       end
 
       it_behaves_like 'full flags that mimic the base flags'
@@ -84,7 +84,7 @@ module RackFlags
       let( :overrides ){ {no_base: true} }
 
       specify 'on? is false' do
-        subject.on?( :no_base ).should be_false
+        expect(reader.on?(:no_base)).to be_falsy
       end
 
       it_behaves_like 'full flags that mimic the base flags'
@@ -96,5 +96,4 @@ module RackFlags
       end
     end
   end
-
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-flags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Pete Hodgson
@@ -10,134 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a simple lightweight way to expose work-in-progress functionality
@@ -173,34 +170,28 @@ files:
 - spec/unit/reader_spec.rb
 - spec/unit/spec_helper.rb
 homepage: https://github.com/moredip/rack-flags
-licenses: []
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1587276137499646704
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1587276137499646704
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple cookie-based feature flags using Rack.
 test_files:
 - spec/acceptance/administering_feature_flags_spec.rb