From 5aba3471fea4ab86bae1f270edeb49e53b085e9a Mon Sep 17 00:00:00 2001
From: Jonathan Abbett <jonathan@act.md>
Date: Thu, 5 Jan 2017 13:43:48 -0500
Subject: [PATCH] Feature: Automatically skip steps with missing attachTo
 elements, resolves #6

---
 .gitignore                                      |   4 ++++
 app/views/application/_abraham.html.erb         |   4 ++++
 lib/abraham/version.rb                          |   2 +-
 test/dummy/config/tours/dashboard/home.en.yml   |   6 ++++++
 test/dummy/config/tours/dashboard/home.es.yml   |   6 ++++++
 test/dummy/db/development.sqlite3               | Bin 40960 -> 0 bytes
 test/dummy/db/test.sqlite3                      | Bin 40960 -> 0 bytes
 .../controllers/dashboard_controller_test.rb    |   3 +++
 8 files changed, 24 insertions(+), 1 deletion(-)
 delete mode 100644 test/dummy/db/development.sqlite3
 delete mode 100644 test/dummy/db/test.sqlite3

diff --git a/.gitignore b/.gitignore
index 6cbbd99..5e2f246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,12 @@ capybara-*.html
 .rspec
 /log
 /tmp
+/test/dummy/log
+/test/dummy/tmp
 /db/*.sqlite3
 /db/*.sqlite3-journal
+/test/dummy/db/*.sqlite3
+/test/dummy/db/*.sqlite3-journal
 /public/system
 /coverage/
 /spec/tmp
diff --git a/app/views/application/_abraham.html.erb b/app/views/application/_abraham.html.erb
index 9b34c20..dea6365 100644
--- a/app/views/application/_abraham.html.erb
+++ b/app/views/application/_abraham.html.erb
@@ -32,6 +32,10 @@
     text: "<%= step['text'] %>",
     <% if step.key?('attachTo') %>
     attachTo: { element: "<%= step['attachTo']['element'] %>", on: "<%= step['attachTo']['placement'] %>" },
+    showOn: function() {
+      // Only display this step if its selector is present
+      return document.querySelector("<%= step['attachTo']['element'] %>") ? true : false
+    },
     <% end %>
     buttons: [
     <% if index == 0 %>
diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb
index c05f56d..a5c6429 100644
--- a/lib/abraham/version.rb
+++ b/lib/abraham/version.rb
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Abraham
-  VERSION = '1.1.1'
+  VERSION = '1.2'
 end
diff --git a/test/dummy/config/tours/dashboard/home.en.yml b/test/dummy/config/tours/dashboard/home.en.yml
index 34c8cfc..0de045a 100644
--- a/test/dummy/config/tours/dashboard/home.en.yml
+++ b/test/dummy/config/tours/dashboard/home.en.yml
@@ -6,6 +6,12 @@ intro:
       title: "ENGLISH This step has a title"
       text: "ENGLISH This intermediate step has some text"
     3:
+      title: "ENGLISH A missing step"
+      text: "ENGLISH Refers to an element that won't exist on the page, should skip to 4"
+      attachTo:
+        element: "#i-dont-exist"
+        position: "right"
+    4:
       title: "ENGLISH The final step"
       text: "ENGLISH Some text here too, and it's attached to the right"
       attachTo:
diff --git a/test/dummy/config/tours/dashboard/home.es.yml b/test/dummy/config/tours/dashboard/home.es.yml
index ff645c0..7077862 100644
--- a/test/dummy/config/tours/dashboard/home.es.yml
+++ b/test/dummy/config/tours/dashboard/home.es.yml
@@ -6,6 +6,12 @@ intro:
       title: "SPANISH This step has a title"
       text: "This intermediate step has some text"
     3:
+      title: "SPANISH A missing step"
+      text: "Refers to an element that won't exist on the page, should skip to 4"
+      attachTo:
+        element: "#i-dont-exist"
+        position: "right"
+    4:
       title: "SPANISH The final step"
       text: "Some text here too, and it's attached to the right"
       attachTo:
diff --git a/test/dummy/db/development.sqlite3 b/test/dummy/db/development.sqlite3
deleted file mode 100644
index 2b24f4f03e066049f6035b27d2f23cbd201ec613..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40960
zcmeI*&2QUe90zc}Bu>+Ic_ySOr!p%QV$qf~j}zzZG7LmjMVG$N3aT9}FL|~Yl6Z66
zY6x-YChq$qxNw0p9Jp}eUzj*?fFW^#0|&-|$4OrtJ1HI7fo5MTah>O}fB8KhKd$uD
zFMWS&-S(Jz*KvE6rxu0Ff+z}asj46d3;aFL-^Y`}7h=aB_)jsgJZ*77$o(9@ME(|%
z^FIjWCiy1yM(WSS=Zjx1CKqg8gb4x=fB*y_009U<00RF_;BYCKNPn;*9vXJP%^nVC
zrgg`)I#$o@*aOdTZ8k8SzPW$DZF#J1T3)1j{+;cHvC~l3n(sC~R5Rxal2JFBY9<mY
zqh8CLep4oUxHNap{8}!XmS6JR`JDziBfr2(Jio+?<mb4i-HtSR?#1#O2Kl%AMk{4E
z6(xQBy12)8T9*wTbor>o9IyxbtltWMOdMsgW4yiIP($lp>svi`gKwFA^kzJfURe<z
ze>RL6X-uR*8H+o4m)q?O?>#$>)yB5ExxIGF*xpm$YwW4U?#{+qlLxrfXzr-Z4gTI;
zU%#PdT29|{oo<)8rk`0xJ+RzX$8vd<)$(lKU&F<ovmae|xGRr5?Y_tEF?Z}+PWn_v
z^?Sc(_gJt#&{L!J*~6xsNb9=z=;la@?|c3gZr|#fJ?2?Fpk+-ci-o)<tl}RfAG1$R
zT78mJ5RX$FSl#_Gn?To%Cd@ZDyFsflC4E~Lh2a5y)IqF$&pA5aCnRdpNiB>&6o*~t
z@am{rwmPh5nLYcSYx%owFbEe&<0O%K-{XL}1HSRuCRsyL(z`3unh*(W(nyiaf6>M+
z@tH(^707cw!vp~cKmY;|fB*y_009U<00Izzz{M80EJ<0dK+BZUDlHW&x+aSfDflP&
zCGyN4|3ACf4Mg@3fB*y_009U<00Izz00bZa0SLS%XT|a1zZ8>6vf!Wp7s=NGe_?_E
z1Rwwb2tWV=5P$##AOHafK;Zu&up!2mmkopU4{X=z_gLR+vjf(3?)!`W_&!Hzj#gEw
z*R^t8tL3$dR?xKRHU9a3k^C<37bXZm00Izz00bZa0SG_<0uX=z1ZG7bB`+rfe?IWf
z|0}7qK)xck$$aYD)JOaSCI~<P0uX=z1Rwwb2tWV=5O`Gtwv;*H>Xo!?7;S6Nx#L)F
zyW{j2f9#*@h>t%Voln+sw5Dpsx>l|0g*>H|Vu?<#X~u^k=O%?bK0mEdRV&mrTGtBs
zTCGs66sFfSW9N!TYjvI0i>18Iv#S&X@j^8l@-Ut_DZkzE%}SMeNy}GD<ytiqFj%uC
zO*fRk`!N(!uj}P}t)dsI)#){x;xME%DM$H9XuG1HWU*YSRLaw9M%VxI=l|j9f3M21
zjdnr+0uX=z1Rwwb2tWV=5P-le3tSQ96*2lRE&S{M74lRdzmT8EZ{#oXl>9Nv3}_n!
zAOHafKmY;|fB*y_009U<V73GjvMlmTHI$e<C&v9*EY1sdWxt$XejvqVDJef0jsI5#
zKKlQjd_g`ZcggB(IiNKVfB*y_009U<00Izz00bZaftM!mx@-&|ub-onZi-M&t7$HJ
zk3&3E9l9|g7Of86W*|?f4%|#2Ey+f5`t|=9|G%_8fItv{00bZa0SG_<0uX=z1RyZ`
M0;gl}3pW1$2eLBXzyJUM

diff --git a/test/dummy/db/test.sqlite3 b/test/dummy/db/test.sqlite3
deleted file mode 100644
index 2b032ab31926fdee30ecb2727e2a534bc46bba9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40960
zcmeI)zi$&~7zgn8Y{$-pBnLxf7L>QgP%H@H>^gxg^a>{$HF0Qg1Q9}~7yC_es(lCN
z*AWa1hN=TnnV33Nf~jK%CjJ4sR_fTL6(fjF9eK}o{3GWxL7j}hR;--g_r2H8^SSq4
z<^1|`?YmV+aJudJRVHYT93_fEzM_;6qRQu#eC|JzawD<-LjG2Iwxc#xGXHvFX8ISR
zPQ4<tf6o3e^UuuX>E}oOp1w8p>d4PgyP+Hc5P$##AOHafKmY<C5NH%8Q|WwOd3aH<
z+ZE1y+i?Z=T~@KHT(B||Y*3kcX~Qy$7A=}zuUb?e)I_JJ^zZq7o$fKew99;2STEAT
z=IScFy0NlmZfwzSt*tXu-(!_J@3fKyC7(0F%Qh1_mG94mQ{|nVWqtilP#RI6xuPc1
zH}eW{+%mscyIYZerrWG8yyk0rP@uLksC4RHGL>FfP#SYhm|AI<SD9UPc6=rr&#i?D
zQvD>M`oLq4`!%_9C)-Y1y(Sqml}v9gM5Pew*fv5%lk%u18Yd=F>FY8BvzdDv;I_|p
zS=HWkYQpm!Ub8*d?uxR5)yZ~ND}~F}4XPii6P>OX<d`_vRRGX^Cq2_RkvL?0%@N_r
zp;-=fI&tXux}6M(ucwiWFa9y{HAiG9zQo7H*B;i9em&<#=4vdNK7Cr*YK_m<NU!m`
zb?%mUd*JWCjQ5Sr1C^&-R^?}8)6By!l;)U!^q@5v96W-d>|%ZW4nE{gS*I(7qIJdE
z=pE(M+$^rI6l4c$RzXe-?a3iH|2<duUZui)JBX}vvdAh{3eLSyvGD5QwmpZE26NgD
z?@mGgdzP7zCs<6gh-PWeJ}|?g8Uhf200bZa0SG_<0uX=z1RyZp0yi2@eto(<N#^F}
z6w_S0e@*y~yORxX#Iom%#d*V+H_lTdznnX_oV###$;fAo3(+;#AN}#$Pkys^wcER~
z-+Ol>x{K(V;QC+DUK9C)2LvDh0SG_<0uX=z1Rwwb2tWV=BQ0=Ti7zBVUwT-s{P=J1
z1^<}#l4virzeYMm1P=iSKmY;|fB*y_009U<00I#BL<K&Nn~CU^{bRpB-X7kfd;R~G
zX#Z(%KT#&61px>^00Izz00bZa0SG_<0uUHCfyua%hy|Yvq~dC#d;O2~|8W}#$QJ?-
zfB*y_009U<00Izz00c%yVEF3(;nx3K_y4~k+MChI8<9c)0uX=z1Rwwb2tWV=5P$##
zATUhes1nNrcMKSYao+ecx0KHY_x~&M;vd)l!`x5@0SG_<0uX=z1Rwwb2tWV=5Evza
zWATjIfBoND|9?TW7o(I1Vub(%AOHafKmY;|fB*y_009V$gTOb+#L3T0le>G4@3~d(
z3c+il|9=5y7nk!(XBU^UStA!+(^~(3N3?h2;D#I_009U<00Izz00bZa0SG_<0%IaD
L8$YS`d~Wa_z)x&s

diff --git a/test/dummy/test/controllers/dashboard_controller_test.rb b/test/dummy/test/controllers/dashboard_controller_test.rb
index 183c6e5..c684713 100644
--- a/test/dummy/test/controllers/dashboard_controller_test.rb
+++ b/test/dummy/test/controllers/dashboard_controller_test.rb
@@ -31,6 +31,9 @@ class DashboardControllerTest < ActionDispatch::IntegrationTest
       assert element.text.include? 'step-1'
       assert element.text.include? 'step-2'
       assert element.text.include? 'step-3'
+      assert element.text.include? 'step-4'
+      # Generates a showOn option
+      assert element.text.include? 'showOn:'
       # it will post the right completion information
       assert element.text.include? "controller_name: 'dashboard'"
       assert element.text.include? "action_name: 'home'"