ziya 2.0.7 → 2.1.6

data/resources/maps/themes/readme.txt

@@ -0,0 +1,13 @@
+This directory indicates the location where you can specify the maps looks and feel.
+You will need to create a new theme directory which contains the map YAML stylesheets for
+your various maps.
+
+For example
+
+public/maps/themes/cool_maps
+ - us_map.yml
+ - world_map.yml
+ 
+Then in your controller, indicate you want to choose the 'cool_maps' theme by using the following:
+
+map.add( :theme, "cool_maps" )

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 => { :url => "url1" }, :blee => { :url => "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=url2&amp;chart_id=blee\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=url1&amp;chart_id=fred\"/></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

@@ -1,8 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require 'ziya/core_ext/string'
 
-describe Ziya::Charts::Base do
-  include Ziya::Utils::Text
-  
+describe Ziya::Charts::Base do  
   before( :all ) do
     @types = %w[
       Area 
@@ -26,13 +25,19 @@ describe Ziya::Charts::Base do
       StackedBar 
       StackedColumn 
       StackedThreedColumn
+      StackedThreedArea
+      AreaThreed
+      Donut
+      ImagePie
+      ImageColumn
+      Custom
     ]
   end
     
   describe "#initialize" do
     it "should create a set of charts correctly" do
       @types.each do |type|
-        chart = Ziya::Charts.const_get( classify(type) ).new
+        chart = Ziya::Charts.const_get( type.classify ).new
         if type.index( /Threed/ )
           match = type.match( /(.*)Threed(.*)/ )
           if match[2] and !match[2].empty?
@@ -40,6 +45,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 → charts/support}/area_spec.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::Area do
+describe Ziya::Charts::Support::Area do
   before( :each ) do
-    @comp = Ziya::Components::Area.new
+    @comp = Ziya::Charts::Support::Area.new
     @comp.x      = 1
     @comp.y      = 2
     @comp.width  = 100
@@ -14,7 +14,7 @@ describe Ziya::Components::Area do
   end
   
   it "should construct an area correctly" do
-    area = Ziya::Components::Area.new( :height => 200, :width => 100, :x => 0, :y => 1 )
+    area = Ziya::Charts::Support::Area.new( :height => 200, :width => 100, :x => 0, :y => 1 )
     area.height.should == 200
     area.width.should  == 100
     area.x.should      == 0
@@ -26,7 +26,7 @@ describe Ziya::Components::Area do
   end
   
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::Area.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::Area.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
   
@@ -35,12 +35,12 @@ describe Ziya::Components::Area do
   end
 
   it "should check that no properties are set correctly" do
-    @comp = Ziya::Components::Area.new    
+    @comp = Ziya::Charts::Support::Area.new    
     @comp.should_not be_configured
   end
   
   it "should merge attributes correctly" do
-    parent = Ziya::Components::Area.new
+    parent = Ziya::Charts::Support::Area.new
     parent.x = 20
     parent.y = 50
     @comp.merge( parent, false )
@@ -58,7 +58,7 @@ describe Ziya::Components::Area do
     
     it "should flatten simple component correctly" do
       xml  = Builder::XmlMarkup.new
-      comp = Ziya::Components::Area.new
+      comp = Ziya::Charts::Support::Area.new
       comp.x = 10
       comp.flatten( xml ).should == "<area x=\"10\"/>"
     end

data/spec/charts/support/chart_pref_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+describe Ziya::Charts::Support::ChartPref do
+  before( :each ) do
+    @comp = Ziya::Charts::Support::ChartPref.new
+  end
+    
+  it "should define the correct attribute methods" do
+    lambda{ Ziya::Charts::Support::ChartPref.attributes[@comp.class.name].each {
+     |m| @comp.send( m ) } }.should_not raise_error
+  end
+    
+  describe "#flatten" do
+    before( :each ) do
+      @xml = Builder::XmlMarkup.new
+    end  
+    
+    it "should flatten line point shape correctly" do
+      @comp.point_shape = "square"
+      @comp.flatten( @xml ).should == '<chart_pref point_shape="square"/>'
+    end
+    
+    it "should flatten line connect correctly" do
+      @comp.connect = true
+      @comp.point_shape = 'square'
+      @comp.flatten( @xml ).should == '<chart_pref point_shape="square" connect="true"/>'
+    end
+
+    it "should flatten zero line correctly" do
+      @comp.zero_line = true
+      @comp.point_shape = 'square'
+      @comp.flatten( @xml ).should == '<chart_pref point_shape="square" zero_line="true"/>'
+    end
+    
+  end
+end

