corral 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16e636469afb7e4a608fd6f34d8c479c9d7b366
-  data.tar.gz: 0d11cd106cc36d68273322e7f0c2c3e5c2bea527
+  metadata.gz: c593e012df1b9d81b10115e9c06fef4fb12c6ea8
+  data.tar.gz: de278173c63e93b84215eedef1624ad61350b6b9
 SHA512:
-  metadata.gz: f3fb14dfebbdeb58615fde4e71838a7b81205091260b21db78e3b6da791909adacbf867ecd37229e3537101af47eaeed4e7fc0bda314931b6e8339efa28c0fda
-  data.tar.gz: 78029aad67dc1a06fb947003de11c422b25a177fd4912eff4e2876497c0ba82a690fafcb9a2ec50bb2f1b9748a4f416842ff1e8f84f9a77e292762a1639849d3
+  metadata.gz: 80b4c8bdc3065a437c6e655ffd05a04955ccac9a0043f83ca881ee4d93e16457c042bebd363b7f7df9e3c119efb095033095370b31a2920ea45462fb8c60c720
+  data.tar.gz: 55e0c876711a8053fa58a4516890982e94618f0c803f50d3720330f80784834b9ead22ff7ac2d2e845a9b04284d66146059642f52895b9e4834c993f934bc0cf

data/README.md

@@ -1,5 +1,7 @@
 # Corral
 
+[![Code Climate](https://codeclimate.com/github/bryanwoods/corral.png)](https://codeclimate.com/github/bryanwoods/corral)
+
 ![Corral](http://cl.ly/image/0Q1E2Z451v2a/corral.jpg)
 
 Use Corral to disable certain features in your application.
@@ -40,7 +42,7 @@ include Corral::Helpers
 
 corral(Rails.env) do
   disable :caching, in: [:development, :test, :staging]
-  disable :crying, when: ->(user) { user.birthday == Date.today }
+  enable :crying, when: ->(user) { user.birthday == Date.today }
 end
 ```
 

data/lib/corral/feature.rb

@@ -1,6 +1,6 @@
 module Corral
   class Feature
-    attr_reader :condition
+    attr_reader :condition, :disabled
 
     def initialize(feature, condition, disabled)
       @feature = feature
@@ -13,6 +13,14 @@ module Corral
       @features[name] = new(name, condition, disabled)
     end
 
+    def self.enable(name, condition)
+      push(name, condition, false)
+    end
+
+    def self.disable(name, condition)
+      push(name, condition, true)
+    end
+
     def self.get(name)
       (@features ||= {})[name]
     end

data/lib/corral/version.rb

@@ -1,3 +1,3 @@
 module Corral
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/corral.rb

@@ -13,20 +13,15 @@ module Corral
 
   def self.corral(env = nil, &block)
     self.environment = env.to_s
-    gather_features(&block)
+    instance_eval(&block)
   end
 
   def self.disable(feature, options = {})
-    environments = options[:in] and
-      return environment_override(feature, *environments)
-
-    condition = options[:when] || options[:if]
-
-    if condition && !condition.respond_to?(:call)
-      raise "'when' or 'if' condition must be a callable object"
-    end
+    flip_feature(feature, options.merge(enable: false))
+  end
 
-    Feature.push(feature, condition)
+  def self.enable(feature, options = {})
+    flip_feature(feature, options.merge(enable: true))
   end
 
   def self.disabled?(feature, *arguments)
@@ -37,18 +32,48 @@ module Corral
     (feature = Feature.get(feature)) && (condition = feature.condition) or
       return false
 
-    !condition.call(*arguments)
+    call_condition(feature, condition, *arguments)
   end
 
   private
 
-  def self.gather_features(&block)
-    instance_eval(&block)
-  end
-
-  def self.environment_override(feature, *environments)
+  def self.environment_override(feature, enable, *environments)
     envs = environments.map(&:to_sym)
     condition = -> { envs.any? { |env| env == self.environment } }
-    Feature.push(feature, condition)
+    push_feature(enable, feature, condition)
+  end
+
+  def self.process_condition(options = {})
+    condition = options[:when] || options[:if]
+
+    (condition && !condition.respond_to?(:call)) and
+      raise "'when' or 'if' condition must be a callable object"
+
+    condition
+  end
+
+  def self.flip_feature(feature, options = {})
+    enable = options[:enable]
+    environments = options[:in] and
+      return environment_override(feature, enable, *environments)
+    condition = process_condition(options)
+
+    push_feature(enable, feature, condition)
+  end
+
+  def self.push_feature(enable, feature, condition)
+    if enable
+      Feature.enable(feature, condition)
+    else
+      Feature.disable(feature, condition)
+    end
+  end
+
+  def self.call_condition(feature, condition, *arguments)
+    if feature.disabled
+      !condition.call(*arguments)
+    else
+      condition.call(*arguments)
+    end
   end
 end

data/spec/corral_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Corral do
   include Corral::Helpers
 
-  describe "#corral" do
+  describe ".corral" do
     context "when given a block" do
       it "yields the block" do
         corral { :cool_feature }.should == :cool_feature
@@ -15,13 +15,13 @@ describe Corral do
             before do
               corral("development") do
                 disable :caching, in: :development
-                disable "expiry_headers", in: :development
+                enable "expiry_headers", in: :development
               end
             end
 
             it "disables the feature" do
               disabled?(:caching).should be_true
-              disabled?(:expiry_headers).should be_true
+              enabled?("expiry_headers").should be_true
             end
           end
 
@@ -241,4 +241,20 @@ describe Corral do
       end
     end
   end
+
+  describe "#enable" do
+    context "when the if or when conditions are true" do
+      before do
+        corral do
+          enable :always_on, if: -> { true }
+          enable :everything, when: -> { 1 + 1 == 2 }
+        end
+      end
+
+      it "enables the feature" do
+        enabled?(:always_on).should be_true
+        disabled?(:everything).should be_false
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corral
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bryan Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler