From ce4be347862e415c32cc2eaab8aebb322d52ba3b Mon Sep 17 00:00:00 2001
From: Jeremy Aube <jjaube@gmail.com>
Date: Thu, 23 Apr 2020 17:03:27 -0400
Subject: [PATCH 1/3] Fixes issue where the contents of hidden sheet was
 returned when parsing visible sheets only.

---
 lib/roo/excelx.rb             |   7 +++++--
 spec/lib/roo/excelx_spec.rb   |  10 +++++++++-
 test/.DS_Store                | Bin 0 -> 8196 bytes
 test/files/hidden_sheets.xlsx | Bin 6152 -> 10296 bytes
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 test/.DS_Store

diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb
index f9f0ee26..25194614 100755
--- a/lib/roo/excelx.rb
+++ b/lib/roo/excelx.rb
@@ -60,15 +60,18 @@ def initialize(filename_or_stream, options = {})
       @filename = local_filename(filename_or_stream, @tmpdir, packed)
       process_zipfile(@filename || filename_or_stream)
 
-      @sheet_names = workbook.sheets.map do |sheet|
+      sheet_indicies = []
+      @sheet_names = workbook.sheets.each_with_index.map do |sheet, index|
         unless options[:only_visible_sheets] && sheet['state'] == 'hidden'
+          sheet_indicies << index
           sheet['name']
         end
       end.compact
       @sheets = []
       @sheets_by_name = {}
       @sheet_names.each_with_index do |sheet_name, n|
-        @sheets_by_name[sheet_name] = @sheets[n] = Sheet.new(sheet_name, @shared, n, sheet_options)
+        sheet_index = sheet_indicies[n]
+        @sheets_by_name[sheet_name] = @sheets[sheet_index] = Sheet.new(sheet_name, @shared, sheet_index, sheet_options)
       end
 
       if cell_max
diff --git a/spec/lib/roo/excelx_spec.rb b/spec/lib/roo/excelx_spec.rb
index 1b67a4db..7cc9b13e 100755
--- a/spec/lib/roo/excelx_spec.rb
+++ b/spec/lib/roo/excelx_spec.rb
@@ -86,6 +86,14 @@
     end
   end
 
+  describe 'for a workbook with hidden sheets' do
+    let(:path) { 'test/files/hidden_sheets.xlsx' }
+
+    it 'returns the cell contents from the visible sheet' do
+      expect(Roo::Excelx.new(path, only_visible_sheets: true).cell('A', 1)).to eq "visible sheet 1"
+    end
+  end
+
   describe '#parse' do
     let(:path) { 'test/files/numeric-link.xlsx' }
 
