egalite 1.5.13 → 1.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f71d5fa8734782993543114f96b69ed47d414e59
-  data.tar.gz: 12d9f1ecc50ba1434829352afd4cb0a6c3619a1c
+SHA256:
+  metadata.gz: f58aca213d75a5b20237d8c539da701bcfffc30b3a4284a1648ef10ce81e1381
+  data.tar.gz: a4e49c8321c915201a3acfd1a40a6e97273540d61c19e347588196345a19a5c8
 SHA512:
-  metadata.gz: f7124f20d90517eff35a7443109475cc90fc1e5fa173e18a4bab80afe2121d6cc55d52dda53d542a835c2386f6846d43554594f38a01488c71508a7ba210e1d8
-  data.tar.gz: 9e3dac0be1a31ffbae18bea9377d33e6b92af8ca864bfdeffc69084fbed80b49ce6d49d17cad535ba1be640820fc61cdd1d621625c896f9aa65802126a51d64d
+  metadata.gz: 8ea8ceb6da4f2f96885cfa443205e0015a3093183b793324de973ed2fec6c3edcf1b94e8fc4e37226e8c4cb89509aaffdc55bf8cf1bf81923ca4c182ec0f327e
+  data.tar.gz: dc24f4b3d897509da313ca4e256b0612f9e0d536cda742580e704bb23f41797a273bed18145ffaa911d70aa43dd42b14cb0aa8d9ed7fcea0b3857fba51523da8

data/lib/egalite.rb

@@ -200,7 +200,7 @@ class Controller
     EgaliteResponse.new(:delegate, params)
   end
   def include(params)
-    raw(req.handler.inner_dispatch(req, params)[2].to_s)
+    raw(req.handler.inner_dispatch(req, params)[2].join)
   end
   def send_file(path, content_type = nil)
     ext = File.extname(path)[1..-1]

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/helper.rb

@@ -191,10 +191,10 @@ class FormHelper
   end
   def radio(name, choice, opts = {})
     selected = (@data[name] == choice)
-    selected = (opts[:default] == choice) || opts[:selected] if @data[name] == nil
+    selected = (opts[:default] == choice) || opts[:selected] || opts[:checked] if @data[name] == nil
     
     attrs = opt_as_hash(opts)
-    attrs[:selected] = 'selected' if selected
+    attrs[:checked] = 'checked' if selected
     attrs[:name] = expand_name(name)
     attrs[:value] = choice
     attrs[:type] = 'radio'

data/lib/egalite/http.rb

@@ -11,6 +11,21 @@ module Egalite
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+      if options[:continue_timeout]
+        http.continue_timeout = options[:continue_timeout]
+      end
+      if options[:keep_alive_timeout]
+        http.keep_alive_timeout = options[:keep_alive_timeout]
+      end
+      if options[:open_timeout]
+        http.open_timeout = options[:open_timeout]
+      end
+      if options[:read_timeout]
+        http.read_timeout = options[:read_timeout]
+      end
+      if options[:ssl_timeout]
+        http.ssl_timeout = options[:ssl_timeout]
+      end
       [http, uri]
     end
     def self.parse_options(options)
@@ -37,9 +52,7 @@ module Egalite
     def self.get(url, options = {})
       params = options[:params]
       if params.is_a?(Hash)
-        params = params.map { |k,v|
-          "#{k}=#{v}"
-        }.join("&")
+        params = URI.encode_www_form(params)
       end
       if params.is_a?(String)
         if url =~ /\?/
@@ -57,9 +70,7 @@ module Egalite
     def self.post(url, body = nil, options = {})
       uri = parse_url(url,options)
       if body.is_a?(Hash)
-        body = body.map { |k,v|
-          "#{k}=#{v}"
-        }.join("&")
+        body = URI.encode_www_form(body)
       end
       parse_options(options)
       (http, uri) = parse_url(url, options)

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.5.13"
+  VERSION = "1.5.18"
 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.18
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Egalite - yet another web application framework.