ziya 2.0.5 → 2.0.6

data/Manifest.txt

@@ -15,25 +15,27 @@ 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
 charts/charts_library/clst.swf
 charts/charts_library/cnno.swf
+charts/charts_library/dollar.jpg
 charts/charts_library/dono.swf
 charts/charts_library/lnno.swf
 charts/charts_library/mxno.swf
 charts/charts_library/pi3d.swf
+charts/charts_library/pie.jpg
+charts/charts_library/piim.swf
 charts/charts_library/pino.swf
 charts/charts_library/pono.swf
 charts/charts_library/scno.swf
-charts/full_screen.swf
 charts/scripts/output_jpg.php
 charts/sliders/black.swf
 charts/sliders/preview_handle_1.swf
 charts/sliders/preview_handle_2.swf
-cp_doc.sh
-fred.rb
+charts/ziya.js
 gauges/designs/circle.yml
 gauges/designs/signal.yml
 gauges/designs/thermo.yml
@@ -48,9 +50,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

data/README.txt

@@ -11,6 +11,7 @@ ziya
   2.0.3 - README file update - Thanks to Paul James !
   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:
 

data/Rakefile

@@ -41,4 +41,4 @@ end
 
 task 'gem:package' => 'manifest:assert'
 
-depend_on "logging", "~> 0.9.0"
+depend_on "logging", ">= 0.9.0"

data/charts/ziya.js

@@ -0,0 +1,66 @@
+// Embed chart in a site
+function ziya_micro( host_url, callback_url, size, background )
+{ 
+   var html = "";
+   html += ziya_setup( host_url );
+   html += ziya_gen( host_url, callback_url, size, background );
+   
+   document.write( html );
+}
+
+// setup js script
+function ziya_setup( host_url )
+{
+    var html = "";
+    html += "<script language=\"javascript\" type=\"text/javascript\">";
+    html += "AC_FL_RunContent = 0;";
+    html += "DetectFlashVer   = 0;";
+    html += "</script>";
+
+    html += "<script src=\"" + host_url + "/AC_RunActiveContent.js\" language=\"javascript\" type=\"text/javascript\"></script>";
+    html += "<script language=\"javascript\" type=\"text/javascript\">";
+    html += "var requiredMajorVersion = 9;"
+    html += "var requiredMinorVersion = 0;"
+    html += "var requiredRevision     = 45;"
+    html += "</script>"    
+    return html;
+}
+
+function ziya_gen( host_url, callback_url, size, background )
+{
+    var tokens = size.split( "x" );
+    var width  = tokens[0];
+    var height = tokens[1];
+    var html = "";
+    html += "<script language=\"javascript\" type=\"text/javascript\">";
+    html +=  "var hasRightVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);";
+    html +=  "if( hasRightVersion ) {";
+    html +=  "AC_FL_RunContent(";
+    html +=  "'codebase'         , 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,45,0',";
+    html +=  "'width'            , '" + width + "',";
+    html +=  "'height'           , '" + height + "}',";
+    html +=  "'scale'            , 'noscale',";
+    html +=  "'salign'           , 'tl',";
+    html +=  "'bgcolor'          , '" + background + "',";
+    html +=  "'wmode'            , 'opaque',";
+    html +=  "'movie'            , '" + host_url + "/charts',";
+    html +=  "'src'              , '" + host_url + "/charts',";
+    html +=  "'FlashVars'        , 'library_path=" + host_url + "/charts_library&xml_source=" + escape( callback_url ) + "',";
+    html +=  "'id'               , 'chart',";
+    html +=  "'name'             , 'chart}',";
+    html +=  "'allowScriptAccess','sameDomain',";
+    html +=  "'quality'          , 'high',";
+    html +=  "'align'            , 'l',";
+    html +=  "'pluginspage'      , 'http://www.macromedia.com/go/getflashplayer',";
+    html +=  "'play'             , 'true',";
+    html +=  "'devicefont'       , 'false'";
+    html += ");";
+    html += "}";
+    html += "else {";
+    html += "var alternateContent = 'This content requires the Adobe Flash Player. '";
+    html += "+ '<u><a href=http://www.macromedia.com/go/getflash/>Get Flash</a></u>.';";
+    html += "document.write(alternateContent);";
+    html += "}";
+    html += "</script>";    
+    return html;
+}

data/lib/ziya/charts/base.rb

@@ -105,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" )
     #
@@ -162,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?
@@ -360,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
     
     # -------------------------------------------------------------------------