data/spec/charts/support/draw_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+describe Ziya::Charts::Support::Draw do
+  before( :each ) do
+    @comp  = Ziya::Charts::Support::Draw.new
+    circle = Ziya::Charts::Support::Circle.new
+    circle.radius = 10
+    image   = Ziya::Charts::Support::Image.new
+    image.x = 10
+    text   = Ziya::Charts::Support::Text.new
+    text.x = 20
+    # text.y = 10
+    text.text = "Hello World"
+    @comp.components = [circle, image, text]
+  end
+    
+  it "should define the correct attribute methods" do
+    lambda{ Ziya::Charts::Support::Draw.attributes[@comp.class.name].each {
+     |m| @comp.send( m ) } }.should_not raise_error
+  end
+    
+  describe "#flatten" do
+    before( :each ) do
+      @xml = Builder::XmlMarkup.new
+    end
+        
+    it "should flatten component correctly" do
+      @comp.flatten( @xml ).should == "<draw><circle radius=\"10\"/><image x=\"10\"/><text x=\"20\">Hello World</text></draw>"
+    end
+    
+    it "should support composite charts" do
+      urls = { :fred => { :url => "/fred" }, :blee => { :url => "/blee" } }
+      @comp.flatten( @xml, urls ).should == "<draw><circle radius=\"10\"/><image x=\"10\"/><text x=\"20\">Hello World</text><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Fblee&amp;chart_id=blee\"/><image url=\"/charts/charts.swf?library_path=/charts/charts_library&amp;xml_source=%2Ffred&amp;chart_id=fred\"/></draw>"
+    end
+    
+    it "should support composite chart with options" do 
+      urls = { :fred => { :url => "/fred", :transition => "slide_left", :duration => 1 } }
+      @comp.flatten( @xml, urls ).index( "transition=\"slide_left\"" ).should_not be_nil
+    end
+  end    
+end

data/spec/{components → charts/support}/filter_spec.rb

@@ -1,17 +1,17 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::Filter do
+describe Ziya::Charts::Support::Filter do
   before( :each ) do
-    @comp = Ziya::Components::Filter.new
-    blur = Ziya::Components::Blur.new
+    @comp = Ziya::Charts::Support::Filter.new
+    blur = Ziya::Charts::Support::Blur.new
     blur.blurX = 10
-    glow = Ziya::Components::Glow.new
+    glow = Ziya::Charts::Support::Glow.new
     glow.alpha = 50
     @comp.filters = [blur, glow]
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::Filter.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::Filter.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/{components → charts/support}/link_spec.rb

@@ -1,17 +1,17 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::Link do
+describe Ziya::Charts::Support::Link do
   before( :each ) do
-    @comp = Ziya::Components::Link.new
-    area1 = Ziya::Components::Area.new
+    @comp = Ziya::Charts::Support::Link.new
+    area1 = Ziya::Charts::Support::Area.new
     area1.x = 10
-    area2 = Ziya::Components::Area.new
+    area2 = Ziya::Charts::Support::Area.new
     area2.x = 20
     @comp.areas = [area1, area2]
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::Link.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::Link.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/{components → charts/support}/series.rb

@@ -1,12 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::Series do
+describe Ziya::Charts::Support::Series do
   before( :each ) do
-    @comp = Ziya::Components::Series.new
+    @comp = Ziya::Charts::Support::Series.new
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::Series.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::Series.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/{components → charts/support}/series_color_spec.rb

@@ -1,12 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::SeriesColor do
+describe Ziya::Charts::Support::SeriesColor do
   before( :each ) do
-    @comp = Ziya::Components::SeriesColor.new
+    @comp = Ziya::Charts::Support::SeriesColor.new
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::SeriesColor.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::SeriesColor.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/{components → charts/support}/series_explode.rb

@@ -1,12 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::SeriesExplode do
+describe Ziya::Charts::Support::SeriesExplode do
   before( :each ) do
