egalite 1.5.19 → 1.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5518c119d01106dbf902bcae84dc6e18241358aef8efc0ac1eae593ef1109a
-  data.tar.gz: 112bbd3f2874cfa616fe3e802685cda5aac6f60cad32045f3ec2deaa348e8611
+  metadata.gz: a36f8f66154a178a6662295979f6cecc7a4b1b28d8a96af7d189950668063d09
+  data.tar.gz: a98099e7e8918e70a8be4b4aa9b52e8137322f720ce3aa9c1667fbf979c60990
 SHA512:
-  metadata.gz: 4869ffa87129c414c49c6109b349752c2a8fc07d1e6c3f1743bc9bda2b4e6998e80d0c05b386ea07dd7e40bb5b8789e678ac991fc9d1d286d4ae7496c0be07a5
-  data.tar.gz: 1e32a1f91d17f9e7cb0b61baf89e8498e596dbbeef38673d8c8df39667eeb79f52eb050bd164552a9c0409023ad29d1e7a34efc8f54a181236dba796c2ac557f
+  metadata.gz: 6625fd9dce4ba14e8325083b60dcfd41e85c3d765d1de59895d5e007585ecd35a1b4b284b7c5fd49b5f58ebfd7a3170e83e103ba86e59e3697135bd1c7c50fd1
+  data.tar.gz: d199ddadc1282e7d56dd827527f4a13e1628e9070d3ae0ebbb3f2fcfdcead7ca52f11f433cdec4922c5b449d0014952abb3781df4aedc5ec9ef8ec8edce8ed74

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.5.19"
+  VERSION = "1.5.20"
 end

data/lib/egalite.rb

@@ -459,6 +459,11 @@ class Handler
     [302,{'Location' => url}, [url]]
   end
   def get_controller(controllername,action, method)
+    # HTTPメソッドと一致するアクション名は却下する(メソッド名で受け付けるべき)
+      # /controller/get みたいな名前でgetがパスパラメータとして渡るべき
+      # といいつつ後方互換性を考慮してとりあえずget/postだけ却下
+    return nil if %w[get post].include?(action&.downcase)
+    
     action = method if action.blank?
     action.downcase!
     action.gsub!(/[^0-9a-z_]/,'')
@@ -470,7 +475,8 @@ class Handler
     controllername ||= ''
     controllername = controllername.split('/').map { |c|
       c.downcase!
-      c.gsub!(/[^0-9a-z]/,'')
+      # 英数字以外が含まれるものはコントローラーとはみなさない。
+      return nil if c =~ /[^0-9a-z]/
       c.capitalize
     }.join
     controllername = 'Default' if controllername.blank?

data/test/test_helper.rb

@@ -205,7 +205,7 @@ class T_FormHelper < Test::Unit::TestCase
     assert_equal("Foo", i.attributes["value"])
     assert_equal("radio", i.attributes["type"])
     assert_equal("foo", i.attributes["name"])
-    assert_equal("selected", i.attributes["selected"])
+    assert_equal("checked", i.attributes["checked"])
   end
 
   def test_radio_should_not_be_checked_if_choice_mismatch

data/test/test_route.rb

@@ -188,5 +188,11 @@ class T_Route < Test::Unit::TestCase
     get "/NoControllerNoAction2"
     assert last_response.ok?
     assert last_response.body == "/route/pathtest"
+    get "/route/get"
+    assert last_response.ok?
+    assert last_response.body == "get"
+    get "/route/-"
+    assert last_response.ok?
+    assert last_response.body == "-"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egalite
 version: !ruby/object:Gem::Version
-  version: 1.5.19
+  version: 1.5.20
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler