egalite 1.5.16 → 1.5.20

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 06173227f95e00091fff07d444005762da8a09cb
-  metadata.gz: a1a46e416239922d02970752ecfad422f65d07f4
-SHA512: 
-  data.tar.gz: bb7dc40e376c23a3af1ec864bf0a3e56ed2bffd6373ee1190dbb227218559fc46bbdf459ab80d696b81eb3f6149680557f4182eb901e46fc18dac4c031412138
-  metadata.gz: 09b06a89aacb7a0098d474c82cc7f2b30c00ea6d353ecb35466285f8988c85f894fb7955bccd952f2661d263309ec1719213b5e82d9137a06cc7b8e484e5f160
+---
+SHA256:
+  metadata.gz: a36f8f66154a178a6662295979f6cecc7a4b1b28d8a96af7d189950668063d09
+  data.tar.gz: a98099e7e8918e70a8be4b4aa9b52e8137322f720ce3aa9c1667fbf979c60990
+SHA512:
+  metadata.gz: 6625fd9dce4ba14e8325083b60dcfd41e85c3d765d1de59895d5e007585ecd35a1b4b284b7c5fd49b5f58ebfd7a3170e83e103ba86e59e3697135bd1c7c50fd1
+  data.tar.gz: d199ddadc1282e7d56dd827527f4a13e1628e9070d3ae0ebbb3f2fcfdcead7ca52f11f433cdec4922c5b449d0014952abb3781df4aedc5ec9ef8ec8edce8ed74

data/.gitignore

@@ -1,17 +1,17 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in egalite.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in egalite.gemspec
+gemspec

data/LICENSE.txt

@@ -1,22 +1,22 @@
-Copyright (c) 2013 Shunichi Arai
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2013 Shunichi Arai
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"

data/egalite.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
   spec.add_development_dependency "rake"
   spec.add_dependency "rack"
 end

data/how_to_gem_push.md

@@ -0,0 +1,22 @@
+
+* Egaliteを更新する方法
+
+Egaliteを更新する方法を以下に書きます。
+
+必要な修正を加えたら、まずlib/egalite/version.rbを書き換えてバージョン番号を上げます。Gemを差し替えるのにバージョンを上げる必要があるので。
+
+次にgit commit, pushを行います。
+
+gem build egalite.gemspec
+を実行するとegalite-x.x.xx.gemが作成されます。
+
+https://rubygems.org/api/v1/api_key.yaml
+にアクセスしてgem push用のyamlキーを取得します。rubygemsのアカウント作成については新井に聞いてください。
+
+取得したファイルをcredentialsという名前に変更し、~/.gem/credentialsにコピーします。
+
+gem push egalite-x.x.xx.gem
+を実行するとgemがpushされ、gem install / updateなどで取得できるようになります。
+
+利用している側では、gem update, bundle updateなどをしてapacheをreloadすると新しいバージョンを利用することができます。
+

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)

data/lib/egalite/sendmail.rb

@@ -33,8 +33,9 @@ module Sendmail
  end
  @force_dkim = false
  @mock = false
+ @override_server = nil
  class <<self
-  attr_accessor :mock, :force_dkim
+  attr_accessor :mock, :force_dkim, :override_server
   attr_reader :lastmail
   def folding(h, s) # folding white space. see RFC5322, section 2.3.3 and 3.2.2.
     len = 78 - h.size - ": ".size
@@ -233,6 +234,7 @@ module Sendmail
     end
     envelope_from = _extract_addrspec(params[:envelope_from] || params[:sender] || params[:from])
     envelope_from = envelope_from[0] if envelope_from.is_a?(Array)
+    host = @override_server if host == 'localhost' and @override_server
     _send(
       text,
       envelope_from,

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.5.16"
+  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

data/test/test_sendmail.rb

@@ -203,5 +203,11 @@ EOS
     assert_match "cGl5bw==", Sendmail.lastmail[0]
     assert_match "--#{boundary}--", Sendmail.lastmail[0]
   end
+  def test_override_server
+    Sendmail.override_server = "example.com"
+    Sendmail.send("Hello",:from => "arai@example.com", :to => "to@example.com")
+    assert_match "example.com", Sendmail.lastmail[3]
+    Sendmail.override_server = nil
+  end
 end
 

metadata

@@ -1,56 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: egalite
-version: !ruby/object:Gem::Version 
-  version: 1.5.16
+version: !ruby/object:Gem::Version
+  version: 1.5.20
 platform: ruby
-authors: 
+authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2017-05-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2022-02-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Egalite - yet another web application framework. see description at https://github.com/araipiyo/egalite
-email: 
+email:
 - arai@mellowtone.co.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -62,6 +71,7 @@ files:
 - examples/simple/run_webrick.rb
 - examples/simple_db/example_db.rb
 - examples/simple_db/pages/edit.html
+- how_to_gem_push.md
 - htmlbuilder.md
 - lib/egalite.rb
 - lib/egalite/auth/basic.rb
@@ -125,29 +135,29 @@ files:
 - test/test_stringify_hash.rb
 - test/test_template.rb
 homepage: https://github.com/araipiyo/egalite
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Egalite - yet another web application framework.
-test_files: 
+test_files:
 - test/cache.html
 - test/cache_cache.html
 - test/cache_nocache.html
@@ -176,4 +186,3 @@ test_files:
 - test/test_session.rb
 - test/test_stringify_hash.rb
 - test/test_template.rb
-has_rdoc: