ziya 2.0.0 → 2.0.1

data/Manifest.txt

@@ -20,6 +20,7 @@ charts/charts_library/clp3.swf
 charts/charts_library/cls3.swf
 charts/charts_library/clst.swf
 charts/charts_library/cnno.swf
+charts/charts_library/dono.swf
 charts/charts_library/lnno.swf
 charts/charts_library/mxno.swf
 charts/charts_library/pi3d.swf
@@ -27,9 +28,11 @@ 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
 gauges/designs/circle.yml
 gauges/designs/signal.yml
@@ -45,6 +48,7 @@ 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/donut.rb
 lib/ziya/charts/floating_bar.rb
 lib/ziya/charts/floating_column.rb
 lib/ziya/charts/line.rb
@@ -75,6 +79,7 @@ lib/ziya/components/chart_pref.rb
 lib/ziya/components/chart_rect.rb
 lib/ziya/components/chart_transition.rb
 lib/ziya/components/circle.rb
+lib/ziya/components/context_menu.rb
 lib/ziya/components/draw.rb
 lib/ziya/components/draw_base.rb
 lib/ziya/components/filter.rb
@@ -86,10 +91,9 @@ lib/ziya/components/link.rb
 lib/ziya/components/link_data.rb
 lib/ziya/components/rect.rb
 lib/ziya/components/scroll.rb
+lib/ziya/components/series.rb
 lib/ziya/components/series_color.rb
 lib/ziya/components/series_explode.rb
-lib/ziya/components/series_gap.rb
-lib/ziya/components/series_switch.rb
 lib/ziya/components/shadow.rb
 lib/ziya/components/text.rb
 lib/ziya/components/update.rb
@@ -126,9 +130,10 @@ spec/components/area_spec.rb
 spec/components/draw_spec.rb
 spec/components/filter_spec.rb
 spec/components/link_spec.rb
+spec/components/series.rb
 spec/components/series_color_spec.rb
+spec/components/series_explode.rb
 spec/components/series_explode_spec.rb
-spec/components/series_switch_spec.rb
 spec/designs/circle.yml
 spec/designs/crapping_out.yml
 spec/designs/gauge_1.yml

data/charts/scripts/output_jpg.php

@@ -0,0 +1,23 @@
+<?php
+    if(!function_exists("imagecreate")) die("Sorry, the GD library is needed to run this script.");
+
+	$data = explode(",", $_POST['img']);
+	$width = $_POST['width'];
+	$height = $_POST['height'];
+	$image=imagecreatetruecolor( $width ,$height );
+	$background = imagecolorallocate( $image ,0 , 0 , 0 );
+	//Copy pixels
+	$i = 0;
+	for($x=0; $x<=$width; $x++){
+		for($y=0; $y<=$height; $y++){
+			$int = hexdec($data[$i++]);
+			$color = ImageColorAllocate ($image, 0xFF & ($int >> 0x10), 0xFF & ($int >> 0x8), 0xFF & $int);
+			imagesetpixel ( $image , $x , $y , $color );
+		}
+	}
+	//Output image and clean
+	header( "Content-type: image/jpeg" );
+	ImageJPEG( $image );
+	imagedestroy( $image );	
+?>
+

data/cp_doc.sh

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

data/lib/ziya/charts/base.rb

@@ -32,9 +32,9 @@ module Ziya::Charts
           :chart_rect, :chart_border, :chart_grid_h, :chart_grid_v,
           :chart_transition, :chart_label, :chart_guide, :legend,
           :filter, :draw, 
-          :series_color, :series_gap, :series_switch, :series_explode, 
+          :series_color, :series, :series_explode, 
           :chart_pref, :scroll,
-          :update, :link_data, :link]                              
+          :update, :link_data, :link, :context_menu]                              
         @components.each { |a| attr_accessor a }      
       end    
       declare_components
