moneta 1.0.0 → 1.5.1

data/spec/moneta/proxies/weak_each_key/weak_each_key_spec.rb

@@ -0,0 +1,22 @@
+describe 'weak_each_key', proxy: :WeakEachKey do
+  before :all do
+    require 'fog/aws'
+
+    # Put Fog into testing mode
+    Fog.mock!
+  end
+
+  moneta_build do
+    Moneta.build do
+      use :WeakEachKey
+
+      adapter :Fog,
+              aws_access_key_id: 'fake_access_key_id',
+              aws_secret_access_key: 'fake_secret_access_key',
+              provider: 'AWS',
+              dir: 'weak_each_key'
+    end
+  end
+
+  moneta_specs ADAPTER_SPECS.with_each_key.without_create.without_increment.without_concurrent.returnsame
+end

data/spec/moneta/proxies/weak_increment/weak_increment_spec.rb

@@ -0,0 +1,21 @@
+describe 'weak_increment', proxy: :WeakIncrement do
+  before :all do
+    require 'fog/aws'
+
+    # Put Fog into testing mode
+    Fog.mock!
+  end
+
+  moneta_build do
+    Moneta.build do
+      use :WeakIncrement
+      adapter :Fog,
+              aws_access_key_id: 'fake_access_key_id',
+              aws_secret_access_key:  'fake_secret_access_key',
+              provider:               'AWS',
+              dir:                    'weak_increment'
+    end
+  end
+
+  moneta_specs ADAPTER_SPECS.without_create.without_concurrent.returnsame
+end

data/spec/moneta/semaphore_spec.rb

@@ -1,31 +1,15 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
-
-describe_moneta "semaphore" do
-  def features
-    []
-  end
-
-  def new_store
-    Moneta.new(:Memory, logger: {file: File.join(make_tempdir, 'semaphore.log')})
-  end
-
-  def load_value(value)
-    Marshal.load(value)
-  end
-
-  include_context 'setup_store'
+describe "semaphore" do
+  moneta_store :Memory
 
   it 'should have #lock' do
     mutex = Moneta::Semaphore.new(store, 'semaphore')
     mutex.lock.should be true
     mutex.locked?.should be true
     expect do
-     mutex.lock
+      mutex.lock
     end.to raise_error(RuntimeError)
     expect do
-     mutex.try_lock
+      mutex.try_lock
     end.to raise_error(RuntimeError)
     mutex.unlock.should be_nil
     mutex.locked?.should be false
@@ -36,10 +20,10 @@ describe_moneta "semaphore" do
     mutex.enter.should be true
     mutex.locked?.should be true
     expect do
-     mutex.enter
+      mutex.enter
     end.to raise_error(RuntimeError)
     expect do
-     mutex.try_enter
+      mutex.try_enter
     end.to raise_error(RuntimeError)
     mutex.leave.should be_nil
     mutex.locked?.should be false
@@ -81,5 +65,4 @@ describe_moneta "semaphore" do
     end
     semaphore.locked?.should be false
   end
-
 end

data/spec/moneta/stack_file_memory_spec.rb

@@ -1,39 +1,15 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
-
-describe_moneta "stack_file_memory" do
-  def features
-    []
-  end
-
-  def new_store
+describe "stack_file_memory" do
+  moneta_build do
+    tempdir = self.tempdir
     Moneta.build do
       use(:Stack) do
         add(Moneta.new(:Null))
         add(Moneta::Adapters::Null.new)
-        add { adapter :File, dir: File.join(make_tempdir, "stack_file_memory") }
+        add { adapter :File, dir: File.join(tempdir, "stack_file_memory") }
         add { adapter :Memory }
       end
     end
   end
 
-  def load_value(value)
-    Marshal.load(value)
-  end
-
-  include_context 'setup_store'
-  it_should_behave_like 'features'
-  it_should_behave_like 'multiprocess'
-  it_should_behave_like 'not_create'
-  it_should_behave_like 'not_increment'
-  it_should_behave_like 'null_stringkey_stringvalue'
-  it_should_behave_like 'null_pathkey_stringvalue'
-  it_should_behave_like 'persist_stringkey_stringvalue'
-  it_should_behave_like 'persist_pathkey_stringvalue'
-  it_should_behave_like 'returndifferent_stringkey_stringvalue'
-  it_should_behave_like 'returndifferent_pathkey_stringvalue'
-  it_should_behave_like 'store_stringkey_stringvalue'
-  it_should_behave_like 'store_pathkey_stringvalue'
-  it_should_behave_like 'store_large'
+  moneta_specs ADAPTER_SPECS.without_increment.without_create
 end

