ziya 2.0.6 → 2.0.7
Sign up to get free protection for your applications and to get access to all the features.
- data/Manifest.txt +4 -0
- data/README.txt +5 -0
- data/charts/charts.swf +0 -0
- data/charts/charts_library/ar3d.swf +0 -0
- data/charts/charts_library/arno.swf +0 -0
- data/charts/charts_library/ars3.swf +0 -0
- data/charts/charts_library/arst.swf +0 -0
- data/charts/charts_library/brfl.swf +0 -0
- data/charts/charts_library/brno.swf +0 -0
- data/charts/charts_library/brst.swf +0 -0
- data/charts/charts_library/buno.swf +0 -0
- data/charts/charts_library/cl3d.swf +0 -0
- data/charts/charts_library/clfl.swf +0 -0
- data/charts/charts_library/clim.swf +0 -0
- data/charts/charts_library/clno.swf +0 -0
- data/charts/charts_library/clp3.swf +0 -0
- data/charts/charts_library/cls3.swf +0 -0
- data/charts/charts_library/clst.swf +0 -0
- data/charts/charts_library/cnno.swf +0 -0
- data/charts/charts_library/dono.swf +0 -0
- data/charts/charts_library/lnno.swf +0 -0
- data/charts/charts_library/mxno.swf +0 -0
- data/charts/charts_library/pi3d.swf +0 -0
- data/charts/charts_library/piim.swf +0 -0
- data/charts/charts_library/pino.swf +0 -0
- data/charts/charts_library/pono.swf +0 -0
- data/charts/charts_library/scno.swf +0 -0
- data/charts/full_screen.swf +0 -0
- data/lib/ziya/charts/base.rb +39 -117
- data/lib/ziya/components/area.rb +2 -3
- data/lib/ziya/components/button.rb +18 -0
- data/lib/ziya/components/chart_guide.rb +4 -2
- data/lib/ziya/components/chart_note.rb +18 -0
- data/lib/ziya/components/tooltip.rb +20 -0
- data/lib/ziya/version.rb +1 -1
- data/lib/ziya/ziya_helper.rb +10 -5
- data/release_notes.txt +7 -1
- data/spec/ziya_helper_spec.rb +1 -1
- metadata +6 -2
data/Manifest.txt
CHANGED
@@ -31,6 +31,7 @@ charts/charts_library/piim.swf
|
|
31
31
|
charts/charts_library/pino.swf
|
32
32
|
charts/charts_library/pono.swf
|
33
33
|
charts/charts_library/scno.swf
|
34
|
+
charts/full_screen.swf
|
34
35
|
charts/scripts/output_jpg.php
|
35
36
|
charts/sliders/black.swf
|
36
37
|
charts/sliders/preview_handle_1.swf
|
@@ -75,11 +76,13 @@ lib/ziya/components/axis_value.rb
|
|
75
76
|
lib/ziya/components/base.rb
|
76
77
|
lib/ziya/components/bevel.rb
|
77
78
|
lib/ziya/components/blur.rb
|
79
|
+
lib/ziya/components/button.rb
|
78
80
|
lib/ziya/components/chart_border.rb
|
79
81
|
lib/ziya/components/chart_grid_h.rb
|
80
82
|
lib/ziya/components/chart_grid_v.rb
|
81
83
|
lib/ziya/components/chart_guide.rb
|
82
84
|
lib/ziya/components/chart_label.rb
|
85
|
+
lib/ziya/components/chart_note.rb
|
83
86
|
lib/ziya/components/chart_pref.rb
|
84
87
|
lib/ziya/components/chart_rect.rb
|
85
88
|
lib/ziya/components/chart_transition.rb
|
@@ -101,6 +104,7 @@ lib/ziya/components/series_color.rb
|
|
101
104
|
lib/ziya/components/series_explode.rb
|
102
105
|
lib/ziya/components/shadow.rb
|
103
106
|
lib/ziya/components/text.rb
|
107
|
+
lib/ziya/components/tooltip.rb
|
104
108
|
lib/ziya/components/update.rb
|
105
109
|
lib/ziya/gauges/base.rb
|
106
110
|
lib/ziya/gauges/radial.rb
|
data/README.txt
CHANGED
@@ -12,6 +12,11 @@ ziya
|
|
12
12
|
2.0.4 - Fixed missing encoding on composite urls - published gem on github
|
13
13
|
2.0.5 - Fixed merb app support issue
|
14
14
|
2.0.6 - Updates to support xml/swf 5.0.5
|
15
|
+
2.0.7 - Updates to support xm/swf 5.0.7
|
16
|
+
- added parameters for the ziya_js helpers ( Tx Brian ! )
|
17
|
+
- added draw button support
|
18
|
+
- added chart_note to annotate a chart
|
19
|
+
- added tooltip chart support
|
15
20
|
|
16
21
|
== DESCRIPTION:
|
17
22
|
|
data/charts/charts.swf
CHANGED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
data/lib/ziya/charts/base.rb
CHANGED
@@ -5,6 +5,8 @@
|
|
5
5
|
#
|
6
6
|
# TODO !! Match helpers with chart class name
|
7
7
|
# TODO !! Add accessor for specifying refresh look and data links on comps
|
8
|
+
# TODO Figure out the equiv require_dep for merb if any ??
|
9
|
+
# TODO Refact and clean up.
|
8
10
|
#
|
9
11
|
# Author:: Fernand Galiana
|
10
12
|
# Date:: Dec 15th, 2006
|
@@ -12,8 +14,6 @@
|
|
12
14
|
require 'ziya/helpers/base_helper'
|
13
15
|
require 'yaml'
|
14
16
|
|
15
|
-
# TODO Figure out the equiv require_dep for merb if any ??
|
16
|
-
# TODO Refact and clean up.
|
17
17
|
module Ziya::Charts
|
18
18
|
# The mother ship of all charts. This class figures out how to generate the
|
19
19
|
# correct xml to render the chart on the client side. This class handles loading
|
@@ -30,6 +30,7 @@ module Ziya::Charts
|
|
30
30
|
@components = [
|
31
31
|
:axis_category, :axis_ticks, :axis_value,
|
32
32
|
:chart_rect, :chart_border, :chart_grid_h, :chart_grid_v,
|
33
|
+
:chart_note, :tooltip,
|
33
34
|
:chart_transition, :chart_label, :chart_guide, :legend,
|
34
35
|
:filter, :draw,
|
35
36
|
:series_color, :series, :series_explode,
|
@@ -55,6 +56,7 @@ module Ziya::Charts
|
|
55
56
|
@license = license
|
56
57
|
@options = {}
|
57
58
|
@series_desc = []
|
59
|
+
@annotations = []
|
58
60
|
@theme = default_theme
|
59
61
|
@render_mode = Base.mode_reset
|
60
62
|
initialize_components
|
@@ -72,14 +74,12 @@ module Ziya::Charts
|
|
72
74
|
# renders everything
|
73
75
|
def self.mode_reset() 0; end
|
74
76
|
|
75
|
-
#
|
76
|
-
# Default ZiYa theme
|
77
|
+
# default ZiYa theme
|
77
78
|
def default_theme # :nodoc:
|
78
79
|
File.join( Ziya.themes_dir, %w[default] )
|
79
80
|
end
|
80
81
|
|
81
|
-
#
|
82
|
-
# Load up ERB style helpers
|
82
|
+
# load up ERB style helpers
|
83
83
|
def load_helpers( helper_dir ) # :nodoc:
|
84
84
|
Dir.foreach(helper_dir) do |helper_file|
|
85
85
|
next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/
|
@@ -122,12 +122,20 @@ module Ziya::Charts
|
|
122
122
|
# <tt>:axis_category_label</tt>:: Array of strings representing the x axis
|
123
123
|
# labels. This is supported only for Scatter and Bubble charts.
|
124
124
|
# This value is optional. Specify nil for no label change.
|
125
|
-
# <tt>:series</tt>:: Specifies the series name and chart data points.
|
125
|
+
# <tt>:series</tt>:: Specifies the series name and chart data points as an array.
|
126
126
|
# The series name will be used to display chart legends.
|
127
127
|
# You must have at least one of these tag defined.
|
128
|
-
#
|
129
|
-
#
|
130
|
-
#
|
128
|
+
# The data values may be specified as a straight up array of
|
129
|
+
# strings or numbers but also as an array of hash representing
|
130
|
+
# the data points and their attributes such as note, label, tooltip, effect, etc..
|
131
|
+
# Examples:
|
132
|
+
# Plain old series with integer data points
|
133
|
+
# my_chart.add( :series, "series A", [ 10, 20, 30] )
|
134
|
+
#
|
135
|
+
# Specifying custom series labels
|
136
|
+
# my_chart.add( :series, "series A", [ { :value => 10, :label => 'l1' }, { :value => 20, :label => 'l2' } ] )
|
137
|
+
# You may specify the following attributes in the data point hash : :note, :label, :tooltip and effects such as :shadow, :glow, etc...
|
138
|
+
#
|
131
139
|
# <tt>:axis_value_label</tt>:: Array of strings representing the ticks on the x/y
|
132
140
|
# axis depending on the chart type. This is symmetrical
|
133
141
|
# to the <tt>axis_category_label</tt> tag for the opposite
|
@@ -233,8 +241,7 @@ module Ziya::Charts
|
|
233
241
|
# =========================================================================
|
234
242
|
private
|
235
243
|
|
236
|
-
#
|
237
|
-
# Inflate object state based on object hierarchy
|
244
|
+
# inflate object state based on object hierarchy
|
238
245
|
def setup_state( state )
|
239
246
|
override = self.class.name == state.class.name
|
240
247
|
Base.components.each do |comp|
|
@@ -242,8 +249,7 @@ module Ziya::Charts
|
|
242
249
|
end
|
243
250
|
end
|
244
251
|
|
245
|
-
#
|
246
|
-
# Load yaml file associated with class if any
|
252
|
+
# load yaml file associated with class if any
|
247
253
|
def inflate( clazz, theme, instance=nil )
|
248
254
|
class_name = underscore(clazz.to_s.gsub( /Ziya::Charts/, '' )).gsub( /\//, '' )
|
249
255
|
class_name += '_chart' unless class_name.match( /.?_chart$/ )
|
@@ -265,104 +271,28 @@ module Ziya::Charts
|
|
265
271
|
nil
|
266
272
|
end
|
267
273
|
|
268
|
-
#
|
269
|
-
# Parse erb template if any
|
274
|
+
# parse erb template if any
|
270
275
|
def erb_render(fixture_content)
|
271
276
|
b = binding
|
272
277
|
ERB.new(fixture_content).result b
|
273
278
|
end
|
274
279
|
|
275
|
-
#
|
276
|
-
|
277
|
-
|
278
|
-
def gen_data_points( series_name, labels=nil )
|
279
|
-
values = @options[series_name]
|
280
|
-
labels.insert( 0, nil ) if labels
|
280
|
+
# generates category axis data points
|
281
|
+
def gen_axis_category
|
282
|
+
categories = @options[:axis_category_text]
|
281
283
|
@xml.row do
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
if label
|
290
|
-
@xml.string( :label => label ) { |x| x.text!( c ) }
|
291
|
-
else
|
292
|
-
@xml.string( c )
|
293
|
-
end
|
294
|
-
else
|
295
|
-
@xml.string( c )
|
296
|
-
end
|
297
|
-
elsif c.respond_to? :zero?
|
298
|
-
if labels and !labels.empty?
|
299
|
-
label = labels.shift
|
300
|
-
if label
|
301
|
-
@xml.number( :label => label ) { |x| x.text!( c.to_s ) }
|
302
|
-
else
|
303
|
-
@xml.number( c )
|
304
|
-
end
|
305
|
-
else
|
306
|
-
@xml.number( c )
|
307
|
-
end
|
308
|
-
end
|
284
|
+
categories.each do |category|
|
285
|
+
case
|
286
|
+
when category.nil? : @xml.null
|
287
|
+
when category.instance_of?(String) : @xml.string( category )
|
288
|
+
when category.respond_to?(:zero?) : @xml.number( category )
|
289
|
+
when category.is_a?(Hash) : gen_row_data( category.delete( :value ), category, @xml )
|
290
|
+
else puts "No match"
|
309
291
|
end
|
310
|
-
else
|
311
|
-
@xml.string( values )
|
312
292
|
end
|
313
|
-
end
|
293
|
+
end
|
314
294
|
end
|
315
295
|
|
316
|
-
# # -------------------------------------------------------------------------
|
317
|
-
# # Generates custom axis values
|
318
|
-
# def gen_axis_value_text( values )
|
319
|
-
# return if values.nil? or values.empty?
|
320
|
-
# @xml.axis_value_text do
|
321
|
-
# values.each { |v| @xml.string( v ) }
|
322
|
-
# end
|
323
|
-
# end
|
324
|
-
|
325
|
-
# # -------------------------------------------------------------------------
|
326
|
-
# # Check if the series are named
|
327
|
-
# def named_series?( names )
|
328
|
-
# names.each do |name|
|
329
|
-
# next unless name.to_s.index( 'series_' )
|
330
|
-
# return @options[name][0].instance_of?(String) if @options[name] and !@options[name].empty?
|
331
|
-
# end
|
332
|
-
# false
|
333
|
-
# end
|
334
|
-
|
335
|
-
# # -------------------------------------------------------------------------
|
336
|
-
# # Check if the options have custom labels ie :label_xxx tag
|
337
|
-
# def has_labels( names )
|
338
|
-
# names.each do |name|
|
339
|
-
# next unless name.to_s.index( 'labels_' )
|
340
|
-
# return @options[name].size if @options[name] and !@options[name].empty?
|
341
|
-
# end
|
342
|
-
# 0
|
343
|
-
# end
|
344
|
-
|
345
|
-
# # -------------------------------------------------------------------------
|
346
|
-
# # Generates custom labels
|
347
|
-
# def gen_labels( series_name, is_default=false )
|
348
|
-
# cltn = @options[series_name]
|
349
|
-
# cltn.insert( 0, nil ) unless is_default
|
350
|
-
# @xml.row do
|
351
|
-
# cltn.each { |c| ((c.nil? or c.to_s.empty?) ? @xml.null : @xml.string( c )) }
|
352
|
-
# end
|
353
|
-
# end
|
354
|
-
|
355
|
-
# # ------------------------------------------------------------------------
|
356
|
-
# # Generates default series labels
|
357
|
-
# def gen_default_labels( size )
|
358
|
-
# labels = []
|
359
|
-
# size.times { |i| labels << nil }
|
360
|
-
# @xml.row do
|
361
|
-
# labels.each { |c| @xml.null }
|
362
|
-
# end
|
363
|
-
# end
|
364
|
-
|
365
|
-
# ------------------------------------------------------------------------
|
366
296
|
# generates chart data row
|
367
297
|
# TODO Validate options !!
|
368
298
|
def gen_row_data( value, opts=nil, xml=@xml )
|
@@ -373,19 +303,16 @@ module Ziya::Charts
|
|
373
303
|
end
|
374
304
|
end
|
375
305
|
|
376
|
-
# -------------------------------------------------------------------------
|
377
306
|
# generates string chart_value
|
378
307
|
def gen_string_data( value, opts, xml )
|
379
308
|
opts ? xml.string( opts ) { |x| x.text!( value ) } : xml.string( value )
|
380
309
|
end
|
381
310
|
|
382
|
-
# -------------------------------------------------------------------------
|
383
311
|
# generates number chart_value
|
384
312
|
def gen_number_data( value, opts, xml )
|
385
313
|
opts ? xml.number( opts ) { |x| x.text!( value.to_s ) } : xml.number( value )
|
386
314
|
end
|
387
315
|
|
388
|
-
# -------------------------------------------------------------------------
|
389
316
|
# generates chart data points
|
390
317
|
# BOZO !! Check args on hash
|
391
318
|
def gen_chart_data( series )
|
@@ -409,15 +336,14 @@ module Ziya::Charts
|
|
409
336
|
end
|
410
337
|
end
|
411
338
|
|
412
|
-
#
|
413
|
-
# Lay down graph data points and labels if any
|
339
|
+
# lay down graph data points and labels if any
|
414
340
|
# TODO Validate series sizes/label sizes
|
415
341
|
def setup_series
|
416
342
|
raise "You must specify an axis_category_text with your series." if !@series_desc.empty? and ! @options[:axis_category_text]
|
417
343
|
|
418
344
|
if @options[:axis_category_text]
|
419
345
|
@xml.chart_data do
|
420
|
-
|
346
|
+
gen_axis_category
|
421
347
|
# render xml for each series
|
422
348
|
@series_desc.each do |series|
|
423
349
|
gen_chart_data( series )
|
@@ -445,8 +371,7 @@ module Ziya::Charts
|
|
445
371
|
|
446
372
|
end
|
447
373
|
|
448
|
-
#
|
449
|
-
# Walk up class hierarchy to find chart inheritance classes
|
374
|
+
# walk up class hierarchy to find chart inheritance classes
|
450
375
|
def ancestors
|
451
376
|
ancestors = self.class.ancestors.reverse
|
452
377
|
allow = false
|
@@ -456,14 +381,12 @@ module Ziya::Charts
|
|
456
381
|
end.compact!
|
457
382
|
end
|
458
383
|
|
459
|
-
#
|
460
|
-
# Check if we should do the all monty or just render the instance styles
|
384
|
+
# check if we should do the all monty or just render the instance styles
|
461
385
|
def render_parents?
|
462
386
|
(@render_mode == Base.mode_reset)
|
463
387
|
end
|
464
388
|
|
465
|
-
#
|
466
|
-
# Load up look and feel data
|
389
|
+
# load up look and feel data
|
467
390
|
def load_lnf
|
468
391
|
unless @partial
|
469
392
|
ancestors.each do |super_class|
|
@@ -490,8 +413,7 @@ module Ziya::Charts
|
|
490
413
|
end
|
491
414
|
end
|
492
415
|
|
493
|
-
#
|
494
|
-
# Generates xml for look and feel data
|
416
|
+
# generates xml for look and feel data
|
495
417
|
def setup_lnf
|
496
418
|
load_lnf
|
497
419
|
unless @partial
|
@@ -506,7 +428,7 @@ module Ziya::Charts
|
|
506
428
|
end
|
507
429
|
end
|
508
430
|
|
509
|
-
#
|
431
|
+
# load up the allowable chart components
|
510
432
|
def initialize_components
|
511
433
|
# Setup instance vars
|
512
434
|
Base.components.each do |comp|
|
data/lib/ziya/components/area.rb
CHANGED
@@ -10,8 +10,7 @@ module Ziya::Components
|
|
10
10
|
# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=link
|
11
11
|
# for additional documentation, examples and futher detail.
|
12
12
|
class Area < Base
|
13
|
-
has_attribute :x, :y, :width, :height, :url, :priority, :target, :
|
14
|
-
:
|
15
|
-
:timeout, :retry, :spinning_wheel
|
13
|
+
has_attribute :x, :y, :width, :height, :url, :priority, :target, :tooltip,
|
14
|
+
:timeout, :retry, :spinning_wheel
|
16
15
|
end
|
17
16
|
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# -----------------------------------------------------------------------------
|
2
|
+
# Draws a button on a chart
|
3
|
+
#
|
4
|
+
# Author:: Fernand Galiana
|
5
|
+
# -----------------------------------------------------------------------------
|
6
|
+
module Ziya::Components
|
7
|
+
# Button component to draw a a button on the chart.
|
8
|
+
# Must be set up within the draw component.
|
9
|
+
# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw
|
10
|
+
# for additional documentation, examples and futher detail.
|
11
|
+
class Button < Base
|
12
|
+
has_attribute :layer, :transition, :delay, :duration,
|
13
|
+
:url_idle, :url_over, :url_press, :x, :y,
|
14
|
+
:width, :height, :alpha,
|
15
|
+
:bevel, :glow, :blur, :shadow,
|
16
|
+
:timeout, :retry
|
17
|
+
end
|
18
|
+
end
|
@@ -9,8 +9,10 @@ module Ziya::Components
|
|
9
9
|
# for additional documentation, examples and futher detail.
|
10
10
|
class ChartGuide < Base
|
11
11
|
has_attribute :horizontal, :vertical, :thickness, :color, :alpha, :type,
|
12
|
-
:snap_h, :snap_v, :
|
12
|
+
:snap_h, :snap_v, :connect,
|
13
|
+
:radius, :fill_color, :line_color, :line_alpha, :line_thickness,
|
13
14
|
:text_h_alpha, :text_v_alpha, :prefix_h, :prefix_v, :suffix_h, :suffix_v,
|
14
|
-
:decimals, :decimal_char, :separator, :font, :bold, :size, :text_color,
|
15
|
+
:decimals, :decimal_char, :separator, :font, :bold, :size, :text_color,
|
16
|
+
:background_color
|
15
17
|
end
|
16
18
|
end
|
@@ -0,0 +1,18 @@
|
|
1
|
+
# -----------------------------------------------------------------------------
|
2
|
+
# Describes the look and feel for a chart annotation. An annotation must be
|
3
|
+
# added using the Chart#add( :series) call using the hash definition ie
|
4
|
+
#
|
5
|
+
# chart.add( :series, "fred", [ { :value => 10, :note => "Hi there !"} ] )
|
6
|
+
#
|
7
|
+
# Author:: Fernand Galiana
|
8
|
+
# -----------------------------------------------------------------------------
|
9
|
+
module Ziya::Components
|
10
|
+
# Specifies an annotation look and feel on a chart.
|
11
|
+
# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=chart_note
|
12
|
+
# for additional documentation, examples and futher detail.
|
13
|
+
class ChartNote < Base
|
14
|
+
has_attribute :type, :x, :y, :offset_x, :offset_y,
|
15
|
+
:font, :bold, :size, :color, :alpha,
|
16
|
+
:background_color, :background_alpha, :shadow, :bevel, :glow, :blur
|
17
|
+
end
|
18
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# -----------------------------------------------------------------------------
|
2
|
+
# Describes the look and feel for a chart annotation. An annotation must be
|
3
|
+
# added using the Chart#add( :series) call using the hash definition ie
|
4
|
+
#
|
5
|
+
# chart.add( :series, "fred", [ { :value => 10, :tooltip => "Hi there !"} ] )
|
6
|
+
#
|
7
|
+
# Author:: Fernand Galiana
|
8
|
+
# -----------------------------------------------------------------------------
|
9
|
+
module Ziya::Components
|
10
|
+
# Specifies the label for the chart element actual value. This can be setup to
|
11
|
+
# be fixed or as a tooltip
|
12
|
+
# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=tooltip
|
13
|
+
# for additional documentation, examples and futher detail.
|
14
|
+
class Tooltip < Base
|
15
|
+
has_attribute :font, :bold, :size, :color, :alpha,
|
16
|
+
:background_color, :background_alpha,
|
17
|
+
:duration,
|
18
|
+
:shadow, :bevel, :glow, :blur
|
19
|
+
end
|
20
|
+
end
|
data/lib/ziya/version.rb
CHANGED
data/lib/ziya/ziya_helper.rb
CHANGED
@@ -11,17 +11,22 @@ module Ziya
|
|
11
11
|
|
12
12
|
# generates a javascript tag to include the js script to create object and
|
13
13
|
# embed tags
|
14
|
-
def ziya_javascript_include_tag
|
14
|
+
def ziya_javascript_include_tag( opts={} )
|
15
|
+
options = { :swf_path => chart_path,
|
16
|
+
:major_vers => 9,
|
17
|
+
:minor_vers => 0,
|
18
|
+
:req_vers => 45 }.merge!( opts )
|
19
|
+
|
15
20
|
js = <<-JS
|
16
21
|
<script language="javascript" type="text/javascript">
|
17
22
|
AC_FL_RunContent = 0;
|
18
23
|
DetectFlashVer = 0;
|
19
24
|
</script>
|
20
|
-
<script src="/
|
25
|
+
<script src="#{options[:swf_path]}/AC_RunActiveContent.js" language="javascript"></script>
|
21
26
|
<script language="javascript" type="text/javascript">
|
22
|
-
var requiredMajorVersion =
|
23
|
-
var requiredMinorVersion =
|
24
|
-
var requiredRevision =
|
27
|
+
var requiredMajorVersion = #{options[:major_vers]};
|
28
|
+
var requiredMinorVersion = #{options[:minor_vers]};
|
29
|
+
var requiredRevision = #{options[:req_vers]};
|
25
30
|
</script>
|
26
31
|
JS
|
27
32
|
end
|
data/release_notes.txt
CHANGED
@@ -1,4 +1,10 @@
|
|
1
1
|
2.0.0 - Gem release - Update to xml/swf 5.0.2 added xml/gauge 1.6
|
2
2
|
2.0.1 - Update for xml/swf 5.0.3
|
3
3
|
2.0.2 - Changed logging required to 0.9.X - Update to xml/swf 5.0.4
|
4
|
-
2.0.3 - README file update - Thanks to Paul James !
|
4
|
+
2.0.3 - README file update - Thanks to Paul James !
|
5
|
+
2.0.4 - Fixed missing encoding on composite urls - published gem on github
|
6
|
+
2.0.5 - Fixed merb app support issue
|
7
|
+
2.0.6 - Updates to support xml/swf 5.0.5
|
8
|
+
Fixed configuration with stacked 3d area charts
|
9
|
+
Added support for nil url in ziya_chart_helper - This allows to get a js callback when the
|
10
|
+
chart loads and populate the charts xml via javascript
|
data/spec/ziya_helper_spec.rb
CHANGED
@@ -37,7 +37,7 @@ describe Ziya::Helper do
|
|
37
37
|
end
|
38
38
|
|
39
39
|
it "should generate the correct js based chart tag" do
|
40
|
-
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"
|
40
|
+
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"
|
41
41
|
end
|
42
42
|
|
43
43
|
it "should set the wmode to opaque if bg_color is set" do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ziya
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Fernand Galiana
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2008-10-
|
12
|
+
date: 2008-10-11 00:00:00 -06:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -67,6 +67,7 @@ files:
|
|
67
67
|
- charts/charts_library/pino.swf
|
68
68
|
- charts/charts_library/pono.swf
|
69
69
|
- charts/charts_library/scno.swf
|
70
|
+
- charts/full_screen.swf
|
70
71
|
- charts/scripts/output_jpg.php
|
71
72
|
- charts/sliders/black.swf
|
72
73
|
- charts/sliders/preview_handle_1.swf
|
@@ -111,11 +112,13 @@ files:
|
|
111
112
|
- lib/ziya/components/base.rb
|
112
113
|
- lib/ziya/components/bevel.rb
|
113
114
|
- lib/ziya/components/blur.rb
|
115
|
+
- lib/ziya/components/button.rb
|
114
116
|
- lib/ziya/components/chart_border.rb
|
115
117
|
- lib/ziya/components/chart_grid_h.rb
|
116
118
|
- lib/ziya/components/chart_grid_v.rb
|
117
119
|
- lib/ziya/components/chart_guide.rb
|
118
120
|
- lib/ziya/components/chart_label.rb
|
121
|
+
- lib/ziya/components/chart_note.rb
|
119
122
|
- lib/ziya/components/chart_pref.rb
|
120
123
|
- lib/ziya/components/chart_rect.rb
|
121
124
|
- lib/ziya/components/chart_transition.rb
|
@@ -137,6 +140,7 @@ files:
|
|
137
140
|
- lib/ziya/components/series_explode.rb
|
138
141
|
- lib/ziya/components/shadow.rb
|
139
142
|
- lib/ziya/components/text.rb
|
143
|
+
- lib/ziya/components/tooltip.rb
|
140
144
|
- lib/ziya/components/update.rb
|
141
145
|
- lib/ziya/gauges/base.rb
|
142
146
|
- lib/ziya/gauges/radial.rb
|