moneta 1.4.2 → 1.5.0

data/spec/rack/session_moneta_spec.rb

@@ -4,30 +4,50 @@ require 'rack/mock'
 require 'thread'
 
 describe Rack::Session::Moneta do
-  session_key = Rack::Session::Moneta::DEFAULT_OPTIONS[:key]
-  session_match = /#{session_key}=([0-9a-fA-F]+);/
-  incrementor = lambda do |env|
-    env["rack.session"]["counter"] ||= 0
-    env["rack.session"]["counter"] += 1
-    Rack::Response.new(env["rack.session"].inspect).to_a
+  use_timecop
+
+  let(:session_key) { Rack::Session::Moneta::DEFAULT_OPTIONS[:key] }
+  let(:session_match) { /#{session_key}=([0-9a-fA-F]+);/ }
+
+  let :incrementor_proc do
+    lambda do |env|
+      env["rack.session"]["counter"] ||= 0
+      env["rack.session"]["counter"] += 1
+      Rack::Response.new(env["rack.session"].inspect).to_a
+    end
+  end
+
+  let :drop_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:drop] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :renew_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:renew] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :defer_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:defer] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :skip_session do
+    Rack::Lint.new(proc do |env|
+                     env['rack.session.options'][:skip] = true
+                     incrementor_proc.call(env)
+                   end)
+  end
+
+  let :incrementor do
+    Rack::Lint.new(incrementor_proc)
   end
-  drop_session = Rack::Lint.new(proc do |env|
-                                  env['rack.session.options'][:drop] = true
-                                  incrementor.call(env)
-                                end)
-  renew_session = Rack::Lint.new(proc do |env|
-                                   env['rack.session.options'][:renew] = true
-                                   incrementor.call(env)
-                                 end)
-  defer_session = Rack::Lint.new(proc do |env|
-                                   env['rack.session.options'][:defer] = true
-                                   incrementor.call(env)
-                                 end)
-  skip_session = Rack::Lint.new(proc do |env|
-                                  env['rack.session.options'][:skip] = true
-                                  incrementor.call(env)
-                                end)
-  incrementor = Rack::Lint.new(incrementor)
 
   it 'supports different constructors' do
     Rack::Session::Moneta.new(incrementor, :store => :Memory)
@@ -96,8 +116,7 @@ describe Rack::Session::Moneta do
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
     res["Set-Cookie"].should == cookie
     res.body.should include '"counter"=>2'
-    puts 'Sleeping to expire session' if $DEBUG
-    sleep 4
+    advance 4
     res = Rack::MockRequest.new(pool).get('/', "HTTP_COOKIE" => cookie)
     res["Set-Cookie"].should_not == cookie
     res.body.should include '"counter"=>1'

data/spec/restserver.rb

@@ -1,18 +1,7 @@
 require 'faraday'
 require 'rack'
 require 'rack/moneta_rest'
-
-MONETA_RESTSERVER_LOGGER =
-  if defined?(JRUBY_VERSION)
-    require 'rjack-logback'
-    RJack::Logback.config_console( :level => :off )
-    require 'fishwife'
-    nil
-  else
-    require 'webrick'
-    # Keep webrick quiet
-    WEBrick::Log.new($stderr, WEBrick::BasicLog::ERROR)
-  end
+require 'webrick'
 
 class MonetaRestServerShutdown < StandardError; end
 
@@ -25,10 +14,10 @@ def start_restserver(port)
       end
     end,
     :environment => 'none',
-    :server => defined?(JRUBY_VERSION) ? :Fishwife : :webrick,
+    :server => :webrick,
     :Port => port,
     :AccessLog => [],
-    :Logger => MONETA_RESTSERVER_LOGGER
+    :Logger => WEBrick::Log.new($stderr, WEBrick::BasicLog::ERROR)
   )
 
   Thread.start { server.start }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,8 +11,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +139,7 @@ files:
 - lib/action_dispatch/middleware/session/moneta_store.rb
 - lib/active_support/cache/moneta_store.rb
 - lib/moneta.rb
+- lib/moneta/adapter.rb
 - lib/moneta/adapters/activerecord.rb
 - lib/moneta/adapters/activesupportcache.rb
 - lib/moneta/adapters/cassandra.rb
@@ -166,6 +181,7 @@ files:
 - lib/moneta/adapters/yaml.rb
 - lib/moneta/builder.rb
 - lib/moneta/cache.rb
+- lib/moneta/config.rb
 - lib/moneta/create_support.rb
 - lib/moneta/dbm_adapter.rb
 - lib/moneta/defaults.rb
@@ -354,6 +370,7 @@ files:
 - spec/moneta/adapters/yaml/standard_yaml_spec.rb
 - spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb
 - spec/moneta/builder_spec.rb
+- spec/moneta/config_spec.rb
 - spec/moneta/mutex_spec.rb
 - spec/moneta/proxies/cache/cache_file_memory_spec.rb
 - spec/moneta/proxies/cache/cache_memory_null_spec.rb
@@ -429,9 +446,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
-  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.2/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.2
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.2
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.5.0/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.5.0
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.5.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -447,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
@@ -596,6 +613,7 @@ test_files:
 - spec/moneta/adapters/yaml/standard_yaml_spec.rb
 - spec/moneta/adapters/yaml/standard_yaml_with_expires_spec.rb
 - spec/moneta/builder_spec.rb
+- spec/moneta/config_spec.rb
 - spec/moneta/mutex_spec.rb
 - spec/moneta/proxies/cache/cache_file_memory_spec.rb
 - spec/moneta/proxies/cache/cache_memory_null_spec.rb