cached_names 0.1.2 → 0.1.3

data/lib/cached_names.rb

@@ -1,2 +1,3 @@
 require 'cached_names/base'
+require 'cached_names/paranoid'
 require "rails/cached_names" if defined?(Rails)

data/lib/cached_names/base.rb

@@ -1,5 +1,13 @@
 module CachedNames
 
+  @@paranoid_loaded ||= false
+  def self.paranoid_loaded=(value)
+    @@paranoid_loaded = value
+  end
+  def self.paranoid_loaded
+    @@paranoid_loaded
+  end
+
   def has_cached_names name_method = "value", options = {}
     @cached_names_name_method = name_method
     @cached_names_sort_field = options[:sorted_by] || @cached_names_name_method
@@ -11,27 +19,17 @@ module CachedNames
     after_destroy { self.class.load_cached_names }
 
     load_cached_names
+    load_paranoid_cached_names if CachedNames.paranoid_loaded
   end
 
   def names
     load_cached_names unless @cached_names_loaded
 
     begin
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names"
-    rescue
-      load_cached_names
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names"
-    end
-  end
-
-  def names_with_deleted
-    load_cached_names unless @cached_names_loaded
-
-    begin
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_with_deleted"
+      Rails.cache.read cache_key
     rescue
       load_cached_names
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_with_deleted"
+      Rails.cache.read cache_key
     end
   end
 
@@ -39,30 +37,19 @@ module CachedNames
     load_cached_names unless @cached_names_loaded
 
     begin
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_group_#{key}"
-    rescue
-      load_cached_names
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_group_#{key}"
-    end
-  end
-
-  def names_group_with_deleted key
-    load_cached_names unless @cached_names_loaded
-
-    begin
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_group_#{key}_with_deleted"
+      Rails.cache.read group_cache_key(key)
     rescue
       load_cached_names
-      Rails.cache.read "#{@cached_names_cache_key_prefix}_names_group_#{key}_with_deleted"
+      Rails.cache.read group_cache_key(key)
     end
   end
 
   def load_cached_names
     begin
-      @cached_names_instances = all(:with_deleted => true, :order => @cached_names_sort_field)
+      @cached_names_instances = all(:order => @cached_names_sort_field)
 
-      load_names
-      load_grouped_names if @cached_names_group_method
+      load_names(@cached_names_instances)
+      load_grouped_names(@cached_names_instances) if @cached_names_group_method
 
       @cached_names_loaded = true
     rescue Exception => e
@@ -74,20 +61,18 @@ module CachedNames
 
   private
 
-  def load_names
-    names = @cached_names_instances.map {|i| [i.deleted?, [i.send(@cached_names_name_method), i.id]] }
-    all_names, non_deleted_names = partition_by_deleted names
+  def load_names(cached_instances, cache_suffix = 'names')
+    all_names = cached_instances.map {|i| [i.send(@cached_names_name_method), i.id] }
 
-    Rails.cache.write "#{@cached_names_cache_key_prefix}_names_with_deleted", all_names
-    Rails.cache.write "#{@cached_names_cache_key_prefix}_names", non_deleted_names
+    Rails.cache.write cache_key(cache_suffix), all_names
   end
 
-  def load_grouped_names
-    groups = @cached_names_instances.inject({}) do |groups, instance|
+  def load_grouped_names(cached_instances, cache_suffix = 'names_group')
+    groups = cached_instances.inject({}) do |groups, instance|
       value = instance.send(@cached_names_group_method)
 
       groups[value] ||= []
-      groups[value] << [instance.deleted?, [instance.send(@cached_names_name_method), instance.id]]
+      groups[value] << [instance.send(@cached_names_name_method), instance.id]
 
       groups
     end
@@ -96,18 +81,18 @@ module CachedNames
     universal_names = groups[nil] || []
 
     groups.each do |(key, names)|
-      all_names, non_deleted_names = partition_by_deleted(names + universal_names)
+      all_names = names + universal_names
 
-      Rails.cache.write "#{@cached_names_cache_key_prefix}_names_group_#{key}_with_deleted", all_names
-      Rails.cache.write "#{@cached_names_cache_key_prefix}_names_group_#{key}", non_deleted_names
+      Rails.cache.write group_cache_key(key, cache_suffix), all_names
     end
   end
 
-  def partition_by_deleted names
-    all_names = names.map {|(deleted, name_id_pair)| name_id_pair }
-    non_deleted_names = names.map {|(deleted, name_id_pair)| name_id_pair unless deleted }.compact
+  def cache_key(cache_suffix = 'names')
+    "#{@cached_names_cache_key_prefix}_#{cache_suffix}"
+  end
 
-    [all_names, non_deleted_names]
+  def group_cache_key(key, cache_suffix = 'names_group')
+    "#{@cached_names_cache_key_prefix}_#{key}_#{cache_suffix}"
   end
 end
 

data/lib/cached_names/paranoid.rb

@@ -0,0 +1,41 @@
+module CachedNames
+  module ParanoidMethods
+
+    def names_with_deleted
+      load_paranoid_cached_names unless @cached_names_loaded
+
+      begin
+        Rails.cache.read cache_key('names_with_deleted')
+      rescue
+        load_paranoid_cached_names
+        Rails.cache.read cache_key('names_with_deleted')
+      end
+    end
+
+    def names_group_with_deleted key
+      load_paranoid_cached_names unless @cached_names_loaded
+
+      begin
+        Rails.cache.read group_cache_key(key, 'names_group_with_deleted')
+      rescue
+        load_paranoid_cached_names
+        Rails.cache.read group_cache_key(key, 'names_group_with_deleted')
+      end
+    end
+
+    def load_paranoid_cached_names
+      begin
+        @paranoid_cached_names_instances = with_deleted.all(:order => @cached_names_sort_field)
+
+        load_names(@paranoid_cached_names_instances, 'names_with_deleted')
+        load_grouped_names(@paranoid_cached_names_instances, 'names_group_with_deleted') if @cached_names_group_method
+
+        @paranoid_cached_names_loaded = true
+      rescue Exception => e
+        Rails.logger.error e.message
+        Rails.logger.error e.backtrace
+        @paranoid_cached_names_loaded = false
+      end
+    end
+  end
+end

data/lib/cached_names/version.rb

@@ -1,3 +1,3 @@
 module CachedNames
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rails/cached_names.rb

@@ -1,7 +1,13 @@
 module CachedNames
   class Railtie < Rails::Railtie
     initializer "cached_names.initialize" do |app|
-      ActiveRecord::Base.send :extend, CachedNames if defined?(ActiveRecord)
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.send :extend, CachedNames
+        if defined?(ActsAsParanoid)
+          ActiveRecord::Base.send :extend, CachedNames::ParanoidMethods
+          CachedNames.paranoid_loaded = true
+        end
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cached_names
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - John 'asceth' Long
@@ -59,6 +59,7 @@ files:
 - cached_names.gemspec
 - lib/cached_names.rb
 - lib/cached_names/base.rb
+- lib/cached_names/paranoid.rb
 - lib/cached_names/version.rb
 - lib/rails/cached_names.rb
 - spec/spec_helper.rb