data/lib/ziya/charts/custom.rb

@@ -0,0 +1,18 @@
+# -----------------------------------------------------------------------------
+# Generates necessary xml for an custom chart 
+#
+# Author: Fernand
+# -----------------------------------------------------------------------------
+require 'ziya/charts/base'
+
+module Ziya::Charts
+  class Custom < Base
+    # Creates an area chart
+    # <tt>:license</tt>::  the XML/SWF charts license
+    # <tt>:chart_id</tt>:: the name of the chart style sheet.        
+    def initialize( license=nil, chart_id=nil )
+      super( license, chart_id )
+      @type = ""      
+    end
+  end
+end

data/lib/ziya/charts/image_column.rb

@@ -0,0 +1,18 @@
+# -----------------------------------------------------------------------------
+# Generates necessary xml for an image column chart 
+#
+# Author: Fernand
+# -----------------------------------------------------------------------------
+require 'ziya/charts/base'
+
+module Ziya::Charts
+  class ImageColumn < Base
+    # Creates an area chart
+    # <tt>:license</tt>::  the XML/SWF charts license
+    # <tt>:chart_id</tt>:: the name of the chart style sheet.        
+    def initialize( license=nil, chart_id=nil )
+      super( license, chart_id )
+      @type = "image column"      
+    end
+  end
+end

data/lib/ziya/charts/image_pie.rb

@@ -0,0 +1,18 @@
+# -----------------------------------------------------------------------------
+# Generates necessary xml for an image pie chart 
+#
+# Author: Fernand
+# -----------------------------------------------------------------------------
+require 'ziya/charts/base'
+
+module Ziya::Charts
+  class ImagePie < Base
+    # Creates an area chart
+    # <tt>:license</tt>::  the XML/SWF charts license
+    # <tt>:chart_id</tt>:: the name of the chart style sheet.        
+    def initialize( license=nil, chart_id=nil )
+      super( license, chart_id )
+      @type = "image pie"      
+    end
+  end
+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  = 5
+    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
@@ -44,7 +44,7 @@ describe Ziya::Helper 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ziya
 version: !ruby/object:Gem::Version 
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-02 00:00:00 -06:00
+date: 2008-10-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.0
     version: 
@@ -51,25 +51,27 @@ files:
 - 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
 - charts/charts_library/clst.swf
 - charts/charts_library/cnno.swf
+- charts/charts_library/dollar.jpg
 - charts/charts_library/dono.swf
 - charts/charts_library/lnno.swf
 - charts/charts_library/mxno.swf
 - charts/charts_library/pi3d.swf
+- charts/charts_library/pie.jpg
+- charts/charts_library/piim.swf
 - charts/charts_library/pino.swf
 - charts/charts_library/pono.swf
 - charts/charts_library/scno.swf
-- charts/full_screen.swf
 - charts/scripts/output_jpg.php
 - charts/sliders/black.swf
 - charts/sliders/preview_handle_1.swf
 - charts/sliders/preview_handle_2.swf
-- cp_doc.sh
-- fred.rb
+- charts/ziya.js
 - gauges/designs/circle.yml
 - gauges/designs/signal.yml
 - gauges/designs/thermo.yml
@@ -84,9 +86,12 @@ files:
 - 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

data/cp_doc.sh

@@ -1 +0,0 @@
-scp -r docs derailed@rubyforge.org:/var/www/gforge-projects/ziya

data/fred.rb

@@ -1,36 +0,0 @@
-# GAUGE IDEAS ??
-
-css_parser for ruby
-
-gauge = Ziya::Gauges::Base.new( :id => 'volume' )
-gauge.add( Ziya::Gauges::Support::RadialTicks.new( :id => 'ticks' ) )
-
-gauge 'volume'
-radial_ticks 'volume_ticks'
-rotate( circle( :circle_1), circle( :circle_2 ) )
-
-    
-gauge#volume {
-  x:      100;
-  y:      100;
-  radius: 35;
-}
-
-gauge#volume rotate {
-  x: 100;
-  y:  75;
-}
-
-gauge = Ziya::Gauges::Base.new( :id => "fred" )
-gauge.add( :ticks,  :volume_ticks )
-gauge.add( :circle, :circle_1 )
-gauge.add( :circle, :circle_2 )
-gauge.add( :rotate, :circle_1, :circle_2 )
-gauge.to_xml
-
-gauge#fred {
-}
-
-gauge#fred circle#volume_ticks {
-
-}