@@ -51,11 +51,12 @@ module Ziya::Charts
     # NOTE: If chart_id is specified the framework will attempt to load the chart styles
     # from public/themes/theme_name/chart_id.yml 
     def initialize( license=nil, chart_id=nil ) 
-      @id      = chart_id
-      @license = license
-      @options = {}
-      @series  = []
-      @theme   = default_theme
+      @id          = chart_id
+      @license     = license
+      @options     = {}
+      @series_desc = []
+      @theme       = default_theme
+      @render_mode = Base.all_styles
       initialize_components
       load_helpers( Ziya.helpers_dir ) if Ziya.helpers_dir
     end
@@ -65,6 +66,12 @@ module Ziya::Charts
       @components
     end
     
+    # don't render stylesheets just gen code for chart stylesheet and data
+    def self.data_only() 1; end
+    
+    # renders everything
+    def self.all_styles() 0; end
+    
     # -------------------------------------------------------------------------
     # Default ZiYa theme
     def default_theme # :nodoc:
@@ -151,12 +158,12 @@ module Ziya::Charts
           @options[directive] = values
         when :series
           legend = args.first.is_a?(String) ? args.shift : ""
-          raise ArgumentError, "Must specify a series name" if legend.empty?
+          # raise ArgumentError, "Must specify a series name" if legend.empty?
           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 << points
+            @series_desc << points
           else
             raise ArgumentError, "Must specify an array of data points"
           end
@@ -178,6 +185,9 @@ module Ziya::Charts
           theme = args.first.is_a?(String) ? args.shift : ""
           raise ArgumentError, "Must specify a theme name" if theme.to_s.empty?          
           @theme = "#{Ziya.themes_dir}/#{theme}"
+        when :mode
+          @render_mode = args.first.is_a?(Integer) ? args.shift : -1
+          raise ArgumentError, "Must specify a valid generation mode" if @render_mode == -1          
         else raise ArgumentError, "Invalid directive must be one of " + 
                                  ":axis_category_text, :axis_value, :series, :user_data"
       end 
@@ -194,13 +204,15 @@ module Ziya::Charts
       @xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
       @xml.chart do
         @xml.license( @license ) unless @license.nil?
-        if !@type.nil?
-          @xml.chart_type( @type )              
-        elsif @options[:chart_types].is_a? Array and ! @options[:chart_types].empty?
-          @xml.chart_type do   
-            @options[:chart_types].each { |type| @xml.string( type ) }   
+        if render_parents?
+          if !@type.nil?
+            @xml.chart_type( @type )              
+          elsif @options[:chart_types].is_a? Array and ! @options[:chart_types].empty?
+            @xml.chart_type do   
+              @options[:chart_types].each { |type| @xml.string( type ) }   
+            end
           end
-        end                
+        end
         setup_lnf
         setup_series
       end
@@ -394,13 +406,13 @@ module Ziya::Charts
     # Lay down graph data points and labels if any
     # TODO Validate series sizes/label sizes
     def setup_series
-      raise "You must specify an axis_category_text with your series." if !@series.empty? and ! @options[:axis_category_text]
+      raise "You must specify an axis_category_text with your series." if !@series_desc.empty? and ! @options[:axis_category_text]
       
       if @options[:axis_category_text]
         @xml.chart_data do 
           gen_data_points( :axis_category_text )
           # render xml for each series
-          @series.each do |series|
+          @series_desc.each do |series|
             gen_chart_data( series )
           end
         end  
@@ -437,14 +449,21 @@ module Ziya::Charts
       end.compact!
     end
     
+    # -------------------------------------------------------------------------
+    # Check if we should do the all monty or just render the instance styles
+    def render_parents?      
+      (@render_mode == Base.all_styles)
+    end
+    
     # -------------------------------------------------------------------------
     # Load up look and feel data
     def load_lnf     
       unless @partial
         ancestors.each do |super_class|
+          o = nil
           if ( super_class == self.class )
             # Load class instance prefs
-            o = inflate( super_class, theme )
+            o = inflate( super_class, theme ) if render_parents?
             setup_state( o ) unless o.nil? 
             # Now load instance prefs if any
             unless id.nil?
