ettu 0.0.4 → 0.0.5

data/lib/ettu.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_support/ordered_options'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
@@ -14,13 +15,20 @@ class Ettu
     @@config.js = 'application.js'
     @@config.css = 'application.css'
     @@config.assets = []
+    @@config.template_digestor = if defined? ActionView::Digestor
+                                   ActionView::Digestor
+                                 else
+                                   nil
+                                 end
 
     def configure
       yield @@config
     end
   end
 
-  def initialize(record_or_options = nil, additional_options = {})
+  def initialize(record_or_options = nil, additional_options = {}, controller = nil)
+    @controller = controller
+    @asset_etags = {}
     if record_or_options.is_a? Hash
       @record = nil
       @options = record_or_options
@@ -28,7 +36,6 @@ class Ettu
       @record = record_or_options
       @options = additional_options
     end
-    @asset_etags = {}
   end
 
   def response_etag
@@ -39,8 +46,8 @@ class Ettu
     @options.fetch(:last_modified, @record.try(:updated_at))
   end
 
-  def view_etag(view, format, lookup_context)
-    @view_etag ||= view_digest(view, format, lookup_context)
+  def view_etag
+    @view_etag ||= view_digest
   end
 
   def js_etag
@@ -54,7 +61,7 @@ class Ettu
   end
 
   def asset_etags
-    assets = @config.fetch(:assets, @@config.assets)
+    assets = @options.fetch(:assets, @@config.assets)
     [*assets].map { |asset| asset_etag(asset) }
   end
 
@@ -66,11 +73,11 @@ class Ettu
 
   # Jeremy Kemper
   # https://gist.github.com/jeremy/4211803
-  def view_digest(view, format, lookup_context)
-    ActionView::Digestor.digest(
-      view,
-      format,
-      lookup_context
+  def view_digest
+    @@config.template_digestor.digest(
+      "#{@controller.controller_name}/#{@controller.action_name}",
+      @controller.request.format.try(:to_sym),
+      @controller.lookup_context
     )
   end
 

data/lib/ettu/fresh_when.rb

@@ -6,13 +6,10 @@ class Ettu
       alias_method :old_fresh_when, :fresh_when
 
       def fresh_when(record_or_options, additional_options = {})
-        ettu = Ettu.new(record_or_options, additional_options)
+        ettu = Ettu.new(record_or_options, additional_options, self)
 
         etags = [*ettu.response_etag]
-        if view = ettu.options.fetch(:view, "#{controller_name}/#{action_name}")
-          # TODO: This is ugly. How do we clean it up?
-          etags << ettu.view_etag(view, request.format.try(:to_sym), lookup_context)
-        end
+        etags << ettu.view_etag
         if request.format.try(:html?)
           etags << ettu.js_etag
           etags << ettu.css_etag

data/lib/ettu/version.rb

@@ -1,3 +1,3 @@
 class Ettu
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/ettu_spec.rb

@@ -17,7 +17,7 @@ module Rails
   end
 end
 
-describe Ettu::Ettu do
+describe Ettu do
   let(:record) { Record.new(DateTime.now) }
   let(:hash) { { etag: record, last_modified: DateTime.now, public: false, random: true } }
 
@@ -31,13 +31,23 @@ describe Ettu::Ettu do
 
   xit '#view_etag'
 
+
+  context '.configure' do
+
+  end
+
+
   context 'when given only a record' do
-    subject(:ettu) { Ettu::Ettu.new(record) }
+    subject(:ettu) { Ettu.new(record) }
 
-    it 'makes #options an empty hash' do
+    it 'makes #options an hash' do
       expect(ettu.options).to be_a(Hash)
     end
 
+    it 'makes #options an empty hash' do
+      expect(ettu.options).to be_empty
+    end
+
     it 'uses record as #response_etag' do
       expect(ettu.response_etag).to eq(record)
     end
@@ -48,7 +58,7 @@ describe Ettu::Ettu do
   end
 
   context 'when given only a hash' do
-    subject(:ettu) { Ettu::Ettu.new(hash) }
+    subject(:ettu) { Ettu.new(hash) }
 
     it 'sets #options to that hash' do
       expect(ettu.options).to eq(hash)
@@ -65,7 +75,11 @@ describe Ettu::Ettu do
 
   context 'when given a record and hash' do
     let(:hash) { { public: true } }
-    subject(:ettu) { Ettu::Ettu.new(record, hash) }
+    subject(:ettu) { Ettu.new(record, hash) }
+
+    it 'sets #options to the hash' do
+      expect(ettu.options).to eq(hash)
+    end
 
     describe '#response_etag' do
       it 'uses record as #response_etag' do 

data/spec/fresh_when_spec.rb

@@ -0,0 +1,8 @@
+describe Ettu::FreshWhen do
+  context 'when given extra options' do
+    subject(:ettu) { Ettu.new(record) }
+
+    it "passes those options to Rails' fresh_when"
+    it "calls #old_fresh_when"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ettu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -95,6 +95,7 @@ files:
 - lib/ettu/railtie.rb
 - lib/ettu/version.rb
 - spec/ettu_spec.rb
+- spec/fresh_when_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/cloudspace/ettu
 licenses:
@@ -123,4 +124,5 @@ specification_version: 3
 summary: Account for view code when using ETags.
 test_files:
 - spec/ettu_spec.rb
+- spec/fresh_when_spec.rb
 - spec/spec_helper.rb