mxit-rails 0.1.4 → 0.2.0

data/app/assets/javascripts/mxit_rails/emulator.js

@@ -42,7 +42,7 @@ Emulator = (function() {
       if (MXIT_PATH && (MXIT_PATH != ''))
         Emulator.setUrl(MXIT_PATH);
       else
-        Emulator.setUrl(MXIT_ROOT);
+        Emulator.home();
     },
 
     clearCookie: function() {
@@ -54,7 +54,11 @@ Emulator = (function() {
       if (MXIT_PATH && (MXIT_PATH != ''))
         Emulator.setUrl(MXIT_PATH);
       else
-        Emulator.setUrl(MXIT_ROOT);
+        Emulator.home();
+    },
+
+    home: function() {
+      Emulator.setUrl(MXIT_ROOT);
     },
 
     getUrl: function() {
@@ -119,13 +123,27 @@ Emulator = (function() {
     },
 
     collapse: function() {
-      $('#phone').removeClass('collapse');
-      $('#fadeout').show();
+      $('body').removeClass('collapse');
     },
 
     expand: function() {
-      $('#phone').addClass('collapse');
-      $('#fadeout').hide();
+      $('body').addClass('collapse');
+    },
+
+    expandCollapse: function(val) {
+      if (val) {
+        if (val == 'expand')
+          localStorage.setItem('expanded', true);
+        else
+          localStorage.removeItem('expanded');
+      }
+
+      var expanded = localStorage.getItem('expanded');
+      if (expanded) {
+        Emulator.expand();
+      } else {
+        Emulator.collapse();
+      }
     },
 
     refresh: function() {
@@ -149,6 +167,13 @@ Emulator = (function() {
         this.activeLink = 0;
       }
       this.focusLink();
+
+      // Look for Rails default stacktrace and expand if it's there.  Otherwise use the localstorage expanded setting
+      if ((Emulator.iframeElement('#env_dump').length > 0) && (Emulator.iframeElement('#session_dump').length > 0)) {
+        Emulator.expand();
+      } else {
+        Emulator.expandCollapse();
+      }
     },
 
     key: function(e) {
@@ -220,6 +245,8 @@ $(function() {
     Emulator.clearCredentials();
   }
 
+  Emulator.expandCollapse();
+
   $('body').on('keydown', $.proxy(Emulator, 'key'));
   $('#phone-input').on('keypress', $.proxy(Emulator, 'submit'))
 

data/app/assets/stylesheets/mxit_rails/emulator.css.scss

@@ -13,7 +13,7 @@ html, body {
   margin: 35px auto 0 auto;
   position: relative;
 }
-#phone.collapse {
+.collapse #phone {
   background: none;
   position: absolute;
   top: 37px;
@@ -31,7 +31,7 @@ html, body {
   position: relative;
   overflow: hidden;
 }
-#phone.collapse #screen {
+.collapse #screen {
   position: static;
   width: 100%;
   height: 100%;
@@ -49,7 +49,7 @@ iframe {
   position: absolute;
   z-index: 1;
 }
-#phone.collapse .content {
+.collapse .content {
   width: 100%;
   height: 100%;
 }
@@ -145,28 +145,20 @@ a.link {
   left: -1px;
   position: relative;
 }
-
-#phone-links {
-  position: absolute;
-  display: block;
-  right: 19px;
-  top: 27px;
-  z-index: 10;
-  width: 90px;
-  height: 40px;
-  text-align: right;
-}
-#phone.collapse #phone-links {
-  right: 1px;
-  top: 5px;
+.home .icon .image {
+  background-size: 21px;
+  top: -2px;
+  left: -1px;
+  position: relative;
 }
+
 #collapse {
   display: none;
 }
-#phone.collapse #expand {
+.collapse #expand {
   display: none;
 }
-#phone.collapse #collapse {
+.collapse #collapse {
   display: inline;
 }
 
@@ -180,7 +172,7 @@ a.link {
   line-height: 30px;
   margin-top: 10px;
 }
-#phone.collapse #phone-input {
+.collapse #phone-input {
   position: fixed;
   bottom: 5px;
   left: 5px;
@@ -200,4 +192,7 @@ a.link {
   right: 0;
   background: -webkit-linear-gradient(90deg, #fff 0%, #fff 5%, rgba(255,255,255,0.95) 15%, rgba(255,255,255,0) 100%);;
   z-index: 10;
-}
+}
+.collapse #fadeout {
+  display: none;
+}

data/app/helpers/mxit_rails_helper.rb

@@ -1,5 +1,27 @@
 module MxitRailsHelper
 
+  def mxit_validation_message
+    @_mxit_validation_messages.first
+  end
+
+  def mxit_table_row *styles
+    str = ''
+    if @_mxit.has_table
+      # Close the previous row if there is one
+      str += "</td></tr>"
+    else
+      # Start a new table
+      str += '<table title="mxit:table:full" style="width:100%" name="main_table" cellspacing="0" cellpadding="0">'
+      str += '<colgroup span="1" width="100%"></colgroup>'
+    end
+    @_mxit.has_table = true
+
+    # Start the new row
+    style = mxit_style *styles
+    str += "<tr><td style=\"#{ style }\">"
+    str.html_safe
+  end
+
   def mxit_link route, label, variables=nil
     unless variables.nil?
       var_strings = []

data/app/views/emulator/index.html.erb

@@ -21,6 +21,7 @@
       .in > .icon .image  { background-image: url(<%= image_path("mxit_rails/in.png");  %>) }
       .out > .icon .image { background-image: url(<%= image_path("mxit_rails/out.png"); %>) }
       .refresh > .icon .image { background-image: url(<%= image_path("mxit_rails/refresh.png"); %>) }
+      .home > .icon .image { background-image: url(<%= image_path("mxit_rails/home.png"); %>) }
     </style>
 </head>
 <body>
@@ -34,6 +35,12 @@
       <a id="link" class="go link" onclick="Emulator.enterCredentials()">Set Credentials <span class="icon"><span class="image"></span></span></a>
     </div>
 
+    <div id="phone-links">
+      <a id="home" class="home link" onclick="Emulator.home()"><span class="icon"><span class="image"></span></span></a>
+      <a id="refresh" class="refresh link" onclick="Emulator.refresh()"><span class="icon"><span class="image"></span></span></a>
+      <a id="expand" class="out link" onclick="Emulator.expandCollapse('expand')"><span class="icon"><span class="image"></span></span></a>
+      <a id="collapse" class="in link" onclick="Emulator.expandCollapse('collapse')"><span class="icon"><span class="image"></span></span></a>
+    </div>
     <div id="inputs">
       <input type="text" placeholder="Mxit ID" id="mxit-id-input" />
       <input type="text" placeholder="MSISDN" id="msisdn-input" />
@@ -43,11 +50,6 @@
   </div>
 
   <div id="phone">
-    <div id="phone-links">
-      <a id="refresh" class="refresh link" onclick="Emulator.refresh()"><span class="icon"><span class="image"></span></span></a>
-      <a id="expand" class="out link" onclick="Emulator.expand()"><span class="icon"><span class="image"></span></span></a>
-      <a id="collapse" class="in link" onclick="Emulator.collapse()"><span class="icon"><span class="image"></span></span></a>
-    </div>
     <div id="screen">
       <iframe id="center" class="content" onLoad="Emulator.updateIframe()"></iframe>
     </div>

data/app/views/layouts/mxit.html.erb

@@ -23,22 +23,11 @@
 
 <body style="<%= mxit_style :body %>">
 
-  <table title="mxit:table:full" style="width:100%" name="title_table" cellspacing="0" cellpadding="0">
-    <colgroup span="1" width="100%"></colgroup>
-    <tr>
-      <td style="<%= mxit_style :title %>">
-        <b><%= yield :title %></b>
-      </td>
-    </tr>
-  </table>
-
-  <%= yield :navigation %>
-
-  <% if !@_mxit_validated %>
-    <%= @_mxit_validation_messages.first %>
-
-  <% else %>
-    <%= yield %>
+  <%= yield %>
+
+  <% if @_mxit.has_table %>
+    <!-- Close the table if there is one -->
+    </table>
   <% end %>
 
   <% if @_mxit.input %>

data/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
 
-  match '/emulator(/*path)', :controller => 'emulator', :action => 'index'
+  if Rails.env.development?
+    match '/emulator(/*path)', :controller => 'emulator', :action => 'index'
+  end
 
 end

data/lib/mxit_rails/descriptor.rb

@@ -23,6 +23,8 @@ module MxitRails
     attr_accessor :input
     attr_accessor :input_label
 
+    attr_accessor :has_table
+
     def initialize name, action, parent=nil
       @parent_descriptor = parent
       @name = name.to_sym

data/lib/mxit_rails/engine.rb

@@ -1,7 +1,4 @@
 module MxitRails
   class Engine < ::Rails::Engine
-    initializer "precompile", :group => :all do |app|
-      app.config.assets.precompile += %w( mxit_rails/emulator.js mxit_rails/emulator.css mxit_rails/included.css )
-    end
   end
 end

data/lib/mxit_rails/page.rb

@@ -30,7 +30,12 @@ module MxitRails
     end
 
     def get_mxit_header_field key
-      request.headers[key] || cookies[key.downcase]
+      output = request.headers[key]
+      # Only allow cookie-based headers in development
+      if Rails.env.development?
+        output ||= cookies[key.downcase]
+      end
+      output
     end
 
     def get_mxit_info

data/lib/mxit_rails/version.rb

@@ -1,3 +1,3 @@
 module MxitRails
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/test/dummy/app/controllers/form_controller.rb

@@ -18,6 +18,8 @@ class FormController < ApplicationController
 
       step :surname do
         input :surname, 'What is your surname?'
+
+        @name = params[:name]
       end
 
       step :age do
@@ -37,7 +39,7 @@ class FormController < ApplicationController
 
       submit do
         logger.info "Form Completed!\nname: #{params[:name]};  surname: #{params[:surname]};  age: #{params[:age]}\n******\n\n"
-        redirect! '/mxit/index/success'
+        redirect_to '/index/success' and return
       end
     end
   end

data/test/dummy/app/controllers/welcome_controller.rb

@@ -18,10 +18,10 @@ class WelcomeController < ApplicationController
 
     submit do
       if params[:phone_number] == '1234567890'
-        redirect! :easter_egg
+        redirect_to '/welcome/easter_egg' and return
       end
       logger.info "This won't execute if an error occurred or if error! or redirect! was called"
-      redirect! '/mxit/index/success'
+      redirect_to '/index/success' and return
     end
   end
 

data/test/dummy/app/views/form/index/age.html.erb

@@ -1,4 +1,11 @@
-<%= content_for :title do %>Step 3 of 3<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>Step 3 of 3</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Back' %>
 
 <p>Great!  The last thing we'll need before we can finish the process is your age.</p>
+
+<% if mxit_validation_message %>
+  <p><%= mxit_validation_message %></p>
+<% end %>

data/test/dummy/app/views/form/index/done.html.erb

@@ -1,7 +1,10 @@
-<%= content_for :title do %>Confirm<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>Confirm</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Back' %>
 
 <p>That's it.  Please just confirm your information below:</p>
 <p>First name: <b><%= @name %></b></p>
 <p>Surname: <b><%= @surname %></b></p>
-<p>Age: <b><%= @age %></b></p>
+<p>Age: <b><%= @age %></b></p>

data/test/dummy/app/views/form/index/name.html.erb

@@ -1,4 +1,12 @@
-<%= content_for :title do %>Step 1 of 3<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>Step 1 of 3</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Back' %>
 
 <p>Hi there!  To get started, we'll need your first name.</p>
+
+<% if mxit_validation_message %>
+  <p><%= mxit_validation_message %></p>
+<% end %>
+

data/test/dummy/app/views/form/index/start.html.erb

@@ -1,4 +1,11 @@
-<%= content_for :title do %>The Form<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>The Form</b>
 
-<p>Please take a minute to complete this fast, simple form.</p>
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Back' %>
+
+<p>Please take a minute to complete this fast, simple form.</p>
+
+<% if mxit_validation_message %>
+  <p><%= mxit_validation_message %></p>
+<% end %>

data/test/dummy/app/views/form/index/surname.html.erb

@@ -1,4 +1,11 @@
-<%= content_for :title do %>Step 2 of 3<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>Step 2 of 3</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Back' %>
 
 <p>Thanks <%= @name %>.  Next we'll need your surname.</p>
+
+<% if mxit_validation_message %>
+  <p><%= mxit_validation_message %></p>
+<% end %>

data/test/dummy/app/views/index/index.html.erb

@@ -1,7 +1,9 @@
-<%= content_for :title do %>Templater<% end %>
+<%= mxit_table_row :title %>
+<b>Templater</b>
 
+<%= mxit_table_row %>
 <p>This is the root of the dummy app...</p>
 
-<p><%= mxit_link '/mxit/welcome', 'Single-page form' %><p>
-<p><%= mxit_link '/mxit/form', 'Multi-step form' %><p>
-<p><%= mxit_link '/mxit/index', 'An extra link' %><p>
+<p><%= mxit_link '/welcome', 'Single-page form' %><p>
+<p><%= mxit_link '/form', 'Multi-step form' %><p>
+<p><%= mxit_link '/index', 'An extra link' %><p>

data/test/dummy/app/views/index/success.html.erb

@@ -1,4 +1,7 @@
-<%= content_for :title do %>Success!<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit', 'Done' %><% end %>
+<%= mxit_table_row :title %>
+<b>Success!</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/', 'Done' %>
 
 <p>Your information was successfully received.</p>

data/test/dummy/app/views/welcome/easter_egg.html.erb

@@ -1,4 +1,7 @@
-<%= content_for :title do %>Easter Egg<% end %>
-<%= content_for :navigation do %><%= mxit_nav_link '/mxit/welcome/index', 'Back' %><% end %>
+<%= mxit_table_row :title %>
+<b>Easter Egg</b>
+
+<%= mxit_table_row %>
+<%= mxit_nav_link '/welcome', 'Back' %>
 
 <p>This is the awesome easter egg :-)</p>