ziya 1.0.0 → 2.0.0

data/spec/charts/base_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::Charts::Base do
   before( :each ) do
@@ -19,12 +18,12 @@ describe Ziya::Charts::Base do
       @chart.id.should == "test_id"
     end        
   end    
-
+  
   describe "it should produce the correct xml for a basic chart" do
     chart = Ziya::Charts::Base.new( "aaa" )
     chart.add( :axis_category_text, %w[fox dog] )
     chart.add( :series, "test", [10, 20] )
-    chart.to_xml.should == "<chart><license>aaa</license><chart_data><row><null/><string>fox</string><string>dog</string></row><row><string>test</string><number>10</number><number>20</number></row></chart_data></chart>"
+    chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><license>aaa</license><chart_data><row><null/><string>fox</string><string>dog</string></row><row><string>test</string><number>10</number><number>20</number></row></chart_data></chart>"
   end
     
   describe "#add" do
@@ -34,7 +33,7 @@ describe Ziya::Charts::Base do
 
     it "should support setting an axis category" do
       @chart.add( :axis_category_text, %w[fox cat dog] )
-      @chart.to_xml.should == "<chart><chart_data><row><null/><string>fox</string><string>cat</string><string>dog</string></row></chart_data></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>fox</string><string>cat</string><string>dog</string></row></chart_data></chart>"
     end    
     it "should error if the axis category is not an array" do
       lambda { @chart.add( :axis_category_text, "") }.should raise_error( ArgumentError, /array of categories/i )
@@ -42,35 +41,50 @@ describe Ziya::Charts::Base do
     
     it "should support setting a composite chart urls" do
       @chart.add( :composites, %w[url1 url2] )
-      @chart.to_xml.should == "<chart></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart></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 )
     end    
     
-    it "should support setting the axis value text" do
+    it "should support setting the axis_value label" do
+      @chart.add( :axis_category_text, %w[dog cat] )        
+      @chart.add( :axis_value_label, %w[blee duh] )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row></chart_data><axis_value_label><string>blee</string><string>duh</string></axis_value_label></chart>"
+    end    
+    it "should error if the axis value label arg is not an array" do
+      lambda { @chart.add( :axis_value_label, "") }.should raise_error( ArgumentError, /array of values/i )
+    end    
+
+    it "should support setting the axis category label" do
       @chart.add( :axis_category_text, %w[dog cat] )        
-      @chart.add( :axis_value_text, %w[blee duh] )
-      @chart.to_xml.should == "<chart><axis_value_text><string>blee</string><string>duh</string></axis_value_text><chart_data><row><null/><string>dog</string><string>cat</string></row></chart_data></chart>"
+      @chart.add( :axis_category_label, %w[blee duh] )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row></chart_data><axis_category_label><string>blee</string><string>duh</string></axis_category_label></chart>"
     end    
-    it "should error if the axis value text arg is not an array" do
-      lambda { @chart.add( :axis_value_text, "") }.should raise_error( ArgumentError, /array of values/i )
+    it "should error if the axis category label arg is not an array" do
+      lambda { @chart.add( :axis_category_label, "") }.should raise_error( ArgumentError, /array of category/i )
     end    
     
     it "should support adding series" do
       @chart.add( :axis_category_text, %w[dog cat] )      
       @chart.add( :series, "test", %w[10 20] )
-      @chart.to_xml.should == "<chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><string>10</string><string>20</string></row></chart_data></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><string>10</string><string>20</string></row></chart_data></chart>"
     end    
     
     it "should support adding labels to series" do
       @chart.add( :axis_category_text, %w[dog cat] )
-      @chart.add( :series, "test", [10,20], %w[label1 label2] )
-      @chart.to_xml.should == "<chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><number>10</number><number>20</number></row></chart_data><chart_value_text><row><null/></row><row><null/><string>label1</string><string>label2</string></row></chart_value_text></chart>"
+      @chart.add( :series, "test", [ {:value => 10, :label => "label1" }, { :value => 20, :label => "label2" } ] )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><number label=\"label1\">10</number><number label=\"label2\">20</number></row></chart_data></chart>"
     end
 
+    it "should support adding filters to series" do
+      @chart.add( :axis_category_text, %w[dog cat] )
+      @chart.add( :series, "test", [ {:value => 10, :glow => "glow1" }, { :value => 20, :blur => "blur2" } ] )
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_data><row><null/><string>dog</string><string>cat</string></row><row><string>test</string><number glow=\"glow1\">10</number><number blur=\"blur2\">20</number></row></chart_data></chart>"
+    end
+    
     it "should error if a series is defined but no axis_category is specified" do
