web-console-rails3 0.2.0 → 0.3.0

data/test/dummy/log/test.log

@@ -2120,3 +2120,332 @@ Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (33.5ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 13ms (Views: 12.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#pending_output as HTML
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 1.9ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 200 OK in 2ms (Views: 1.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 3ms (Views: 2.9ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 422 Unprocessable Entity in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Filter chain halted as :prevent_unauthorized_requests! rendered or redirected
+Completed 401 Unauthorized in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.2ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.1ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.2ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+   (0.2ms)  begin transaction
+SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
+Connecting to database specified by database.yml
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (34.3ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 11ms (Views: 9.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.1ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#pending_output as HTML
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 200 OK in 1ms (Views: 0.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 3ms (Views: 2.8ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 422 Unprocessable Entity in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Filter chain halted as :prevent_unauthorized_requests! rendered or redirected
+Completed 401 Unauthorized in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.3ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (33.8ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 11ms (Views: 10.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#pending_output as HTML
+Completed 200 OK in 1ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.0ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 200 OK in 2ms (Views: 0.8ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 3ms (Views: 2.9ms | ActiveRecord: 0.0ms)
+Processing by WebConsole::ConsoleSessionsController#input as HTML
+Unpermitted parameters: id
+Completed 422 Unprocessable Entity in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 2ms (Views: 2.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Filter chain halted as :prevent_unauthorized_requests! rendered or redirected
+Completed 401 Unauthorized in 1ms (Views: 0.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by WebConsole::ConsoleSessionsController#index as HTML
+Completed 200 OK in 3ms (Views: 2.2ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/models/console_session_test.rb

@@ -5,72 +5,40 @@ module WebConsole
     include ActiveModel::Lint::Tests
 
     setup do
-      reset_persistent_storage!
-      @model1 = @model = new_valid_model
-      @model2 = new_valid_model
+      PTY.stubs(:spawn).returns([String.new, String.new, Random.rand(20000)])
+      ConsoleSession::INMEMORY_STORAGE.clear
+      @model1 = @model = ConsoleSession.new
+      @model2 = ConsoleSession.new
     end
 
-    test 'consequential ids on creation' do
-      assert_equal 1, @model1.id
-      assert_equal 2, @model2.id
-    end
-
-    test 'populates output on save' do
-      model = new_model
-      assert_nil model.output
-      model.save(input: 'puts "foo"')
-      assert_match %r{foo}, model.output
-    end
-
-    test 'populates prompt on save' do
-      assert_not_nil @model.prompt
-    end
-
-    test 'preserved models can be found' do
-      id = @model.tap(&:save).id
-      assert_equal @model, ConsoleSession.find(id)
-    end
-
-    test 'trying to find a model fails if no longer in storage' do
-      assert_raises(ConsoleSession::NotFound) { ConsoleSession.find(0) }
+    test 'raises ConsoleSession::NotFound on not found sessions' do
+      assert_raises(ConsoleSession::NotFound) { ConsoleSession.find(-1) }
     end
 
     test 'find coerces ids' do
-      id = @model.tap(&:save).id
-      assert_equal @model, ConsoleSession.find("#{id}")
+      assert_equal @model.persist, ConsoleSession.find("#{@model.pid}")
     end
 
     test 'not found exceptions are json serializable' do
-      exception = assert_raises(ConsoleSession::NotFound) do
-        ConsoleSession.find(0)
-      end
+      exception = assert_raises(ConsoleSession::NotFound) { ConsoleSession.find(-1) }
       assert_equal '{"error":"Session unavailable"}', exception.to_json
     end
 
+    test 'can be used as slave as the methods are delegated' do
+      slave_methods = Slave.instance_methods - @model.methods
+      slave_methods.each { |method| assert @model.respond_to?(method) }
+    end
+
     test 'persisted models knows that they are in memory' do
       refute @model.persisted?
-      @model.save
+      @model.persist
       assert @model.persisted?
     end
 
     test 'persisted models knows about their keys' do
       assert_nil @model.to_key
-      @model.save
-      assert_equal [1], @model.to_key
-    end
-
-    test 'supports json serialization' do
-      rails3 = Rails::VERSION::MAJOR == 3
-
-      with_dummy_adapter do
-        model = new_model
-        expected_nil_json = "{\"id\":3,\"input\":null,\"output\":null,\"prompt\":\"#{rails3 ? ">>" : "\\u003E\\u003E"} \"}"
-        assert_equal expected_nil_json, model.to_json
-
-        model.save(input: 'puts "foo"')
-        expected_json = "{\"id\":3,\"input\":\"puts \\\"foo\\\"\",\"output\":\"foo\\n=#{rails3 ? ">" : "\\u003E"} nil\\n\",\"prompt\":\"#{rails3 ? ">>" : "\\u003E\\u003E"} \"}"
-        assert_equal expected_json, model.to_json
-      end
+      @model.persist
+      assert_not_nil @model.to_key
     end
 
     test 'create gives already persisted models' do
@@ -80,32 +48,5 @@ module WebConsole
     test 'no gives not persisted models' do
       refute ConsoleSession.new.persisted?
     end
-
-    private
-      def new_model(attributes = {})
-        ConsoleSession.new(attributes)
-      end
-
-      def new_valid_model(attributes = {})
-        attributes.merge!(input: 'puts "foo"') unless attributes[:input].present?
-        new_model(attributes)
-      end
-
-      def reset_persistent_storage!
-        ConsoleSession::INMEMORY_STORAGE.clear
-        ConsoleSession.class_variable_set(:@@counter, 0)
-      end
-
-      def with_dummy_adapter
-        previous_method = WebConsole::REPL.method(:default)
-        WebConsole::REPL.module_eval do
-          define_singleton_method(:default) { WebConsole::REPL::Dummy }
-        end
-        yield
-      ensure
-        WebConsole::REPL.module_eval do
-          define_singleton_method(:default, &previous_method)
-        end
-      end
   end
 end