ziya 2.0.7 → 2.1.6

data/lib/ziya/{components → charts/support}/area.rb

@@ -3,9 +3,9 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-require 'ziya/components/base'
+require 'ziya/charts/support/base'
 
-module Ziya::Components
+module Ziya::Charts::Support
   # Creates a linkable area on the chart to use with the link component.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=link
   # for additional documentation, examples and futher detail.

data/lib/ziya/{components → charts/support}/axis_category.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the label attributes on the x or y axis depending on the chart type.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=axis_category
   # for additional documentation, examples and futher detail.  

data/lib/ziya/{components → charts/support}/axis_ticks.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # ------------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the tick marks on the chart axes.
   #
   # <tt>value_ticks</tt>:       A boolean value that indicates whether the ticks on the value axis are visible or not.

data/lib/ziya/{components → charts/support}/axis_value.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the label attribute on the x or y axis depending on the chart type.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=axis_value
   # for additional documentation, examples and futher detail.    

data/lib/ziya/{components → charts/support}/base.rb

@@ -7,9 +7,10 @@
 # Author:: Fernand Galiana
 # Date::   Dec 15th, 2006
 # -----------------------------------------------------------------------------
-module Ziya::Components
+require 'ziya/core_ext/string'
+
+module Ziya::Charts::Support
   class Base # :nodoc:
-    include Ziya::Utils::Text
         
     # class methods...
     class << self     
@@ -59,10 +60,11 @@ module Ziya::Components
       end
     end
   
+    # -------------------------------------------------------------------------
+    # Flattens out this component to xml
     def flatten( xml )
-      hash  = has_sub_components
-      clazz = demodulize( self.class.name )
-      pref  = underscore( clazz )
+      hash = has_sub_components
+      pref = self.class.name.demodulize.underscore
       if hash and ! hash.empty?     
         self.class.module_eval <<-XML
          xml.#{pref}( #{options_as_string} ) do
@@ -74,20 +76,6 @@ module Ziya::Components
       end
     end
     
-    # -------------------------------------------------------------------------
-    # handles simple flatten operation
-    # def method_missing(method, *args)
-    #   case method
-    #     when :flatten
-    #       xml   = args.first
-    #       clazz = demodulize( self.class.name )
-    #       pref  = underscore( clazz )
-    #       self.class.module_eval "xml.#{pref}( #{options_as_string} )"
-    #     else
-    #       super.method_missing(method, *args)
-    #   end
-    # end
-  
     # -------------------------------------------------------------------------
     # checks if a give component properties have been set. 
     # return true if one or more props have been set. False otherwise...
@@ -110,7 +98,7 @@ module Ziya::Components
       options = {}
       attributes_for(self).each do |p|
         option = self.send(p.to_sym)   
-        options[p] = option unless option.nil?
+        options[p] = option if option
       end
       options
     end
@@ -122,7 +110,7 @@ module Ziya::Components
       opts = options
       opts.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |k|
         value = opts[k]
-        buff << sprintf( ":%s => '%s'", k, value.to_s ) if !value.nil? and !value.is_a? YAML::Omap
+        buff << sprintf( ":%s => '%s'", k, value.to_s ) if value and !value.is_a? YAML::Omap
       end      
       buff.join( "," )
     end

data/lib/ziya/{components → charts/support}/bevel.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the bevel filter to be applied to some component ie chart_rect, axis_value, etc...
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=filter
   # for additional documentation, examples and futher detail.    

data/lib/ziya/{components → charts/support}/blur.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the blur filter to be applied to some component ie chart_rect, axis_value, etc...
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=filter
   # for additional documentation, examples and futher detail.

data/lib/ziya/{components → charts/support}/button.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Button component to draw a a button on the chart. 
   # Must be set up within the draw component.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw

data/lib/ziya/{components → charts/support}/chart_border.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies how to render a chart border
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=chart_border
   # for additional documentation, examples and futher detail.      

data/lib/ziya/{components → charts/support}/chart_grid_h.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the chart's horizontal grid attributes.
   #
   # <tt>thickness</tt>:   The thickness of the grid's horizontal lines. Valid values are zero and above.

