rack-test_app 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2ce0590323aed326f765838e0e0ff9fcbafa23
-  data.tar.gz: ac91d827a933137c4b1a44b15d453f64f3d4c094
+  metadata.gz: bcda18c27ea20de2cac4ccd10eb02dd825082316
+  data.tar.gz: bb4e19bbf2cfc3fbbeba4eb31a4552423df9dab7
 SHA512:
-  metadata.gz: 084c7935751936114289ab16209e1b2e537d9acd4945ad34790ee611fc5cf8a24ef0e0efa6909fe01a0d3c3f2baaed3cc47cb585b51c2378fae373320a58fb85
-  data.tar.gz: 3982adf894d08f028bded159fe9f6e30ee9a3142a0e21cad104402e88b09abf9fc8f18b39f741075a79b5852db877fb3473d56ca428c6d0ec1149e160521a987
+  metadata.gz: fc9e70351334d583198c599ce3f5fe01f058af68f817532feafdff86191efdbf62f390ba9cb8d7739168dbfab036012d7c799ef0cff2ad14e9bc0e3dfed10fc9
+  data.tar.gz: fcb95b8bc2656ed4423595586c3e55e7ab1f6ed989374325a7703851fc5c8de8d320805f3f0704969cebfef86c8af5fc39e25be9bb03318c415370c057f63223

data/README.md

@@ -36,7 +36,7 @@ app = proc {|env|
   [200, headers, [text]]
 }
 
-## crate wrapper objects
+## create wrapper objects
 http  = Rack::TestApp.wrap(Rack::Lint.new(app))
 https = Rack::TestApp.wrap(Rack::Lint.new(app), env: {'HTTPS'=>'on'})
 

data/{Rakefile → Rakefile.rb}

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+
+copyright = "copyright(c) 2015-2021 kuwata-lab.com all rights reserved"
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -25,8 +29,11 @@ How to release:
     $ git commit -a -m "release preparation for 1.0.0"
     $ rake build                # for confirmation
     $ rake install              # for confirmation
-    $ rake release
-    $ git push -u --tags origin rel-1.0
+    $ #rake release
+    $ gem push pkg/rack-test_app-1.0.0.gem
+    $ git tag rel-1.0.0
+    $ git push -u origin rel-1.0
+    $ git push --tags
 END
 
 end
@@ -38,12 +45,27 @@ task :edit do
     raise "ERROR: 'rel' environment variable expected."
   filenames = Dir[*%w[lib/**/*.rb test/**/*_test.rb]]
   filenames.each do |fname|
-    File.open(fname, 'r+', encoding: 'utf-8') do |f|
-      content = f.read()
-      x = content.gsub!(/\$Release:.*?\$/, "$Release: #{rel} $")
+    changed = edit_file(fname) {|s|
+      s = s.gsub(/\$Release:.*?\$/, "$"+"Release: #{rel} $")
+      #s = s.gsub(/\$Copyright:.*?\$/, "$"+"Copyright: #{copyright} $")
+      s
+    }
+    puts "[changed] #{fname}" if changed
+  end
+end
+
+
+def edit_file(fname, &b)
+  File.open(fname, 'r+', encoding: 'utf-8') do |f|
+    s1 = f.read()
+    s2 = yield s1
+    if s1 != s2
       f.rewind()
       f.truncate(0)
-      f.write(content)
+      f.write(s2)
+      return true
+    else
+      return false
     end
   end
 end

data/lib/rack/test_app.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -20,7 +20,7 @@ module Rack
 
   module TestApp
 
-    VERSION = '$Release: 1.0.0 $'.split()[1]
+    VERSION = '$Release: 1.1.0 $'.split()[1]
 
 
     module Util
@@ -232,7 +232,7 @@ module Rack
         end
         input = multipart.to_s
         #; [!dq33d] sets content type with 'multipart/form-data'.
-        m = /\A--(\S+)\r\n/.match(input)  or
+        input =~ /\A--(\S+)\r\n/  or
           raise ArgumentError.new("invalid multipart format.")
         boundary = $1
         ctype = "multipart/form-data; boundary=#{boundary}"
