catche 0.2.3 → 0.2.4

data/README.md

@@ -151,7 +151,7 @@ Catche intercepts a cached value and tags this value using the unique identifier
 
 ```ruby
 Catche::Tag::Collect.resource(@task) # { :set => ["tasks_1"], :expire => ["tasks_1"] }
-Catche::Tag::Collect.collection_tags(@task, Task) # { :set => ["projects_1_tasks"], :expire => ["tasks", "projects_1_tasks"] }
+Catche::Tag::Collect.collection(@task) # { :set => ["projects_1_tasks"], :expire => ["tasks", "projects_1_tasks"] }
 ```
 
 The tags will point to different cached values, for example pointing to a cached key or a cached filepath.

data/lib/catche/controller.rb

@@ -1,15 +1,13 @@
+require 'catche/controller/actions'
+require 'catche/controller/pages'
+
 module Catche
   module Controller
 
     extend ActiveSupport::Concern
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :Action
-      autoload :Page
-    end
 
-    include Action, Page
+    include Catche::Controller::Actions
+    include Catche::Controller::Pages
 
     included do
 

data/lib/catche/controller/{action.rb → actions.rb}

@@ -1,6 +1,6 @@
 module Catche
   module Controller
-    module Action
+    module Actions
 
       extend ActiveSupport::Concern
 

data/lib/catche/controller/{page.rb → pages.rb}

@@ -1,6 +1,6 @@
 module Catche
   module Controller
-    module Page
+    module Pages
 
       extend ActiveSupport::Concern
 
@@ -9,7 +9,7 @@ module Catche
         # Caches an action by file
         # See ActionController `caches_page` for more information
         #
-        #   catches_action Project, :index
+        #   catches_page Project, :index
         def catches_page(model, *args)
           catche model, *args, :type => :page
         end
@@ -29,7 +29,6 @@ module Catche
         super
       end
 
-
     end
   end
 end

data/lib/catche/expire.rb

@@ -1,5 +1,5 @@
-require 'catche/expire/view'
-require 'catche/expire/page'
+require 'catche/expire/views'
+require 'catche/expire/pages'
 
 module Catche
   module Expire
@@ -7,8 +7,8 @@ module Catche
     class << self
 
       def expire!(data)
-        Catche::Expire::View.expire! *data[:views]
-        Catche::Expire::Page.expire! *data[:pages]
+        Catche::Expire::Views.expire! *data[:views]
+        Catche::Expire::Pages.expire! *data[:pages]
       end
 
     end

data/lib/catche/expire/{page.rb → pages.rb}

@@ -1,6 +1,6 @@
 module Catche
   module Expire
-    module Page
+    module Pages
 
       class << self
 

data/lib/catche/expire/{view.rb → views.rb}

@@ -1,6 +1,6 @@
 module Catche
   module Expire
-    module View
+    module Views
 
       class << self
 

data/lib/catche/model.rb

@@ -1 +1,78 @@
-require 'catche/model/base'
+module Catche
+  module Model
+
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :catche_class,
+                      :catche_collection_tag,
+                      :catche_tag_identifier,
+                      :catche_associations
+
+      # Expiration callbacks
+
+      after_update  :expire_resource_and_collection!
+      after_destroy :expire_resource_and_collection!
+
+      after_create  :expire_collection!
+    end
+
+    module ClassMethods
+
+      # Configures catche
+      #
+      #   catche :through => :project, :catche_class => Task
+      def catche(options={})
+        options = {
+          :class          => self,
+          :tag_identifier => :id,
+          :collection_tag => nil,
+          :associations   => [options[:through]].flatten.compact
+        }.merge(options)
+
+        options.each do |key, value|
+          self.send("catche_#{key}=", value) if self.respond_to?("catche_#{key}")
+        end
+
+        self.catche_collection_tag ||= self.catche_class.name.downcase.pluralize
+      end
+
+      def catche_reset!
+        catche {}
+      end
+
+      def catche_tag
+        self.catche_collection_tag || self.name.downcase.pluralize
+      end
+
+      def catche_tag=(value)
+        self.catche_collection_tag = value
+      end
+
+      def catche_tag_identifier
+        super || :id
+      end
+
+    end
+
+    def catche_tag
+      Tag.join self.class.catche_tag, self.send(:id)
+    end
+
+    def expire_resource_and_collection!
+      expire_collection!
+      expire_resource!
+    end
+
+    def expire_collection!
+      Catche::Tag.expire! *Catche::Tag::Collect.collection(self)[:expire]
+    end
+
+    def expire_resource!
+      Catche::Tag.expire! *Catche::Tag::Collect.resource(self)[:expire]
+    end
+
+  end
+end
+
+ActiveRecord::Base.send :include, Catche::Model

data/lib/catche/tag/collect.rb

@@ -21,11 +21,12 @@ module Catche
           }
         end
 
-        # Collects collection tags for a given context, for example a controller
+        # Collects collection tags for a given context, for example the resource or a controller
         #
-        #   Catche::Tag::Collect.collection_tags(controller, Task)
+        #   Catche::Tag::Collect.collection(@task)
         #   => { :set => ["projects_1_tasks"], :expire => ["tasks", "projects_1_tasks"] }
-        def collection(context, resource_class, include_base=true)
+        def collection(context, resource_class=nil, include_base=true)
+          resource_class  ||= context.class
           associations      = Catche::ResourceLoader.fetch(context, *resource_class.catche_associations)
           association_tags  = associations.map { |a| a.catche_tag }
 

data/lib/catche/version.rb

@@ -1,3 +1,3 @@
 module Catche
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catche
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70331391407000 !ruby/object:Gem::Requirement
+  requirement: &70111289680960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70331391407000
+  version_requirements: *70111289680960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70331391406580 !ruby/object:Gem::Requirement
+  requirement: &70111289680540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331391406580
+  version_requirements: *70111289680540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70331391406120 !ruby/object:Gem::Requirement
+  requirement: &70111289680080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331391406120
+  version_requirements: *70111289680080
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70331391405700 !ruby/object:Gem::Requirement
+  requirement: &70111289679660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331391405700
+  version_requirements: *70111289679660
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70331391405280 !ruby/object:Gem::Requirement
+  requirement: &70111289679240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331391405280
+  version_requirements: *70111289679240
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70331391404860 !ruby/object:Gem::Requirement
+  requirement: &70111289678820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331391404860
+  version_requirements: *70111289678820
 description: ''
 email:
 - mail@arjen.me
@@ -86,13 +86,12 @@ extra_rdoc_files: []
 files:
 - lib/catche/adapter/base.rb
 - lib/catche/adapter.rb
-- lib/catche/controller/action.rb
-- lib/catche/controller/page.rb
+- lib/catche/controller/actions.rb
+- lib/catche/controller/pages.rb
 - lib/catche/controller.rb
-- lib/catche/expire/page.rb
-- lib/catche/expire/view.rb
+- lib/catche/expire/pages.rb
+- lib/catche/expire/views.rb
 - lib/catche/expire.rb
-- lib/catche/model/base.rb
 - lib/catche/model.rb
 - lib/catche/railtie.rb
 - lib/catche/resource_loader.rb
@@ -127,5 +126,5 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Smart collection and resource caching
+summary: Automatic resource and collection caching/expiration for Ruby on Rails
 test_files: []

data/lib/catche/model/base.rb

@@ -1,79 +0,0 @@
-module Catche
-  module Model
-    module Base
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :catche_class,
-                        :catche_collection_tag,
-                        :catche_tag_identifier,
-                        :catche_associations
-
-        # Expiration callbacks
-
-        after_update  :expire_resource_and_collection!
-        after_destroy :expire_resource_and_collection!
-
-        after_create  :expire_collection!
-      end
-
-      module ClassMethods
-
-        # Configures catche
-        #
-        #   catche :through => :project, :catche_class => Task
-        def catche(options={})
-          options = {
-            :class          => self,
-            :tag_identifier => :id,
-            :collection_tag => nil,
-            :associations   => [options[:through]].flatten.compact
-          }.merge(options)
-
-          options.each do |key, value|
-            self.send("catche_#{key}=", value) if self.respond_to?("catche_#{key}")
-          end
-
-          self.catche_collection_tag ||= self.catche_class.name.downcase.pluralize
-        end
-
-        def catche_reset!
-          catche {}
-        end
-
-        def catche_tag
-          self.catche_collection_tag || self.name.downcase.pluralize
-        end
-
-        def catche_tag=(value)
-          self.catche_collection_tag = value
-        end
-
-        def catche_tag_identifier
-          super || :id
-        end
-
-      end
-
-      def catche_tag
-        Tag.join self.class.catche_tag, self.send(:id)
-      end
-
-      def expire_resource_and_collection!
-        expire_collection!
-        expire_resource!
-      end
-
-      def expire_collection!
-        Catche::Tag.expire! *Catche::Tag::Collect.collection(self, self.class)[:expire]
-      end
-
-      def expire_resource!
-        Catche::Tag.expire! *Catche::Tag::Collect.resource(self)[:expire]
-      end
-
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Catche::Model::Base