derailed-ziya 2.0.6 → 2.0.8

data/lib/ziya/components/tooltip.rb

@@ -0,0 +1,20 @@
+# -----------------------------------------------------------------------------

+# Describes the look and feel for a chart annotation. An annotation must be
+# added using the Chart#add( :series) call using the hash definition ie
+#
+# chart.add( :series, "fred", [ { :value => 10, :tooltip => "Hi there !"} ] )
+#
+# Author:: Fernand Galiana
+# -----------------------------------------------------------------------------
+module Ziya::Components
+  # 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=tooltip
+  # for additional documentation, examples and futher detail.          
+  class Tooltip < Base  
+    has_attribute :font, :bold, :size, :color, :alpha, 
+                  :background_color, :background_alpha, 
+                  :duration,
+                  :shadow, :bevel, :glow, :blur        
+  end
+end

data/lib/ziya/helpers/base_helper.rb

@@ -10,11 +10,11 @@ module Ziya::Helpers
     # 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 ) %>
+    #   <%= chart_url( chart_1_path, "fred" ) %>
     #
-    #  => /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 )
+    #  => /charts/charts.swf?library_path=/charts/charts_library&xml_source=http://fred/load_chart_1.xml&chart_id=fred
+    def chart_url( url, swf_chart_dir="/charts", id=nil )
+      gen_composite_path( swf_chart_dir, url, id )
     end
     
     # indent yaml content vy multiples of 2 spaces

data/lib/ziya/version.rb

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

data/lib/ziya/ziya_helper.rb

@@ -11,17 +11,22 @@ module Ziya
     
     # generates a javascript tag to include the js script to create object and
     # embed tags
-    def ziya_javascript_include_tag
+    def ziya_javascript_include_tag( opts={} )
+      options = { :swf_path   => chart_path,
+                  :major_vers => 9,
+                  :minor_vers => 0,
+                  :req_vers   => 45 }.merge!( opts )
+      
       js = <<-JS
         <script language="javascript" type="text/javascript">
           AC_FL_RunContent = 0;
           DetectFlashVer = 0;
         </script>
-        <script src="/charts/AC_RunActiveContent.js" language="javascript"></script>
+        <script src="#{options[:swf_path]}/AC_RunActiveContent.js" language="javascript"></script>
         <script language="javascript" type="text/javascript">
-          var requiredMajorVersion = 9;
-          var requiredMinorVersion = 0;
-          var requiredRevision = 45;
+          var requiredMajorVersion = #{options[:major_vers]};
+          var requiredMinorVersion = #{options[:minor_vers]};
+          var requiredRevision = #{options[:req_vers]};
         </script>
        JS
     end
@@ -52,7 +57,7 @@ module Ziya
       # setup width and height
       setup_movie_size( options )
       
-      flash_vars   = url ? charts_swf : charts_swf_no_src
+      flash_vars   = url ? charts_swf : charts_swf_base
       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
@@ -135,29 +140,37 @@ module Ziya
                   :use_stage      => false
                 }.merge!(chart_options)
     
-      flash_vars = url ? charts_swf : charts_swf_no_src
+      flash_vars = url ? charts_swf : charts_swf_base
       generate_flash_tag( url, flash_vars, "charts.swf", options )
     end   
         
     # flash chart library path
-    def gen_composite_path( swf_chart_dir, url )
-      composite_url % [swf_chart_dir, swf_chart_dir, escape_url( url )] 
+    def gen_composite_path( swf_chart_dir, url, chart_id=null )
+      buff = ""
+      if url
+        buff = composite_url % [swf_chart_dir, swf_chart_dir, escape_url( url )] 
+      else
+        buff = composite_base_url % [swf_chart_dir, swf_chart_dir]
+      end
+      buff << "&chart_id=#{chart_id}" if chart_id
+      buff
     end
     
     # =========================================================================
     # 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_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
+      def mime()               "application/x-shockwave-flash"; end
+      def composite_base_url() "%s/charts.swf?library_path=%s/charts_library" end        
+      def composite_url()      "#{composite_base_url}&xml_source=%s" end
+      def charts_swf_base()    "library_path=%s/charts_library"; end      
+      def charts_swf()         "#{charts_swf_base}&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 )

data/release_notes.txt

@@ -0,0 +1,10 @@
+2.0.0 - Gem release - Update to xml/swf 5.0.2 added xml/gauge 1.6 
+2.0.1 - Update for xml/swf 5.0.3
+2.0.2 - Changed logging required to 0.9.X - Update to xml/swf 5.0.4
+2.0.3 - README file update - Thanks to Paul James !
+2.0.4 - Fixed missing encoding on composite urls - published gem on github
+2.0.5 - Fixed merb app support issue
+2.0.6 - Updates to support xml/swf 5.0.5 
+  Fixed configuration with stacked 3d area charts
+  Added support for nil url in ziya_chart_helper - This allows to get a js callback when the
+  chart loads and populate the charts xml via javascript

