egalite 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71d5fa8734782993543114f96b69ed47d414e59
-  data.tar.gz: 12d9f1ecc50ba1434829352afd4cb0a6c3619a1c
+  metadata.gz: 3a9c5192532b745af1b9af582f08661f470a8080
+  data.tar.gz: 168d9cd38658b514c908168c89c8460e0571b2a3
 SHA512:
-  metadata.gz: f7124f20d90517eff35a7443109475cc90fc1e5fa173e18a4bab80afe2121d6cc55d52dda53d542a835c2386f6846d43554594f38a01488c71508a7ba210e1d8
-  data.tar.gz: 9e3dac0be1a31ffbae18bea9377d33e6b92af8ca864bfdeffc69084fbed80b49ce6d49d17cad535ba1be640820fc61cdd1d621625c896f9aa65802126a51d64d
+  metadata.gz: 8579ab001b10cb885fadd5d7c181dbe268c2ba58614911c77e12d2175285f6562d4fa0af9e163d0e7dd8030806d6bb29d1c3e2c51d8bac41151221814702bd09
+  data.tar.gz: 39de9fbccf6d700ab26a0d5da58dc89aa4533f2b0d284a4f1f0b55b3319a011dbe8c5ca66f29db195f806630cc10cc4fd1da6318c3e706cf17d11032427c93d8

data/lib/egalite/cache.rb

@@ -5,6 +5,7 @@
 CREATE TABLE controller_cache (
   id SERIAL PRIMARY KEY,
   inner_path TEXT NOT NULL,
+  query_string TEXT,
   language TEXT,
   updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
   content TEXT NOT NULL
@@ -19,6 +20,14 @@ module Egalite
       def create_table(db, opts = {})
         table = opts[:table_name] || :controller_cache
         
+        create_table_without_query(db, opts)
+        db.alter_table(table) {
+          add_column :query_string, :varchar
+        }
+      end
+      def create_table_without_query(db, opts = {})
+        table = opts[:table_name] || :controller_cache
+        
         db.create_table(table) {
           primary_key :id, :integer, :auto_increment => true
           column :inner_path, :varchar
@@ -38,14 +47,21 @@ module Egalite
     def self.included(base)
       base.extend(ClassMethods)
     end
-    def __controller_cache__dataset
+    def __controller_cache__dataset(options)
       table = Egalite::ControllerCache.table
       dataset = table.filter(:inner_path => req.inner_path)
+      if options[:with_query]
+        dataset = dataset.filter(:query_string => __query_string(options))
+      end
       if req.language
         dataset = dataset.filter(:language => req.language)
       end
       dataset
     end
+    def __query_string(options)
+      return nil unless options[:with_query] and not req.rack_request.query_string.empty?
+      req.rack_request.query_string
+    end
     def before_filter
       cache = self.class.controller_cache_actions[req.action_method]
       if cache and Egalite::ControllerCache.table
@@ -53,7 +69,7 @@ module Egalite
         if result != true
           return result
         end
-        dataset = __controller_cache__dataset
+        dataset = __controller_cache__dataset(cache)
         record = dataset.first
         return true unless record
         return true if record[:updated_at] < (Time.now - cache[:expire])
@@ -66,13 +82,16 @@ module Egalite
       html = super(html)
       cache = self.class.controller_cache_actions[req.action_method]
       if cache and Egalite::ControllerCache.table
-        dataset = __controller_cache__dataset
+        dataset = __controller_cache__dataset(cache)
         data = {
           :inner_path => req.inner_path,
           :language => req.language,
           :updated_at => Time.now,
           :content => html,
         }
+        if cache[:with_query]
+          data[:query_string] = __query_string(cache)
+        end
         if dataset.count > 0
           dataset.update(data)
         else
@@ -83,4 +102,3 @@ module Egalite
     end
   end
 end
-

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.5.13"
+  VERSION = "1.5.14"
 end

data/test/test_cache.rb

@@ -25,6 +25,19 @@ class TestCacheController < Egalite::Controller
   end
 end
 
+class TestCachewithqueryController < Egalite::Controller
+  include Egalite::ControllerCache
+
+  cache_action :get, :expire => 1, :with_query => true
+
+  def get
+    "#{Time.now.to_i}.#{Time.now.usec}"
+  end
+  def nocache
+    "#{Time.now.to_i}.#{Time.now.usec}"
+  end
+end
+
 class CacheController < Egalite::Controller
   include Egalite::ControllerCache
   
@@ -41,6 +54,47 @@ class CacheController < Egalite::Controller
   end
 end
 
+# compatibility test
+class T_CacheWithoutQuery < Test::Unit::TestCase
+  include Rack::Test::Methods
+  
+  def app
+    db = Sequel.sqlite
+    Egalite::ControllerCache.create_table_without_query(db)
+    Egalite::ControllerCache.table = db[:controller_cache]
+    Egalite::Handler.new
+  end
+  def test_cache
+    # test cache is not working
+    get "/test/cache/nocache"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cache/nocache"
+    b = last_response.body
+    assert_not_equal a,b
+    
+    # test cache is working
+    get "/test/cache/"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cache/"
+    b = last_response.body
+    assert_equal a,b
+    sleep 2
+    get "/test/cache/"
+    c = last_response.body
+    assert_not_equal a,c
+    
+    # test cache is not working for different url
+    get "/test/cache/1"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cache/2"
+    b = last_response.body
+    assert_not_equal a,b
+  end
+end
+
 class T_Cache < Test::Unit::TestCase
   include Rack::Test::Methods
   
@@ -79,6 +133,43 @@ class T_Cache < Test::Unit::TestCase
     b = last_response.body
     assert_not_equal a,b
   end
+  def test_cache_with_query
+    # test cache is not working
+    get "/test/cachewithquery/nocache"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cachewithquery/nocache"
+    b = last_response.body
+    assert_not_equal a,b
+
+    # test cache is working
+    get "/test/cachewithquery?a=1"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cachewithquery?a=1"
+    b = last_response.body
+    assert_equal a,b
+    sleep 2
+    get "/test/cachewithquery?a=1"
+    c = last_response.body
+    assert_not_equal a,c
+
+    # test cache is not working for different url
+    get "/test/cachewithquery?a=1"
+    a = last_response.body
+    sleep 0.1
+    get "/test/cachewithquery"
+    b = last_response.body
+    assert_not_equal a,b
+    sleep 0.1
+    get "/test/cachewithquery?a=2"
+    c = last_response.body
+    assert_not_equal a,c
+    sleep 0.1
+    get "/test/cachewithquery?a=1&b=2"
+    d = last_response.body
+    assert_not_equal a,d
+  end
 end
 
 # テンプレートでのテスト

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egalite
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler