rack-webconsole-pry 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-webconsole-pry (0.1.6)
+    rack-webconsole-pry (0.1.7)
       json
       multi_json (>= 1.0.3)
       pry

data/lib/rack/webconsole.rb

@@ -51,7 +51,9 @@ module Rack
       #
       # @param [String] value key code used at keypress event to start web console.
       def key_code=(value)
-        value = value.to_s unless value.is_a?(String)
+        value = [value] unless value.kind_of?(Array)
+        value.map! {|v| v.to_i }
+        value = MultiJson::encode(value)
         @@config[:key_code] = value
       end
     end

data/lib/rack/webconsole/assets.rb

@@ -33,13 +33,14 @@ module Rack
         end
 
         # Regenerate the security token
-        Webconsole::Repl.reset_token
+        token = Webconsole::Repl.reset_token(self, env)
 
         # Expose the request object to the Repl
         Webconsole::Repl.request = Rack::Request.new(env)
 
         # Inject the html, css and js code to the view
-        response_body.gsub!('</body>', "#{code}</body>")
+        c = code(token)
+        response_body.gsub!('</body>', "#{c}</body>")
 
         headers['Content-Length'] = response_body.bytesize.to_s
 
@@ -53,10 +54,10 @@ module Rack
       # secure.
       #
       # @return [String] the injectable code.
-      def code
+      def code token
         html_code <<
           css_code <<
-          render(js_code, :TOKEN => Webconsole::Repl.token, :KEY_CODE => Webconsole.key_code)
+          render(js_code, :TOKEN => token, :KEY_CODE => Webconsole.key_code)
       end
 
       private

data/lib/rack/webconsole/repl.rb

@@ -13,19 +13,28 @@ module Rack
     #
     class Repl
       @@request = nil
-      @@token   = nil
+      @@tokens = {}
 
       class << self
+        def clear_tokens
+          @@tokens.each_pair do |k, v|
+            @@tokens.delete(k) if v <= Time.now
+          end
+        end
         # Returns the autogenerated security token
         #
         # @return [String] the autogenerated token
-        def token
-          @@token
+        def token_valid? token
+          clear_tokens
+          @@tokens.keys.include?(token)
         end
 
         # Regenerates the token.
-        def reset_token
-          @@token = Digest::SHA1.hexdigest("#{rand(36**8)}#{Time.now}")[4..20]
+        def reset_token(app, env)
+          clear_tokens
+          token = Digest::SHA1.hexdigest("#{rand(36**8)}#{Time.now}")[4..20]
+          @@tokens[token] = Time.now + 30 * 60
+          token
         end
 
         # Returns the original request for inspection purposes.
@@ -111,7 +120,7 @@ module Rack
       private
 
       def check_legitimate(req)
-        req.post? && !Repl.token.nil? && req.params['token'] == Repl.token
+        req.post? && Repl.token_valid?(req.params['token'])
       end
     end
   end

data/lib/rack/webconsole/version.rb

@@ -2,6 +2,6 @@
 module Rack
   class Webconsole
     # rack-webconsole version number.
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/public/webconsole.js

@@ -10,81 +10,71 @@
     e.preventDefault();
   });
 	
-	function componentToHex(c) {
-	    var hex = c.toString(16);
-	    return hex.length == 1 ? "0" + hex : hex;
-	}
-
-	function rgbToHex(r, g, b) {
-	    return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
-	}
 	var prevStyle = {
 		color: "#ffffff",
 		bold: false,
 		underline: false
 	}
