arturo 1.5.0 → 1.5.1

data/app/models/arturo/feature.rb

@@ -10,7 +10,7 @@ module Arturo
     Arturo::Feature::SYMBOL_REGEX = /^[a-zA-z][a-zA-Z0-9_]*$/
     DEFAULT_ATTRIBUTES = { :deployment_percentage => 0 }.with_indifferent_access
 
-    attr_accessible :symbol, :deployment_percentage if Rails::VERSION::MAJOR < 4
+    attr_accessible :symbol, :deployment_percentage if ActiveRecord::VERSION::MAJOR < 4
     attr_readonly :symbol
 
     validates_presence_of :symbol, :deployment_percentage
@@ -23,10 +23,19 @@ module Arturo
 
     # Looks up a feature by symbol. Also accepts a Feature as input.
     # @param [Symbol, Arturo::Feature] feature_or_name a Feature or the Symbol of a Feature
-    # @return [Arturo::Feature, nil] the Feature if found, else nil
+    # @return [Arturo::Feature, nil] the Feature if found, else Arturo::NoSuchFeature
     def self.to_feature(feature_or_symbol)
       return feature_or_symbol if feature_or_symbol.kind_of?(self)
-      self.where(:symbol => feature_or_symbol.to_sym).first
+      symbol = feature_or_symbol.to_sym
+      self.where(:symbol => symbol).first || Arturo::NoSuchFeature.new(symbol)
+    end
+
+    # Looks up a feature by symbol. Also accepts a Feature as input.
+    # @param [Symbol, Arturo::Feature] feature_or_name a Feature or the Symbol of a Feature
+    # @return [Arturo::Feature, nil] the Feature if found, else nil
+    def self.find_feature(feature_or_symbol)
+      feature = to_feature(feature_or_symbol)
+      feature.is_a?(Arturo::NoSuchFeature) ? nil : feature
     end
 
     # Create a new Feature

data/lib/arturo/feature_caching.rb

@@ -42,7 +42,7 @@ module Arturo
         cached_feature
       else
         symbol = feature_or_symbol.to_sym
-        feature = to_feature_without_caching(symbol) || Arturo::NoSuchFeature.new(symbol)
+        feature = to_feature_without_caching(symbol)
         feature_cache.write(symbol, feature, :expires_in => cache_ttl)
         feature
       end

data/lib/arturo/test_support.rb

@@ -7,8 +7,7 @@ Arturo.instance_eval do
   #
   # @param [Symbol, String] name the feature name
   def enable_feature!(name)
-    feature = Arturo::Feature.to_feature(name)
-    if feature
+    if feature = Arturo::Feature.find_feature(name)
       feature.update_attributes(:deployment_percentage => 100)
     else
       Arturo::Feature.create!(:symbol => name, :deployment_percentage => 100)
@@ -22,7 +21,7 @@ Arturo.instance_eval do
   #
   # @param [Symbol, String] name the feature name
   def disable_feature!(name)
-    if (feature = Arturo::Feature.to_feature(name))
+    if feature = Arturo::Feature.find_feature(name)
       feature.update_attributes(:deployment_percentage => 0)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arturo
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails