derailed-ziya 2.0.4 → 2.0.6

data/History.txt

@@ -0,0 +1,4 @@
+== 1.0.0 / 2008-03-01
+
+* 1 major enhancement
+  * Birthday!

data/Manifest.txt

@@ -18,6 +18,7 @@
 .git/logs/refs/remotes/origin/master
 .git/objects/00/5dafe13c5c2aa03dba72889caa5f5327ebdbcd
 .git/objects/00/f3bd0a5b954c54cac69aeb58fcc21911f075e1
+.git/objects/02/e2e24292dcedc460e6a9bc265fd7d3cbe12774
 .git/objects/05/0624754a454325bc9ea4519fee6c661041d54e
 .git/objects/05/4c110fac17a5e862931efa94b7f392391acde2
 .git/objects/06/1262ae993b5a644171bf9d34e855e88d094cb1
@@ -31,26 +32,37 @@
 .git/objects/0d/ce21001b368716fe45c3ad70198e0df8fa4e3a
 .git/objects/0e/9e2b6ecaf7d24999f4f272a307e3c13ee2d372
 .git/objects/0e/d43a33a81abc4e8d882c7cab4a577d1b70ff66
+.git/objects/10/317d2ec1c81d7c48346ed5b039ae48ede9da19
 .git/objects/10/a2d6340a89565c5f3d2e7d2a46c4d3e745955e
 .git/objects/11/2367525f183f8a5cdcce1143dab16bc0133b9a
 .git/objects/13/11ab7f0d2d5cd141647f76e644e84d17934b93
 .git/objects/13/58c5e18e13c135a88a3b26459c7cc612bef7cf
+.git/objects/13/8cde0dee025f4ccb0c31217d4e1f56c36cda9e
 .git/objects/15/9a3b758523049cd63283435ac32c4dc470efba
 .git/objects/16/c180bc711cf67686bacaafe96a4c49fd25d27a
+.git/objects/17/10881b4a1460ced951bd5b768ebc0c5d32260b
 .git/objects/18/3f5416cf1b619a3c982049036888d42a15314e
 .git/objects/19/84d29634104afb86aab38acff76629b3052c6f
 .git/objects/1a/05e6f9f7dcea4e427528df477cc4ab64cef4f4
 .git/objects/1a/710ae86f3f4bd81bf1f9aa50bbc08e9328fd19
+.git/objects/1a/e9f93f80f6890334e865da64e72e91b40af185
 .git/objects/1b/5c5134a077026d4a5c19e6ed51ae9d8a84b894
 .git/objects/1b/f36aa549a1635845428cae269951a9e44871ee
 .git/objects/1c/909bd56adc7b47fe505b69243c3d971e5879a2
 .git/objects/1c/9974bf1a58186f120b8eafcabb6203a8579907
+.git/objects/1d/22a4a279a71856e5d40d928ffacccb69804423
 .git/objects/1e/03d884a1f201973313d9fc795beb173ca85008
 .git/objects/20/9892ec0fd94f7f9ddafcd404b687a1b29daeba
+.git/objects/21/2a8a8d425a3cdf40873ae664536c944783fafc
+.git/objects/22/a836d2e01309a72de70d90b8cadaa8fb29c5a4
 .git/objects/24/325e0615f9689d94a296f37ea21a303ce92150
 .git/objects/27/2e94c25ef7702510a0b3536f4006441aa219e8
+.git/objects/27/bf5840c98b934a46312583c49b3c1ca2c6820b
+.git/objects/29/164195268dce70265f34191cf93ac33187d931
 .git/objects/2a/cde3d862632947e5c5c811cfcb0f9bef5165d9
 .git/objects/2b/a7d14485b326d1041428a5c06033b955bfdcb1
+.git/objects/2e/bc44aa7cdc5dc14e5cbc93a195e0cc424bb666
+.git/objects/30/5d9ee5c80cfdf63de692069474e887affa2ba2
 .git/objects/31/669ee8c91ef0739fb31679603e793df94b6492
 .git/objects/31/bbcb7ee218e7f195132b901ecfbae869a05ae2
 .git/objects/31/bd7843a436bef2b30753075ef6cab1f933c1b2
@@ -58,6 +70,8 @@
 .git/objects/32/21fdaac97163e7bbe46d6be44523d4d5cfa2fc
 .git/objects/32/992ec645fa125f57ee4a2aa1bafbd2aae004d4
 .git/objects/32/abd8edef2cc5c993ecca658101c129309487bb
+.git/objects/32/d07f11a9af49398a8aed22368b6799c4d0e92a
+.git/objects/33/7c9c80e807a27c9af155e766f06c07eaa388e8
 .git/objects/34/8c2626cead317b74dcb9b7348dc860fa3a4345
 .git/objects/34/fffbbdcc380b15069f789571c143b52420088b
 .git/objects/36/27ab0fccccbaf28a67d3b3049a2f0a9799b265
@@ -69,7 +83,9 @@
 .git/objects/3e/b0b7d9fb3c58bd91338f33d689065d011f6184
 .git/objects/41/ed6a6903441655a9258021cdbc7e62963d67bb
 .git/objects/41/f8afbfb5dbe3abc46fd1893dcf8d8bb9e15faa
+.git/objects/42/241eba242f67f7d7231803023bb1cdb1d447ba
 .git/objects/42/43d673c2e3f3825f9da9008ff97adacbb03a8f
+.git/objects/42/7c0b5508fecec972323b53508afbc80afe4bbd
 .git/objects/43/ee089c3cdd92a9d040ead8af512edbc43c1f90
 .git/objects/44/56f0bf6a6d82a7c0b1ab8ff4d0a89614d180d0
 .git/objects/45/5e18fc2c8f14a8fffae239745977715d9ba977
@@ -84,7 +100,11 @@
 .git/objects/49/dfcd49270f0c45e21f31ba81665f5420201d13
 .git/objects/49/e23e4fece3df463d1e216b70d5159b87f5e8e2
 .git/objects/49/e894076a99273f2cffabd2ea69931229b1ec09
+.git/objects/4a/01bed5eeb6e2e3f6066cb9dc2dd71a1376d1a1
+.git/objects/4a/2e799c52c0423dc90829d1acbddd7a958839a5
 .git/objects/4b/1c70d5cbde60bd3bb6717b32afc5ec0b4264b0
+.git/objects/4c/ab7aaabe6a7cd2ad5a47a8aea56bdb32af5494
+.git/objects/4c/b186bc25904f1b991f9a5b9360d8ee9041e010
 .git/objects/4d/3e8957b25a5e35eec64e8be07491e3981adefb
 .git/objects/4d/a4ded55776a5a163c6b6fadc5219dac4e9b462
 .git/objects/4d/ec076944bbff6e0b8a51199a8e7e6de56897b1
@@ -94,24 +114,32 @@
 .git/objects/53/47cc429c3682c421285c8c31460b988560910a
 .git/objects/53/ef722701dcca10bdcde2f657aa563393edf383
 .git/objects/54/4b5c80a232db5d194a8fe58dd5d905cf4b9821
+.git/objects/54/c919ffef4cacbce5d60ba585560dec8c467659
 .git/objects/55/2abaf327019eaae07e694b97d459d81aca0c6a
+.git/objects/55/db8d413bf00aabc7999adb00afd196a01a6e51
 .git/objects/57/2ff9a160755a9e8a496f16393b8a23689c4b95
 .git/objects/57/457cd7398fde0285a55c2c07fa96a1a01371f4
 .git/objects/57/edf48136e2087780b7664206aec2fd47630ae0
 .git/objects/58/bc9104547ad86d8ab9c78237567e507da593d1
 .git/objects/59/e7957197204368f417a13eaee74ac3ab3b0980
 .git/objects/5a/7569fb2457afd9b8113f0ab1d05ded78d38241
+.git/objects/5b/31c63d6807e5f161d1231e5346e109238fdd64
 .git/objects/5c/335c5ec654745b93834cec5b31f6bcf96a504d
 .git/objects/5c/fe7b7bd7a7c97c8f10f49e58211dbfc50ff527
 .git/objects/5d/43f2860c3f36ba9fe34b9539a3a7d0ba0b03d4
+.git/objects/5d/458b505c6c2364a0ab96046d02445788effbd8
 .git/objects/5d/e06b82ee0c8bc39a148dbeb15526dd938d9711
 .git/objects/5e/12dd2342bb1d162bbfd3e02bd893301a251458
 .git/objects/5f/d8fa1774b2b59270056a385ca94e67d390978d
+.git/objects/60/2eac9dc1fddb046fcf44c5d68faedd82ef9d57
+.git/objects/60/e4de083d4745f5712ea146883cb6419e7638c4
 .git/objects/61/a9f36a6e6032e766135e3ae0898bf9e98fa844
 .git/objects/61/d57910c713f616645922d04e2f53e9e0742963
+.git/objects/62/0e37edefc5cb274a1837b568579f12f0d6495c
 .git/objects/62/e7ce9ae1cd2da5168cf6e9969152a9df293241
 .git/objects/64/820fa6a489f8bfb3df4285b51c3499cdc28e21
 .git/objects/64/b3a1a8e30d6fd113a0a183152c80e3e7ef3ed2
+.git/objects/64/db304038859ffd707bb3a8e1527ee5f6f492d7
 .git/objects/65/f42ef6efbb62ce352077725859aa3210d0d037
 .git/objects/66/02069058631cc22e0a5e3b0486ac598dff4df6
 .git/objects/67/01f3e70063bc8aa91d61f28bc1bdac690a23ab
@@ -121,6 +149,7 @@
 .git/objects/6b/366153e1938fac82d824cc3c101bc48d06b4ac
 .git/objects/6b/4b1108316c30486bc1d4252464afeba566bbb3
 .git/objects/6c/4aec9fae71936e6577213523fab7280c7abfac
+.git/objects/6d/38aee8373335857008fa77356f538aba6af48a
 .git/objects/6d/48d7a2b9d1489c7e8adc7634028567dd38bb1f
 .git/objects/6e/0cb5ae2d801f0af8be97f3c54b6bd4aeceda2c
 .git/objects/6f/22fded86bc0370e96e762429cae4baed1dd30c
@@ -128,11 +157,13 @@
 .git/objects/74/96bc8a5ae3ee2342196b432b0798b1ac0ff377
 .git/objects/7a/0ccb4c794a5ecdb520f1c70aedabb8a902159a
 .git/objects/7a/9d321125c5547b67fee6edcd3685c6c640f4b6
+.git/objects/7b/6a97db20063704a4e6cec738f4ecbdf5508cbe
 .git/objects/7b/7c321289400939ffd0f9af86c6ec8d23a4dcb8
 .git/objects/7b/bc084d6c80faac624aca316406117072436224
 .git/objects/7c/e16bb5899a8d10bae32b3f96c3ec0076d0730d
 .git/objects/81/835d74d8b1436f18c46538a238f0018bbc46d7
 .git/objects/81/97bcca7fd2d96b6f02625187e4d2be2b261d0f
+.git/objects/81/a8010dcefd013866a2661006fa2c08311d9116
 .git/objects/82/e104075340ce9561b76330d950f3b877d7e76c
 .git/objects/83/305415cb38b7580ef8e2619742264c4d697583
 .git/objects/83/3dd1c8dd4476fa42b3242f610416c8b3ecbe6b
@@ -141,6 +172,7 @@
 .git/objects/89/2b2e3e4f750b72358216eb8543473a6504afd4
 .git/objects/8a/d3d6b62e2f4a2e3fbcb6f947f3318e256de511
 .git/objects/8d/0a7f95bb55b70e4b8ff8fe46796303359ca08d
+.git/objects/8d/3658e559e6e3ed0e06a9364eacbf0d82719255
 .git/objects/8e/c4983249407e0b6402012ddd1a70b70930fc07
 .git/objects/8f/54ed909a0df47cbf9c4d6a89c473eac5a4ef34
 .git/objects/92/758085c0a0a541e417f9393c28f4b9097cca2a
@@ -152,27 +184,40 @@
 .git/objects/99/7f03dc15404690b07658b4d736ca5c782ca98c
 .git/objects/99/be08248c9c320ffe9167fafdcafce2d2a85754
 .git/objects/9c/719a7578206cf9cbc3c027989f860888ffbd56
+.git/objects/9c/9f992b211f4572b869a925bc8d14081280e87c
 .git/objects/9e/bcf4fcf7d300d627dc9268bdfaac8b8e34320e
 .git/objects/a0/e2fd366943a85764c52a0a58f182ae26c9ed55
 .git/objects/a3/3f0b02cfccee08c0fb5a0894da6a873c6d1f77
+.git/objects/a3/5fdda2309e4fc97a2f887e3fc913ca45d2ffb6
 .git/objects/a3/9833d0ed7b53121b78da31e4262d4859c9c34c
 .git/objects/a3/9ad5f9fbf91a0387879654c432a576c9ecd93f
+.git/objects/a3/ebfc700a52cb556d439da73794d0aca6f3e774
+.git/objects/a3/f25a7a120571fa24e994b48b75dc9c4bd57bf9
+.git/objects/a4/8c559554780c8629b810ee57c9ba66e1cf7845
 .git/objects/a5/573e8cfc5af6d5676b201a73eb0f60fdb7b48e
 .git/objects/a5/6b35ba1c24c6f3f971cd87a64dfab00d9090c2
 .git/objects/a6/1528d87b381df0ff5d6a81fdfc5d0137188b00
+.git/objects/a6/fb813c1bbe4b77574ca85f0caba36e14ecd88a
 .git/objects/a8/01aac96e843a4d84d9fa94b018942e293695fe
 .git/objects/a9/d62fb7f4d22460d0a73cb9dcba3e4a1c702863
 .git/objects/ab/489babc57fdeb25306df9e2f4511be2b840a18
+.git/objects/ad/f4c7545ff9b23b9a16a780af00ff34a18edf3d
 .git/objects/ae/b35f284ca0e55ced6182df81b0a8ccef7546a3
 .git/objects/af/27e34f6ef585c6e4b8e29f504d398563746cb9
 .git/objects/af/35a9cbf6d5fffa2a1a7866c719dd6a350be949
 .git/objects/b0/16a41c361dbd6abba5a6a4d3b6c210741c3bd9
 .git/objects/b0/40aea00724838f0ddf68ec658a0a29fcf538e5
+.git/objects/b3/a43292a06509f9d5ee598231e9b1f7c4f32ef9
+.git/objects/b3/f2d207bb43d790f08274a1599c128daf751e4a
 .git/objects/b4/55173a38af0df33dc4e4d47c5e0dc5904525b0
 .git/objects/b6/0be30e423a0226182a3fbddf2bae74c4381d3c
 .git/objects/b6/1a81567bb2df7e67ac564fd7bec34c2584415d
 .git/objects/b9/d37f572ce994aebe2c6adf06faecfba631de00
 .git/objects/ba/48d7f0fe9f95b6db8d8a9154179051128c2922
+.git/objects/bb/49af5d1369941a2eba3b0bb263634ef4f38369
+.git/objects/bb/cc9441da2ed067f9668d3620a4f3a27552d0af
+.git/objects/bc/08b79fa32d8b84d53626e2b20dafd51b74db77
+.git/objects/bc/45a53b565b4de740c51e7a95749a0f00edc255
 .git/objects/bc/a55bc20febe11ae681bad43ff22706abba9662
 .git/objects/be/3387d70b611cba4575643073d279896be9ca5f
 .git/objects/be/ac1440c4feb427a00f12a7a4abd5f2bcb3a3f3
@@ -180,11 +225,14 @@
 .git/objects/bf/22ec08738e91a7bc6ff33e81b9a1fb19008558
 .git/objects/c0/e3861230557f6409bac5a9e27cbc76c0918ab1
 .git/objects/c1/7da230eff31a4473be6fb94e6ea8000a02dfca
+.git/objects/c3/799c6c4fa6728f664ade0ff826bfa573f2397d
 .git/objects/c4/269c01e6627e427519d495a65b0899e6e34972
 .git/objects/c4/4c7e232e4108ba296d0a7767bbedca379befd8
 .git/objects/c5/736daf294c827e40d1a983cafba355be0a517d
 .git/objects/c5/d9ca89678d7a020b3d037ed4a98f99cac2b0a7
 .git/objects/c6/4d0319126e720c1a3371db08023eb7ba5ec37e
+.git/objects/c7/dce0fff8881a72bf94a87cb4b542c44dc8f299
+.git/objects/c9/2bb99942f426d859b0f0c9f4309086485d029e
 .git/objects/cb/09ede42cf0aab3a6a2f88faf77d969dd092957
 .git/objects/cb/3814b73a9fb6954dcd5e5c6bcc98855154fc1f
 .git/objects/cc/799dbed2913a05f0fe1a0bd6e8de6cd3968f31
@@ -192,11 +240,16 @@
 .git/objects/d0/e9d0ae9f944c34e5821956deb9a8a5c40e8be7
 .git/objects/d3/1a90c6ee74dad377ec05bd14e83ac8e8971a11
 .git/objects/d3/bc0ae274d415e2251afc9b2eef076faad75252
+.git/objects/d4/30738d12d781f354b5238a675b853a62243d2f
 .git/objects/d5/141fd8c61733c0f5a7d15de589028917775a33
+.git/objects/d5/b3996fa0a7029741d69bbf68f7a3de25c9dfcf
 .git/objects/d7/3013fb3c829786cee45049087fc3bcb914e03d
 .git/objects/da/54094d26c59a45d7abce957d013d0b0e7edf3e
 .git/objects/da/9993b7b2385ee45046c6edffcfc4f9dd706dc9
 .git/objects/da/a8e4c185e5c3fedfd394410bc72ba37b97a748
+.git/objects/da/b335d0ddbb36855f125805ad4033100dc48de9
+.git/objects/db/329d0c6af78296dff7bdf329f302d8e1a1010a
+.git/objects/dc/58993017f642b86ed6cba18e4ce4009d5729a3
 .git/objects/dd/0dd16990f9e04313393ac5ecda4f3bee14e609
 .git/objects/de/87140bf33b53f08e61da7c01f9323e2e3ca151
 .git/objects/df/d095ebe3587078830a0860847d7bef06bcbd5d
@@ -204,17 +257,24 @@
 .git/objects/e2/0242d302a3901772feb39280e59e6113e738ae
 .git/objects/e2/e851194abf89943c44eea36156cfc81e228dd5
 .git/objects/e3/85d31b72152a9a8132909f97adf62e28c10201
+.git/objects/e3/875c20aa265aed1bbe93707af34e1be4fe2384
 .git/objects/e4/c17d29d1f754e94215350d8e79b9326ccbe234
+.git/objects/e6/9076f984b68e0fe843a25a592a37a4af8a42bc
 .git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
 .git/objects/e7/413f3a7fd0246ec3c6beb5e539d6702b767d18
 .git/objects/e7/429aad6ca0778b3157aff5bdf12a417292a8a4
+.git/objects/e8/c7b0c48adcdcf664a046ad1406d42f8bed4745
 .git/objects/e9/37a8f3b410e581a8218c11bd2d72f623c3f00c
 .git/objects/e9/39f89cc63280f801a49795fd46d2d0de18e0df
 .git/objects/eb/9ecd91bbcc23f5e31d903b3493f343c378918c
 .git/objects/ed/86e9f95e63202686d35020892d2c947ed7aa7d
 .git/objects/ed/c4ff8e01529932ad201c2dd0c218bb70c832aa
+.git/objects/ee/ac01d011da2c52622086d8ab3e9ddb299e384a
+.git/objects/f0/52f3442294de1520f8e757cef6a3476dd391c2
 .git/objects/f0/58537e675806b3b103314b7300e4dd77657c83
+.git/objects/f0/b48a1e84b9076c2c6a4ac641b3b9674319112d
 .git/objects/f1/2fbc659078cedaacffab700252c43489106ff9
+.git/objects/f1/5d7a375c83735f20cea45aa3a32e30e9f72723
 .git/objects/f2/ddcc35798004e1eada7ca3a65c1e5b846342cc
 .git/objects/f3/9601adf9ad7b49b242445403d3da93519955b0
 .git/objects/f3/ff80aedb5984973bd72d426f698e692e70ae95
@@ -222,8 +282,10 @@
 .git/objects/f7/351c172a138824869da7acded429bf94c0c0ef
 .git/objects/f7/40452f3f070440276e289a0a41f77743f076cb
 .git/objects/f9/c9b4a7f2641fa239b6f36b955ba2560593a8b8
+.git/objects/f9/d155ef5a6fd45be0ebff4af70117ffc77f0f2b
 .git/objects/fa/a1b52c7607b406a85351c059813d1b5dc8d55a
 .git/objects/fa/a3225d45f0d7a2665811b673ed3dbeb9724a27
+.git/objects/ff/edbe0dd8107f80cf2113c5308239821e89d1b6
 .git/objects/ff/f5b98a0ff80230e85b2a47e73844ebb8269ebb
 .git/refs/heads/master
 .git/refs/remotes/origin/master
@@ -244,6 +306,7 @@ charts/charts_library/brst.swf
 charts/charts_library/buno.swf
 charts/charts_library/cl3d.swf
 charts/charts_library/clfl.swf
+charts/charts_library/clim.swf
 charts/charts_library/clno.swf
 charts/charts_library/clp3.swf
 charts/charts_library/cls3.swf