@@ -428,7 +428,7 @@ module Rack
       def with(headers: nil, cookies: nil, env: nil)
         tmp_env = TestApp.new_env(headers: headers, cookies: cookies, env: env)
         new_env = @env ? @env.dup : {}
-        http_headers = tmp_env.each do |k, v|
+        tmp_env.each do |k, v|
           new_env[k] = v if k.start_with?('HTTP_')
         end
         new_wrapper = self.class.new(@app, new_env)
@@ -452,14 +452,14 @@ module Rack
         return Result.new(status, headers, body)
       end
 
-      def GET     path, kwargs={}; request(:GET    , path, kwargs); end
-      def POST    path, kwargs={}; request(:POST   , path, kwargs); end
-      def PUT     path, kwargs={}; request(:PUT    , path, kwargs); end
-      def DELETE  path, kwargs={}; request(:DELETE , path, kwargs); end
-      def HEAD    path, kwargs={}; request(:HEAD   , path, kwargs); end
-      def PATCH   path, kwargs={}; request(:PATCH  , path, kwargs); end
-      def OPTIONS path, kwargs={}; request(:OPTIONS, path, kwargs); end
-      def TRACE   path, kwargs={}; request(:TRACE  , path, kwargs); end
+      def GET     path, kwargs={}; request(:GET    , path, **kwargs); end
+      def POST    path, kwargs={}; request(:POST   , path, **kwargs); end
+      def PUT     path, kwargs={}; request(:PUT    , path, **kwargs); end
+      def DELETE  path, kwargs={}; request(:DELETE , path, **kwargs); end
+      def HEAD    path, kwargs={}; request(:HEAD   , path, **kwargs); end
+      def PATCH   path, kwargs={}; request(:PATCH  , path, **kwargs); end
+      def OPTIONS path, kwargs={}; request(:OPTIONS, path, **kwargs); end
+      def TRACE   path, kwargs={}; request(:TRACE  , path, **kwargs); end
 
       ## define aliases because ruby programmer prefers #get() rather than #GET().
       alias get     GET

data/rack-test_app.gemspec

@@ -6,8 +6,8 @@ require 'rack/test_app'
 Gem::Specification.new do |spec|
   spec.name          = "rack-test_app"
   spec.version       = Rack::TestApp::VERSION
-  spec.authors       = ["makoto kuwata"]
-  spec.email         = ["kwa@kuwata-lab.com"]
+  spec.authors       = ["kwatch"]
+  spec.email         = ["kwatch@gmail.com"]
   spec.summary       = "more intuitive testing helper library for Rack app"
   spec.description   = <<END
 Rack::TestApp is another testing helper library for Rack application.
@@ -16,7 +16,7 @@ END
   spec.homepage      = "https://github.com/kwatch/rack-test_app"
   spec.license       = "MIT-LICENCE"
   spec.files         = Dir[*%w[
-                         README.md MIT-LICENSE.txt Rakefile rack-test_app.gemspec
+                         README.md MIT-LICENSE.txt Rakefile.rb rack-test_app.gemspec
                          lib/rack/test_app.rb
 			 test/test_helper.rb
 			 test/rack/**/*_test.rb
@@ -24,8 +24,6 @@ END
                        ]]
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.0'
-  spec.add_runtime_dependency 'rack'
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency "rack"
   spec.add_development_dependency "minitest"
 end

data/test/rack/test_app/MultipartBuilder_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 

data/test/rack/test_app/Result_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -175,7 +175,7 @@ describe Rack::TestApp::Result do
     it "[!oapns] returns nil if cookie not exists." do
       headers = {'Set-Cookie' => 'name1=value1'}
       r = Rack::TestApp::Result.new(200, headers, [])
-      assert_equal nil, r.cookie_value('name2')
+      assert_nil r.cookie_value('name2')
     end
 
   end

data/test/rack/test_app/TestApp_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -20,7 +20,7 @@ describe Rack::TestApp do
   describe '::VERSION' do
 
     it "represents release version number." do
