ziya 1.0.0 → 2.0.0

data/spec/gauges/support/scale_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+describe Ziya::Gauges::Support::Scale do
+  before( :all ) do
+    @comp = Ziya::Gauges::Support::Scale.new(
+      :x               => 3,
+      :y               => 30,
+      :start_scale     => 25,
+      :end_scale       => 100,
+      :step            => 0,
+      :direction       => 10,
+      :shake_span      => 100,
+      :shake_frequency => 10,
+      :shake_snap      => 20,
+      :shadow_alpha    => 100,
+      :shadow_x_offset => 10,
+      :shadow_y_offset => 20,      
+      :components      => YAML::Omap[
+        :line1, Ziya::Gauges::Support::Line.new( :x1 => 10, :y1 => 20 ), 
+        :line2, Ziya::Gauges::Support::Line.new( :x1 => 20, :y1 => 30 )
+      ] )
+  end
+  
+  describe "#flatten" do  
+    it "should flatten component correctly" do
+      xml = Builder::XmlMarkup.new
+      @comp.flatten( xml )
+      buff = xml.to_s  
+      @comp.class.attributes[@comp.class.name].each do |attr|
+        buff.scan( /\s#{attr}=\"(\w+)\"/ ).should == [ [@comp.send( attr ).to_s] ] unless attr == :components
+      end
+      buff.scan( /<line/ ).size.should == 2
+      buff.scan( /\sx1=\"(.*?\d+)\"/ ).should == [ ["10"], ["20"] ]
+      buff.scan( /\sy1=\"(.*?\d+)\"/ ).should == [ ["20"], ["30"] ]
+    end        
+  end
+  
+  describe "YAML load" do
+    it "should load from yaml correctly" do
+      comp = YAML.load( @comp.to_comp_yaml( :test, 1 ) ).first[:test]
+      @comp.options.each_pair do |k,v|
+        comp.send( k ).should == v
+      end
+    end
+  end
+end

data/spec/gauges/support/text_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+describe Ziya::Gauges::Support::Text do
+  before( :all ) do
+    @comp = Ziya::Gauges::Support::Text.new(
+      :x           => 1,
+      :y           => 2,
+      :width       => 100,
+      :height      => 100,
+      :rotation    => 0,
+      :font        => "arial",
+      :bold        => true,
+      :size        => 1,
+      :align       => "left",
+      :color       => "ffffff",
+      :alpha       => 100,
+      :text        => "Hello Bubba !!" )
+  end
+  
+  describe "#flatten" do  
+    it "should flatten component correctly" do
+      xml = Builder::XmlMarkup.new
+      @comp.flatten( xml )
+      buff = xml.to_s  
+      @comp.class.attributes[@comp.class.name].each do |attr|
+        buff.scan( /#{attr}=\"(\w+)\"/ ).should == [ [@comp.send( attr ).to_s] ] unless attr == :text
+      end
+      buff.scan( />(#{@comp.text})<\/text>/ ).should == [ [@comp.text] ]
+    end        
+  end
+  
+  describe "YAML load" do
+    it "should load from yaml correctly" do
+      comp = YAML.load( @comp.to_comp_yaml( :test, 1 ) ).first[:test]
+      @comp.options.each_pair do |k,v|
+        comp.send( k ).should == v
+      end
+    end
+  end
+end

data/spec/gauges/thermo_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Ziya::Gauges::Thermo do  
+  describe "#initialize" do    
+    before( :each ) do
+      @gauge = Ziya::Gauges::Thermo.new( "test_license", "override" ) 
+    end
+    
+    it "should create a gauge with the correct license" do
+      @gauge.license.should == "test_license"
+    end    
+    
+    it "should create a gauge with the correct id" do
+      @gauge.design_id.should == "override"
+    end        
+  end    
+
+  describe "#to_xml" do  
+    it "should produce the correct xml for the std gauge" do
+      buff  = Ziya::Gauges::Thermo.new( "test_license" ).to_xml
+      buff.scan( /<license/ ).size.should == 1
+      buff.scan( /<circle/ ).size.should  == 6  
+      buff.scan( /<line/ ).size.should    == 13      
+      buff.scan( /<rect/ ).size.should    == 4
+      buff.scan( /x1=\"(.*?\d+)\"/ ).should == [["30"], ["30"], ["30"], ["30"], ["30"], ["30"], ["30"], ["80"], ["80"], ["80"], ["80"], ["80"], ["80"]]
+      buff.scan( /y1=\"(.*?\d+)\"/ ).should == [["155.0"], ["138.0"], ["121.0"], ["104.0"], ["87.0"], ["70.0"], ["53.0"], ["153"], ["133"], ["113"], ["93"], ["73"], ["53"]]
+      buff.scan( /x2=\"(.*?\d+)\"/ ).should == [["38"], ["38"], ["38"], ["38"], ["38"], ["38"], ["38"], ["88"], ["88"], ["88"], ["88"], ["88"], ["88"]]
+      buff.scan( /y2=\"(.*?\d+)\"/ ).should == [["155.0"], ["138.0"], ["121.0"], ["104.0"], ["87.0"], ["70.0"], ["53.0"], ["153"], ["133"], ["113"], ["93"], ["73"], ["53"]]
+      buff.scan( /x=\"(.*?\d+)\"/ ).should  == [["-130"], ["40"], ["60"], ["60"], ["60"], ["55"], ["20"], ["20"], ["85"], ["60"], ["44"], ["44"], ["10"], ["10"], ["10"], ["10"], ["10"], ["10"], ["10"], ["88"], ["88"], ["88"], ["88"], ["88"], ["88"], ["999"]]
+      # buff.scan( /y=\"(.*?\d+)\"/ ).should  == [["290"], ["40"], ["210"], ["210"], ["210"], ["210"], ["20"], ["25"], ["25"], ["10"], ["153"], ["52"], ["152"], ["147.0"], ["130.0"], ["113.0"], ["96.0"], ["79.0"], ["62.0"], ["45.0"], ["145"], ["125"], ["105"], ["85"], ["65"], ["45"], ["999"]]
+    end 
+    
+    it "user can override due point" do
+      gauge = Ziya::Gauges::Thermo.new( "test_license" )
+      gauge.set_preferences( :due_point => 100 )
+      buff  = gauge.to_xml
+      buff.scan( /end_scale=\"(.*?\d+)\"/ ).should == [["80"]]
+    end 
+    
+    it "user can override thermo color" do
+      gauge = Ziya::Gauges::Thermo.new( "test_license" )
+      gauge.set_preferences( :gauge_color => "00FF00" )
+      buff  = gauge.to_xml
+      buff.scan( /end_scale=\"(.*?\d+)\"/ ).should == [["20"]]
+      buff.scan( /color=\"(\w+)\"/ ).uniq.should   == [["ffffff"], ["00FF00"], ["ffff00"], ["cccccc"], ["aaaaaa"], ["880000"]]
+    end 
+    
+  end  
+end

data/spec/helpers/base_helper_spec.rb

@@ -1,22 +1,36 @@
-require 'spec/spec_helper'
-# require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
 describe Ziya::Helpers::BaseHelper do    
   
+  it "should generate the correct chart path" do
+    chart_url( "http://test.me.com/blee" ).should == 
+      "/charts/charts.swf?library_path=/charts/charts_library&xml_source=http%3A%2F%2Ftest.me.com%2Fblee"
+    chart_url( "http://test.me.com/blee", "/blees" ).should == 
+      "/blees/charts.swf?library_path=/blees/charts_library&xml_source=http%3A%2F%2Ftest.me.com%2Fblee"
+  end
+  
   it "should generate the correct yaml class name" do
-    component( "fred" ).should == "fred: !ruby/object:Ziya::Components::Fred\n"
+    component( "fred" ).should == "fred: !ruby/object:Ziya::Components::Fred"
   end
   
   it "should generate the correct yaml clqss name for alias" do
-    comp( "fred" ).should == "fred: !ruby/object:Ziya::Components::Fred\n"
+    comp( "fred" ).should == "fred: !ruby/object:Ziya::Components::Fred"
   end
 
   it "should generate the correct yaml drawing class name" do
-    drawing( "fred" ).should == "!ruby/object:Ziya::Components::Fred\n"
+    drawing( "fred" ).should == "!ruby/object:Ziya::Components::Fred"
   end
 
   it "should generate the correct yaml chart class name" do
-    chart( "fred" ).should == "--- !ruby/object:Ziya::Charts::Fred\n"
+    chart( "fred" ).should == "--- !ruby/object:Ziya::Charts::Fred"
+  end
+  
+  it "should generate the correct yaml for a gauge" do
+    gauge( "fred" ).should == "--- !ruby/object:Ziya::Gauges::Fred\ncomponents: !omap"
+  end
+
+  it "should generate the correct yaml for a dial" do
+    dial( :circle, :blee ).should == "- :blee: !ruby/object:Ziya::Gauges::Support::Circle"
   end
   
 end

data/spec/spec_helper.rb

@@ -4,4 +4,7 @@ require 'spec'
 require File.join( File.dirname(__FILE__), %w[.. lib ziya] )
 
 # Init ZiYa...
-::Ziya.initialize( :themes_dir => File.join( File.dirname(__FILE__), %w[themes] ) )
+Ziya.initialize( :log_level   => :debug,
+                 :themes_dir  => File.join( File.dirname(__FILE__), %w[themes] ),
+                 :designs_dir => File.join( File.dirname(__FILE__), %w[designs] ),
+                 :helpers_dir => File.join( File.dirname(__FILE__), %w[test_helpers] ) )

data/spec/test_helpers/gauge_2_helper.rb

@@ -0,0 +1,17 @@
+module Ziya::Gauge2Helper
+  def colorize
+    "ff00ff"
+  end
+  
+  # creates a red circle start at coords x,y radius r
+  def make_circle( x, y, radius )
+    circle = Ziya::Gauges::Support::Circle.new( 
+      :x          => x, 
+      :y          => y, 
+      :radius     => radius, 
+      :start      => 0, 
+      :end        => 360, 
+      :fill_color => "ff0000" )
+    circle.to_comp_yaml( :circle_2, 2 )
+  end
+end

data/spec/utils/logger_spec.rb

@@ -1,6 +1,4 @@
-require 'spec/spec_helper'
-# require File.join(File.dirname(__FILE__), %w[.. spec_helper] )
-
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 require 'stringio'          
 require "ziya/utils/logger"
 

data/spec/utils/text_spec.rb

@@ -1,5 +1,4 @@
-require 'spec/spec_helper'
-# require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
 describe Ziya::Utils::Text do  
   describe "camelize" do

data/spec/ziya_helper_spec.rb

@@ -1,30 +1,97 @@
-require 'spec/spec_helper'
-# require File.join(File.dirname(__FILE__), %w[spec_helper])
+require File.expand_path(File.join(File.dirname(__FILE__), %w[spec_helper]))
 
 describe Ziya::Helper do  
-  
-  describe "ziya_chart" do
-    before( :each ) do
-      @url = "/fred/blee/duh"
-    end
-    
+  before( :all ) do
+    @url = "/fred/blee/duh"
+  end
+
+  describe "ziya_gauge" do    
     it "should generate the correct html with the default options" do
-      ziya_chart( @url, :cache => true ).should == "<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0\" data=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred%2Fblee%2Fduh&amp;stage_width=400&amp;stage_height=300\" height=\"300\" id=\"ziya_chart\" stage_height=\"300\" stage_width=\"400\" style=\"\" width=\"400\"><param name=\"movie\" value=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred%2Fblee%2Fduh&amp;stage_width=400&amp;stage_height=300\"><param name=\"quality\" value=\"high\"><embed bgcolor=\"#FFFFFF\" height=\"300\" name=\"ziya_chart\" pluginspage=\"http://www.macromedia.com/go/getflashplayer\" quality=\"high\" src=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred%2Fblee%2Fduh&amp;stage_width=400&amp;stage_height=300\" swLiveConnect=\"true\" type=\"application/x-shockwave-flash\" width=\"400\" wmode=\"transparent\"></embed><param name=\"bgcolor\" value=\"#FFFFFF\"><param name=\"wmode\" value=\"transparent\"></object>"
+      ziya_gauge( @url ).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_gauge\" height=\"200\" width=\"200\">\n            <param name=\"scale\" value=\"noscale\">\n            <param name=\"align\" value=\"middle\">            \n            <param name=\"bgcolor\" value=\"#FFFFFF\">\n            <param name=\"wmode\" value=\"transparent\">                                  \n            <param name=\"movie\" value=\"/gauges/gauge.swf?xml_source=/fred/blee/duh\">\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              src=\"/gauges/gauge.swf?xml_source=/fred/blee/duh\" \n              menu=\"true\" \n              name=\"ziya_gauge\" \n              play=\"true\" \n              pluginspage=\"http://www.macromedia.com/go/getflashplayer\" \n              quality=\"high\" \n              salign=\"\" \n              src=\"/gauges/gauge.swf?xml_source=/fred/blee/duh\" \n              type=\"application/x-shockwave-flash\" \n              wmode=\"transparent\" \n              salign=\"\" \n              height=\"200\" \n              width=\"200\">\n         </object>        \n"
     end
     
     it "should set the wmode to opaque if bg_color is set" do
-      html = ziya_chart( @url, :bgcolor => "ffffff" )
+      html = ziya_gauge( @url, :bgcolor => "ffffff" )
       html.index (/name=\"wmode\" value=\"opaque\"/).should_not be_nil
       html.index (/wmode=\"opaque\"/).should_not be_nil      
     end
     
     it "should handle the size has widthxheight" do
-      html = ziya_chart( @url, :size => "100x200" )
+      html = ziya_gauge( @url, :size => "100x200" )
       html.index (/width=\"100\"/).should_not be_nil
       html.index (/height=\"200\"/).should_not be_nil      
     end    
   end
   
+  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"
+    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"
+    end
+
+    it "should generate the correct js tag" do
+      ziya_javascript_include_tag.should == "        <script language=\"javascript\" type=\"text/javascript\">\n          AC_FL_RunContent = 0;\n          DetectFlashVer = 0;\n        </script>\n        <script src=\"/charts/AC_RunActiveContent.js\" language=\"javascript\"></script>\n        <script language=\"javascript\" type=\"text/javascript\">\n          var requiredMajorVersion = 9;\n          var requiredMinorVersion = 0;\n          var requiredRevision = 45;\n        </script>\n"
+    end
+     
+    it "should generate the correct js based chart tag" do
+      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"
+    end
+       
+    it "should set the wmode to opaque if bg_color is set" 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
+    end
+    
+    it "should handle the size has widthxheight" do
+      html = ziya_chart( @url, :size => "100x200" )
+      html.index( /width=\"100\"/ ).should_not be_nil      
+      html.index( /height=\"200\"/ ).should_not be_nil            
+      # html.index (/'width'\s+,\s'100'/).should_not be_nil
+      # html.index (/'height'\s+,\s'200'/).should_not be_nil      
+    end    
+  end
+  
+  describe "escape_url" do
+    it "should escape a plain url correctly" do
+      escape_url( "/fred/blee/duh" ).should == "%2Ffred%2Fblee%2Fduh"
+    end
+    
+    it "should escape a url with args correctly" do
+      escape_url( "/fred?blee=hello world&bobo=10" ).should == "%2Ffred%3Fblee%3Dhello+world%26bobo%3D10"
+    end
+  end
+  
+  describe "setup_mode" do
+    before( :each ) do
+      @options = { :bgcolor => "#000000" }
+    end
+    
+    it "should set the wmode to opaque if a color is given" do
+      setup_wmode( @options )  
+      @options[:wmode].should == "opaque"
+    end
+    
+    it "should set the wmode to transparent and color to white if a color is not given" do
+      @options.delete(:bgcolor )
+      setup_wmode( @options )  
+      @options[:wmode].should   == "transparent"
+      @options[:bgcolor].should == "#FFFFFF"      
+    end
+  
+    it "should not set the wmode is user specified it" do
+      @options.delete(:bgcolor )
+      @options[:wmode] = 'transparent'
+      setup_wmode( @options )  
+      @options[:wmode].should   == "transparent"
+      @options[:bgcolor].should == "#FFFFFF"      
+    end    
+  end
+  
   describe "content_tag" do
     it "should output an html tag correctly" do
       content_tag( :div, content_tag( :h1, "Hello" ) ).should == "<div><h1>Hello</h1></div>"
@@ -37,4 +104,14 @@ describe Ziya::Helper do
     end
   end
   
+  describe "tag_options" do
+    it "should correctly escape tag options" do
+      tag_options( {:blee => "<blee>", :fred => 10 }, true ).should == " blee=\"&lt;blee&gt;\" fred=\"10\""
+    end
+    
+    it "should leave tag options unescaped" do
+      tag_options( {:blee => "<blee>", :fred => 10 }, false ).should == " blee=\"<blee>\" fred=\"10\""
+    end
+  end
+   
 end

data/spec/ziya_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper" )
+require File.expand_path(File.join(File.dirname(__FILE__), %w[spec_helper]))
 
 describe Ziya do
   before( :all ) do        

data/tasks/gem.rake

@@ -90,7 +90,7 @@ namespace :gem do
 
   desc 'Install the gem'
   task :install => [:clobber, :package] do
-    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name}"
+    sh "#{SUDO} #{GEM} install pkg/#{PROJ.spec.full_name} --no-rdoc --no-ri"
   end
 
   desc 'Uninstall the gem'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ziya
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-22 00:00:00 -06:00
+date: 2008-08-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logging
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.9.0
     version: 
 description: Easily add charting to your rails/merb applications
 email: fernand@liquidrail.com
@@ -37,12 +38,16 @@ files:
 - README.txt
 - Rakefile
 - bin/ziyafy
+- charts/AC_RunActiveContent.js
 - charts/charts.swf
+- charts/charts_library/ar3d.swf
 - charts/charts_library/arno.swf
+- charts/charts_library/ars3.swf
 - charts/charts_library/arst.swf
 - charts/charts_library/brfl.swf
 - charts/charts_library/brno.swf
 - charts/charts_library/brst.swf
+- charts/charts_library/buno.swf
 - charts/charts_library/cl3d.swf
 - charts/charts_library/clfl.swf
 - charts/charts_library/clno.swf
@@ -56,33 +61,22 @@ files:
 - charts/charts_library/pino.swf
 - charts/charts_library/pono.swf
 - charts/charts_library/scno.swf
-- charts/themes/commando/bar_chart.yml
-- charts/themes/commando/base_chart.yml
-- charts/themes/commando/column_chart.yml
-- charts/themes/commando/column_threed_chart.yml
-- charts/themes/commando/parallel_threed_column_chart.yml
-- charts/themes/commando/pie_chart.yml
-- charts/themes/commando/pie_threed_chart.yml
-- charts/themes/commando/polar_chart.yml
-- charts/themes/commando/stacked_bar_chart.yml
-- charts/themes/commando/stacked_column_chart.yml
-- charts/themes/commando/stacked_threed_column_chart.yml
-- charts/themes/default/bar_chart.yml
-- charts/themes/default/base_chart.yml
-- charts/themes/default/column_chart.yml
-- charts/themes/default/column_threed_chart.yml
-- charts/themes/default/parallel_threed_column_chart.yml
-- charts/themes/default/pie_chart.yml
-- charts/themes/default/pie_threed_chart.yml
-- charts/themes/default/polar_chart.yml
-- charts/themes/default/stacked_bar_chart.yml
-- charts/themes/default/stacked_column_chart.yml
-- charts/themes/default/stacked_threed_column_chart.yml
-- charts/themes/default/test.yml
+- charts/full_screen.swf
+- charts/sliders/black.swf
+- charts/sliders/preview_handle_1.swf
+- charts/sliders/preview_handle_2.swf
+- fred.rb
+- gauges/designs/circle.yml
+- gauges/designs/signal.yml
+- gauges/designs/thermo.yml
+- gauges/designs/title.yml
+- gauges/gauge.swf
 - lib/ziya.rb
 - lib/ziya/charts/area.rb
+- lib/ziya/charts/area_threed.rb
 - lib/ziya/charts/bar.rb
 - lib/ziya/charts/base.rb
+- lib/ziya/charts/bubble.rb
 - lib/ziya/charts/candle_stick.rb
 - lib/ziya/charts/column.rb
 - lib/ziya/charts/column_threed.rb
@@ -98,35 +92,64 @@ files:
 - lib/ziya/charts/stacked_area.rb
 - lib/ziya/charts/stacked_bar.rb
 - lib/ziya/charts/stacked_column.rb
+- lib/ziya/charts/stacked_threed_area.rb
 - lib/ziya/charts/stacked_threed_column.rb
 - lib/ziya/components/area.rb
 - lib/ziya/components/axis_category.rb
 - lib/ziya/components/axis_ticks.rb
 - lib/ziya/components/axis_value.rb
 - lib/ziya/components/base.rb
+- lib/ziya/components/bevel.rb
+- lib/ziya/components/blur.rb
 - lib/ziya/components/chart_border.rb
 - lib/ziya/components/chart_grid_h.rb
 - lib/ziya/components/chart_grid_v.rb
+- lib/ziya/components/chart_guide.rb
+- lib/ziya/components/chart_label.rb
 - lib/ziya/components/chart_pref.rb
 - lib/ziya/components/chart_rect.rb
 - lib/ziya/components/chart_transition.rb
-- lib/ziya/components/chart_value.rb
 - lib/ziya/components/circle.rb
 - lib/ziya/components/draw.rb
+- lib/ziya/components/draw_base.rb
+- lib/ziya/components/filter.rb
+- lib/ziya/components/glow.rb
 - lib/ziya/components/image.rb
-- lib/ziya/components/legend_label.rb
-- lib/ziya/components/legend_rect.rb
-- lib/ziya/components/legend_transition.rb
+- lib/ziya/components/legend.rb
 - lib/ziya/components/line.rb
 - lib/ziya/components/link.rb
 - lib/ziya/components/link_data.rb
-- lib/ziya/components/live_update.rb
 - lib/ziya/components/rect.rb
+- lib/ziya/components/scroll.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
+- lib/ziya/gauges/base.rb
+- lib/ziya/gauges/radial.rb
+- lib/ziya/gauges/signal.rb
+- lib/ziya/gauges/support/area.rb
+- lib/ziya/gauges/support/base.rb
+- lib/ziya/gauges/support/circle.rb
+- lib/ziya/gauges/support/design.rb
+- lib/ziya/gauges/support/image.rb
+- lib/ziya/gauges/support/line.rb
+- lib/ziya/gauges/support/link.rb
+- lib/ziya/gauges/support/move.rb
+- lib/ziya/gauges/support/point.rb
+- lib/ziya/gauges/support/polygon.rb
+- lib/ziya/gauges/support/radial_base.rb
+- lib/ziya/gauges/support/radial_numbers.rb
+- lib/ziya/gauges/support/radial_ticks.rb
+- lib/ziya/gauges/support/rect.rb
+- lib/ziya/gauges/support/rotate.rb
+- lib/ziya/gauges/support/scale.rb
+- lib/ziya/gauges/support/text.rb
+- lib/ziya/gauges/support/update.rb
+- lib/ziya/gauges/thermo.rb
 - lib/ziya/helpers/base_helper.rb
 - lib/ziya/utils/logger.rb
 - lib/ziya/utils/text.rb
@@ -136,12 +159,36 @@ files:
 - spec/charts/chart_type_spec.rb
 - spec/components/area_spec.rb
 - spec/components/draw_spec.rb
+- spec/components/filter_spec.rb
 - spec/components/link_spec.rb
 - spec/components/series_color_spec.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
+- spec/designs/gauge_2.yml
+- spec/designs/gauge_no_name.yml
+- spec/designs/gauge_raw.yml
+- spec/designs/thermo.yml
+- spec/gauges/base_spec.rb
+- spec/gauges/signal_spec.rb
+- spec/gauges/support/area_spec.rb
+- spec/gauges/support/circle_spec.rb
+- spec/gauges/support/image_spec.rb
+- spec/gauges/support/line_spec.rb
+- spec/gauges/support/link_spec.rb
+- spec/gauges/support/move_spec.rb
+- spec/gauges/support/polygon_spec.rb
+- spec/gauges/support/radial_numbers_spec.rb
+- spec/gauges/support/radial_ticks_spec.rb
+- spec/gauges/support/rotate_spec.rb
+- spec/gauges/support/scale_spec.rb
+- spec/gauges/support/text_spec.rb
+- spec/gauges/thermo_spec.rb
 - spec/helpers/base_helper_spec.rb
 - spec/spec_helper.rb
+- spec/test_helpers/gauge_2_helper.rb
 - spec/themes/default/fred.yml
 - spec/themes/default/line_chart.yml
 - spec/utils/logger_spec.rb
@@ -182,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ziya
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Easily add charting to your rails/merb applications