@@ -253,6 +316,7 @@ charts/charts_library/dono.swf
 charts/charts_library/lnno.swf
 charts/charts_library/mxno.swf
 charts/charts_library/pi3d.swf
+charts/charts_library/piim.swf
 charts/charts_library/pino.swf
 charts/charts_library/pono.swf
 charts/charts_library/scno.swf
@@ -261,6 +325,7 @@ charts/scripts/output_jpg.php
 charts/sliders/black.swf
 charts/sliders/preview_handle_1.swf
 charts/sliders/preview_handle_2.swf
+charts/ziya.js
 gauges/designs/circle.yml
 gauges/designs/signal.yml
 gauges/designs/thermo.yml
@@ -275,9 +340,12 @@ lib/ziya/charts/bubble.rb
 lib/ziya/charts/candle_stick.rb
 lib/ziya/charts/column.rb
 lib/ziya/charts/column_threed.rb
+lib/ziya/charts/custom.rb
 lib/ziya/charts/donut.rb
 lib/ziya/charts/floating_bar.rb
 lib/ziya/charts/floating_column.rb
+lib/ziya/charts/image_column.rb
+lib/ziya/charts/image_pie.rb
 lib/ziya/charts/line.rb
 lib/ziya/charts/mixed.rb
 lib/ziya/charts/parallel_threed_column.rb
@@ -351,6 +419,7 @@ lib/ziya/utils/logger.rb
 lib/ziya/utils/text.rb
 lib/ziya/version.rb
 lib/ziya/ziya_helper.rb
+release_notes.txt
 spec/charts/base_spec.rb
 spec/charts/chart_type_spec.rb
 spec/components/area_spec.rb
@@ -403,3 +472,4 @@ tasks/setup.rb
 tasks/spec.rake
 tasks/svn.rake
 tasks/test.rake
+ziya.gemspec

data/README.txt

@@ -1,6 +1,7 @@
 ziya
     by Fernand Galiana
     ziya.rubyforge.org
+    git://github.com/derailed/ziya.git
 
 == RELEASES
 
@@ -8,8 +9,10 @@ ziya
   2.0.1 - Additional support for 5.02 + Added donut chart from 5.03
   2.0.2 - Changed logging required to 0.9.X - Update to xml/swf 5.0.4
   2.0.3 - README file update - Thanks to Paul James !
-  2.0.4 - Fixed missing encoding on composite urls
-
+  2.0.4 - Fixed missing encoding on composite urls - published gem on github
+  2.0.5 - Fixed merb app support issue
+  2.0.6 - Updates to support xml/swf 5.0.5
+  
 == DESCRIPTION:
 
 ZiYa allows you to easily display graphs in your ruby based applications by leveraging
@@ -25,6 +28,8 @@ managers will love you for it !!
 	Video            : http://www.youtube.com/watch?v=axIMmMHdXzo ( Out of date but you'll get the basics... )
 	Documentation    : http://ziya.liquidrail.com/docs
 	Forum            : http://groups.google.com/group/ziya-plugin
+	Repositories     : http://rubyforge.org/projects/ziya 
+	                   git://github.com/derailed/ziya.git
 
 
 == FEATURES:
@@ -50,6 +55,27 @@ managers will love you for it !!
 
 *  Theme support. You can change the appearance and behavior of any charts by introducing
    new themes under the public/charts/themes directory.
+
+== REQUIREMENTS:
+
+  ZiYa depends on the logging gem version > 0.9.0  
+
+== INSTALL:
+  
+  On rubyforge
+  
+  sudo gem install ziya
+  
+  or github
+  
+  sudo gem install derailed-ziya
+  
+  cd to your application directory and issue the following command
+  
+  > ziyafy
+  
+  This will copy the necessary themes and flash files to run ziya in your application 
+  public/charts directory.
       
 == SYNOPSIS:
   
@@ -191,21 +217,6 @@ managers will love you for it !!
                 radius:       5
                 fill_alpha:  80
   
-== REQUIREMENTS:
-
-  ZiYa depends on the logging gem version > 0.9.0  
-
-== INSTALL:
-
-  sudo gem install ziya
-  
-  cd to your application directory and issue the following command
-  
-  > ziyafy
-  
-  This will copy the necessary themes and flash files to run ziya in your application 
-  public/charts directory.
-
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -25,7 +25,7 @@ PROJ.svn            = 'ziya'
 PROJ.rcov_threshold = 90.0
 PROJ.executables    = ['ziyafy']
 
-PROJ.exclude        << %w[.DS_Store$ .svn$ .swo$ .swp$]
+PROJ.exclude        << %w[.DS_Store$ .swo$ .swp$]
 PROJ.tests          = FileList['test/**/test_*.rb']   
 PROJ.annotation_tags << 'BOZO'
 
@@ -41,4 +41,4 @@ end
 
 task 'gem:package' => 'manifest:assert'
 
-depend_on "logging", "~> 0.9.0"
+depend_on "logging", ">= 0.9.0"

data/lib/ziya/charts/base.rb

@@ -56,7 +56,7 @@ module Ziya::Charts
       @options     = {}
       @series_desc = []
       @theme       = default_theme
-      @render_mode = Base.all_styles
+      @render_mode = Base.mode_reset
       initialize_components
       load_helpers( Ziya.helpers_dir ) if Ziya.helpers_dir
     end
@@ -67,10 +67,10 @@ module Ziya::Charts
     end
     
     # don't render stylesheets just gen code for chart stylesheet and data
-    def self.data_only() 1; end
+    def self.mode_data() 1; end
     
     # renders everything
-    def self.all_styles() 0; end
+    def self.mode_reset() 0; end
     
     # -------------------------------------------------------------------------
     # Default ZiYa theme
@@ -84,7 +84,12 @@ module Ziya::Charts
       Dir.foreach(helper_dir) do |helper_file| 
         next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/
         Ziya.logger.debug( ">>> ZiYa loading custom helper `#{$1}" )        
-        require_dependency File.join(helper_dir, $1)        
+        # check rails env for autoloader ?
+        if defined?(RAILS_ROOT) 
+          require_dependency File.join(helper_dir, $1) 
+        else
+          require File.join(helper_dir, $1)
+        end
         helper_module_name = "Ziya::" + $1.gsub(/(^|_)(.)/) { $2.upcase }        
         # helper_module_name = $1.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
         # if Ziya::Helpers.const_defined?(helper_module_name)
@@ -100,7 +105,8 @@ module Ziya::Charts
     # Example:
     #   my_chart = Ziya::Charts::Bar.new
     #   my_chart.add( :axis_category_text, ['2004', '2005', '2006'] ) 
-    #   my_chart.add( :series, 'series A', [ 10, 20, 30], [ '10 dogs', '20 cats', '30 rats'] )
+    #   my_chart.add( :axis_category_label, [ '10 dogs', '20 cats', '30 rats'] )
+    #   my_chart.add( :series, 'series A', [ 10, 20, 30] )
     #   my_chart.add( :axis_value_label, [ 'my dogs', 'my cats', 'my rats'] )
     #   my_chart.add( :user_data, :mykey, "Fred" )
     #
@@ -157,15 +163,19 @@ module Ziya::Charts
           raise ArgumentError, "Must specify an array of values" if values.empty?
           @options[directive] = values
         when :series
+          series = {}
           legend = args.first.is_a?(String) ? args.shift : ""
           if args.first.is_a?( Array )
             points = args.shift || []
             raise ArgumentError, "Must specify an array of data points" if points.empty?
             points.insert( 0, legend )
-            @series_desc << points
+            series[:points] = points
           else
             raise ArgumentError, "Must specify an array of data points"
           end
+          url = args.shift          
+          series[:url] = url if url
+          @series_desc << series
         when :user_data
           key = args.first.is_a?(Symbol) ? args.shift : ""
           raise ArgumentError, "Must specify a key" if key.to_s.empty?
@@ -355,50 +365,48 @@ module Ziya::Charts
     # ------------------------------------------------------------------------
     # generates chart data row
     # TODO Validate options !!
-    def gen_row_data( value, opts=nil )
+    def gen_row_data( value, opts=nil, xml=@xml )
       if value.instance_of? String
-        gen_string_data( value, opts )
+        gen_string_data( value, opts, xml )
       elsif value.respond_to? :zero?
-        gen_number_data( value, opts )
+        gen_number_data( value, opts, xml )
       end        
     end
     
     # -------------------------------------------------------------------------
     # generates string chart_value
-    def gen_string_data( value, opts )
-      if opts
-        @xml.string( opts ) { |x| x.text!( value ) }
-      else
-        @xml.string( value )
-      end
+    def gen_string_data( value, opts, xml )
+      opts ? xml.string( opts ) { |x| x.text!( value ) } : xml.string( value )
     end
     
     # -------------------------------------------------------------------------
     # generates number chart_value
-    def gen_number_data( value, opts )
-      if opts
-        @xml.number( opts ) { |x| x.text!( value.to_s ) }
-      else
-        @xml.number( value )
-      end
+    def gen_number_data( value, opts, xml )
+      opts ? xml.number( opts ) { |x| x.text!( value.to_s ) } : xml.number( value )
     end
     
     # -------------------------------------------------------------------------
     # generates chart data points    
     # BOZO !! Check args on hash
     def gen_chart_data( series )
-      @xml.row do
-        series.each do |row|      
+      block = lambda {
+        series[:points].each do |row|      
           if row.nil?
             @xml.null 
           elsif row.instance_of? Hash
             value = row.delete( :value )
-            gen_row_data( value, row )
+            gen_row_data( value, row, @xml )
           else
-            gen_row_data( row )
+            gen_row_data( row, nil, @xml )
           end
         end
-      end        
+      }
+      
+      if series[:url]
+        @xml.row( :url => series[:url], &block )
+      else
+        @xml.row( &block )
+      end
     end
     
     # -------------------------------------------------------------------------
@@ -451,7 +459,7 @@ module Ziya::Charts
     # -------------------------------------------------------------------------
     # Check if we should do the all monty or just render the instance styles
     def render_parents?      
-      (@render_mode == Base.all_styles)
+      (@render_mode == Base.mode_reset)
     end
     
     # -------------------------------------------------------------------------

data/lib/ziya/charts/stacked_threed_area.rb

@@ -10,7 +10,7 @@ module Ziya::Charts
     # <tt>:chart_id</tt>:: the name of the chart style sheet.              
     def initialize( license=nil, chart_id=nil )
       super( license, chart_id )
-      @type = "3d area"      
+      @type = "stacked 3d area"      
     end
   end
 end

data/lib/ziya/components/chart_pref.rb

@@ -13,9 +13,9 @@ module Ziya::Components
   # for additional documentation, examples and futher detail.
   #  
   class ChartPref < Base  
-    has_attribute :line_thickness, :point_shape, :point_size, :fill_shape,
+    has_attribute :line_thickness, :point_shape, :point_size, :fill_shape, :connect, :tip,
                   :type, :bull_color, :bear_color,
-                  :reverse, :drag, :min_x, :min_y, :max_x, :max_y,
+                  :drag, :min_x, :min_y, :max_x, :max_y,
                   :trend_thickness, :trend_alpha, :line_alpha, :rotation_x,
                   :rotation_y, :grid, :select, :empty_center
   end

data/lib/ziya/components/chart_rect.rb

@@ -30,7 +30,7 @@ module Ziya::Components
   #  
   class ChartRect < Base
     has_attribute :x, :y, :width, :height, :positive_color, :negative_color,
-                  :positive_alpha, :negative_alpha, 
+                  :positive_alpha, :negative_alpha, :hide,
                   :shadow, :bevel, :blur, :glow,
                   :corner_tl, :corner_tr, :corner_bl, :corner_br
   end

data/lib/ziya/helpers/base_helper.rb

@@ -5,66 +5,87 @@ module Ziya::Helpers
   module BaseHelper
     include Ziya::Utils::Text, Ziya::Helper
 
-    # -------------------------------------------------------------------------
-    # generates a swf chart path from the given url. Used as helper to embed 
-    # chart 
+    # Defines various helpers to assist in writing ZiYa yaml stylesheets.
+
+    # generates a swf chart path from the given url. Used as helper to embed a chart
+    # within a chart
+    # ==== Example
+    #   <%= chart_url( chart_1_path ) %>
+    #
+    #  => /charts/charts.swf?library_path=/charts/charts_library&xml_source=http://fred/load_chart_1.xml
     def chart_url( url, swf_chart_dir="/charts" )
       gen_composite_path( swf_chart_dir, url )
     end
     
-    # -------------------------------------------------------------------------
     # indent yaml content vy multiples of 2 spaces
     def indent( multiple= 1 )
       "  " * multiple
     end
 
-    # -------------------------------------------------------------------------
-    # YAML Convenience for gauge class   
+    # generates a gauge yaml class declaration
+    # ==== Example
+    #  <%= gauge :thermo %>
+    #
+    #  produces:
+    #
+    #  --- !ruby/object:Ziya::Gauges::Thermo
+    #    components: !omap
     def gauge( class_name )
       "--- #{clazz( class_name, 'Gauges' )}\n#{dials}" 
     end
     
-    # -------------------------------------------------------------------------
-    # YAML Convenience for gauge component declaration   
+    # generates a gauge element declaration
+    # ==== Example
+    #  <%= dial :rect %>
+    #  => --- !ruby/object:Ziya::Gauges::Support::Rect
     def dial( comp_class, comp_name=nil )
       clazz = clazz( comp_class, "Gauges::Support" )
       comp_name ? "- :#{comp_name}: #{clazz}" : "- #{clazz}"
     end
 
-    # -------------------------------------------------------------------------
-    # YAML dials declaration   
+    # generates a yaml hash of dials
+    # ==== Example
+    #  <%= dials %>
+    #  => components: !omap
     def dials
       "components: !omap"
     end
         
-    # -------------------------------------------------------------------------
-    # YAML Convenience for component declaration   
+    # generates a component yaml class declaration
+    # ==== Example
+    #  <%= component :axis_category %>
+    #  => axis_category: --- !ruby/object:Ziya::Components::AxisCategory
     def component( component_name )
       "#{component_name}: #{clazz component_name, :Components}"
     end
     alias :comp :component
     