data/spec/moneta/stack_memory_file_spec.rb

@@ -1,39 +1,13 @@
-# coding: binary
-# Generated by generate-specs
-require 'helper'
-
-describe_moneta "stack_memory_file" do
-  def features
-    [:create, :increment]
-  end
-
-  def new_store
+describe "stack_memory_file" do
+  moneta_build do
+    tempdir = self.tempdir
     Moneta.build do
       use(:Stack) do
         add { adapter :Memory }
-        add { adapter :File, dir: File.join(make_tempdir, "stack_memory_file") }
+        add { adapter :File, dir: File.join(tempdir, "stack_memory_file") }
       end
     end
   end
 
-  def load_value(value)
-    Marshal.load(value)
-  end
-
-  include_context 'setup_store'
-  it_should_behave_like 'concurrent_create'
-  it_should_behave_like 'concurrent_increment'
-  it_should_behave_like 'create'
-  it_should_behave_like 'features'
-  it_should_behave_like 'increment'
-  it_should_behave_like 'multiprocess'
-  it_should_behave_like 'null_stringkey_stringvalue'
-  it_should_behave_like 'null_pathkey_stringvalue'
-  it_should_behave_like 'persist_stringkey_stringvalue'
-  it_should_behave_like 'persist_pathkey_stringvalue'
-  it_should_behave_like 'returnsame_stringkey_stringvalue'
-  it_should_behave_like 'returnsame_pathkey_stringvalue'
-  it_should_behave_like 'store_stringkey_stringvalue'
-  it_should_behave_like 'store_pathkey_stringvalue'
-  it_should_behave_like 'store_large'
+  moneta_specs ADAPTER_SPECS.returnsame
 end

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

@@ -0,0 +1,44 @@
+require 'faraday'
+require 'rack'
+require 'rack/moneta_rest'
+require 'webrick'
+
+class MonetaRestServerShutdown < StandardError; end
+
+def start_restserver(port)
+  server = Rack::Server.new(
+    :app => Rack::Builder.app do
+      use Rack::Lint
+      map '/moneta' do
+        run Rack::MonetaRest.new(:Memory)
+      end
+    end,
+    :environment => 'none',
+    :server => :webrick,
+    :Port => port,
+    :AccessLog => [],
+    :Logger => WEBrick::Log.new($stderr, WEBrick::BasicLog::ERROR)
+  )
+
+  Thread.start { server.start }
+
+  begin
+    Faraday.get("http://127.0.0.1:#{port}")
+  rescue Faraday::ConnectionFailed
+    tries ||= 5
+    tries -= 1
+    if tries > 0
+      sleep 0.1
+      retry
+    else
+      raise
+    end
+  end
+
+  server
+end
+
+def stop_restserver(server)
+  server.server.shutdown
+end
+

data/{spec/action_dispatch/session_moneta_store_spec.rb → test/action_dispatch/session_moneta_store_test.rb}

@@ -20,11 +20,11 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
     end
 
     def get_session_value
-      render text: "foo: #{session[:foo].inspect}"
+      render plain: "foo: #{session[:foo].inspect}"
     end
 
     def get_session_id
-      render text: "#{request.session_options[:id]}"
+      render plain: "#{request.cookies['_session_id']}"
     end
 
     def call_reset_session
@@ -144,7 +144,7 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
 
       get '/get_session_value'
       assert_response :success
-      assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
+      assert_nil headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
     end
   end
 
@@ -157,7 +157,7 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
 
       reset!
 
-      get '/set_session_value', _session_id: session_id
+      get '/set_session_value', params: {_session_id: session_id}
       assert_response :success
       assert_not_equal session_id, cookies['_session_id']
     end
@@ -183,7 +183,15 @@ class MonetaStoreTest < ActionDispatch::IntegrationTest
   def with_test_route_set
     with_routing do |set|
       set.draw do
-        get ':action', to: ::MonetaStoreTest::TestController
+        scope module: "moneta_store_test" do
+          controller "test" do
+            get 'set_session_value'
+            get 'get_session_value'
+            get 'call_reset_session'
+            get 'get_session_id'
+            get 'set_serialized_session_value'
+          end
+        end
       end
 
       @app = ActionDispatch::MiddlewareStack.new do |middleware|