@@ -452,7 +471,7 @@ module Ziya::Charts
               setup_state( o ) unless o.nil?        
             end
           else
-            o = inflate( super_class, theme, nil )
+            o = inflate( super_class, theme, nil ) if render_parents?
             setup_state( o ) unless o.nil?
           end
         end      

data/lib/ziya/charts/donut.rb

@@ -0,0 +1,18 @@
+# -----------------------------------------------------------------------------
+# Generates necessary xml for donut chart 
+#
+# Author: Fernand
+# -----------------------------------------------------------------------------
+require 'ziya/charts/base'
+
+module Ziya::Charts
+  class Donut < Base
+    # Creates a donut 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 = "donut"      
+    end
+  end
+end

data/lib/ziya/components/context_menu.rb

@@ -0,0 +1,15 @@
+# -----------------------------------------------------------------------------
+# Defines an area on a chart. Typically used to embed links and buttons
+#
+# Author:: Fernand Galiana
+# -----------------------------------------------------------------------------
+require 'ziya/components/base'
+
+module Ziya::Components
+  # Refines the default context menu by adding or removing default options
+  # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=context_menu
+  # for additional documentation, examples and futher detail.
+  class ContextMenu < Base  
+    has_attribute :about, :print, :full_screen, :quality, :jpeg_url
+  end
+end

data/lib/ziya/components/series.rb

@@ -0,0 +1,16 @@
+# -----------------------------------------------------------------------------
+# Refines series attributes on a chart
+#
+# Author:: Fernand Galiana
+# -----------------------------------------------------------------------------
+require 'ziya/components/base'
+
+module Ziya::Components
+  # Specifies the gap betwen cols/bars and gap between series for column and bar
+  # charts only.
+  # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=series
+  # for additional documentation, examples and futher detail.
+  class Series < Base  
+    has_attribute :bar_gap, :set_gap, :transfer
+  end
+end

data/lib/ziya/version.rb

@@ -2,7 +2,7 @@ module Ziya
   module Version
     MAJOR = 2
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     
     # Returns the version string for the library.
     #

data/spec/components/{series_switch_spec.rb → series.rb}

@@ -1,18 +1,18 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
-describe Ziya::Components::SeriesSwitch do
+describe Ziya::Components::Series do
   before( :each ) do