-      @chart.add( :series, "test", [10,20], %w[label1 label2] )      
+      @chart.add( :series, "test", [10,20] )      
       lambda { @chart.to_xml }.should raise_error( RuntimeError, /axis_category_text/i )
     end 
     
@@ -78,7 +92,7 @@ describe Ziya::Charts::Base do
       lambda { @chart.add( :series, nil) }.should raise_error( ArgumentError, /series name/i )
     end 
        
-    it "should error if the series is not an arry" do
+    it "should error if the series is not an array" do
       lambda { @chart.add( :series, "test", nil) }.should raise_error( ArgumentError, /data points/i )
     end    
     
@@ -91,23 +105,23 @@ describe Ziya::Charts::Base do
     
     it "should support setting yaml styles directly" do
       @chart.add( :styles, "--- !ruby/object:Ziya::Charts::Base\n" )
-      @chart.to_xml.should == "<chart></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart></chart>"
     end    
     it "should error if no style is specified" do
       lambda { @chart.add( :styles, "") }.should raise_error( ArgumentError, /set of styles/i )
     end    
-
+    
     it "should support mixed charts" do
       @chart.add( :chart_types, %w[line bar] )
-      @chart.to_xml.should == "<chart><chart_type><string>line</string><string>bar</string></chart_type></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart><chart_type><string>line</string><string>bar</string></chart_type></chart>"
     end    
     it "should error if no chart types are specified" do
       lambda { @chart.add( :chart_types, "") }.should raise_error( ArgumentError, /set of chart types/i )
     end    
-
+    
     it "should support setting a themes" do
       @chart.add( :theme, "blee" )
-      @chart.to_xml.should == "<chart></chart>"
+      @chart.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?><chart></chart>"
     end    
     it "should error if no chart types are specified" do
       lambda { @chart.add( :theme, "") }.should raise_error( ArgumentError, /theme name/i )

data/spec/charts/chart_type_spec.rb

@@ -1,11 +1,32 @@
-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::Charts::Base do
   include Ziya::Utils::Text
   
   before( :all ) do
-    @types = %w[Area Bar CandleStick Column ColumnThreed FloatingBar FloatingColumn Line Mixed ParallelThreedColumn Pie PieThreed Polar Scatter StackedArea StackedBar StackedArea StackedBar StackedColumn StackedThreedColumn]
+    @types = %w[
+      Area 
+      Bar 
+      Bubble
+      CandleStick 
+      Column 
+      ColumnThreed 
+      FloatingBar 
+      FloatingColumn 
+      Line 
+      Mixed 
+      ParallelThreedColumn 
+      Pie 
+      PieThreed 
+      Polar 
+      Scatter 
+      StackedArea 
+      StackedBar 
+      StackedArea 
+      StackedBar 
+      StackedColumn 
+      StackedThreedColumn
+    ]
   end
     
   describe "#initialize" do

data/spec/components/area_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::Components::Area do
   before( :each ) do
@@ -14,6 +13,14 @@ describe Ziya::Components::Area do
     @comp.options.should == { :height => 200, :x => 1, :width => 100, :y => 2 }
   end
   
+  it "should construct an area correctly" do
+    area = Ziya::Components::Area.new( :height => 200, :width => 100, :x => 0, :y => 1 )
+    area.height.should == 200
+    area.width.should  == 100
+    area.x.should      == 0
+    area.y.should      == 1
+  end
+  
   it "should have no options as string" do
     @comp.options_as_string.should == ":height => '200',:width => '100',:x => '1',:y => '2'"
   end

data/spec/components/draw_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::Components::Draw do
   before( :each ) do