@@ -653,4 +661,4 @@
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/test/.DS_Store b/test/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e96db6ad84257d06adf55e118f1a12155a054028
GIT binary patch
literal 8196
zcmeHMTWl0n7(QPqFhhqj1(dQbxKN;=HM9jmL}BR`1Sz(%EiF)4W_JddFrBG0vs<vD
z4KLn;@xgdOjba2fyn-0KJP3)#=z~JMh8N@Ikr%uqM&p0ZnI*J^2NGj2%t_|_XU=~)
zbH4MPIs4Bt#?VqUn;5HQj45<+saH{TnZot_8dWNyo=TD+f5w9RK+vCey!<HJxFbd&
zMj%EYMj%EYM&Q~&fX-}Qlq;P3QXAJX0x<&DB?A2YkfMvrbR>tQ6t51dL<&HXrvRc*
zoALnRlZs?Il0#AoSBfdK2Sl!jQVd9U(x<pN$#f)#q?GOq(w!k18BvA;F*^CBggHZ6
z%D9dZh!Gf#0N*}i*$!qihgrk&_h0k<jva)Jjo+YROy$^d;}vy6m0DF@r9P0|<qc#*
zBP<3jhM&`uS=+SohTm<Q;jT{0UF}#U%We1DjL`D8a^p_VbI3rpjr=Ct8p!EWGoBk7
zwrlw!o{Z7kZM&v7(Bc(cGZ6MsaMA8C!d(<csY@FvF&9-)b9(LI;G*W{riRoVP5T;B
zgG-k-Hl!9WTC#7SswmUz*KFKY-2e2!m)<yh<js#x2``4|Ey8N#{l)q;wJw3f2}&9H
zIiuoa8IJERfkT^^SiA1t^=(>CpIo9zwfBd%=LVZBKOmXYCj~V5bp_Au@GY+IE_hC{
z&kb^VO~G&qMTZbt<v3aUA&dGZ1qI)8oDMIrd6>;Tp|vOEx>2g0ErI8U84;|<rufoI
zF9y~|i-OuEtCd0rI@F`p(~`61-m-A<vK5)Llk}R&Q>JR#76RK1?H#t|cMb4W+iU~{
z%QbCxXLrdC?7U-jx<;R+pI24kR69M9=qcvy2a9&NSFckP(K};iLhChYpbehMgPHnq
zMcU7vnMiEqnv8EzZAK3B>JwULKr_;f$ne$%P3zoEYpw^;P>oGmqRTPzmZO`h9Ow2W
zTB5roLDknsop&zR5<La4ua9OD)Sw~iUYSlLw(*hMj38|9w_JLvPom*l>8Unz-73@M
z&qO?WrdO<eU3$LcKwX&%V*YjMMtQH&@ic=qvsTu|wlkj%vIFb|c8DEg@30f>6#I;Q
z&Cao3*m-t={l<Q0e*l;O4HHp~X_$j~sK<OX;cl$JO02~Ow4(#}V+(RHkVgRye1s^X
zgh%lhp1_lM3eVydyoN(~9Y=8z@8bh}h>!6FzQh@v#X0<p^SFS&<Rey;IelMw3R2>4
zlEXP2eWI&)_41rf-or_K4RiY2YDwf9Zk(2yyWqCwrFX5m$b=DVKa8H2GE&e`@=Wlr
z%rCL-XNm7OC1+?imv_U+UD8F2we~2ScKUc}Jv%u^A*ShyxYg>DRVr-<sjE*mD2iSo
zH4BqXD)C<*BXx_lB?>WJA1k%XwB;)81-(*gS7>R4D6fx`+KjeZrA?``e~Y@GvNP-l
zqV1nx7>6oMK`mxs0TyBz5jBkrTCqlubtAIq!nTO8yNR%U@URDaF^Grp2$A-2LD~a&
z4$tF79K_2wj3ampZxelw;W$p<U83=OIE~No6~4!hBZ#|U1aW^FPTW$~cOB2&NxfyN
z4|j;~t`31Q(!7@E|EsV3{r~EM#?~<cF#`W91W?(UZEc}PzS3)z=h`W{w$sH6w;PgD
wxKJh1agscr;QEVy7*abG^`#>@BqeF6{O2D6qF<!(`7eID#^=9a;q_Pj1BX;Of&c&j

literal 0
HcmV?d00001

diff --git a/test/files/hidden_sheets.xlsx b/test/files/hidden_sheets.xlsx
index 78eccaa601cdc1f8029f1132a639c5d33b7972b9..b61589ca230bad18524a62a31352e501d7896115 100644
GIT binary patch
literal 10296
zcmeHtg;yMD`gP+@aCdha3&Dd2cY?dSy99R#F2Ows?gR^N!QI_0xWlhAyYpoxll}gI
z-Rjd-r%%;$Pru#wKKjZ_K|o>vpaHM|0Du(WWtD<u4h8^ZLjeHj09bHMVOtv~V;d)3
zWp_JcM{OoIYb%mmNN}2L066IR{~iCuzreSI6^jlaM$ZY1XGq+_m<VAcONq|m$QIQ%
zzSq;~^LlB4>AM$4u6WLoW3;&yOYAlMx2?Kzakj5?IH)v*ULRSt-!=ELRum}B55r%*
z^d7KP4_45ijH;He;2^<|VPX!RsD=4fJa5pxkMo#;qBcGHW^*{8Aax)}Ow0p`ZOxb~
znGGdC=R_=FSge92rW6_<i8wnB0lm5x(|h?nB(SgQeyC&mv);I8o)m7FGDGRzTAVH6
zE0sbHHOrW{f$bti!aV0q?RCdN8t66tR%F6nNl5ykiKxU(-&Qg{oIjEgCX{`0f*VMT
z2<HAe2J;@?^4%;>rr7cuYu823hY14=^W7}m{Kqy5FN)sPEIX}dRPp@t7i4^LD{&N#
zdJw=eq}9e4eKfvJtwF#(2ef2(HH6p9a<AaE8CtryWCEbqRUaGI+WA-lR%r4&CZ2Zk
z$zbgG?q;3v2UmFIkoq^b+;@-w!1FT%K>lwEtyKY%Uw~*Q4H6&%NTIq8##WBZOh3;5
zQ|5oM9RITPk~kT;P9S3N$(x6ezU!%__b5VAu7YoxNR@rwNi4pojmo3IUuvT!KvBjE
zfDrd>@p%|nSmKS^?<2ihXD^9B!{8yWb1e-{zO#3Rp`&t060<K^>q2#zx}3U76_<3U
zacPO6``l2RBh|k`E;ey0Qi(Fc^cD{ey?`JXi!aqrqen)4+2E!OY)VM!s5H2uo-=zt
ze&mDiOj6+<l0Ybz^x=3aW}l;h>0FstpB3rlEuM;!8JBs5L8b#YnY*r$)z@>84{hj=
zUW~HoeTro4Xg91Q;=PpFm%bV`?5Ben?p>U4ouB)@_xnc>7cYZ?)jvhD4EIO_4!Sc5
z0RZ3uV8Pt1nE#~{S6c^516y0mAA#&o&47WT8R*&n?xQ(=!~(>bo|Ax<fH80TI2+>x
z?v_Zwa?NW1mBRXH*UO|UYFmML;V-ZInR2iLC?328MvETTicY$)p)E30-c!=T))ai!
zSfIIi)xyskKr&r7o>5(__u60B-nZVjQ`Yf8r0|j=H=GhGc<v-We_XGe)}F{ZeUj-S
z%@7xF&)Iz%X@FOzp7mksok1aObfUjq$x9O1fSBQD%cd_jQeO63rZGw7YJIlY!$v4v
z;rpW`^eGw?z5P^ST_ok5o1DS@$$C}zokmi?1rGhb-FH(wAt^#%N-U;z{M|J$gF~2t
zec%zJF5@0I(yj>P;FymMX?tDgL(-QFP7!{`AUgLp$a#>9?S%#aUVx|pV$ff?ldrNM
zy8%S;)-``_Kl7|ylA=MSrNa;@Fb-<qC*!ooXAaA#&Cm(FxhABRG2bie5}M++@8NPZ
z+5UEMW0Y!Y#uS;TA(}!c9~l_#Og6>PaqWs-$}cu;pZHyx9(66T;>PIv<HD)Xhn=wL
z5m-P%l-<4-Dw@HD^5!DZt`JRybZviQKxrzfCQdv02l%zK$QoLtH^T)T971ON{y9ZT
zxDm0@gIY9i18`#PVJ@uc5EinxPQ_OpY%&LPF%Oynp<&<hHC3{4w(MVJ(puk81XLuK
zgd{<?f<52_6)d@dPh@`9>JiiAbA|!PSd4p~vPt4BNVGc$zz_@Xqmgfq&)9ViKxP?X
zT2=US0>#=QdtPfKstUbXrXKUax3T7Zl{p~IJ2@`eOyhI5_?E7dW@9>odOVDxBcx&q
zq4NA|Lbo|BTLtU9F`+axK9??jLMSaWn=6cv&FY#S3PG*s69uec3YR{H>$)^O47XPA
zrOJ@Xtm#MSpgjE3rUbFqhJLLis%q{8XJIYdOriz-WYWiska9k7<Y$=7)c&v07+5sW
zVNTJqh@|R_2ChBV1p)^QiTV7#TZUgg-YWx?&|exfyFj-;x?MoPI}Gl~6QKxJ9WPgo
z`0hw_QyIxI=dF76A<v0gc9|7%96F1auDOTQ(i~;6zTD3mJ6@xQH1r2fH#_ZpIV0lk
zSX$PVe(N=-hJz%P+C1i#bMRtS>CVR7s+?a>V1p=MZI(0YhEaoGGI3WlFaY^TSoyPw
z?<9g=Q*lWQtNll8xnAOrS=#ViQhpA^R3u{2ayAba{=(Y9s4*Go5j^~UEiuJM=HhN4
z$Hj%7U|C7JF1vAzty9HN%Tt&iKk+dc$H6)ugaBU^GpG=LqCLreZSD*pNB8J8Ne5;H
zS%<>lumdr!fqG;%Iu>od=7Y@X3pYm(3${~9`C+8n>WD3S%$dxkHM0*eNKYV=|I?AS
zW23an!T<n0BtPnbKV;x!W^8TD{KuK)hZ{XqABw=|#Aw656F_uyec;%Lp<G@av5H@!
zFv>_EsI5CxP-SC{YsN<hr{ua+q{%Nx7P93_7=I0c)N&C6M^Up!JVre<OJ2G~@xe+`
z!v!fq{Hdj==sMHK<J{?Vyd}j$JO!a6E=jjl{){g@ayErxBFWeC6%D(W+?#|*RAV@s
zTLgv&sf8>b2UP2R*xp%)TM?_ABw`7!1v;#5*x=ZPuO_ejR;VI--*k{?Vf7La1}vvw
z(HAI|;*iJP==dARdwR2yk{==^O8R<!Y?fPNi4{VMq*;0Usgg3Ma-*|KC^TqS@tBZw
z{!BlUg@<U}bNreH4b8{wmhy22yPg?qOqEJx3tC;+Ci|JSQCiPSZOrj(uiavt1U5j!
zvp^T37{uR$M~$|+@gguYcK^h}x>@dnM4R{eNb+}6IZba*R0gq@M|HKU8wo$f1kGeC
z`&I-KBYs&GMJN}f<=5&A$uKE0J($VH(ADgmkvh_mufMRA7m;vi2xbbZwQy~m$298L
zjYeNa3=nLIqa9IrkM#LaQAt{jjB`sP@|cw$@D5y&LSntY8&Pf)wyGh5hHJHJfpP*C
z%{CZ~O0Pkg7D-a&rkvmJsgOLp4#=9HsI3>KhOc<#X3*6yUH3qrJ;h1FoXO|;^nLF<
zq>az_V)wRFx2mz0PRa&`Qc3A}Dn|GD@ezAjx9#cs{we3)B=u=WSKGtwU~=2@DfeZ?
z`XVNCtM}R2UOe`S_vMaU4B`9&0b$B_(y+?!Wow2fR1x}q$oHpU0vTOEp{}^ssJkx3
z$Af*~I+`T=9nKX;9Sa0%Jy6ZOZI*Lih))|SqEpMoDxnq)BVBM@xmQ1>4SxS_mnppz
zf8H3@6gC=bdCVkP0=V8`%YM7AI2To6yp0r&7FPJGeO#%nQaF<EbCYoB)(ju(x^zX@
z#W6~GK<EUeu!A0@B2$g9LFizIF-hS3+0e3ed1tZZ6rYz7xjyK70DVF~ZuJbBF)17>
za*42T5Vl4bZL&J}wu@7hF;j?mgwvki88QS)ZF7fQ;t96FBW@ty6KQw7jFWQM9dC@l
zVT<K+nT?X?b)1)u>+ABNLM9cBbq$cf_KKO~5#bXikgsA{tcR=Xcr+nvfZDW3OP~(D
zGae?aY>rHAA;xy{uZS?7=dGKq9SURP;XePEINyY$<P_P1<5|z|s5Yw4Hn`I`_LfX9
zk?>HmguZWB<uY9l%sB3o<ut8BGAzCE^=X22g{iH*zZ(`!80t#?EuP4dr1q<=bY+i>
zXk?jH4)87F&4>xw8K_-gTvMCGK@_aIX|e~_v6r?Ty^n2mub%EQ-%%?hu9pQa$yNQ;
z5Q>7OKd*i;EIcCil7A@Xla@%vXAP_4gb%YHUcP|95L0bIkKc^y9to?WesCQias_jQ
zhKkWVy-(o&Kx4ck;#UoKP0V2FVV1f0)h@2YaoSzQQD^Gr`Tmp1gbshX@vvp;xkk_B
z)uo_CYO|N$0M*IaZl+vw<rW)h!to$fcaxB-H)QizBn+^4LE#H^qXpP7*-aWp3d3Ro
zIpc;sl>jyCe9S1KhOqI{*Yt4dOJz4Us%*pj5NCSKtkKeY*>ks;s0mrq#*!~-9}%G9
zZry0LqJ)zr3wJg6PL@k24}5l&UDcDJY33$y^rcPk6`XMtbdiNHbW8(v=2F$hoYcnT
z_mgup#O$}=f!3IqZd+HYqAgn?g7bpGCIksPhL}Y)sm+mP@WZKM9`S4+Q^Dj7nAu2T
zoRsFi*t=Uen}2E%&1WQ!bgGU5jsyL%*BE$)lJ3=ezNCgsvdT3YG~zq3?MJ;pwG<_z
zZt$a`QX1{zvAM0afUTz^XScjX-^J;iaf5CopVY+8Rcdg-mB_TYan(=4#jXkwN#NFs
zmmPp+iB0iL=wj4m^i4!!A0x=Mrhoemg<oSM?KM5|2YVDJo<29$c5?IJB^-rJSz^C6
zr82vxPu(koB@}Z69WBIBF)a|>JDjNbYHG~%FwtS}A_5%thgkeRRA9z#-MX&p4VcX|
zhmUh5M3Zwz$h+jG7-e>Fgq3|8lcOibk(*0v&pBY?P5A_I)grgVNjx>+2yMP?TG&mu
zKj{>|7s9iN^!ZG9vWl+2=24c>q0Ex05gBdDU9x#?(mMj89mtsVja5dyS++C0x>{kO
zhK&IhQEu|(jkUAbE56e*YJt9tZyL_884e^fZteyao2N`*T>W@G?0jDpDelS(*(Q_I
z+>PV+CA`#&Sd3SXf?a9mqGo*dp|yfplAL8sz|(I-Q4UbdL9P27<btC*_*kK}?@ae%
zRWDXS3wh$;4opjbRMf@1ymyA_cw>ukC<rwoLR$A5cJ12TdaKr)m;DJUNydHcK(@NI
zi$#!0EgubJi)`NL;WT%UPO0VzlE+fT7y<A17IGxy`6(Ou15Wr_hk8v|3rb_3JoRFj
zL`k0Fdi=-iM-qBNy)9aAqgKGRMN{4LZ|j&P!HYIeP!^g8YRBRH%t9T_jE$Wfng6)3
z{fNQo2`h37K$PAU>LcHZhl-+FSw;8)sQ?t%_D&Q7D^HgUDMS6<)T5{QnrCm*kV0uE
zG;#|oPS+=|6DI5(Q~c6C_>%a-)G?<NdGIJ;ffW|p-Q}7EFsI9XIYBEG+QbPVIur9`
zWy{i#SQ}{-4h@epulD*VfrZ*)bP-7g0ZD_-kmLGhhAG98@jI){c(}2I!#DP1q$60R
zd%WO}bhNAEp#{M`t|$oMo{=k4Rn9zVSmo{JHpIzCuW^>h444ux7GMiRBKC%IS&~LD
zw_7A)8c6UX+7M61WU2UlbMgx+dQt~o#D4pdqFd-YAd8F5w`crR-jOf<twS;xyFuL8
z7J-)Vy2R=QehaG0Vy95!p%d*O?qedaHbnXakRkxmleEmGZl$JAD$Mqkktl;Qn@6Ui
z>Sm>TtAtvUspZ)O&ZDRuRDI3@#+ALlHvzYk%{N24Ho+~(9Au2pQTo7*8h-@&U7zUw
zFT@$rSVn5)=Uy!n&Eb6Brv2$W4Z!^-25&+UTH2g-sjcf5)Sdk_Qex&WkE5<lypbFf
zJQva6(YY-(Y?#~Otjr@FQ=)}YI%t%;V$E<{WvnDx;aL4@ea59j#*&?fSq`O+-D5SY
zsb&=#25Wh}vi2}$Lb~NCZw$iV_IXMsKJ_`&b!<W{ht4PF7}k4%Wi@K|^`JtjMBW-X
zI5^!Mb~tvrNKkb`ytJKnTa2uZf9ha#+-MmKVc;Mld?!ehuhMhli(47DwETHjd9#qA
zoV?`btMmOHS@Z?i!ceTHTD)hT`}rvmmQ*)m)HHj<g!}N-2Z$ZGTjF#c2Ewo>SJXO$
z@JB-OgP581A4SnW^Tj1}lF<s#oqNz5<6nezG}Cu5Hd1nOFt;&v{6SWyVL|u~AWG0$
z%PL{VAxEu$D1|+#8#v!<D=~aCs#-Qi56{nJ>m6Gg8zH83^^?V5JkhBP4BJpN`E(&~
zun~GYed?gQ*J*F4&@~#!JEvu+gViTz(KL%i=cA^zrc!uE93$8VxLo@OUo}N+*9j9h
zh$T$!R?(<(-@eKIv>30Z=D$y?<GJWv$3~EW`nDJ4{Up5#LS8rSV?sT0?8e7--v{*M
z6}6b1B~bI=pDT1mD=CQvNs<;+7$W_9g--5P#(yj=UwOs$0}#b0s|HjS@^Fm4r$m+K
zkcp+Up2&9@*C7OksXV`~i;tDLUvUklKyjWgyn<TE7;;^?ZF2OOko3FyrdFmBoc9@p
zyiiixzPA7SOc7a%z7e4cCZ<LuB5_JL=k2}gM`xIJqWVZKNR$B+w*#$elCC68s*f$>
zNJ<q-mgFBHW~@T35%Ur+1tbL5f$3-xjU9X)LP^gMWFOs^IRrl%3lr)(wlC#$cDzZ7
z2#FdGE`yS{&VyrAz?YGU)Nqs>7uDU2ZDya}pVtOs8gm|!x{5na{|3hhL-E>&P%+^>
zu(h~_qg*5nrSocWFyy>udO%%yKf{593gz-`g`4VK6Wv47i>sou$*0$zbR=j7aYf;h
z)A#kkN^8O#iCP4AdWR5Qoy6D(_gbNjRkIsHByxh7y^(ZZ1;y|8M&A*^;}wVO4L@#N
z^o$B)Q0Ec9Ne0Tz%qx#p2&WdwXTq!UkXYQ99K0>UzbUJAB(ca;O}DAZ?MNOENJpY6
zG7{pwD|}Mb)vM=F<WYZfEpLp|)2Z9hA1D-U5;Ma?<Qq9{*oKQ$dr8Sp5^bjYp1(+3
zXBN@-N{J?$G#bUMWuwFX5~kywdTl4B)6&|5h;y>zFgT||W!iC|C%3JMTZKSn_=%Ah
z|7Flg?EwiZ?<{eP;@ITpZyMKQLZ0p6F2SZZJCA3bUe3B*?F?GO{{0+M{_a&;Q2m=W
zjT)HeK;#pjsO>u>r6oRLclh(F3UHGZf(X8(n^#?|ybd0B+A-iqEZ6S5NVf4bh~Wo7
zcq%1s1e1va3Ys_?9U1Du`}{Xzi}7z|ec$93`-=148m%=L`G1aAr4H&*K!ICq!w{5}
ze7_bo;`>|T7EeQ?e*+Ph3q;)i5KI23=h71t{){C&YCf|Q#qkM3d*fsxD(#)}P(Ncy
zO_2EtD3;Xyh$WH))TYl*t~=G|=TWLgP}34hG3N79G=3T>LeqmRk1hf{c#7-1<p^cc
zNQQT?(V24mK7BJi{0;D5(J3Zvr0GvSpc=|5XEz?CLR-`%^jI99PB5ifGJGeK{Ueri
zuqSgI!IIx&1=C8=>RE_<&bcD&@?R%<bWOBcOe*Zwv`bqEspCQu;|x`ML-}YJsF>Tm
z>!FT6hz-B7oZqYUKB}9iv#2dG>{*xAoVLWi@Pdz`dU$7MEvu5Pr#t$B`-xM3+|Wdy
zvJ?DRVeVc_5{5^$F643rj%Ti2=*wYoVt2}uWM(<JS5c0{)zI|S2iY^Bb@-6t&>#nC
zX2k(2cZSRpwCQ8fEMDBa6UeuA=$~Zt38~e3bA+&acmvmFiqlCZ{lHNzg6zCXSJ5z#
z+rH{8jmT0Vuv!(JSG7&0cc*1)R;?m4Mct7i=t3z-!qd2aet6oc;5;;y5Ez2y*(g=l
z_0v)%Dhlih9KgejQL+P<!h1X{2v`jS!edraY6Q20QTB5RQdLZkq?t2E8!xTyUL|<)
z_m`@pm(Zkd;SpV#a(6uGvnazEvUEdU5^kGwNPq&#DinX{d|{3urx%=VqxQf&DwOfX
zt&^LF*VX!uKq5%h0tzH)Zi|Rj6H7r#SUsM3FVyLHxd9oxZ|I{=pIHs40@_?x7lPTF
z!91z6?8G-L8s*t4O-s5KdzFl&@eNzH#+AmoQ#94dJ?9x2wo!N1PEu=zM`ArE_C??K
zEULV5XAM=D5bN=CtMCXTTd>u~gNyakaYh}=J&0e#=vG0rKMOn99yGSv<Ff%5x6zZa
ziQ2y0(NwDo*TgF|$I`{-T989dH{JBL6C$CA&Jv%UroF0<v2xv&`+YMb5Ozw=AEbcl
z|C~*+{(rNn$`De>p9*-=n|Qj;AWU<~jmJ^l$iG_J@pNr`C9q&7s;Za4J``El8Hi>U
zNNZf3GFJZLZ2%nQ@Ok0p06Q>GZgp4v^hvw*<<-~}Ad@7=o=wAZMHbgF7kX%Ev}SZw
z*0^Mw=y@K>u@p*2jJi}UiK189ac(pkSX-{2@+l6SDN4=4%nPP6yP@|+n^CjA!2A?1
zef!FO4mog)k!)L0;u#|+!Hngx*(`F)G05F^oSdnzXPvpzvL-R?fH|QCWBQfSEoq!O
z_W9t2+#KyjE_KVdXO)zTP<6Hb@8GV*ht{M88<~kmdU>23(Vl8F$r((>TzPGAJ1k#4
z@d}OJ=j+eox0%N#qpjHWg{u{tT<{i@^ckLe#aFm^j&z;h^3k9W$&(ap7O~vv*g<jT
z++&nc&d%f*?)30NUyqojWQRuB2nHfBzqJE{9~xnCzs`#v@@F`3zRs#=(ds5@t2G)X
z)WW&cPHIKYO-PVGEjVlH?zdwdh*L<5x*y`HZiQ|v=KB&T6eRm0NiKO6vhGz6mvk>F
ztUd<ax^xZV3SAw|3S{b64FSu-PP0Mo4V){=>*hX?7!H9K4va5WEV;XPIt_}^tSUD_
zVwg5p$>-A4KLckLu^t?))NFmnyvSs<5$aFZ<HgFw#l3{@7Cp<<Z{(&o^5G?sz{X)d
z@h&UpGQPK2QBNLd&KOWLfb(1~Q)0B^i5V5Xn6Tv>h)LXFBcR=t%CC3N<p5#nV9IXG
zzua!{v7x}8b7=jD*OX`HtGn0}%np{6c<!Thpml(OZ*Sk-M%~SCJ-1;OuRsx~KCl4Y
zMFCASjBE|%9c=9!nf2}Le()7E_xs-r1C)xT$IDoPn)1OX2#+tsuEk^(CE=<D#$EdL
z2cg$ZMn17eiyHTv6;jRVwpGcXn>HQl+n%4E?We|49KVPf<PJ3pV4n3#szz)^?z!`B
z*BP*#ab*xzT&BV1#W;lRJKmbYt_;fwdV>X&!XiRYMX#kFR+t&3NiV3A%b@ELQ;^)q
z4Ea=rM-<>=`xRYx^Oi9L!jDt0Y$2W$pYSc=WBEt8FFT#u?pEj(7{(-9k_+#en@}Ip
z!^*7>N>meil1Ef~-{s^Us+%9s>Sgc|vcGCCVvU8K_4kQMie|<3N((PlMJ5`bt5QT3
z{O%}NB6#V!M1!vo9<54f2G1gVPjBtgUiCI;6dk)nX^c)TtT{QVAEgP4b|8ziRUhd!
zjT>5IH)*;>QDsZ)px}FdDSca@e|`_8fq6gJQ}Ii>aox~lrFB33O+x$WX`Js1nGXB~
zyr;(u^KW6E<)s<0vY-iFlHWhSd$4)LZ>=$QQ-&l?wo}Jg&=3XgEz2f5(S<tC`#QDs
z3zt3+eGA!k%=6`KIz8ySJz~(^-s6zA@XrzmdjO@&|IDXt8RX`yLFCQ=IcC(qlH1VM
z!T5jd2GRQ8hnJ$ZTqg;JH|MDUdvm>f9WJFdwm=ok1{!+3nU`?GLK@~g;C{C)xvJD<
z?52-zhiI7Vy$tfFNEbaTg*_HYbbqqZ+_)f}s4)ZnC|d<1!kM__#9$VSuelOF-icvp
zVFO=3f3yIW0r1@^ty7D8&5pE&fOQ5);R{`CH89DE3X8XS>T78cNV;H!fs1-j(Nf2+
zY@jy2D2Y%@&~o>CSPqboKn0^=n3>wA<==!He5JYH5qj+*t<q3<l`89UKd(s89_?Kr
zD!zDf-S2~9<@QYbl+w~1RBWHKPzIUJ8}APXv8Y0oWnUe}y7-~yC~@&iDzk_BJ1?^{
zQ($)5uFpLb?h{fyKD3MIy{tPP&eGTlW-cK!B(8h)A<j``^9!P^ZKVXIxM%|*L+*5?
z0a#=5vpMdjS=%9EnElNYT~SE`*2q0QSvdUVO7<h#Oei5@%9+olzLx|}&29)mPI>Ql
z&xE&DKtJ}sI0^>N2&!Ozzc1>~zvR#BZ+1z^OZ^?-@7p&1H2iVR1$p(qY~uLU@b9DS
zzZ(7+P5$S>_OCd<4m5uv!NL7wy!or~uVbK}#wdut9SZ#l@M|OMCqN8ntn}~U>Ob0A
z|3LYryYLg`HP#;}|L8URituao{u6-=`(FtEua^JS^w;|7r|AOjZ<p{#HT5gXuQ}*X
zlqG`SqWqDO{)+PVjNm5*0FX!w0Q{OC{A&Gom-|<12eQ9d|LK6`rJz7e0{{?zyg+2d
JqWtmc{{ZHN+}8jA

literal 6152
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
Kn%j~fR{sIvMS$V}


From 3009f6f853382eea9e7a19d267b98b466a7afe78 Mon Sep 17 00:00:00 2001
From: Jeremy Aube <jjaube@gmail.com>
Date: Tue, 4 Aug 2020 15:05:44 -0400
Subject: [PATCH 2/3] Deletes unnecessary file.

---
 test/.DS_Store | Bin 8196 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test/.DS_Store

diff --git a/test/.DS_Store b/test/.DS_Store
deleted file mode 100644
index e96db6ad84257d06adf55e118f1a12155a054028..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMTWl0n7(QPqFhhqj1(dQbxKN;=HM9jmL}BR`1Sz(%EiF)4W_JddFrBG0vs<vD
z4KLn;@xgdOjba2fyn-0KJP3)#=z~JMh8N@Ikr%uqM&p0ZnI*J^2NGj2%t_|_XU=~)
zbH4MPIs4Bt#?VqUn;5HQj45<+saH{TnZot_8dWNyo=TD+f5w9RK+vCey!<HJxFbd&
zMj%EYMj%EYM&Q~&fX-}Qlq;P3QXAJX0x<&DB?A2YkfMvrbR>tQ6t51dL<&HXrvRc*
zoALnRlZs?Il0#AoSBfdK2Sl!jQVd9U(x<pN$#f)#q?GOq(w!k18BvA;F*^CBggHZ6
z%D9dZh!Gf#0N*}i*$!qihgrk&_h0k<jva)Jjo+YROy$^d;}vy6m0DF@r9P0|<qc#*
zBP<3jhM&`uS=+SohTm<Q;jT{0UF}#U%We1DjL`D8a^p_VbI3rpjr=Ct8p!EWGoBk7
zwrlw!o{Z7kZM&v7(Bc(cGZ6MsaMA8C!d(<csY@FvF&9-)b9(LI;G*W{riRoVP5T;B
zgG-k-Hl!9WTC#7SswmUz*KFKY-2e2!m)<yh<js#x2``4|Ey8N#{l)q;wJw3f2}&9H
zIiuoa8IJERfkT^^SiA1t^=(>CpIo9zwfBd%=LVZBKOmXYCj~V5bp_Au@GY+IE_hC{
z&kb^VO~G&qMTZbt<v3aUA&dGZ1qI)8oDMIrd6>;Tp|vOEx>2g0ErI8U84;|<rufoI
zF9y~|i-OuEtCd0rI@F`p(~`61-m-A<vK5)Llk}R&Q>JR#76RK1?H#t|cMb4W+iU~{
z%QbCxXLrdC?7U-jx<;R+pI24kR69M9=qcvy2a9&NSFckP(K};iLhChYpbehMgPHnq
zMcU7vnMiEqnv8EzZAK3B>JwULKr_;f$ne$%P3zoEYpw^;P>oGmqRTPzmZO`h9Ow2W
zTB5roLDknsop&zR5<La4ua9OD)Sw~iUYSlLw(*hMj38|9w_JLvPom*l>8Unz-73@M
z&qO?WrdO<eU3$LcKwX&%V*YjMMtQH&@ic=qvsTu|wlkj%vIFb|c8DEg@30f>6#I;Q
z&Cao3*m-t={l<Q0e*l;O4HHp~X_$j~sK<OX;cl$JO02~Ow4(#}V+(RHkVgRye1s^X
zgh%lhp1_lM3eVydyoN(~9Y=8z@8bh}h>!6FzQh@v#X0<p^SFS&<Rey;IelMw3R2>4
zlEXP2eWI&)_41rf-or_K4RiY2YDwf9Zk(2yyWqCwrFX5m$b=DVKa8H2GE&e`@=Wlr
z%rCL-XNm7OC1+?imv_U+UD8F2we~2ScKUc}Jv%u^A*ShyxYg>DRVr-<sjE*mD2iSo
zH4BqXD)C<*BXx_lB?>WJA1k%XwB;)81-(*gS7>R4D6fx`+KjeZrA?``e~Y@GvNP-l
zqV1nx7>6oMK`mxs0TyBz5jBkrTCqlubtAIq!nTO8yNR%U@URDaF^Grp2$A-2LD~a&
z4$tF79K_2wj3ampZxelw;W$p<U83=OIE~No6~4!hBZ#|U1aW^FPTW$~cOB2&NxfyN
z4|j;~t`31Q(!7@E|EsV3{r~EM#?~<cF#`W91W?(UZEc}PzS3)z=h`W{w$sH6w;PgD
wxKJh1agscr;QEVy7*abG^`#>@BqeF6{O2D6qF<!(`7eID#^=9a;q_Pj1BX;Of&c&j


From 16d9d28810a1e50e1326bcb1850f591af69e4147 Mon Sep 17 00:00:00 2001
From: Jeremy Aube <jjaube@gmail.com>
Date: Tue, 4 Aug 2020 15:19:13 -0400
Subject: [PATCH 3/3] Simplifies code for constructing excel sheet-related
 instance variables.

---
 lib/roo/excelx.rb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb
index 25194614..83aa9e4b 100755
--- a/lib/roo/excelx.rb
+++ b/lib/roo/excelx.rb
@@ -60,18 +60,16 @@ def initialize(filename_or_stream, options = {})
       @filename = local_filename(filename_or_stream, @tmpdir, packed)
       process_zipfile(@filename || filename_or_stream)
 
-      sheet_indicies = []
-      @sheet_names = workbook.sheets.each_with_index.map do |sheet, index|
-        unless options[:only_visible_sheets] && sheet['state'] == 'hidden'
-          sheet_indicies << index
-          sheet['name']
-        end
-      end.compact
+      @sheet_names = []
       @sheets = []
       @sheets_by_name = {}
-      @sheet_names.each_with_index do |sheet_name, n|
-        sheet_index = sheet_indicies[n]
-        @sheets_by_name[sheet_name] = @sheets[sheet_index] = Sheet.new(sheet_name, @shared, sheet_index, sheet_options)
+
+      workbook.sheets.each_with_index do |sheet, index|
+        next if options[:only_visible_sheets] && sheet['state'] == 'hidden'
+
+        sheet_name = sheet['name']
+        @sheet_names << sheet_name
+        @sheets_by_name[sheet_name] = @sheets[index] = Sheet.new(sheet_name, @shared, index, sheet_options)
       end
 
       if cell_max