kasket 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/kasket.rb

@@ -2,11 +2,14 @@ require 'rubygems'
 require 'active_record'
 require 'active_support'
 
-require 'kasket/configuration_mixin'
-require 'kasket/reload_association_mixin'
-require 'kasket/cache'
+require 'kasket/active_record_patches'
 
 module Kasket
+  autoload :Cache, 'kasket/cache'
+  autoload :ConfigurationMixin, 'kasket/configuration_mixin'
+  autoload :ReloadAssociationMixin, 'kasket/reload_association_mixin'
+  autoload :RackMiddleware, 'kasket/rack_middleware'
+
   CONFIGURATION = {:max_collection_size => 100}
 
   module_function
@@ -23,13 +26,20 @@ module Kasket
     ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, Kasket::ReloadAssociationMixin)
     ActiveRecord::Associations::HasOneThroughAssociation.send(:include, Kasket::ReloadAssociationMixin)
 
-    #sets up local cache clearing after each request
+    #sets up local cache clearing on rack
+    begin
+      ActionController::Dispatcher.middleware.use(Kasket::RackMiddleware)
+    rescue NameError => e
+      puts('WARNING: The kasket rack middleware is not in your rack stack')
+    end
+
+    #sets up local cache clearing before each request.
+    #this is done to make it work for non rack rails and for functional tests
     begin
-      ApplicationController.after_filter do
+      ApplicationController.before_filter do
         Kasket.cache.clear_local
       end
     rescue NameError => e
-
     end
 
     #sets up local cache clearing after each test case

data/lib/kasket/active_record_patches.rb

@@ -0,0 +1,56 @@
+module Kasket
+  module FixForAssociationAccessorMethods
+    def association_accessor_methods(reflection, association_proxy_class)
+      define_method(reflection.name) do |*params|
+        force_reload = params.first unless params.empty?
+        association = association_instance_get(reflection.name)
+
+        if association.nil? || force_reload
+          association = association_proxy_class.new(self, reflection)
+          retval = force_reload ? association.reload : association.__send__(:load_target)
+          if retval.nil? and association_proxy_class == ActiveRecord::Associations::BelongsToAssociation
+            association_instance_set(reflection.name, nil)
+            return nil
+          end
+          association_instance_set(reflection.name, association)
+        end
+
+        association.target.nil? ? nil : association
+      end
+
+      define_method("loaded_#{reflection.name}?") do
+        association = association_instance_get(reflection.name)
+        association && association.loaded?
+      end
+
+      define_method("#{reflection.name}=") do |new_value|
+        association = association_instance_get(reflection.name)
+
+        if association.nil? || association.target != new_value
+          association = association_proxy_class.new(self, reflection)
+        end
+
+        if association_proxy_class == ActiveRecord::Associations::HasOneThroughAssociation
+          association.create_through_record(new_value)
+          if new_record?
+            association_instance_set(reflection.name, new_value.nil? ? nil : association)
+          else
+            self.send(reflection.name, new_value)
+          end
+        else
+          association.replace(new_value)
+          association_instance_set(reflection.name, new_value.nil? ? nil : association)
+        end
+      end
+
+      define_method("set_#{reflection.name}_target") do |target|
+        return if target.nil? and association_proxy_class == ActiveRecord::Associations::BelongsToAssociation
+        association = association_proxy_class.new(self, reflection)
+        association.target = target
+        association_instance_set(reflection.name, association)
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.extend Kasket::FixForAssociationAccessorMethods

data/lib/kasket/rack_middleware.rb

@@ -0,0 +1,13 @@
+module Kasket
+  class RackMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    ensure
+      Kasket.cache.clear_local
+    end
+  end
+end

data/lib/kasket/reload_association_mixin.rb

@@ -3,12 +3,11 @@ module Kasket
     def reload_with_kasket_clearing(*args)
       if loaded?
         clear_local_kasket_indices if respond_to?(:clear_local_kasket_indices)
+      else
+        target_class = proxy_reflection.options[:polymorphic] ? association_class : proxy_reflection.klass
+        Kasket.cache.delete_matched_local(/^#{target_class.kasket_key_prefix}/) if target_class.respond_to?(:kasket_key_prefix)
       end
 
-      # or maybe something like this?
-      #target_class = proxy_reflection.options[:polymorphic] ? association_class : proxy_reflection.klass
-      #Kasket.cache.delete_matched_local(/^#{target_class.kasket_key_prefix}/) if target_class.respond_to?(:kasket_key_prefix)
-
       reload_without_kasket_clearing(*args)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kasket
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -49,10 +49,12 @@ files:
 - Rakefile
 - VERSION
 - lib/kasket.rb
+- lib/kasket/active_record_patches.rb
 - lib/kasket/cache.rb
 - lib/kasket/conditions_parser.rb
 - lib/kasket/configuration_mixin.rb
 - lib/kasket/dirty_mixin.rb
+- lib/kasket/rack_middleware.rb
 - lib/kasket/read_mixin.rb
 - lib/kasket/reload_association_mixin.rb
 - lib/kasket/write_mixin.rb