feature_definitions 0.3.2 → 0.4.0

data/README.rdoc

@@ -5,15 +5,22 @@
 A minimal useful feature toggle mechanism.
 
 Thanks to Travis-CI, tested on:
-  - "1.8.7"
+  - "1.8.7"  ***
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-18mode # JRuby in 1.8 mode  ***
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
+  - rbx-18mode  ***
   - rbx-19mode
 
+==== Note on 1.8
+
+I've given up trying to find a cross version way of using instance_eval/exec
+to give a nicer syntax to feature evaluation blocks, but it's just not
+working out. If you're using 1.8, you're block will just have to take the
+context as an argument.
+
 == Installation
 
   gem 'feature_definitions'
@@ -24,6 +31,8 @@ Thanks to Travis-CI, tested on:
 lib/features.rb:
   class Features < FeatureDefinitions
     AWESOME = self.new {|flags| flags.is_awesome? }
+    # > 1.8 only, evaluated in context of Features.context
+    AWESOME = self.new { is_awesome? }
   end
 
 app/main.rb:
@@ -51,6 +60,10 @@ app/model/features.rb:
     define_feature :AWESOME do |user|
       user.is_awesome?
     end
+    # > 1.8 only, evaluated in context of Features.context
+    define_feature :AWESOMER do
+      is_awesome?
+    end
   end
 
 app/controller/application_controller.rb:
@@ -65,7 +78,7 @@ app/views/some/view.erb.html:
   <% Features.AWESOME.enabled? do %>
     You have awesome blocks enabled!
   <% end %>
-  <% Features.AWESOME do %>
+  <% Features.AWESOMER do %>
     Declarative feature blocks!
   <% end %>
 

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/feature_definitions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "feature_definitions"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Graham"]
-  s.date = "2013-04-09"
+  s.date = "2013-04-12"
   s.description = "Simple and flexible feature toggle defintion"
   s.email = "r.m.graham@gmail.com"
   s.extra_rdoc_files = [

data/lib/feature_definitions.rb

@@ -12,13 +12,13 @@ class FeatureDefinitions
     end
   end
 
-  PASSTHROUGH = Proc.new { |arg| arg }
+  IDENTITY = Proc.new { |arg| arg }
 
   def initialize(&block)
     if block_given?
       @test_proc = block.to_proc
     else
-      @test_proc = PASSTHROUGH
+      @test_proc = IDENTITY
     end
   end
 
@@ -31,10 +31,18 @@ class FeatureDefinitions
   end
 
   def enabled?(&block)
-    test_proc.call(context).tap do |verdict|
+    eval_test_proc.tap do |verdict|
       if verdict and block_given?
         yield
       end
     end
   end
+
+  def eval_test_proc
+    if test_proc.arity == 0
+      context.instance_exec(&test_proc)
+    else
+      test_proc.call(context)
+    end
+  end
 end

data/test/test_feature_definitions.rb

@@ -89,6 +89,33 @@ class TestFeatureDefaultBlock < MiniTest::Unit::TestCase
   end
 end
 
+# 1.8 instance_eval makes me sad :-(
+if RUBY_VERSION.to_i > 1 or RUBY_VERSION.split('.')[1].to_i > 8
+  class TestFeatureEvalBlock < MiniTest::Unit::TestCase
+    def setup
+      @feature_class = Class.new(FeatureDefinitions) do
+        define_feature :AWESOME do
+          some_instance_method
+        end
+      end
+    end
+    def test_feature_enabled
+      @feature_class.context = OpenStruct.new(:some_instance_method => true)
+      assert @feature_class.AWESOME.enabled?
+    end
+    def test_feature_disabled
+      @feature_class.context = OpenStruct.new(:some_instance_method => false)
+      refute @feature_class.AWESOME.enabled?
+    end
+    def test_feature_toggling
+      @feature_class.context = OpenStruct.new(:some_instance_method => true)
+      assert @feature_class.AWESOME.enabled?
+      @feature_class.context = OpenStruct.new(:some_instance_method => false)
+      refute @feature_class.AWESOME.enabled?
+    end
+  end
+end
+
 class TestDeclarativeFeatures < MiniTest::Unit::TestCase
   def setup
     @feature_class = Class.new(FeatureDefinitions) do

metadata

@@ -2,14 +2,14 @@
 name: feature_definitions
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4576073114140406011
+      hash: -230299105052606753
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false