-      expected = '$Release: 1.0.0 $'.split()[1]
+      expected = '$Release: 1.1.0 $'.split()[1]
       assert_equal expected, Rack::TestApp::VERSION
     end
 
@@ -103,7 +103,8 @@ describe Rack::TestApp do
 
       it "[!dq33d] sets content type with 'multipart/form-data'." do
         env = Rack::TestApp.new_env(multipart: {})
-        assert_match /\Amultipart\/form-data; boundary=\S+\z/, env['CONTENT_TYPE']
+        rexp = /\Amultipart\/form-data; boundary=\S+\z/
+        assert_match rexp, env['CONTENT_TYPE']
       end
 
       it "[!gko8g] 'multipart:' kwarg accepts Hash object (which is converted into multipart data)." do
@@ -149,7 +150,7 @@ describe Rack::TestApp do
       #
       assert_equal Rack::VERSION   , env['rack.version']
       assert_kind_of Array         , env['rack.version']
-      assert_match /\A\[1, \d+\]\z/, env['rack.version'].inspect
+      assert_match(/\A\[1, \d+\]\z/, env['rack.version'].inspect)
       assert_kind_of StringIO      , env['rack.input']
       assert_kind_of StringIO      , env['rack.errors']
       assert_equal true            , env['rack.multithread']
@@ -166,7 +167,7 @@ describe Rack::TestApp do
       assert_equal 'off'           , env['HTTPS']
       assert_equal ''              , env['SCRIPT_NAME']
       assert_equal '0'             , env['CONTENT_LENGTH']
-      assert_equal nil             , env['CONTENT_TYPE']
+      assert_nil                     env['CONTENT_TYPE']
     end
 
     it "[!ezvdn] unsets CONTENT_TYPE when not input." do

data/test/rack/test_app/Util_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -36,8 +36,7 @@ describe Rack::TestApp::Util do
   describe '.#build_query_string()' do
 
     it "[!098ac] returns nil when argument is nil." do
-      expected = nil
-      assert_equal expected, Rack::TestApp::Util.build_query_string(nil)
+      assert_nil Rack::TestApp::Util.build_query_string(nil)
     end
 
     it "[!z9ds2] returns argument itself when it is a string." do
@@ -116,7 +115,7 @@ describe Rack::TestApp::Util do
       set_cookie = "name1=value1; Max-Age=3600"
       c = Rack::TestApp::Util.parse_set_cookie(set_cookie)
       assert_equal 3600, c[:max_age]
-      assert_kind_of Fixnum, c[:max_age]
+      assert_kind_of Integer, c[:max_age]
     end
 
     it "[!wgzyz] raises error when Max-Age attribute value is not a positive integer." do
@@ -140,7 +139,7 @@ describe Rack::TestApp::Util do
       arr = (1..1000).map { Rack::TestApp::Util.randstr_b64() }
       assert_equal 1000, arr.sort.uniq.length
       arr.each do |s|
-        assert_match /\A[-\w]+\z/, s
+        assert_match(/\A[-\w]+\z/, s)
         assert_equal 27, s.length
       end
     end

data/test/rack/test_app/Wrapper_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 1.0.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 1.1.0 $
+### $Copyright: copyright(c) 2015-2021 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -31,7 +31,7 @@ describe Rack::TestApp::Wrapper do
       #
       wrapper = Rack::TestApp::Wrapper.new(app)
       assert_equal app, wrapper.instance_variable_get('@app')
-      assert_equal nil, wrapper.instance_variable_get('@env')
+      assert_nil        wrapper.instance_variable_get('@env')
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-test_app
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
-- makoto kuwata
+- kwatch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +42,14 @@ description: |
   Rack::TestApp is another testing helper library for Rack application.
   IMO it is more intuitive than Rack::Test.
 email:
-- kwa@kuwata-lab.com
+- kwatch@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE.txt
 - README.md
-- Rakefile
+- Rakefile.rb
 - lib/rack/test_app.rb
 - rack-test_app.gemspec
 - test/rack/test_app/MultipartBuilder_test.rb
@@ -109,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: more intuitive testing helper library for Rack app