gc_feature 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6236d11dc915cc89796a37af66249e7042ec92f7
-  data.tar.gz: 98dbec8f839afaac094b0ae374be00d7fec7a1d0
+  metadata.gz: 7c90998fd597fd87517a277484f5a39ccc47ae00
+  data.tar.gz: c69e6385c85ceb340e52cb8501e323a67bead6f2
 SHA512:
-  metadata.gz: efa2c92794a0d65024bc3959fb0bafe7f4248adf39f07d5cfa042de29ccbd17ec3aac13b7712158f4d2bc626b1ddb0b3ecf5a1ef257830b6eef6e938a9fce2bc
-  data.tar.gz: 17079bf0e911a6f56257e4ec81392f6bbe51e0500f949986a75f17acbce16a460972c2117b338e3fec904a7f5111d129c0a29fa34a708bcd891e72083e3b2f6f
+  metadata.gz: 1363247971532d67446182e722d90a4d7886a955b5fd0d0517f535777333183327fcd9601df498d13db6fabc8452e7bce4b2a7456527e75b0ea8ea203e0e147e
+  data.tar.gz: c58e4f405350569c844be64f02588a61a3c7c8ca15d8f04d8e677293311978022cb6facf14688a722b89f48073ff8fa605038f84b5a3946e612722edd3b4c035

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 2.0.0
+  - 1.9.3
+services: redis-server
+script:
+ - bundle exec rspec

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -1,11 +1,13 @@
 # Feature