-    # -------------------------------------------------------------------------
-    # YAML Convenience for draw component class   
+    # generates a drawing yaml class declaration
+    # ==== Example
+    #  <%=drawing :rect %>
+    #  => --- !ruby/object:Ziya::Components::Rect
     def drawing( class_name )
       clazz( class_name, :Components )
     end
     alias_method :filter_type, :drawing
     alias_method :area       , :drawing
     
-    # -------------------------------------------------------------------------
-    # YAML Convenience for chart class   
+    # generates a yaml chart declaration
+    # ==== Example
+    #  <%= chart :bar %>
+    #  => --- !ruby/object:Ziya::Charts::Bar
     def chart( class_name )
       "--- #{clazz( class_name, :Charts )}" 
     end
-       
-   # -------------------------------------------------------------------------
-    # YAML Convenience for chart name setting       
-    def clazz( class_name, module_name=nil )
-      buff = "!ruby/object:Ziya::"
-      buff << "#{module_name}::" unless module_name.nil?
-      buff << "#{camelize(class_name.to_s)}"
-      buff
-    end               
+      
+    private
+    
+      # generates a yaml class declaration
+      def clazz( class_name, module_name=nil ) #:nodoc:
+        buff = "!ruby/object:Ziya::"
+        buff << "#{module_name}::" unless module_name.nil?
+        buff << "#{camelize(class_name.to_s)}"
+        buff
+      end               
   end
 end

data/lib/ziya/version.rb

@@ -2,10 +2,9 @@ module Ziya
   module Version
     MAJOR = 2
     MINOR = 0
-    TINY  = 4
+    TINY  = 6
     
     # Returns the version string for the library.
-    #
     def self.version
       [ MAJOR, MINOR, TINY].join( "." )
     end

data/lib/ziya/ziya_helper.rb

@@ -1,17 +1,14 @@
-# -----------------------------------------------------------------------------
 # Generates necessary html flash tag to support ZiYa
 #
-# TODO !! Rewrite to use content tag block instead...
+# TODO -- Rewrite to use content tag block instead...
 #
 # Author: Fernand Galiana
-# -----------------------------------------------------------------------------
 require 'cgi'
 require 'erb'
 
 module Ziya
   module Helper    
     
-    # -------------------------------------------------------------------------
     # generates a javascript tag to include the js script to create object and
     # embed tags
     def ziya_javascript_include_tag
@@ -55,7 +52,9 @@ module Ziya
       # setup width and height
       setup_movie_size( options )
       
-      xml_swf_path = charts_swf % [options[:swf_path], escape_url(url)]
+      flash_vars   = url ? charts_swf : charts_swf_no_src
+      xml_swf_path = flash_vars % [options[:swf_path], escape_url(url)]
+      xml_swf_path << "&chart_id=#{options[:id]}"
       xml_swf_path << "&timestamp=#{Time.now.to_i}" if options[:cache] == false
       xml_swf_path << "&timeout=#{options[:timeout]}&retry=#{options[:retry]}" if options[:timeout]
       xml_swf_path << "&stage_width=#{options[:width]}&stage_height=#{options[:height]}" if options[:use_stage] == true 
@@ -101,7 +100,6 @@ module Ziya
       JS
     end
     
