arturo 0.2.3.7 → 0.2.3.8

data/app/models/arturo/feature.rb

@@ -28,6 +28,10 @@ module Arturo
       self.find(:first, :conditions => { :symbol => feature_or_symbol.to_s })
     end
 
+    def self.find_feature(*args)
+      to_feature(*args)
+    end
+
     # Create a new Feature
     def initialize(attributes = {})
       super(DEFAULT_ATTRIBUTES.merge(attributes || {}))
@@ -76,7 +80,7 @@ module Arturo
 
     def passes_threshold?(feature_recipient)
       threshold = self.deployment_percentage || 0
-      return false if threshold == 0
+      return false if threshold == 0 || !feature_recipient.id
       return true if threshold == 100
       (((feature_recipient.id + (self.id || 1) + 17) * 13) % 100) < threshold
     end

data/lib/arturo/feature_caching.rb

@@ -16,13 +16,21 @@ module Arturo
   # to use a shared cache like Memcached.
   module FeatureCaching
 
+    # A marker in the cache to record the fact that the feature with the
+    # given symbol doesn't exist.
+    NO_SUCH_FEATURE = :NO_SUCH_FEATURE
+
     def self.extended(base)
-      class <<base
+      class << base
         alias_method_chain :to_feature, :caching
-        attr_accessor :cache_ttl, :feature_cache
+        attr_accessor :cache_ttl, :feature_cache, :feature_caching_strategy
+      end
+      base.send(:after_save) do |f|
+        f.class.feature_caching_strategy.expire(f.class.feature_cache, f.symbol.to_sym) if f.class.caches_features?
       end
       base.cache_ttl = 0
       base.feature_cache = Arturo::FeatureCaching::Cache.new
+      base.feature_caching_strategy = AllStrategy
     end
 
     def caches_features?
@@ -31,28 +39,75 @@ module Arturo
 
     # Wraps Arturo::Feature.to_feature with in-memory caching.
     def to_feature_with_caching(feature_or_symbol)
-      if !self.caches_features?
-        return to_feature_without_caching(feature_or_symbol)
-      elsif (feature_or_symbol.kind_of?(Arturo::Feature))
-        feature_cache.write(feature_or_symbol.symbol, feature_or_symbol, :expires_in => cache_ttl)
+      if !caches_features?
+        to_feature_without_caching(feature_or_symbol)
+      elsif feature_or_symbol.kind_of?(Arturo::Feature)
         feature_or_symbol
-      elsif (cached_feature = feature_cache.read(feature_or_symbol.to_sym))
-        cached_feature
-      elsif (f = to_feature_without_caching(feature_or_symbol))
-        feature_cache.write(f.symbol, f, :expires_in => cache_ttl)
-        f
+      else
+        symbol = feature_or_symbol.to_sym
+        feature = feature_caching_strategy.fetch(feature_cache, symbol) { to_feature_without_caching(symbol) }
+        feature unless feature == NO_SUCH_FEATURE
+      end
+    end
+
+    def warm_cache!
+      warn "Deprecated, no longer necessary!"
+    end
+
+    class AllStrategy
+      class << self
+        def fetch(cache, symbol, &block)
+          features = cache.read("arturo.all")
+
+          unless cache_is_current?(cache, features)
+            features = Hash[Arturo::Feature.all.map { |f| [f.symbol.to_sym, f] }]
+            mark_as_current!(cache)
+            cache.write("arturo.all", features, :expires_in => Arturo::Feature.cache_ttl * 10)
+          end
+
+          features[symbol] || NO_SUCH_FEATURE
+        end
+
+        def expire(cache, symbol)
+          cache.delete("arturo.all")
+        end
+
+        private
+
+        def cache_is_current?(cache, features)
+          return unless features
+          return true if cache.read("arturo.current")
+          return false if features.values.map(&:updated_at).compact.max != Arturo::Feature.maximum(:updated_at)
+          mark_as_current!(cache)
+        end
+
+        def mark_as_current!(cache)
+          cache.write("arturo.current", true, :expires_in => Arturo::Feature.cache_ttl)
+        end
       end
     end
 
-    protected
+    class OneStrategy
+      def self.fetch(cache, symbol, &block)
+        if feature = cache.read("arturo.#{symbol}")
+          feature
+        else
+          cache.write("arturo.#{symbol}", yield || NO_SUCH_FEATURE, :expires_in => Arturo::Feature.cache_ttl)
+        end
+      end
+
+      def self.expire(cache, symbol)
+        cache.delete("arturo.#{symbol}")
+      end
+    end
 
     # Quack like a Rails cache.
     class Cache
       def initialize
         @data = {} # of the form {key => [value, expires_at or nil]}
       end
+
       def read(name, options = nil)
-        name = name.to_s
         value, expires_at = *@data[name]
         if value && (expires_at.blank? || expires_at > Time.now)
           value
@@ -60,8 +115,12 @@ module Arturo
           nil
         end
       end
+
+      def delete(name)
+        @data.delete(name)
+      end
+
       def write(name, value, options = nil)
-        name = name.to_s
         expires_at = if options && options.respond_to?(:[]) && options[:expires_in]
           Time.now + options.delete(:expires_in)
         else
@@ -71,6 +130,7 @@ module Arturo
           @data[name] = [value, expires_at]
         end
       end
+
       def clear
         @data.clear
       end
@@ -78,4 +138,4 @@ module Arturo
 
   end
 
-end
+end

data/lib/arturo/test_support.rb

@@ -9,6 +9,7 @@ Arturo.instance_eval do
   def enable_feature!(name)
     feature = Arturo::Feature.to_feature(name)
     if feature
+      feature = feature.class.find(feature.id) if feature.frozen?
       feature.update_attributes(:deployment_percentage => 100)
     else
       Arturo::Feature.create!(:symbol => name, :deployment_percentage => 100)
@@ -23,6 +24,7 @@ Arturo.instance_eval do
   # @param [Symbol, String] name the feature name
   def disable_feature!(name)
     if (feature = Arturo::Feature.to_feature(name))
+      feature = feature.class.find(feature.id) if feature.frozen?
       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: 0.2.3.7
+  version: 0.2.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160470160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,31 @@ dependencies:
         version: 2.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *2160470160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2160469760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160469760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2160469300 !ruby/object:Gem::Requirement
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +69,47 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160469300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redgreen
-  requirement: &2160468800 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: minitest-rg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160468800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2160468300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +117,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2160468300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2160467840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +133,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2160467840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2160467380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +149,12 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2160467380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Deploy features incrementally to your users
 email: james.a.rosen@gmail.com
 executables: []
@@ -147,8 +214,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Feature sliders, wrapped up in an engine
 test_files: []
+has_rdoc: