egalite 1.5.15 → 1.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbfc73af2ba067b4b7278c031eef5e8922409d3c
-  data.tar.gz: fa0e9d6eb79cf495ace9496455b78879e98fafa9
+SHA256:
+  metadata.gz: 0a5518c119d01106dbf902bcae84dc6e18241358aef8efc0ac1eae593ef1109a
+  data.tar.gz: 112bbd3f2874cfa616fe3e802685cda5aac6f60cad32045f3ec2deaa348e8611
 SHA512:
-  metadata.gz: 5259f0c26544063d8a4447052baf29425512cb190dfaae3ed7564d0d320b8f7a55ac70dcf646d3281603cd444801a207d37aad4499fed939856481523a8d2a54
-  data.tar.gz: d494300fd010741c580ba07468ca7b1b8f913db3a652a92e3a603a35124e75ad42bc4653fb833ba098604836ec024af47b5c9347fd1495e92e28e385dde4f607
+  metadata.gz: 4869ffa87129c414c49c6109b349752c2a8fc07d1e6c3f1743bc9bda2b4e6998e80d0c05b386ea07dd7e40bb5b8789e678ac991fc9d1d286d4ae7496c0be07a5
+  data.tar.gz: 1e32a1f91d17f9e7cb0b61baf89e8498e596dbbeef38673d8c8df39667eeb79f52eb050bd164552a9c0409023ad29d1e7a34efc8f54a181236dba796c2ac557f

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/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.15"
+  VERSION = "1.5.19"
 end

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/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.15
+  version: 1.5.19
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2021-09-29 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.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Egalite - yet another web application framework.