data/lib/ziya/{components → charts/support}/chart_grid_v.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the chart's vertical grid attributes.
   #
   # <tt>thickness</tt>:   The thickness of the grid's vertical lines. Valid values are zero and above.

data/lib/ziya/{components → charts/support}/chart_guide.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies how to configure a guide for either axis on a chart
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=chart_guide
   # for additional documentation, examples and futher detail.        

data/lib/ziya/{components → charts/support}/chart_label.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the label for the chart element actual value. This can be setup to 
   # be fixed or as a tooltip
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=chart_label

data/lib/ziya/{components → charts/support}/chart_note.rb

@@ -6,7 +6,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies an annotation look and feel on a chart. 
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=chart_note
   # for additional documentation, examples and futher detail.          

data/lib/ziya/{components → charts/support}/chart_pref.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the preferences for some chart types. Each chart type has different preferences,
   # or no preferences at all.
   #
@@ -17,6 +17,7 @@ module Ziya::Components
                   :type, :bull_color, :bear_color,
                   :drag, :min_x, :min_y, :max_x, :max_y,
                   :trend_thickness, :trend_alpha, :line_alpha, :rotation_x,
-                  :rotation_y, :grid, :select, :empty_center
+                  :rotation_y, :grid, :select, :empty_center,
+                  :zero_line
   end
 end

data/lib/ziya/{components → charts/support}/chart_rect.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the chart's rectangle
   #
   # <tt>x</tt>:               The horizontal position of the rectangle's upper left corner relative to the upper

data/lib/ziya/{components → charts/support}/chart_transition.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the transition attributes for the chart elements.
   #
   # <tt>type</tt>:      The type of the transition. Valid values are dissolve, drop, spin, scale, zoom,

data/lib/ziya/{components → charts/support}/circle.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Circle component to draw a circle on the chart. Must be set up within the draw
   # component.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw

data/lib/ziya/{components → charts/support}/context_menu.rb

@@ -3,9 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-require 'ziya/components/base'
-
-module Ziya::Components
+module Ziya::Charts::Support
   # 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.

data/lib/ziya/charts/support/draw.rb

@@ -0,0 +1,76 @@
+# -----------------------------------------------------------------------------