-    # -------------------------------------------------------------------------
     # generates necessary html tags to display a gauge.  
     def ziya_gauge( url, gauge_options={} )
       options = { :width          => "200",
@@ -121,7 +119,6 @@ module Ziya
       generate_old_style_flash_tag( url, gauges_swf, options )
     end
         
-    # -------------------------------------------------------------------------------------
     # generates neccessary html tags to display a chart.
     def ziya_chart( url, chart_options = {} )
       options = { :width          => "400",
@@ -138,7 +135,8 @@ module Ziya
                   :use_stage      => false
                 }.merge!(chart_options)
     
-      generate_flash_tag( url, charts_swf, "charts.swf", options )
+      flash_vars = url ? charts_swf : charts_swf_no_src
+      generate_flash_tag( url, flash_vars, "charts.swf", options )
     end   
         
     # flash chart library path
@@ -150,19 +148,20 @@ module Ziya
     # private                               
 
       # Const accessors...
-      def mime()          "application/x-shockwave-flash"; end
-      def composite_url() "%s/charts.swf?library_path=%s/charts_library&xml_source=%s" end
-      def charts_swf()    "library_path=%s/charts_library&xml_source=%s"; end      
-      def plugin_url()    "http://www.macromedia.com/go/getflashplayer"; end
-      def gauges_swf()    "%s/gauge.swf?xml_source=%s"; end              
-      def gauge_path()    "/gauges"; end
-      def chart_path()    "/charts"; end       
-      def class_id()      "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" end
-      def codebase()      "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0"; end
+      def mime()              "application/x-shockwave-flash"; end
+      def composite_url()     "%s/charts.swf?library_path=%s/charts_library&xml_source=%s" end
+      def charts_swf_no_src() "library_path=%s/charts_library"; end      
+      def charts_swf()        "#{charts_swf_no_src}&xml_source=%s"; end      
+      def plugin_url()        "http://www.macromedia.com/go/getflashplayer"; end
+      def gauges_swf()        "%s/gauge.swf?xml_source=%s"; end              
+      def gauge_path()        "/gauges"; end
+      def chart_path()        "/charts"; end       
+      def class_id()          "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" end
+      def codebase()          "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0"; end
 
       # generates swf path
       def gen_swf_path( path_directive, swf_dir, url )
-        path_directive % [swf_dir, escape_url( url )]
+        path_directive % [swf_dir, escape_url( url )]        
       end
 
       def generate_old_style_flash_tag( url, swf_path, options )
@@ -230,69 +229,45 @@ module Ziya
         xml_swf_path << "&timeout=#{options[:timeout]}" if options[:timeout]
         xml_swf_path << "&stage_width=#{options[:width]}&stage_height=#{options[:height]}" if options[:use_stage] == true 
         
-        # if options[:tag_type] == "object"
-          tags = <<-TAGS
-          <object codebase="#{codebase}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="#{options[:id]}" height="#{options[:height]}" width="#{options[:width]}">
-            <param name="scale"             value="noscale">
-            <param name="salign"            value="#{options[:salign]}">            
-            <param name="bgcolor"           value="#{options[:bgcolor]}">
-            <param name="wmode"             value="#{options[:wmode]}">                                  
-            <param name="movie"             value="#{options[:swf_path]}/#{swf_file}">            
-            <param name="FlashVars"         value="#{xml_swf_path}&chart_id=#{options[:id]}">
-            <param name="menu"              value="true">
-            <param name="allowFullScreen"   value="true">
-            <param name="allowScriptAccess" value="sameDomain">            
-            <param name="quality"           value="high">
-            <param name="play"              value="true">                        
-            <param name="devicefont"        value="false">
-              <embed scale="noscale" 
-                allowfullscreen="true" 
-                allowscriptaccess="sameDomain" 
-                bgcolor="#{options[:bgcolor]}" 
-                devicefont="false" 
-                flashvars="#{xml_swf_path}" 
-                menu="true" 
-                name="#{options[:id]}" 
-                play="true" 
-                pluginspage="http://www.macromedia.com/go/getflashplayer" 
-                quality="high" 
-                salign="#{options[:salign]}" 
-                src="#{options[:swf_path]}/#{swf_file}" 
-                type="application/x-shockwave-flash" 
-                wmode="#{options[:wmode]}" 
-                align="#{options[:align]}" 
-                height="#{options[:height]}" 
-                width="#{options[:width]}"/>            
+        tags = <<-TAGS
+        <object codebase="#{codebase}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" id="#{options[:id]}" height="#{options[:height]}" width="#{options[:width]}">
+          <param name="scale"             value="noscale">
+          <param name="salign"            value="#{options[:salign]}">            
+          <param name="bgcolor"           value="#{options[:bgcolor]}">
+          <param name="wmode"             value="#{options[:wmode]}">                                  
+          <param name="movie"             value="#{options[:swf_path]}/#{swf_file}">
+          <param name="Flashvars"         value="#{xml_swf_path}&chart_id=#{options[:id]}">
+          <param name="menu"              value="true">
+          <param name="allowFullScreen"   value="true">
+          <param name="allowScriptAccess" value="sameDomain">            
+          <param name="quality"           value="high">
+          <param name="play"              value="true">                        
+          <param name="devicefont"        value="false">
+            <embed scale="noscale" 
+              allowfullscreen   = "true" 
+              allowscriptaccess = "sameDomain" 
+              bgcolor           = "#{options[:bgcolor]}" 
+              devicefont        = "false" 
+              flashvars         = "#{xml_swf_path}&chart_id=#{options[:id]}" 
+              menu              = "true" 
+              name              = "#{options[:id]}" 
+              play              = "true" 
+              pluginspage       = "http://www.macromedia.com/go/getflashplayer" 
+              quality           = "high" 
+              salign            = "#{options[:salign]}" 
+              src               = "#{options[:swf_path]}/#{swf_file}" 
+              type              = "application/x-shockwave-flash" 
+              wmode             = "#{options[:wmode]}" 
+              align             = "#{options[:align]}" 
+              height            = "#{options[:height]}" 
+              width             = "#{options[:width]}"/>            
          </object>        
         TAGS
-      # else
-       #    tags = <<-TAGS
-       #      <embed scale="noscale" 
-       #        allowfullscreen="true" 
-       #        allowscriptaccess="sameDomain" 
-       #        bgcolor="#{options[:bgcolor]}" 
-       #        devicefont="false" 
-       #        flashvars="#{xml_swf_path}" 
-       #        menu="true" 
-       #        name="#{options[:id]}" 
-       #        play="true" 
-       #        pluginspage="http://www.macromedia.com/go/getflashplayer" 
-       #        quality="high" 
-       #        salign="#{options[:salign]}" 
-       #        src="#{options[:swf_path]}/#{swf_file}" 
-       #        type="application/x-shockwave-flash" 
-       #        wmode="#{options[:wmode]}" 
-       #        align="#{options[:align]}" 
-       #        height="#{options[:height]}" 
-       #        width="#{options[:width]}"/>
-       #    TAGS
-       # end 
-       tags
       end
               
       # escape url    
       def escape_url( url )
-        CGI.escape( url.gsub( /&amp;/, '&' ) )
+        url ? CGI.escape( url.gsub( /&amp;/, '&' ) ) : url
       end
     
       # setup up wmode

data/spec/charts/base_spec.rb

@@ -82,6 +82,12 @@ describe Ziya::Charts::Base do
       @chart.add( :series, "test", [ {:value => 10, :glow => "glow1" }, { :value => 20, :blur => "blur2" } ] )
       @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><number glow=\"glow1\">10</number><number blur=\"blur2\">20</number></row></chart_data></chart>"
     end
+
+    it "should support adding an image to a series" do
+      @chart.add( :axis_category_text, %w[dog cat] )
+      @chart.add( :series, "test", [ 10, 20 ], "some_url" )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row url=\"some_url\"><string>test</string><number>10</number><number>20</number></row></chart_data></chart>"
+    end
     
     it "should error if a series is defined but no axis_category is specified" do
       @chart.add( :series, "test", [10,20] )      

data/spec/ziya_helper_spec.rb

@@ -25,11 +25,11 @@ describe Ziya::Helper do
   
   describe "ziya_chart" do
     it "should generate the correct embed tag with the default options" do
-      ziya_chart( @url, :tag_type => "embed" ).should == "          <object codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" id=\"ziya_chart\" height=\"300\" width=\"400\">\n            <param name=\"scale\"             value=\"noscale\">\n            <param name=\"salign\"            value=\"tl\">            \n            <param name=\"bgcolor\"           value=\"#FFFFFF\">\n            <param name=\"wmode\"             value=\"transparent\">                                  \n            <param name=\"movie\"             value=\"/charts/charts.swf\">            \n            <param name=\"FlashVars\"         value=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\">\n            <param name=\"menu\"              value=\"true\">\n            <param name=\"allowFullScreen\"   value=\"true\">\n            <param name=\"allowScriptAccess\" value=\"sameDomain\">            \n            <param name=\"quality\"           value=\"high\">\n            <param name=\"play\"              value=\"true\">                        \n            <param name=\"devicefont\"        value=\"false\">\n              <embed scale=\"noscale\" \n                allowfullscreen=\"true\" \n                allowscriptaccess=\"sameDomain\" \n                bgcolor=\"#FFFFFF\" \n                devicefont=\"false\" \n                flashvars=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh\" \n                menu=\"true\" \n                name=\"ziya_chart\" \n                play=\"true\" \n                pluginspage=\"http://www.macromedia.com/go/getflashplayer\" \n                quality=\"high\" \n                salign=\"tl\" \n                src=\"/charts/charts.swf\" \n                type=\"application/x-shockwave-flash\" \n                wmode=\"transparent\" \n                align=\"l\" \n                height=\"300\" \n                width=\"400\"/>            \n         </object>        \n"
+      ziya_chart( @url, :tag_type => "embed" ).should == "        <object codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" id=\"ziya_chart\" height=\"300\" width=\"400\">\n          <param name=\"scale\"             value=\"noscale\">\n          <param name=\"salign\"            value=\"tl\">            \n          <param name=\"bgcolor\"           value=\"#FFFFFF\">\n          <param name=\"wmode\"             value=\"transparent\">                                  \n          <param name=\"movie\"             value=\"/charts/charts.swf\">\n          <param name=\"Flashvars\"         value=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\">\n          <param name=\"menu\"              value=\"true\">\n          <param name=\"allowFullScreen\"   value=\"true\">\n          <param name=\"allowScriptAccess\" value=\"sameDomain\">            \n          <param name=\"quality\"           value=\"high\">\n          <param name=\"play\"              value=\"true\">                        \n          <param name=\"devicefont\"        value=\"false\">\n            <embed scale=\"noscale\" \n              allowfullscreen   = \"true\" \n              allowscriptaccess = \"sameDomain\" \n              bgcolor           = \"#FFFFFF\" \n              devicefont        = \"false\" \n              flashvars         = \"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\" \n              menu              = \"true\" \n              name              = \"ziya_chart\" \n              play              = \"true\" \n              pluginspage       = \"http://www.macromedia.com/go/getflashplayer\" \n              quality           = \"high\" \n              salign            = \"tl\" \n              src               = \"/charts/charts.swf\" \n              type              = \"application/x-shockwave-flash\" \n              wmode             = \"transparent\" \n              align             = \"l\" \n              height            = \"300\" \n              width             = \"400\"/>            \n         </object>        \n"
     end
 
     it "should generate the correct object tag with the default options" do
-      ziya_chart( @url, :tag_type => "object" ).should == "          <object codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" id=\"ziya_chart\" height=\"300\" width=\"400\">\n            <param name=\"scale\"             value=\"noscale\">\n            <param name=\"salign\"            value=\"tl\">            \n            <param name=\"bgcolor\"           value=\"#FFFFFF\">\n            <param name=\"wmode\"             value=\"transparent\">                                  \n            <param name=\"movie\"             value=\"/charts/charts.swf\">            \n            <param name=\"FlashVars\"         value=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\">\n            <param name=\"menu\"              value=\"true\">\n            <param name=\"allowFullScreen\"   value=\"true\">\n            <param name=\"allowScriptAccess\" value=\"sameDomain\">            \n            <param name=\"quality\"           value=\"high\">\n            <param name=\"play\"              value=\"true\">                        \n            <param name=\"devicefont\"        value=\"false\">\n              <embed scale=\"noscale\" \n                allowfullscreen=\"true\" \n                allowscriptaccess=\"sameDomain\" \n                bgcolor=\"#FFFFFF\" \n                devicefont=\"false\" \n                flashvars=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh\" \n                menu=\"true\" \n                name=\"ziya_chart\" \n                play=\"true\" \n                pluginspage=\"http://www.macromedia.com/go/getflashplayer\" \n                quality=\"high\" \n                salign=\"tl\" \n                src=\"/charts/charts.swf\" \n                type=\"application/x-shockwave-flash\" \n                wmode=\"transparent\" \n                align=\"l\" \n                height=\"300\" \n                width=\"400\"/>            \n         </object>        \n"
+      ziya_chart( @url, :tag_type => "object" ).should == "        <object codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" id=\"ziya_chart\" height=\"300\" width=\"400\">\n          <param name=\"scale\"             value=\"noscale\">\n          <param name=\"salign\"            value=\"tl\">            \n          <param name=\"bgcolor\"           value=\"#FFFFFF\">\n          <param name=\"wmode\"             value=\"transparent\">                                  \n          <param name=\"movie\"             value=\"/charts/charts.swf\">\n          <param name=\"Flashvars\"         value=\"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\">\n          <param name=\"menu\"              value=\"true\">\n          <param name=\"allowFullScreen\"   value=\"true\">\n          <param name=\"allowScriptAccess\" value=\"sameDomain\">            \n          <param name=\"quality\"           value=\"high\">\n          <param name=\"play\"              value=\"true\">                        \n          <param name=\"devicefont\"        value=\"false\">\n            <embed scale=\"noscale\" \n              allowfullscreen   = \"true\" \n              allowscriptaccess = \"sameDomain\" \n              bgcolor           = \"#FFFFFF\" \n              devicefont        = \"false\" \n              flashvars         = \"library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart\" \n              menu              = \"true\" \n              name              = \"ziya_chart\" \n              play              = \"true\" \n              pluginspage       = \"http://www.macromedia.com/go/getflashplayer\" \n              quality           = \"high\" \n              salign            = \"tl\" \n              src               = \"/charts/charts.swf\" \n              type              = \"application/x-shockwave-flash\" \n              wmode             = \"transparent\" \n              align             = \"l\" \n              height            = \"300\" \n              width             = \"400\"/>            \n         </object>        \n"
     end
 
     it "should generate the correct js tag" do
@@ -37,14 +37,14 @@ describe Ziya::Helper do
     end
      
     it "should generate the correct js based chart tag" do
-      ziya_chart_js( @url ).should == "        <script language=\"javascript\" type=\"text/javascript\">\n        if (AC_FL_RunContent == 0 || DetectFlashVer == 0) {\n          alert( \"This page requires AC_RunActiveContent.js.\" );\n        } \n        else {\n          var hasRightVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);\n          if( hasRightVersion ) { \n            AC_FL_RunContent(\n              'codebase'         , 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0',\n              'width'            , '400',\n              'height'           , '300',\n              'scale'            , 'noscale',\n              'salign'           , 'tl',\n              'bgcolor'          , '000000',\n              'wmode'            , 'opaque',\n              'movie'            , '/charts/charts',\n              'src'              , '/charts/charts',\n              'FlashVars'        , 'library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh', \n              'id'               , 'ziya_chart',\n              'name'             , 'ziya_chart',\n              'menu'             , 'true',\n              'allowFullScreen'  , 'true',\n              'allowScriptAccess','sameDomain',\n              'quality'          , 'high',\n              'align'            , 'l',\n              'pluginspage'      , 'http://www.macromedia.com/go/getflashplayer',\n              'play'             , 'true',\n              'devicefont'       , 'false'\n            ); \n          } \n          else { \n            var alternateContent = 'This content requires the Adobe Flash Player. '\n            + '<u><a href=http://www.macromedia.com/go/getflash/>Get Flash</a></u>.';\n            document.write(alternateContent); \n          }\n        }\n        </script>\n"
+      ziya_chart_js( @url ).should == "        <script language=\"javascript\" type=\"text/javascript\">\n        if (AC_FL_RunContent == 0 || DetectFlashVer == 0) {\n          alert( \"This page requires AC_RunActiveContent.js.\" );\n        } \n        else {\n          var hasRightVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);\n          if( hasRightVersion ) { \n            AC_FL_RunContent(\n              'codebase'         , 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0',\n              'width'            , '400',\n              'height'           , '300',\n              'scale'            , 'noscale',\n              'salign'           , 'tl',\n              'bgcolor'          , '000000',\n              'wmode'            , 'opaque',\n              'movie'            , '/charts/charts',\n              'src'              , '/charts/charts',\n              'FlashVars'        , 'library_path=/charts/charts_library&xml_source=%2Ffred%2Fblee%2Fduh&chart_id=ziya_chart', \n              'id'               , 'ziya_chart',\n              'name'             , 'ziya_chart',\n              'menu'             , 'true',\n              'allowFullScreen'  , 'true',\n              'allowScriptAccess','sameDomain',\n              'quality'          , 'high',\n              'align'            , 'l',\n              'pluginspage'      , 'http://www.macromedia.com/go/getflashplayer',\n              'play'             , 'true',\n              'devicefont'       , 'false'\n            ); \n          } \n          else { \n            var alternateContent = 'This content requires the Adobe Flash Player. '\n            + '<u><a href=http://www.macromedia.com/go/getflash/>Get Flash</a></u>.';\n            document.write(alternateContent); \n          }\n        }\n        </script>\n"
     end
        
     it "should set the wmode to opaque if bg_color is set" do
       html = ziya_chart( @url, :bgcolor => "ffffff" )      
       # html.index (/name=\"wmode\" value=\"opaque\"/).should_not be_nil
       # html.index (/'wmode'\s+,\s'opaque'/).should_not be_nil      
-      html.index( /wmode=\"opaque\"/ ).should_not be_nil
+      html.index( /wmode\s+=\s\"opaque\"/ ).should_not be_nil
     end
     
     it "should handle the size has widthxheight" do
@@ -114,4 +114,4 @@ describe Ziya::Helper do
     end
   end
    
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: derailed-ziya
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors: 
 - Fernand Galiana