+[![Gem Version](https://badge.fury.io/rb/gc_feature.png)](http://badge.fury.io/rb/gc_feature)
+[![Build Status](https://travis-ci.org/gocardless/feature.png?branch=master)](https://travis-ci.org/gocardless/feature)
 
 A group based feature switching framework.
 
 ## Installation
 
 ```console
-$ gem install feature
+$ gem install gc_feature
 ```
 
 ## Usage
@@ -67,9 +69,9 @@ Just call `enable` or `disable` on a `Feature`.
 
 ```ruby
 Feature(:v2_design).enable
-Feature(:v2_design).enabled?   # => true
+Feature(:v2_design).enabled?  # => true
 Feature(:v2_design).disable
-Feature(:v2_design).enabled?   # => false
+Feature(:v2_design).enabled?  # => false
 ```
 
 ### Changing Groups membership at runtime

data/feature.gemspec

@@ -9,10 +9,14 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/gocardless/feature'
 
   gem.add_dependency 'redis-namespace', '~> 1.2'
-  gem.add_dependency 'sinatra', '~> 1.3.2'
+  gem.add_dependency 'sinatra', '~> 1.3'
+  # See https://github.com/sinatra/sinatra/pull/907
+  # Remove when sinatra hits 1.4.6
+  gem.add_dependency 'rack', '< 1.6.0'
 
-  gem.add_development_dependency 'rspec', '~> 2.11'
-  gem.add_development_dependency 'mocha', '~> 0.12'
+  gem.add_development_dependency 'rspec', '~> 3.1'
+  gem.add_development_dependency 'mocha', '~> 1.1'
+  gem.add_development_dependency 'rack-test', '~> 0.6.2'
 
   gem.files = `git ls-files`.split("\n")
   gem.test_files = `git ls-files -- spec/*`.split("\n")

data/lib/feature/dashboard.rb

@@ -55,6 +55,11 @@ module Feature
       redirect to("/groups/#{@group}")
     end
 
+    not_found do
+      status 404
+      'Not found.'
+    end
+
     private
 
     def set_group

data/lib/feature/dashboard/views/index.erb

@@ -18,7 +18,7 @@
               <a href="<%= url("groups/#{group}") %>">
                 <code>:<%= group %></code>
               </a>
-            <% end -%>
+            <% end %>
           <% else %>
             <span class="muted">-</span>
           <% end %>

data/lib/feature/version.rb

@@ -1,3 +1,3 @@
 module Feature
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/spec/feature/config_spec.rb

@@ -14,12 +14,12 @@ describe Feature::Config do
 
     it "adds features to the feature definitions list" do
       subject.feature :foo, default: :on
-      subject.features.should include :foo
+      expect(subject.features).to include :foo
     end
 
     it "defaults 'default' to true" do
       subject.feature :foo
-      subject.features[:foo][:default].should be_true
+      expect(subject.features[:foo][:default]).to eq(true)
     end
 
     it "accepts definitions with no options" do
@@ -29,7 +29,7 @@ describe Feature::Config do
     it "sets backend_obj to the given backend" do
       backend = stub
       subject.backend backend
-      subject.backend_obj.should == backend
+      expect(subject.backend_obj).to eq(backend)
     end
   end
 end

data/spec/feature/dashboard_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'feature/dashboard'
+require 'rack/test'
+
+describe 'The Dashboard App' do
+  include Rack::Test::Methods
+
+  def app
+    Feature::Dashboard
+  end
+
+  before do
+    Feature.configure do
+      backend Feature::RedisBackend.new($redis)
+      feature :foo, default: false, groups: %w(beta_users employees)
+    end
+  end
+
+  context "index" do
+    subject { get '/' }
+    specify { expect(subject.status).to eq(200) }
+  end
+
+  context "when the page can't be found" do
+    subject { get '/groups' }
+    specify { expect(subject.status).to eq(404) }
+  end
+end

data/spec/feature/redis_backend_spec.rb

@@ -12,11 +12,11 @@ describe Feature::RedisBackend do
   describe "#initialize" do
     context "with a namespaced redis connection" do
       subject do
-        ns = Redis::Namespace.new "ns", $redis
+        ns = Redis::Namespace.new("ns", redis: $redis)
         Feature::RedisBackend.new(ns)
       end
       it "uses the namespaced connection" do
-        redis.namespace.should == "ns"
+        expect(redis.namespace).to eq("ns")
       end
     end
 
@@ -25,7 +25,7 @@ describe Feature::RedisBackend do
         Feature::RedisBackend.new($redis, namespace: 'feature-test')
       end
       it "creates a new namespaced connection" do
-        redis.namespace.should == "feature-test"
+        expect(redis.namespace).to eq("feature-test")
       end
     end
 
@@ -40,7 +40,7 @@ describe Feature::RedisBackend do
     it "clears out any set keys" do
       redis.set('foo', 'bar')
       subject.reset!
-      redis.get('foo').should be_nil
+      expect(redis.get('foo')).to be_nil
     end
   end
 
@@ -49,11 +49,11 @@ describe Feature::RedisBackend do
       before { redis.set('foo', 'enabled') }
 
       it "returns true with true as the default" do
-        subject.enabled?(:foo, default: true).should be_true
+        expect(subject.enabled?(:foo, default: true)).to eq(true)
       end
 
       it "returns true with false as the default" do
-        subject.enabled?(:foo, default: false).should be_true
+        expect(subject.enabled?(:foo, default: false)).to eq(true)
       end
     end
 
@@ -61,21 +61,21 @@ describe Feature::RedisBackend do
       before { redis.set('foo', 'disabled') }
 
       it "returns false with true as the default" do
-        subject.enabled?(:foo, default: true).should be_false
+        expect(subject.enabled?(:foo, default: true)).to eq(false)
       end
 
       it "returns false with false as the default" do
-        subject.enabled?(:foo, default: false).should be_false
+        expect(subject.enabled?(:foo, default: false)).to eq(false)
       end
     end
 
     context "when the feature is missing from redis" do
       it "returns true with true as the default" do
-        subject.enabled?(:foo, default: true).should be_true
+        expect(subject.enabled?(:foo, default: true)).to eq(true)
       end
 
       it "returns false with false as the default" do
-        subject.enabled?(:foo, default: false).should be_false
+        expect(subject.enabled?(:foo, default: false)).to eq(false)
       end
     end
 
@@ -85,7 +85,7 @@ describe Feature::RedisBackend do
 
         result = subject.enabled?(:foo, groups: [:employees],
                                         for: 'alan')
-        result.should be_true
+        expect(result).to eq(true)
       end
 
       context "when globally disabled" do
@@ -94,7 +94,7 @@ describe Feature::RedisBackend do
         context "with groups passed" do
           it "returns false with no group members passed" do
             result = subject.enabled?(:foo, groups: ["foo"], default: false)
-            result.should be_false
+            expect(result).to eq(false)
           end
         end
 
@@ -102,26 +102,26 @@ describe Feature::RedisBackend do
           subject.add_to_group('employees', 'alan')
           result = subject.enabled?(:foo, groups: [:employees, :beta],
                                           for: 'alan')
-          result.should be_true
+          expect(result).to eq(true)
         end
 
         it "returns false if not enabled in any of the groups" do
           result = subject.enabled?(:foo, groups: [:employees, :beta],
                                           for: 'alan')
-          result.should be_false
+          expect(result).to eq(false)
         end
 
         context "when for_any option is passed" do
           it "returns false if not enabled for any items" do
-            subject.enabled?(:foo, for_any: true, for_any: ["a", "b"])
-              .should be_false
+            expect(subject.enabled?(:foo, for_any: true, for_any: ["a", "b"])).
+              to eq(false)
           end
 
           it "returns true if enabled for one item" do
             subject.add_to_group('employees', 'alan')
             result = subject.enabled?(:foo, groups: [:employees],
                                         for_any: ["alan", "andy"])
-            result.should be_true
+            expect(result).to eq(true)
           end
         end
 
@@ -132,26 +132,26 @@ describe Feature::RedisBackend do
   describe "#enable" do
     it "enables a previously unspecified feature" do
       subject.enable(:foo)
-      subject.enabled?(:foo, default: false).should be_true
+      expect(subject.enabled?(:foo, default: false)).to eq(true)
     end
 
     it "enables a previously disabled feature" do
       redis.set('foo', 'disabled')
       subject.enable(:foo)
-      subject.enabled?(:foo, default: false).should be_true
+      expect(subject.enabled?(:foo, default: false)).to eq(true)
     end
   end
 
   describe "#disable" do
     it "disables a previously unspecified feature" do
       subject.disable(:foo)
-      subject.enabled?(:foo, default: true).should be_false
+      expect(subject.enabled?(:foo, default: true)).to eq(false)
     end
 
     it "enables a previously disabled feature" do
       redis.set('foo', 'enabled')
       subject.disable(:foo)
-      subject.enabled?(:foo, default: true).should be_false
+      expect(subject.enabled?(:foo, default: true)).to eq(false)
     end
   end
 
@@ -161,7 +161,7 @@ describe Feature::RedisBackend do
       subject.add_to_group('admin', 'a')
       subject.add_to_group('admin', 'b')
 
-      redis.smembers(subject.group_key('admin')).should include('a', 'b')
+      expect(redis.smembers(subject.group_key('admin'))).to include('a', 'b')
     end
   end
 
@@ -172,7 +172,7 @@ describe Feature::RedisBackend do
       subject.add_to_group('admin', 'b')
 
       subject.remove_from_group('admin', 'b')
-      redis.smembers(subject.group_key('admin')).should == ['a']
+      expect(redis.smembers(subject.group_key('admin'))).to eq(['a'])
     end
   end
 
@@ -183,32 +183,32 @@ describe Feature::RedisBackend do
     end
 
     it "lists group members" do
-      subject.get_group_members("admin").should == %w(1 2)
+      expect(subject.get_group_members("admin")).to eq(%w(1 2))
     end
   end
 
   describe "#group_key" do
     it "prefixes the redis key with 'group:'" do
-      subject.group_key('admin').should start_with('group:')
+      expect(subject.group_key('admin')).to start_with('group:')
     end
   end
 
   describe "#in_group?" do
     it "returns false if the group is not defined" do
-      subject.in_group?('admin', '1').should be_false
+      expect(subject.in_group?('admin', '1')).to eq(false)
     end
 
     context "with one item" do
       it "returns false if is not the group" do
         subject.add_to_group('admin', '1')
 
-        subject.in_group?('admin', '2').should be_false
+        expect(subject.in_group?('admin', '2')).to eq(false)
       end
 
       it "returns true if is in the group" do
         subject.add_to_group('admin', '1')
 
-        subject.in_group?('admin', '1').should be_true
+        expect(subject.in_group?('admin', '1')).to eq(true)
       end
     end
 
@@ -216,34 +216,34 @@ describe Feature::RedisBackend do
       it "returns false if all are not in the group" do
         subject.add_to_group('admin', '1')
 
-        subject.in_group?('admin', ['1', '2']).should be_false
+        expect(subject.in_group?('admin', ['1', '2'])).to eq(false)
       end
 
       it "returns true if all are in the group" do
         subject.add_to_group('admin', '1')
         subject.add_to_group('admin', '2')
 
-        subject.in_group?('admin', ['1', '2']).should be_true
+        expect(subject.in_group?('admin', ['1', '2'])).to eq(true)
       end
     end
   end
 
   describe "#any_in_group?" do
     it "returns false if the group is not defined" do
-      subject.any_in_group?('admin', ['1']).should be_false
+      expect(subject.any_in_group?('admin', ['1'])).to eq(false)
     end
 
     it "returns true if one is in the group" do
       subject.add_to_group('admin', '1')
 
-      subject.any_in_group?('admin', ['1', '2']).should be_true
+      expect(subject.any_in_group?('admin', ['1', '2'])).to eq(true)
     end
 
     it "returns true if all are in the group" do
       subject.add_to_group('admin', '1')
       subject.add_to_group('admin', '2')
 
-      subject.any_in_group?('admin', ['1', '2']).should be_true
+      expect(subject.any_in_group?('admin', ['1', '2'])).to eq(true)
     end
   end
 end

data/spec/feature_spec.rb

@@ -36,7 +36,7 @@ describe Feature do
 
     describe ".features" do
       it "returns the feature definition hash" do
-        described_class.features.should include(foo: {default: true})
+        expect(described_class.features).to include(foo: {default: true})
       end
     end
 
@@ -68,7 +68,7 @@ describe Feature do
     end
 
     context "given an valid name" do
-      specify { Feature(:foo).should be_a Feature::Feature }
+      specify { expect(Feature(:foo)).to be_a Feature::Feature }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'mocha_standalone'
+require 'mocha/api'
 require 'redis'
 require 'feature'
 

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: gc_feature
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.6.2
 description: 
 email:
 - developers@gocardless.com
@@ -73,7 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - circle.yml
@@ -91,6 +120,7 @@ files:
 - lib/feature/version.rb
 - lib/gc_feature.rb
 - spec/feature/config_spec.rb
+- spec/feature/dashboard_spec.rb
 - spec/feature/feature_spec.rb
 - spec/feature/redis_backend_spec.rb
 - spec/feature_spec.rb
@@ -104,22 +134,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic feature switching framework
 test_files:
 - spec/feature/config_spec.rb
+- spec/feature/dashboard_spec.rb
 - spec/feature/feature_spec.rb
 - spec/feature/redis_backend_spec.rb
 - spec/feature_spec.rb