egalite 1.5.17 → 1.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be8c7aafc49f11ad4a4ca22ed436d2feffea90a
-  data.tar.gz: c513f3916c6645a2ad178b78dc2594aefd9f038a
+SHA256:
+  metadata.gz: a6fd3b5c1b4e8fbf04a70cede521f109d0caa2507e6ec65e47fa40fc5acba594
+  data.tar.gz: efa0a98954427e7d9162b460675cdbb2c0ecbf81102dd4f93a8d0cfa81c492f5
 SHA512:
-  metadata.gz: bcb2530fa430c96d97004e2db0bc2d48941508454896b45fe701d2e96134fbd69a3159232f868c43915a3df6ec1fc84bec76973c87d80a9a9a1972de60be5f13
-  data.tar.gz: 32a5d26ad20aa7d43d359d17ace9d442ae857899cd0dce0f4dcb41a57f772836233b5f7837b819e1e41ff4aa48fd8131070c53fdb7274a5a082cfb07343df04d
+  metadata.gz: 1fe15bdbbe09ab6a27100c70140da9e39ebfc06c66a29140979d22449a9a86ee002b2e89333d0d343c78443909b4391b45341acade26c533028819a91b1e71fa
+  data.tar.gz: 6a06ad9ae47d08f31839aa01e625e8f9636c20d6b623fcb606d7983f2b42926009916d0ca0d11e30df89c3c1205b5149b777aa5b5d55966032d1eefc7686048c

data/egalite.gemspec

@@ -1,24 +1,24 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'egalite/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "egalite"
-  spec.version       = Egalite::VERSION
-  spec.authors       = ["Shunichi Arai"]
-  spec.email         = ["arai@mellowtone.co.jp"]
-  spec.description   = %q{Egalite - yet another web application framework. see description at https://github.com/araipiyo/egalite}
-  spec.summary       = %q{Egalite - yet another web application framework.}
-  spec.homepage      = "https://github.com/araipiyo/egalite"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  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 "rake"
-  spec.add_dependency "rack"
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'egalite/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "egalite"
+  spec.version       = Egalite::VERSION
+  spec.authors       = ["Shunichi Arai"]
+  spec.email         = ["arai@mellowtone.co.jp"]
+  spec.description   = %q{Egalite - yet another web application framework. see description at https://github.com/araipiyo/egalite}
+  spec.summary       = %q{Egalite - yet another web application framework.}
+  spec.homepage      = "https://github.com/araipiyo/egalite"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  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/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.17"
+  VERSION = "1.5.21"
 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/headだけ却下
+    return nil if %w[get post head].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

@@ -45,6 +45,9 @@ class RouteController < Egalite::Controller
   def get(s)
     s ? s : "null"
   end
+  def head(s)
+    s ? s : "null"
+  end
   def pathtest
     req.path_info
   end
@@ -188,5 +191,14 @@ 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 == "-"
+    get "/route/head"
+    assert last_response.ok?
+    assert last_response.body == "head"
   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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: egalite
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.21
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,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
@@ -152,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Egalite - yet another web application framework.