erector_cache 0.0.7 → 0.1.0

data/Rakefile

@@ -18,29 +18,3 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "erector_cache #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/erector_cache.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{erector_cache}
-  s.version = "0.0.7"
+  s.name = "erector_cache"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grockit"]
-  s.date = %q{2011-01-27}
-  s.description = %q{Caching for your Erector}
-  s.email = %q{mmol@grockit.com}
+  s.date = "2012-01-10"
+  s.description = "Caching for your Erector"
+  s.email = "mmol@grockit.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README",
@@ -26,27 +26,20 @@ Gem::Specification.new do |s|
     "VERSION",
     "erector_cache.gemspec",
     "lib/erector_cache.rb",
+    "lib/erector_cache/abstract_widget.rb",
     "lib/erector_cache/fragment.rb",
-    "lib/erector_cache/widget.rb",
     "spec/erector_cache/fragment_spec.rb",
     "spec/erector_cache/widget_spec.rb",
     "spec/erector_cache_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/grockit/erector_cache}
+  s.homepage = "http://github.com/grockit/erector_cache"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Caching for your Erector}
-  s.test_files = [
-    "spec/erector_cache/fragment_spec.rb",
-    "spec/erector_cache/widget_spec.rb",
-    "spec/erector_cache_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Caching for your Erector"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/erector_cache/{widget.rb → abstract_widget.rb}

@@ -1,19 +1,21 @@
 module ErectorCache
-  module Widget
+  module AbstractWidget
     def self.included(base)
       base.module_eval do
         cattr_accessor :expire_in
         extend ClassMethods
-        class_inheritable_array :key_components
-        class_inheritable_hash :interpolations
+        class_attribute :key_components
+        class_attribute :interpolations
         include InstanceMethods
-        alias_method_chain :_render_via, :caching
+        alias_method_chain :_emit_via, :caching
       end
     end
 
     module ClassMethods
       def cache_with(*components)
         self.key_components = components
+        puts "Set key components: #{self.key_components.inspect}"
+        puts "Self: #{self.inspect}"
       end
       
       def interpolate(interpolations)
@@ -63,10 +65,14 @@ module ErectorCache
         return self.class.cache_key(key_data)
       end
       
-      def _render_via_with_caching(parent, options={})
+      def _emit_via_with_caching(parent, options={})
+        puts "emit with key components: #{self.class.key_components.inspect}"
+        puts "Self.class: #{self.class.inspect}"
         if self.class.key_components.blank?
-          _render_via_without_caching(parent, options)
+          puts "Erector#emit without caching"
+          _emit_via_without_caching(parent, options)
         else
+          puts "Erector#emit with caching"
           options = {:expire_in => @expire_in || 1.hour, :raw => true}
           unless self.class.interpolations.blank?
             options[:interpolate] = self.class.interpolations.inject({}) do |collection, interpolation| 
@@ -76,13 +82,14 @@ module ErectorCache
           end
           
           cached_fragment = LAWNCHAIR.cache(cache_key, options) do
-            parent.capture { _render_via_without_caching(parent, options) }
+            parent.capture { _emit_via_without_caching(parent, options) }
           end
-          parent.output << cached_fragment
+          parent.output << cached_fragment.html_safe  
         end
       end
     end
+
   end
 end
 
-Erector::Widget.send(:include, ErectorCache::Widget)
+Erector::AbstractWidget.send(:include, ErectorCache::AbstractWidget)

data/lib/erector_cache.rb

@@ -3,4 +3,4 @@ require 'action_controller'
 require 'erector'
 require 'erector/rails'
 require 'erector_cache/fragment'
-require 'erector_cache/widget'
+require 'erector_cache/abstract_widget'

metadata

@@ -1,82 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: erector_cache
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Grockit
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-27 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153457820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 2
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: lawnchair
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153457820
+- !ruby/object:Gem::Dependency
+  name: lawnchair
+  requirement: &2153457280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 6
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: erector
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153457280
+- !ruby/object:Gem::Dependency
+  name: erector
+  requirement: &2153456680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153456680
 description: Caching for your Erector
 email: mmol@grockit.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - README.rdoc
-files: 
+files:
 - .document
 - LICENSE
 - README
@@ -85,49 +61,35 @@ files:
 - VERSION
 - erector_cache.gemspec
 - lib/erector_cache.rb
+- lib/erector_cache/abstract_widget.rb
 - lib/erector_cache/fragment.rb
-- lib/erector_cache/widget.rb
 - spec/erector_cache/fragment_spec.rb
 - spec/erector_cache/widget_spec.rb
 - spec/erector_cache_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/grockit/erector_cache
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Caching for your Erector
-test_files: 
-- spec/erector_cache/fragment_spec.rb
-- spec/erector_cache/widget_spec.rb
-- spec/erector_cache_spec.rb
-- spec/spec_helper.rb
+test_files: []