Extract the style options into config.web_console.style

rails · Sep 3, 2013 · 88d39b1 · 88d39b1
1 parent 06eeaf8
commit 88d39b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/app/assets/stylesheets/web_console/console_sessions.css.erb b/app/assets/stylesheets/web_console/console_sessions.css.erb
@@ -1,4 +1,4 @@
-<% WebConsole.config.instance_eval do %>
+<% WebConsole.config.style.instance_eval do %>
   body { color: <%= colors.foreground %>; background: <%= colors.background %>; margin: 0; padding: 0; }
 
   .terminal { float: left; overflow: hidden; font: <%= font %>; }

diff --git a/app/views/web_console/console_sessions/index.html.erb b/app/views/web_console/console_sessions/index.html.erb
@@ -1,7 +1,7 @@
 <script>
   var config = {
     terminal: {
-      colors: <%= raw WebConsole.config.colors.to_json %>
+      colors: <%= raw WebConsole.config.style.colors.to_json %>
     },
 
     transport: {

diff --git a/lib/web_console/engine.rb b/lib/web_console/engine.rb
@@ -10,12 +10,15 @@ class Engine < ::Rails::Engine
     config.web_console = ActiveSupport::OrderedOptions.new.tap do |c|
       c.automount          = true
       c.command            = nil
-      c.colors             = 'light'
       c.default_mount_path = '/console'
-      c.font               = 'large DejaVu Sans Mono, Liberation Mono, monospace'
       c.timeout            = 0.seconds
       c.term               = 'xterm-color'
       c.whitelisted_ips    = '127.0.0.1'
+
+      c.style = ActiveSupport::OrderedOptions.new.tap do |s|
+        s.colors = 'light'
+        s.font   = 'large DejaVu Sans Mono, Liberation Mono, monospace'
+      end
     end
 
     initializer 'web_console.add_default_route' do |app|
@@ -53,7 +56,7 @@ def (c.whitelisted_ips).include?(ip)
     end
 
     initializer 'web_console.process_colors' do
-      config.web_console.tap do |c|
+      config.web_console.style.tap do |c|
         case colors = c.colors
         when Symbol, String
           c.colors = Colors[colors] || Colors.default

diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
@@ -27,7 +27,7 @@ class Application < Rails::Application
       config.web_console.timeout = 45.seconds
     end
 
-    config.web_console.colors =
+    config.web_console.style.colors =
       if ENV['SOLARIZED_LIGHT']
         'solarized_light'
       elsif ENV['SOLARIZED_DARK']