-    @comp = Ziya::Components::SeriesSwitch.new
+    @comp = Ziya::Components::Series.new
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::SeriesSwitch.attributes[@comp.class.name].each {
+    lambda{ Ziya::Components::Series.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     
   it "should flatten component correctly" do
     xml          = Builder::XmlMarkup.new
     @comp.switch = false
-    @comp.flatten( xml ).should == "<series_switch>false</series_switch>"
+    @comp.flatten( xml ).should == "<series>false</series>"
   end
 end

data/spec/components/series_explode.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Ziya::Components::SeriesExplode do
+  before( :each ) do
+    @comp = Ziya::Components::SeriesExplode.new
+  end
+    
+  it "should define the correct attribute methods" do
+    lambda{ Ziya::Components::SeriesExplode.attributes[@comp.class.name].each {
+     |m| @comp.send( m ) } }.should_not raise_error
+  end
+    
+  describe "#flatten" do
+    before( :each ) do
+      @xml     = Builder::XmlMarkup.new
+      @results = "<series_explode><number>10</number><number>20</number><number>30</number></series_explode>"
+    end  
+    
+    it "should flatten string explode version correctly" do
+      @comp.numbers = "10,20,30"
+      @comp.flatten( @xml ).should == @results
+    end
+
+    it "should flatten string numbers with spaces explode version correctly" do
+      @comp.numbers = "10 , 20 , 30"
+      @comp.flatten( @xml ).should == @results
+    end
+
+    it "should flatten single string explode version correctly" do    
+      @comp.numbers = 10
+      @comp.flatten( @xml ).should == "<series_explode><number>10</number></series_explode>"
+    end
+    
+    it "should flatten array explode version correctly" do    
+      @comp.numbers = %w[10 20 30]
+      @comp.flatten( @xml ).should == @results
+    end    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ziya
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 -06:00
+date: 2008-08-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - charts/charts_library/cls3.swf
 - charts/charts_library/clst.swf
 - charts/charts_library/cnno.swf
+- charts/charts_library/dono.swf
 - charts/charts_library/lnno.swf
 - charts/charts_library/mxno.swf
 - charts/charts_library/pi3d.swf
@@ -62,9 +63,11 @@ files:
 - 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
 - gauges/designs/circle.yml
 - gauges/designs/signal.yml
@@ -80,6 +83,7 @@ files:
 - lib/ziya/charts/candle_stick.rb
 - lib/ziya/charts/column.rb
 - lib/ziya/charts/column_threed.rb
+- lib/ziya/charts/donut.rb
 - lib/ziya/charts/floating_bar.rb
 - lib/ziya/charts/floating_column.rb
 - lib/ziya/charts/line.rb
@@ -110,6 +114,7 @@ files:
 - lib/ziya/components/chart_rect.rb
 - lib/ziya/components/chart_transition.rb
 - lib/ziya/components/circle.rb
+- lib/ziya/components/context_menu.rb
 - lib/ziya/components/draw.rb
 - lib/ziya/components/draw_base.rb
 - lib/ziya/components/filter.rb
@@ -121,10 +126,9 @@ files:
 - lib/ziya/components/link_data.rb
 - lib/ziya/components/rect.rb
 - lib/ziya/components/scroll.rb
+- lib/ziya/components/series.rb
 - lib/ziya/components/series_color.rb
 - lib/ziya/components/series_explode.rb
-- lib/ziya/components/series_gap.rb
-- lib/ziya/components/series_switch.rb
 - lib/ziya/components/shadow.rb
 - lib/ziya/components/text.rb
 - lib/ziya/components/update.rb
@@ -161,9 +165,10 @@ files:
 - spec/components/draw_spec.rb
 - spec/components/filter_spec.rb
 - spec/components/link_spec.rb
+- spec/components/series.rb
 - spec/components/series_color_spec.rb
+- spec/components/series_explode.rb
 - spec/components/series_explode_spec.rb
-- spec/components/series_switch_spec.rb
 - spec/designs/circle.yml
 - spec/designs/crapping_out.yml
 - spec/designs/gauge_1.yml

data/lib/ziya/components/series_gap.rb

@@ -1,18 +0,0 @@
-# -----------------------------------------------------------------------------

-# Sets up the gap between bars/columns for bar and column charts.
-#
-# Applies to column and bar charts only, and sets the gap between bars and sets of bars.
-#
-# <tt></tt>:
-#
-# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=series_gap
-# for additional documentation, examples and futher detail.
-#
-# Author:: Fernand Galiana
-# Date::   Dec 15th, 2006
-# -----------------------------------------------------------------------------
-module Ziya::Components
-  class SeriesGap < Base  
-    has_attribute :bar_gap, :set_gap
-  end
-end

data/lib/ziya/components/series_switch.rb

@@ -1,25 +0,0 @@
-# -----------------------------------------------------------------------------

-# Sets up whether to switch colors for each element in a serie. Only applies
-# to chart with only one serie
-#
-# Switches the series colors to be used for the categories instead.
-#
-# <tt></tt>:
-#
-# See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=series_switch
-# for additional documentation, examples and futher detail.
-#
-# Author:: Fernand Galiana
-# Date::   Dec 15th, 2006
-# -----------------------------------------------------------------------------
-module Ziya::Components
-  class SeriesSwitch < Base  
-    has_attribute :switch
-    
-    # -------------------------------------------------------------------------
-    # Dump has_attribute into xml element    
-    def flatten( xml )
-      xml.series_switch( switch )
-    end
-  end
-end