setting validity period until one day

first click free update rule
https://webmasters.googleblog.com/2015/09/first-click-free-update.html

Author: kkyouhei

lib/first_click_free.rb

@@ -4,6 +4,7 @@ module FirstClickFree
   require 'first_click_free/helpers/path'
   require 'first_click_free/helpers/referrer'
   require 'first_click_free/concerns/controller'
+  require 'first_click_free/sessions/first_click_free_session'
 
   class << self
 

lib/first_click_free/concerns/controller.rb

@@ -73,18 +73,19 @@ def record_or_reject_first_click_free!
         # (new first click free will be set)
         reset_first_click_free! if permitted_domain?
 
-        if session[:first_click] && session[:first_click].include?(checksum(url_for))
+        fcf_session = FirstClickFreeSession.new session
+        if fcf_session.clicks.include?(checksum(url_for))
           # already visited, can visit again
-        elsif session[:first_click] && session[:first_click].length < FirstClickFree.free_clicks
+        elsif fcf_session.clicks.length < FirstClickFree.free_clicks
           # new page but within free click limit
-          session[:first_click] << checksum(url_for)
-        elsif session[:first_click] && session[:first_click].length == FirstClickFree.free_clicks
+          fcf_session << checksum(url_for)
+        elsif fcf_session.clicks.length == FirstClickFree.free_clicks
           raise FirstClickFree::Exceptions::SubsequentAccessException
         else
           # first click!
-          session[:first_click] = [ checksum(url_for) ]
+          fcf_session.clicks = [ checksum(url_for) ]
         end
-        request.env["first_click_free_count"] = session[:first_click].length
+        request.env["first_click_free_count"] = fcf_session.clicks.length
         return true
       end
 
@@ -94,7 +95,7 @@ def record_or_reject_first_click_free!
       #
       # Returns the value set in the first click session (nil)
       def reset_first_click_free!
-        session.delete(:first_click)
+        session.delete(:first_click_free)
       end
 
       # Private: Create a checksum string.

lib/first_click_free/sessions/first_click_free_session.rb

@@ -0,0 +1,33 @@
+class FirstClickFreeSession
+  def initialize session
+    key = first_click_free_of_session_key
+    if session["first_click_free"].blank? || session["first_click_free"][key].blank?
+      session["first_click_free"] = {key => {}}
+    end
+    @clicks = session["first_click_free"][key]["first_click"] || []
+    @session = session
+  end
+
+  def clicks
+    @clicks
+  end
+
+  def clicks=(click)
+    add click,  -> c { @clicks = c }
+  end
+
+  def <<(click)
+    add click, -> c { @clicks << c }
+  end
+
+  private
+    def add click, operation
+      key = first_click_free_of_session_key
+      operation.call click
+      @session["first_click_free"][key] = {"first_click" => @clicks}
+    end
+
+    def first_click_free_of_session_key
+      Date.today.strftime("%Y%m%d")
+    end
+end

spec/concerns/controller_spec.rb

@@ -30,28 +30,28 @@ def checksum(url)
     context "first visit" do
       before { get :index, test: true }
 
-      it { session[:first_click].should include checksum(current_url) }
+      it { expect(FirstClickFreeSession.new(session).clicks).to include checksum(current_url) }
       it { request.env["first_click_free_count"].should eq 1 }
       it { response.should be_success }
     end
 
     context "subsequent visit to same page" do
-      before { session[:first_click] = [ checksum(current_url) ] }
+      before { FirstClickFreeSession.new(session).clicks = [ checksum(current_url) ] }
 
       it { get :index; request.env["first_click_free_count"].should eq 1 }
       it { expect { get :index }.not_to raise_error }
     end
 
     context "subsequent visit to different page" do
-      before { session[:first_click] = [ checksum("http://test.host/another-page") ] }
+      before { FirstClickFreeSession.new(session).clicks = [ checksum("http://test.host/another-page") ] }
 
       it { expect { get :index }.to raise_error FirstClickFree::Exceptions::SubsequentAccessException }
     end
 
     context "subsequent visit to different page with unused multiple clicks" do
       before do
-        session[:first_click] = [ checksum("http://test.host/some-page"),
-                                  checksum("http://test.host/some-other-page") ]
+        FirstClickFreeSession.new(session).clicks = [ checksum("http://test.host/some-page"),
+                                                      checksum("http://test.host/some-other-page") ]
         FirstClickFree.free_clicks = 3
       end
 
@@ -61,9 +61,9 @@ def checksum(url)
 
     context "subsequent visit to different page with multiple clicks used up" do
       before do
-        session[:first_click] = [ checksum("http://test.host/some-page"),
-                                  checksum("http://test.host/some-other-page"),
-                                  checksum("http://test.host/yet-another-page") ]
+        FirstClickFreeSession.new(session).clicks = [ checksum("http://test.host/some-page"),
+                                                      checksum("http://test.host/some-other-page"),
+                                                      checksum("http://test.host/yet-another-page") ]
         FirstClickFree.free_clicks = 3
       end
 
@@ -73,14 +73,14 @@ def checksum(url)
     context "googlebot visit" do
       before { controller.stub(:googlebot? => true); get :index }
 
-      it { session[:first_click].should be_nil }
+      it { expect(FirstClickFreeSession.new(session).clicks).to be_empty }
       it { response.should be_success }
     end
 
     context "registered user vist" do
       before { controller.stub(:user_for_first_click_free => true); get :index }
 
-      it { session[:first_click].should be_nil }
+      it { expect(FirstClickFreeSession.new(session).clicks).to be_empty }
       it { response.should be_success }
     end
 
@@ -102,7 +102,7 @@ def index
 
     before { get :index }
 
-    it { session[:first_click].should be_nil }
+    it { expect(FirstClickFreeSession.new(session).clicks).to be_empty }
     it { response.should be_success }
   end
 
@@ -122,7 +122,7 @@ def index
 
     before { get :index }
 
-    it { session[:first_click].should be_nil }
+    it { expect(FirstClickFreeSession.new(session).clicks).to be_empty }
     it { response.should be_success }
   end
 end