data/spec/charts/base_spec.rb

@@ -40,11 +40,11 @@ describe Ziya::Charts::Base do
     end    
     
     it "should support setting a composite chart urls" do
-      @chart.add( :composites, %w[url1 url2] )
-      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart></chart>"
+      @chart.add( :composites, { :fred => "url1", :blee => "url2" } )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><draw><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=url1&amp;chart_id=fred\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=url2&amp;chart_id=blee\"/></draw></chart>"
     end    
     it "should error if the composite url arg is not an array" do
-      lambda { @chart.add( :composites, "") }.should raise_error( ArgumentError, /array of urls/i )
+      lambda { @chart.add( :composites, "") }.should raise_error( ArgumentError, /hash of id => url/ )
     end    
     
     it "should support setting the axis_value label" do
@@ -88,10 +88,11 @@ describe Ziya::Charts::Base do
       @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
-    
+
+    # BOZO !! Review    
     it "should error if a series is defined but no axis_category is specified" do
-      @chart.add( :series, "test", [10,20] )      
-      lambda { @chart.to_xml }.should raise_error( RuntimeError, /axis_category_text/i )
+      # @chart.add( :series, "test", [10,20] )      
+      # lambda { @chart.to_xml }.should raise_error( RuntimeError, /axis_category_text/i )
     end 
     
     it "should accept a series with no name" do

data/spec/charts/chart_type_spec.rb

@@ -26,6 +26,12 @@ describe Ziya::Charts::Base do
       StackedBar 
       StackedColumn 
       StackedThreedColumn
+      StackedThreedArea
+      AreaThreed
+      Donut
+      ImagePie
+      ImageColumn
+      Custom
     ]
   end
     
@@ -40,6 +46,8 @@ describe Ziya::Charts::Base do
           else
             chart.type.gsub(/ /, '' ).should == "3d" + match[1].downcase
           end
+        elsif type == "Custom"
+          chart.type.should be_empty
         else
           chart.type.gsub(/ /, '' ).should == type.downcase unless type == "Mixed"
         end

data/spec/components/draw_spec.rb

@@ -2,10 +2,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
 describe Ziya::Components::Draw do
   before( :each ) do
-    @comp = Ziya::Components::Draw.new
+    @comp  = Ziya::Components::Draw.new
     circle = Ziya::Components::Circle.new
     circle.radius = 10
-    image = Ziya::Components::Image.new
+    image   = Ziya::Components::Image.new
     image.x = 10
     @comp.components = [circle, image]
   end
@@ -25,8 +25,13 @@ describe Ziya::Components::Draw do
     end
     
     it "should support composite charts" do
-      urls = [ "/fred", "/blee" ]
-      @comp.flatten( @xml, urls ).should == "<draw><circle radius=\"10\"/><image x=\"10\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Fblee\"/></draw>"
+      urls = { :fred => "/fred", :blee => "/blee" }
+      @comp.flatten( @xml, urls ).should == "<draw><circle radius=\"10\"/><image x=\"10\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred&amp;chart_id=fred\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Fblee&amp;chart_id=blee\"/></draw>"
+    end
+    
+    it "should support js based composite chart" do 
+      urls = { :fred => nil }
+      @comp.flatten( @xml, urls ).should == "<draw><circle radius=\"10\"/><image x=\"10\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;chart_id=fred\"/></draw>"
     end
   end    
 end

data/spec/ziya_helper_spec.rb

@@ -114,4 +114,4 @@ describe Ziya::Helper do
     end
   end
    
-end
+end

data/tasks/doc.rake

@@ -1,6 +1,8 @@
 # $Id$
-
 require 'rake/rdoctask'
+gem 'darkfish-rdoc'
+require 'darkfish-rdoc'
+
 
 namespace :doc do
 
@@ -12,17 +14,20 @@ namespace :doc do
     incl = Regexp.new(PROJ.rdoc_include.join('|'))
     excl = Regexp.new(PROJ.rdoc_exclude.join('|'))
     files = PROJ.files.find_all do |fn|
-              case fn
-              when excl; false
-              when incl; true
-              else false end
-            end
+      case fn
+      when excl; false
+      when incl; true
+      else false end
+    end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
+    title = "#{PROJ.version} documentation"
     title = "#{PROJ.rubyforge_name}'s " + title if PROJ.rubyforge_name != title
 
     rd.options << "-t #{title}"
+    rd.options << "-SHN"
+    rd.options << "-f"
+    rd.options << "darkfish"
     rd.options.concat(PROJ.rdoc_opts)
   end