-    @comp = Ziya::Components::SeriesExplode.new
+    @comp = Ziya::Charts::Support::SeriesExplode.new
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::SeriesExplode.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::SeriesExplode.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/{components → charts/support}/series_explode_spec.rb

@@ -1,12 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. spec_helper]))
 
-describe Ziya::Components::SeriesExplode do
+describe Ziya::Charts::Support::SeriesExplode do
   before( :each ) do
-    @comp = Ziya::Components::SeriesExplode.new
+    @comp = Ziya::Charts::Support::SeriesExplode.new
   end
     
   it "should define the correct attribute methods" do
-    lambda{ Ziya::Components::SeriesExplode.attributes[@comp.class.name].each {
+    lambda{ Ziya::Charts::Support::SeriesExplode.attributes[@comp.class.name].each {
      |m| @comp.send( m ) } }.should_not raise_error
   end
     

data/spec/core_ext/string_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+require 'ziya/core_ext/string'
+
+describe String do  
+  describe "#camelize_it" do
+    describe "it should strip module info and camelize string correctly" do
+      "fred/blee/hello_world".camelize_it.should == "Fred::Blee::HelloWorld"
+    end
+  
+    describe "it should camelize a string correctly" do
+      "hello_world".camelize_it.should == "HelloWorld"
+    end
+    
+    describe "it should camelize a plural class correctly" do
+      "axis_ticks".camelize_it.should == "AxisTicks"
+    end
+  end
+  
+  describe "#underscore" do
+    describe "it should underscore a class name correctly" do
+      "Fred::Blee::HelloWorld".underscore.should == "fred/blee/hello_world"
+    end
+
+    describe "it should underscore a name correctly" do
+      "HelloWorld".underscore.should == "hello_world"
+    end    
+  end
+  
+  describe "#classify" do
+    it "should create a class name correctly" do
+      "/fred.blee.hello_world".classify.should == "HelloWorld"
+    end
+  end
+  
+  describe "#demodulize" do
+    it "should strip module info correctly" do
+      "Fred::Blee::HelloWorld".demodulize.should == "HelloWorld"
+    end
+  end
+end

data/spec/gauges/base_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
 
 describe Ziya::Gauges::Base do
+
   describe "#initialize" do
     before( :each ) do
       @gauge = Ziya::Gauges::Base.new( "test_license", "test" ) 
@@ -86,5 +87,4 @@ describe Ziya::Gauges::Base do
     buff.scan( /url=\"(\/\w+\/\w+)\"/ ).should         == [ ["/blee/fred"] ]
     buff.scan( /delay=\"(.*?\d+)\"/ ).should         == [ ["30"] ]
   end    
-  
 end

data/spec/html_helpers/base_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Ziya::HtmlHelpers::Base do 
+  
+  include Ziya::HtmlHelpers::Base
+  
+  it "should generate the correct mime" do
+    mime.should == "application/x-shockwave-flash"
+  end
+  
+  it "should generate the correct plugin url" do
+    plugin_url.should == "http://www.macromedia.com/go/getflashplayer"
+  end
+  
+  describe "should generate the correct wmode" do    
+    before( :each ) do
+      @opts = { :bgcolor => '#ffffff' } 
+    end
+    
+    it "should set up the correct wmode when a background color is specified" do
+      setup_wmode( @opts )
+      @opts[:wmode].should == "opaque"
+    end
+    
+    it "should not override wmode if specified" do
+      @opts[:wmode] = "test"
+      setup_wmode( @opts )
+      @opts[:wmode].should == "test"
+    end
+    
+    it "should generate the correct defaults if no color is specified" do
+      @opts.delete( :bgcolor )
+      setup_wmode( @opts )
+      @opts[:wmode].should   == "transparent"
+      @opts[:bgcolor].should == "#FFFFFF"
+    end    
+  end
+  
+  it "should set up the flash movie size correctly" do
+    opts = { :size => "400x300" }
+    setup_movie_size( opts )
+    opts[:size].should   be_nil
+    opts[:width].should  == "400"
+    opts[:height].should == "300"
+  end
+  
+  it "should escape a url correctly" do
+    escape_url( "http://fred?arg1=1&arg2=2&test=hello world" ).should == "http%3A%2F%2Ffred%3Farg1%3D1%26arg2%3D2%26test%3Dhello+world"
+  end
+end