+# Sets up a drawing area on the chart to draw text, rect, circles...
+#
+# Author:: Fernand Galiana
+# -----------------------------------------------------------------------------
+require 'ziya/html_helpers/charts'
+
+module Ziya::Charts::Support
+  # Sets up a drawing area on the chart to draw text, rect, circles...
+  #
+  # Holds any number of elements to draw. A draw element can be a circle, image (JPEG or SWF),
+  # line, rectangle, or text. Use draw "image" to include SWF flash file with animation,
+  # roll-over buttons, sounds, scripts, etc.
+  #
+  # <tt></tt>:
+  #
+  # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw
+  # for additional documentation, examples and futher detail.
+  #  
+  class Draw < Base  
+    include Ziya::HtmlHelpers::Charts
+    
+    has_attribute :components
+                         
+    # -------------------------------------------------------------------------
+    # Override merge attributes enhance component definitions vs override
+    def merge( parent_attributes, override=false )
+      comps = send( :components ) || []
+      comps = comps + parent_attributes.send( :components ) if parent_attributes.send( :components )
+      send( "components=", comps )      
+    end
+                         
+    # -------------------------------------------------------------------------
+    # Dump has_attribute into xml element
+    def flatten( xml, composite_urls=nil )
+      if components or composite_urls
+        xml.draw do 
+          components.each { |comp| comp.flatten( xml ) } if components
+          gen_composites( xml, composite_urls ) if composite_urls
+        end
+      end
+    end
+    
+    # -------------------------------------------------------------------------
+    # Generates Draw component for composite charts
+    def gen_composites( xml, composite_urls ) 
+      composite_urls.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |chart_id|
+        # composite descriptor can either be a string for the comp url or a pair for the swf lib_path and url
+        raise "You must specify a hash of options" unless composite_urls[chart_id].is_a? Hash
+        opts = composite_urls[chart_id].clone
+        url  = opts.delete( :url )
+        raise "Unable to find composite chart url" unless url
+        path = opts.delete(:path ) || chart_path 
+        opts[:url] = gen_composite_path( path, url, chart_id )
+        
+        self.class.module_eval <<-XML
+         xml.image( #{opts_as_string( opts )} )
+        XML
+        
+        # xml.image( opts )
+      end
+    end
+    
+    # -------------------------------------------------------------------------
+    # Turns options hash into string representation
+    def opts_as_string( opts )
+      buff = []
+      opts.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |k|
+        value = opts[k]
+        buff << sprintf( ":%s => '%s'", k, value.to_s ) if value
+      end    
+      buff.join( "," )
+    end
+
+  end
+end

data/lib/ziya/{components → charts/support}/draw_base.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   class DrawBase < Base  # :nodoc:
     has_attribute :shadow, :bevel, :glow, :blur
   end

data/lib/ziya/{components → charts/support}/filter.rb

@@ -6,7 +6,7 @@
 #
 # Author:: Fernand
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the various filters that can be reused across components ie blur, bevel, glow, etc...
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=filter
   # for additional documentation, examples and futher detail.      

data/lib/ziya/charts/support/flash_to_javascript.rb

@@ -0,0 +1,23 @@
+# -----------------------------------------------------------------------------
+# Provide for the toggling of js function callback. You can enable or disable
+# some or all the automatic flash to js callbacks using this component
+#
+# Author:: Fernand Galiana
+# -----------------------------------------------------------------------------
+module Ziya::Charts::Support
+  # Toggles flash to js callbacks. 
+  #
+  # === Example
+  # Add this component to your yaml stylesheet. Enables Loaded_Chart callback and disable
+  # all other callbacks.
+  #  <%= comp :flash_to_javascript %>
+  #    Loaded_Chart:   true
+  #    Render_Count:   false
+  #    Scrolled_Chart: false
+  # 
+  # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=Flash_to_Javascript
+  # for additional documentation, examples and further detail.
+  class FlashToJavascript < Base  
+    has_attribute :Loaded_Chart, :Render_Count, :Scrolled_Chart, :Stopped_Scrolling
+  end
+end

data/lib/ziya/{components → charts/support}/glow.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Specifies the glow filter to be applied to some component ie chart_rect, axis_value, etc...
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=filter
   # for additional documentation, examples and futher detail.      

data/lib/ziya/{components → charts/support}/image.rb

@@ -5,7 +5,7 @@
 # Author:: Fernand Galiana
 # Date::   Dec 15th, 2006
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Renders the specified image (jpg/gif) on the chart. Must be set up within the draw
   # component.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw

data/lib/ziya/{components → charts/support}/legend.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Renders a legend on the chart
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=legend
   # for additional documentation, examples and futher detail.          

data/lib/ziya/{components → charts/support}/line.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Line component to draw a line on the chart. Must be set up within the draw
   # component.
   # See http://www.maani.us/xml_charts/index.php?menu=Reference&submenu=draw

data/lib/ziya/{components → charts/support}/link.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets up clickable areas on the chart.
   #
   # Holds any number of areas, each defining a rectangle and a URL to go to when the user
@@ -16,6 +16,14 @@ module Ziya::Components
   class Link < Base  
     has_attribute :areas
                      
+    # -------------------------------------------------------------------------
+    # Override merge attributes enhance component definitions vs override
+    def merge( parent_attributes, override=false )
+      comps = send( :areas ) || []
+      comps = comps + parent_attributes.send( :areas ) if parent_attributes.send( :areas )
+      send( "areas=", comps )
+    end
+                     
     # -------------------------------------------------------------------------
     # Dump has_attribute into xml element
     def flatten( xml )

data/lib/ziya/{components → charts/support}/link_data.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Fernand Galiana
 # -----------------------------------------------------------------------------
-module Ziya::Components
+module Ziya::Charts::Support
   # Sets the URL of a script responsible for processing clicks on chart elements.
   # This enables drilling down into charts.
   #