data/spec/components/filter_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. spec_helper]))
+
+describe Ziya::Components::Filter do
+  before( :each ) do
+    @comp = Ziya::Components::Filter.new
+    blur = Ziya::Components::Blur.new
+    blur.blurX = 10
+    glow = Ziya::Components::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 {
+     |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 == "<filter><blur blurX=\"10\"/><glow alpha=\"50\"/></filter>"
+    end    
+  end    
+end

data/spec/components/link_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::Components::Link do
   before( :each ) do

data/spec/components/series_color_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::Components::SeriesColor do
   before( :each ) do

data/spec/components/series_explode_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::Components::SeriesExplode do
   before( :each ) do

data/spec/components/series_switch_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::Components::SeriesSwitch do
   before( :each ) do

data/spec/designs/circle.yml

@@ -0,0 +1,7 @@
+<%= gauge :base %>
+  <%= dial :circle, :circle_1 %>
+      x:             999
+      y:             999
+      radius:         30
+      fill_alpha:      0
+      line_thickness:  5

data/spec/designs/crapping_out.yml

@@ -0,0 +1,8 @@
+<%= gauge :base %>
+
+<%= dial :circle, :circle_1 %>
+    x:             999
+    y:             999
+    radius:         30
+    fill_alpha:      0
+    line_thickness:  5

data/spec/designs/gauge_1.yml

@@ -0,0 +1,43 @@
+<%= gauge :base %>  
+  <%= dial :circle, :circle_2 %>
+      x:      200
+      y:       75
+      radius:  30
+      start:    0
+      end:     90   
+
+  <%= dial :circle, :circle_1 %>
+      x:             200
+      y:              75
+      radius:         30
+      fill_alpha:      0
+      line_thickness:  5    
+        
+  <%= dial :radial_ticks, :ticks %>
+      x:              200
+      y:               75
+      radius:          27
+      length:          10
+      start_angle:      0
+      end_angle:       90
+      ticks:           10
+      thickness:        2
+      color:       555555
+          
+  <%= dial :rotate, :rotation %>
+      x:               200
+      y:                75
+      start:           230
+      span:            160
+      step:              5
+      shadow_alpha:     20
+      shadow_x_offset:   3
+      shadow_y_offset:   3
+      <%= dials %>
+        <%= dial :line, :line %>
+            x1:             200
+            y1:              45
+            x2:             200
+            y2:              52
+            color:       ff3300
+            thickness:        4

data/spec/designs/gauge_2.yml

@@ -0,0 +1,11 @@
+<%= gauge :base %> 
+  <%= dial :circle, :circle %>
+      x:               200
+      y:                75
+      radius:           30
+      fill_alpha:        0
+      fill_color:      <%= colorize %>
+      line_thickness:    5    
+    
+  # call up to helper to draw another circle
+  <%= make_circle( 10, 10, 200 ) %>

data/spec/designs/gauge_no_name.yml

@@ -0,0 +1,43 @@
+<%= gauge :base %>  
+  <%= dial :circle %>
+      x:      200
+      y:       75
+      radius:  30
+      start:    0
+      end:     90   
+
+  <%= dial :circle %>
+      x:             200
+      y:              75
+      radius:         30
+      fill_alpha:      0
+      line_thickness:  5    
+        
+  <%= dial :radial_ticks %>
+      x:              200
+      y:               75
+      radius:          27
+      length:          10
+      start_angle:      0
+      end_angle:       90
+      ticks:           10
+      thickness:        2
+      color:       555555
+          
+  <%= dial :rotate %>
+      x:               200
+      y:                75
+      start:           230
+      span:            160
+      step:              5
+      shadow_alpha:     20
+      shadow_x_offset:   3
+      shadow_y_offset:   3
+      <%= dials %>
+        <%= dial :line %>
+            x1:             200
+            y1:              45
+            x2:             200
+            y2:              52
+            color:       ff3300
+            thickness:        4

data/spec/designs/gauge_raw.yml

@@ -0,0 +1,5 @@
+--- !ruby/object:Ziya::Gauges::Base
+components: !omap
+  - :circle_1: !ruby/object:Ziya::Gauges::Support::Circle
+      x: 200
+      y: 100

data/spec/designs/thermo.yml

@@ -0,0 +1,13 @@
+# -----------------------------------------------------------------------------
+# Thermometer design ( Override )
+# -----------------------------------------------------------------------------  
+<%= gauge :thermo %>
+  # -----------------------------------------------------------------------------
+  # Thermo tube
+  <%= dial :rect, :thermo_tube %>
+      x:              999
+      y:              999
+      height:         150
+      width:          40  
+      fill_color:     880000
+      line_thickness: 8

data/spec/gauges/base_spec.rb

@@ -0,0 +1,90 @@
+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" ) 
+    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 == "test"
+    end        
+  end    
+
+  describe "#to_xml" do
+    it "should produce the correct xml for a basic gauge" do
+      gauge = Ziya::Gauges::Base.new( "aaa", "gauge_1" )
+      buff  = gauge.to_xml
+      buff.scan( /<license/ ).size.should == 1
+      buff.scan( /<circle/ ).size.should  == 2   
+      buff.scan( /<line/ ).size.should    == 11        
+      buff.scan( /x1=\"(.*?\d+)\"/ ).should == [["200"], ["204"], ["209"], ["213"], ["217"], ["220"], ["223"], ["225"], ["226"], ["227"], ["200"]]
+      buff.scan( /y1=\"(.*?\d+)\"/ ).should == [["48"], ["48"], ["49"], ["51"], ["54"], ["57"], ["61"], ["65"], ["70"], ["75"], ["45"]]
+      buff.scan( /x2=\"(.*?\d+)\"/ ).should == [["200"], ["206"], ["212"], ["218"], ["223"], ["228"], ["232"], ["234"], ["236"], ["237"], ["200"]]
+      buff.scan( /y2=\"(.*?\d+)\"/ ).should == [["38"], ["38"], ["40"], ["42"], ["46"], ["51"], ["56"], ["62"], ["68"], ["75"], ["52"]]
+    end 
+
+    it "should produce the correct xml for a gauge with no design override" do
+      gauge = Ziya::Gauges::Base.new( "aaa", "title" )
+      buff  = gauge.to_xml
+      buff.scan( /<license/ ).size.should == 1
+      buff.scan( /<text/ ).size.should  == 1
+      buff.scan( /x=\"(.*?\d+)\"/ ).should == [["-15"]]
+      buff.scan( /y=\"(.*?\d+)\"/ ).should == [["300"]]
+    end 
+      
+    it "should produce the correct xml for a gauge with design override" do
+      gauge = Ziya::Gauges::Base.new( "aaa", "circle" )
+      buff  = gauge.to_xml
+      buff.scan( /<license/ ).size.should  == 1
+      buff.scan( /<text/ ).size.should     == 1   
+      buff.scan( /<circle/ ).size.should   == 1
+      buff.scan( /x=\"(.*?\d+)\"/ ).should == [["999"],["-15"]]
+      buff.scan( /y=\"(.*?\d+)\"/ ).should == [["999"], ["300"]]
+    end 
+    
+    it "should throw an exception when yaml is hosed" do
+      gauge = Ziya::Gauges::Base.new( "aaa", "crapping_out" )
+      lambda { gauge.to_xml }.should raise_error
+    end     
+  end
+    
+  describe "helpers" do
+    gauge = Ziya::Gauges::Base.new( "aaa", "gauge_2" )
+    buff  = gauge.to_xml
+    buff.scan( /<license/ ).size.should          == 1
+    buff.scan( /<circle/ ).size.should           == 2         
+    buff.scan( /x=\"(.*?\d+)\"/ ).should         == [ ["200"], ["10"] ]
+    buff.scan( /y=\"(.*?\d+)\"/ ).should         == [ ["75"], ["10"] ]
+    buff.scan( /start=\"(.*?\d+)\"/ ).should     == [ ["0"] ]
+    buff.scan( /end=\"(.*?\d+)\"/ ).should       == [ ["360"] ]
+    buff.scan( /fill_color=\"(\w{6})\"/ ).should ==  [ ["ff00ff"], ["ff0000"] ]
+  end   
+  
+  describe "helpers" do
+    gauge = Ziya::Gauges::Base.new( "aaa", "gauge_2" )
+    buff  = gauge.to_xml
+    buff.scan( /<license/ ).size.should          == 1
+    buff.scan( /<circle/ ).size.should           == 2         
+    buff.scan( /x=\"(.*?\d+)\"/ ).should         == [ ["200"], ["10"] ]
+    buff.scan( /y=\"(.*?\d+)\"/ ).should         == [ ["75"], ["10"] ]
+    buff.scan( /start=\"(.*?\d+)\"/ ).should     == [ ["0"] ]
+    buff.scan( /end=\"(.*?\d+)\"/ ).should       == [ ["360"] ]
+    buff.scan( /fill_color=\"(\w{6})\"/ ).should ==  [ ["ff00ff"], ["ff0000"] ]
+  end   
+  
+  describe "refresh" do
+    gauge = Ziya::Gauges::Base.new( "aaa", "gauge_1" )
+    gauge.set_preferences( :url => "/blee/fred" )
+    buff  = gauge.to_xml
+    buff.scan( /<license/ ).size.should          == 1
+    buff.scan( /<update/ ).size.should           == 1        
+    buff.scan( /url=\"(\/\w+\/\w+)\"/ ).should         == [ ["/blee/fred"] ]
+    buff.scan( /delay=\"(.*?\d+)\"/ ).should         == [ ["30"] ]
+  end    
+  
+end