+	
+	// colors
+	var colors = {
+		30: "#eeeeee",
+		31: "#ff6c60",
+		32: "#a8ff60",
+		33: "#ffffb6",
+		34: "#96cbfe",
+		35: "#ff73fd",
+		36: "#c6c5fe",
+		37: "#eeeeee"
+	}
+	var boldColors = {
+		30: "#7c7c7c",
+		31: "#ffb6b0",
+		32: "#ceffac",
+		33: "#ffffcb",
+		34: "#b5dcfe",
+		35: "#ff9cfe",
+		36: "#dfdffe",
+		37: "#ffffff"
+	}
+	
+	function resetBashStyle()
+	{
+		prevStyle = {
+			color: colors[37],
+			bold: 'normal',
+			underline: 'none'
+		};
+	}
 	function bashColorToHtml(bcolor)
 	{
-		// colors
-		var textColor = rgbToHex(238, 238, 238);
-		var boldColor = rgbToHex(255, 255, 255);
-		var strColors = "[0;30m 238 238 238 \
-		[1;37m 255 255 255 \
-		[0;34m 150 203 254 \
-		[1;34m 181 220 254 \
-		[0;32m 168 255 96 \
-		[1;32m 206 255 172 \
-		[0;36m 198 197 254 \
-		[1;36m 223 223 254 \
-		[0;31m 255 108 96 \
-		[1;31m 255 182 176 \
-		[0;35m 255 115 253 \
-		[1;35m 255 156 254 \
-		[0;33m 255 255 182 \
-		[1;33m 255 255 203 \
-		[1;30m 124 124 124 \
-		[0;37m 238 238 238";
-		var colors = {};
-		var boldColors = {};
-		var matcher = /\[([0-9;]+)m\s+(\d+)\s+(\d+)\s+(\d+)/gm;
-		while ((r = matcher.exec(strColors)) != null) {
-			components = r[1].split(";")
-			if (components[0] == "0")
-				colors[components[1]] = rgbToHex(parseInt(r[2]), parseInt(r[3]), parseInt(r[4]));
-			else
-				boldColors[components[1]] = rgbToHex(parseInt(r[2]), parseInt(r[3]), parseInt(r[4]));
-		}
 		// set values
-		all = bcolor.split(/;/g)
-		if (all.indexOf("0") >= 0 && all.indexOf("0") > 0) // ignore anything before 0, since 0 resets
+		var all = bcolor.split(/;/g)
+		if (all.indexOf("0") > 0) // ignore anything before 0, since 0 resets
 			all.splice(0, all.indexOf("0"));
 		if (all.indexOf("0") >= 0)
-			prevStyle = {
-				color: textColor,
-				bold: false,
-				underline: false
-			};
+			resetBashStyle();
 		if (all.indexOf("1") >= 0)
-			prevStyle['bold'] = true;
+			prevStyle['bold'] = 'bold';
 		if (all.indexOf("4") >= 0)
-			prevStyle['underline'] = true;
-		if (prevStyle['bold'])
+			prevStyle['underline'] = 'underline';
+		if (prevStyle['bold'] == 'bold')
 			colorMap = boldColors;
 		else
 		  colorMap = colors;
 		$.each(all, function(idx, val) {
-			if (colorMap[val] != undefined)
-				prevStyle['color'] = colorMap[val];
+			var i = parseInt(val);
+			if (i > 10 && colorMap[i] != undefined)
+				prevStyle['color'] = colorMap[i];
 		});
-		return 'color:'+prevStyle['color']+';font-weight:'+(prevStyle['bold'] ? 'bold' : 'normal')+
-			';text-decoration:'+(prevStyle['underline'] ? 'underline' : 'none');
+		return 'color:'+prevStyle['color']+';font-weight:'+prevStyle['bold']+
+			';text-decoration:'+prevStyle['underline'];
 	}
 	function parseBashString(str)
 	{
 		str = str.replace(/\u001B\[([0-9;]+)m/g, function(fm, sm) {
 			return '</span><span style="'+bashColorToHtml(sm)+'">';
-		});
-		str = str.replace(/\n/g, "<br>");
+		}).replace(/\n/g, "<br>");
 		return '<span>'+str+'</span>';
 	}
   $("#rack-webconsole form input").keyup(function(event) {

data/spec/rack/webconsole/assets_spec.rb

@@ -13,14 +13,13 @@ module Rack
 
     describe "#code" do
       it 'injects the token and key_code' do
-        Webconsole::Repl.stubs(:token).returns('fake_generated_token')
         Webconsole.key_code = "96"
 
         @assets = Webconsole::Assets.new(nil)
-        assets_code = @assets.code
+        assets_code = @assets.code 'fake_generated_token'
 
         assets_code.must_match /fake_generated_token/
-        assets_code.must_match /event\.which == 96/
+        assets_code.must_match /\[96\]/
       end
     end
 

data/spec/rack/webconsole/repl_spec.rb

@@ -15,8 +15,8 @@ module Rack
       it 'evaluates the :query param in a sandbox and returns the result' do
         @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
         env = {}
-        Webconsole::Repl.stubs(:token).returns('abc')
-        request = OpenStruct.new(:params => {'query' => 'a = 4; a * 2', 'token' => 'abc'}, :post? => true)
+        Webconsole::Repl.stubs(:token_valid?).returns(true)
+        request = OpenStruct.new(:params => {'query' => 'a = 4; a * 2'}, :post? => true)
         Rack::Request.stubs(:new).returns request
 
         @repl = Webconsole::Repl.new(@app)
@@ -29,8 +29,8 @@ module Rack
       it 'maintains local state in subsequent calls thanks to an evil global variable' do
         @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
         env = {}
-        Webconsole::Repl.stubs(:token).returns('abc')
-        request = OpenStruct.new(:params => {'query' => 'a = 4', 'token' => 'abc'}, :post? => true)
+        Webconsole::Repl.stubs(:token_valid?).returns(true)
+        request = OpenStruct.new(:params => {'query' => 'a = 4'}, :post? => true)
         Rack::Request.stubs(:new).returns request
         @repl = Webconsole::Repl.new(@app)
 
@@ -47,8 +47,8 @@ module Rack
       it "returns any found errors prepended with 'Error:'" do
         @app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['hello world']] }
         env = {}
-        Webconsole::Repl.stubs(:token).returns('abc')
-        request = OpenStruct.new(:params => {'query' => 'unknown_method', 'token' => 'abc'}, :post? => true)
+        Webconsole::Repl.stubs(:token_valid?).returns(true)
+        request = OpenStruct.new(:params => {'query' => 'unknown_method'}, :post? => true)
         Rack::Request.stubs(:new).returns request
         @repl = Webconsole::Repl.new(@app)
 
@@ -85,12 +85,6 @@ module Rack
     end
 
     describe 'class methods' do
-      describe '#reset_token and #token' do
-        it 'returns the security token' do
-          Webconsole::Repl.reset_token
-          Webconsole::Repl.token.must_be_kind_of String
-        end
-      end
       describe '#request= and #request' do
         it 'returns the request object' do
           request = stub

data/spec/rack/webconsole_spec.rb

@@ -43,13 +43,13 @@ module Rack
         Webconsole.inject_jquery.must_equal true
       end
       it '#key_code accessors' do
-        Webconsole.key_code.must_equal "96"
+        Webconsole.key_code.must_equal "[96]"
         Webconsole.key_code = "97"
-        Webconsole.key_code.must_equal "97"
+        Webconsole.key_code.must_equal "[97]"
       end
       it '#key_code setter cast parameter type' do
         Webconsole.key_code = 96
-        Webconsole.key_code.must_equal "96"
+        Webconsole.key_code.must_equal "[96]"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-webconsole-pry
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3719169181226662823
+      hash: -3970192323891586303
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3719169181226662823
+      hash: -3970192323891586303
 requirements: []
 rubyforge_project: rack-webconsole-pry
 rubygems_version: 1.8.24