ziya 2.1.7 → 2.1.8

data/lib/ziya.rb

@@ -1,121 +1,146 @@
-# Initializes the ziya framework. Call Ziya.initialize(...) somewhere in your
-# framework initialization routine
-unless defined? Ziya
-  module Ziya          
-    # :stopdoc:
-    LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-    PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-               
-    def self.default_configuration
-      { 
-        :themes_dir => File.join( File.dirname(__FILE__), %w[.. charts themes] ),
-        :log_file   => $stdout,
-        :log_level  => :info 
-      }
-    end
-                            
-    def self.initialize( opts={} )
-      if opts[:log_level] == :debug
-        puts ">>> No logger specified. Using ZiYa default logger" unless opts[:logger]
-        puts ">>> No themes_dir specified. Using ZiYa default themes" unless opts[:themes_dir]      
-      end
-      @config = default_configuration.merge( opts )
-      @logger = opts[:logger] if opts[:logger]
-
-      # Verify existence of themes, designs and helper dirs if any
-      if themes_dir
-        raise "Unable to find themes directory `#{themes_dir}" unless File.exists?( themes_dir )
-      end
-
-      if map_themes_dir
-        raise "Unable to find map themes directory `#{map_themes_dir}" unless File.exists?( map_themes_dir )
-      end
+module Ziya
+  # :stopdoc:
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  # :startdoc:
 
-      if designs_dir
-        raise "Unable to find designs directory `#{designs_dir}" unless File.exists?( designs_dir )
-      end
-      
-      if helpers_dir
-        raise "Unable to find helper directory `#{helpers_dir}" unless File.exists?( helpers_dir )
-      end
-      
-      # Add the ziya/lib to the ruby path...
-      $: << libpath
-      Ziya.require_all_libs_relative_to __FILE__
-      
-      dump if config[:log_level] == :debug
+  def self.initialize( opts={} )
+    if opts[:log_level] == :debug
+      puts ">>> No logger specified. Using ZiYa default logger" unless opts[:logger]
+      puts ">>> No themes_dir specified. Using ZiYa default themes" unless opts[:themes_dir]      
     end
+    @config = default_configuration.merge( opts )
+    @logger = opts[:logger] if opts[:logger]
 
-    # ZiYa configuration
-    def self.config
-      @config
-    end
-          
-    # directory location for ziya stylesheet custom helpers
-    def self.helpers_dir
-      config[:helpers_dir]
-    end
-    
-    # the themes root directory location
-    def self.themes_dir
-      config[:themes_dir]
+    # Verify existence of themes, designs and helper dirs if any
+    if themes_dir
+      raise "Unable to find themes directory `#{themes_dir}" unless File.exists?( themes_dir )
     end
 
-    # the map themes root directory location
-    def self.map_themes_dir
-      config[:map_themes_dir]
+    if map_themes_dir
+      raise "Unable to find map themes directory `#{map_themes_dir}" unless File.exists?( map_themes_dir )
     end
 
-    # the gauges designs root directory location
-    def self.designs_dir
-      config[:designs_dir]
+    if designs_dir
+      raise "Unable to find designs directory `#{designs_dir}" unless File.exists?( designs_dir )
     end
     
-    # Debug                        
-    def self.dump #:nodoc:
-      puts "" 
-      puts "ZiYa Configuration Landscape"    
-      config.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |k| 
-        key   = k.to_s.rjust(20)
-        value = config[k].to_s.rjust(97,".")
-        puts "#{key} : #{value}"
-      end
+    if helpers_dir
+      raise "Unable to find helper directory `#{helpers_dir}" unless File.exists?( helpers_dir )
     end
     
-    # fetch the framework logger        
-    def self.logger
-      # get a hold of a logger.
-      @logger ||= ::Ziya::Logger.new( { :log_file          => config[:log_file], 
-                                        :logger_name       => "ZiYa",
-                                        :log_level         => config[:log_level],
-                                        :additive          => false } )
+    # Add the ziya/lib to the ruby path...
+    $: << libpath
+    Ziya.require_all_libs_relative_to __FILE__
+    
+    dump if config[:log_level] == :debug
+  end
+
+  def self.default_configuration
+    { 
+      :themes_dir => File.join( File.dirname(__FILE__), %w[.. charts themes] ),
+      :log_file   => $stdout,
+      :log_level  => :info 
+    }
+  end
+
+  # ZiYa configuration
+  def self.config
+    @config
+  end
+          
+  # directory location for ziya stylesheet custom helpers
+  def self.helpers_dir
+    config[:helpers_dir]
+  end
+  
+  # the themes root directory location
+  def self.themes_dir
+    config[:themes_dir]
+  end
+
+  # the map themes root directory location
+  def self.map_themes_dir
+    config[:map_themes_dir]
+  end
+
+  # the gauges designs root directory location
+  def self.designs_dir
+    config[:designs_dir]
+  end
+  
+  # Debug                        
+  def self.dump #:nodoc:
+    puts "" 
+    puts "ZiYa Configuration Landscape"    
+    config.keys.sort{ |a,b| a.to_s <=> b.to_s }.each do |k| 
+      key   = k.to_s.rjust(20)
+      value = config[k].to_s.rjust(97,".")
+      puts "#{key} : #{value}"
     end
-           
-    # Returns the library path for the module. If any arguments are given,
-    # they will be joined to the end of the libray path using
-    # <tt>File.join</tt>.
-    #
-    def self.libpath( *args ) #:nodoc:
-      args.empty? ? LIBPATH : ::File.join(LIBPATH, *args)
+  end
+  
+  # fetch the framework logger        
+  def self.logger
+    # get a hold of a logger.
+    @logger ||= ::Ziya::Logger.new( { :log_file          => config[:log_file], 
+                                      :logger_name       => "ZiYa",
+                                      :log_level         => config[:log_level],
+                                      :additive          => false } )
+  end
+
+  # Returns the version string for the library.
+  #
+  def self.version
+    @version ||= File.read(path('version.txt')).strip
+  end
+
+  # Returns the library path for the module. If any arguments are given,
+  # they will be joined to the end of the libray path using
+  # <tt>File.join</tt>.
+  #
+  def self.libpath( *args, &block )
+    rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    if block
+      begin
+        $LOAD_PATH.unshift LIBPATH
+        rv = block.call
+      ensure
+        $LOAD_PATH.shift
+      end
     end
+    return rv
+  end
 
-    # Returns the lpath for the module. If any arguments are given,
-    # they will be joined to the end of the path using
-    # <tt>File.join</tt>.
-    #
-    def self.path( *args ) #:nodoc:
-      args.empty? ? PATH : ::File.join(PATH, *args)
+  # Returns the lpath for the module. If any arguments are given,
+  # they will be joined to the end of the path using
+  # <tt>File.join</tt>.
+  #
+  def self.path( *args, &block )
+    rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
+    if block
+      begin
+        $LOAD_PATH.unshift PATH
+        rv = block.call
+      ensure
+        $LOAD_PATH.shift
+      end
     end
+    return rv
+  end
 
-    # Utility method used to require all files ending in .rb that lie in the
-    # directory below this file that has the same name as the filename passed
-    # in. Optionally, a specific _directory_ name can be passed in such that
-    # the _filename_ does not have to be equivalent to the directory.
-    #
-    def self.require_all_libs_relative_to( fname, dir = nil ) #:nodoc:
-      dir       ||= ::File.basename(fname, '.*')
-      search_me   = ::File.expand_path( ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-      Dir.glob(search_me).sort.each {|rb| require rb}
-    end 
+  # Utility method used to require all files ending in .rb that lie in the
+  # directory below this file that has the same name as the filename passed
+  # in. Optionally, a specific _directory_ name can be passed in such that
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+
+    Dir.glob(search_me).sort.each {|rb| require rb}
   end
-end
+end
+
+Ziya.require_all_libs_relative_to(__FILE__)

data/lib/ziya/charts/base.rb

@@ -217,7 +217,7 @@ module Ziya::Charts
           @options[directive] = styles   
         when :chart_types
           types = args.first.is_a?(Array) ? args.shift : []
-          raise ArgumentError, "Must specify a set of chart types" if types.to_s.empty?          
+          raise ArgumentError, "Must specify a set of chart types" if types.empty?
           @options[directive] = types                        
         when :theme
           theme = args.first.is_a?(String) ? args.shift : ""
@@ -237,7 +237,8 @@ module Ziya::Charts
     #                      link update where you may not need to redraw the whole chart.
     def to_s( options={} )
       @partial = options[:partial] || false
-      @xml     = Builder::XmlMarkup.new
+      out     = ""
+      @xml = Builder::XmlMarkup.new( :target => out )
       # Forces utf8 encoding on xml stream
       @xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
       @xml.chart do
@@ -255,6 +256,7 @@ module Ziya::Charts
         setup_series
       end
       @xml.to_s.gsub( /<to_s\/>/, '' )
+      out
     end                                       
     # dumps the chart design to xml for client side consumption
     alias to_xml to_s  
@@ -303,12 +305,18 @@ module Ziya::Charts
       @xml.row do
         categories.each do |category|
           case
-            when category.nil?                 : @xml.null
-            when category.instance_of?(Symbol) : @xml.string( category.to_s )
-            when category.instance_of?(String) : @xml.string( category )
-            when category.respond_to?(:zero?)  : @xml.number( category )
-            when category.is_a?(Hash)          : categ = category.clone;gen_row_data( categ.delete( :value ), categ, @xml )
-            else puts "No match"
+            when category.nil?
+              @xml.null
+            when category.instance_of?(Symbol)
+              @xml.string( category.to_s )
+            when category.instance_of?(String)
+              @xml.string( category )
+            when category.respond_to?(:zero?) 
+              @xml.number( category )
+            when category.is_a?(Hash)
+              categ = category.clone;gen_row_data( categ.delete( :value ), categ, @xml )
+            else 
+              puts "No match"
           end
         end
       end
@@ -339,7 +347,7 @@ module Ziya::Charts
     # generates chart data points    
     # BOZO !! Check args on hash
     def gen_chart_data( series )
-      block = lambda {
+      block = proc {
         series[:points].each do |row|      
           if !row
             @xml.null 

data/lib/ziya/gauges/base.rb

@@ -134,13 +134,15 @@ module Ziya::Gauges
       # -----------------------------------------------------------------------
       # renders chart to xml
       def render_xml
-        @xml = Builder::XmlMarkup.new
+        out = ''
+        @xml = Builder::XmlMarkup.new( :target => out )
         @xml.gauge do
           @xml.license( @license ) unless @license.nil?
           render_extra_components          
           render_components
         end
-        @xml.to_s.gsub( /<to_s\/>/, '' )        
+        @xml.to_s.gsub( /<to_s\/>/, '' )
+        out
       end
 
       # -----------------------------------------------------------------------

data/lib/ziya/gauges/signal.rb

@@ -79,7 +79,7 @@ module Ziya::Gauges
           count += 1
         end
         buff.join( "\n" )
-    	end
+      end
 
       # -----------------------------------------------------------------------
       # draws signal change indicator
@@ -122,9 +122,9 @@ module Ziya::Gauges
       def calc_change_alpha( change )
         alphas = []
         indexes = case change.abs
-          when 0..1   : change >= 0 ? [2] : [3]
-          when 1..5   : change >= 0 ? [1, 2] : [3,4]
-          when 5...10 : change >= 0 ? [0, 1, 2] : [3,4,5]
+          when 0..1   then change >= 0 ? [2] : [3]
+          when 1..5   then change >= 0 ? [1, 2] : [3,4]
+          when 5...10 then change >= 0 ? [0, 1, 2] : [3,4,5]
         end
         6.times { |i| alphas[i] = indexes.include?(i) ? 100 : 10 }
         alphas

data/lib/ziya/gauges/support/base.rb

@@ -11,9 +11,9 @@ module Ziya::Gauges::Support
       options.each_pair do |k,v|
         if v.is_a? YAML::Omap
           buff << "#{tab}#{indent}#{dials}"
-          v.each do |name, comp|
-            buff << "#{tab}#{indent(2)}#{dial( comp.class.name.ziya_demodulize, name )}"
-            comp.options.each_pair { |k,v| buff << "#{tab}#{indent(4)}#{k}: #{v}"}
+          v.each do |comp_name, comp|
+            buff << "#{tab}#{indent(2)}#{dial( comp.class.name.ziya_demodulize, comp_name )}"
+            comp.options.each_pair { |key,val| buff << "#{tab}#{indent(4)}#{key}: #{val}"}
           end          
         else
           buff << "#{tab}#{indent(1)}#{k}: #{v}" if options[k] and !options[k].to_s.empty?

data/lib/ziya/maps/base.rb

@@ -108,7 +108,7 @@ module Ziya::Maps
         if defined?(RAILS_ROOT) 
           require_dependency File.join(helper_dir, $1) 
         else
-          require File.join(helper_dir, $1)
+          require File.expand_path( File.join(helper_dir, $1) )
         end
         helper_module_name = "Ziya::" + $1.gsub(/(^|_)(.)/) { $2.upcase }        
         # helper_module_name = $1.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
@@ -208,7 +208,8 @@ module Ziya::Maps
                 
     # spews the map specification to a string
     def to_s
-      @xml = Builder::XmlMarkup.new
+      out = ''
+      @xml = Builder::XmlMarkup.new( :target => out )
       # Forces utf8 encoding on xml stream
       @xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"    
       if map_type == :us
@@ -223,6 +224,7 @@ module Ziya::Maps
         end         
       end
       @xml.to_s.gsub( /<to_s\/>/, '' )
+      out
     end                                       
     # dumps the map design to xml for client side consumption
     alias to_xml to_s  

data/lib/ziya/maps/support/base.rb

@@ -6,7 +6,7 @@ module Ziya::Maps::Support
 
     # flatten component to xml
     def flatten( xml )
-      xml.state( :id => to_component_id ) do |b|
+      xml.state( :id => to_component_id ) do |state|
         options.keys.sort { |a,b| a.to_s <=> b.to_s }.each{ |k| self.class.module_eval "xml.#{k}( '#{options[k]}' )" }
       end
     end

data/lib/ziya/maps/support/range.rb

@@ -16,7 +16,7 @@ module Ziya::Maps::Support
     define_mappings :level => :data
     
     def flatten( xml )
-      xml.state( :id => to_component_id ) do |b|
+      xml.state( :id => to_component_id ) do
         options.keys.sort { |a,b| a.to_s <=> b.to_s }.each { |k| self.class.module_eval "xml.#{find_key_for_attr(k)}( '#{options[k]}' )" }
       end
     end

data/lib/ziya/yaml_helpers/charts.rb

@@ -43,7 +43,7 @@ module Ziya
       #  => --- !ruby/object:Ziya::Charts::Bar
       def chart( class_name )
         "--- #{clazz( class_name, :Charts )}" 
-       end
+      end
     end
   end
 end

data/spec/charts/support/chart_pref_spec.rb

@@ -23,7 +23,7 @@ describe Ziya::Charts::Support::ChartPref do
     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"/>'
+      @comp.flatten( @xml ).should == '<chart_pref connect="true" point_shape="square"/>'
     end
 
     it "should flatten zero line correctly" do

data/spec/gauges/signal_spec.rb

@@ -21,8 +21,8 @@ describe Ziya::Gauges::Signal do
       buff.scan( /<license/ ).size.should == 1
       buff.scan( /<polygon/ ).size.should == 16  
       buff.scan( /<point/ ).size.should   == 58      
-      buff.scan( /x=\"(.*?\d+)\"/ ).should == [["20"], ["20.0"], ["20.0"], ["35.0"], ["30.0"], ["31.7557050458495"], ["37.6335575687742"], ["47.406363729278"], ["38.270909152852"], ["39.0211303259031"], ["48.5316954888546"], ["49.3444280220142"], ["39.5629520146761"], ["39.0211303259031"], ["48.5316954888546"], ["40.0739181907658"], ["33.3826121271772"], ["31.7557050458495"], ["37.6335575687742"], ["23.1358538980296"], ["22.0905692653531"], ["20.0"], ["20.0"], ["5.0"], ["10.0"], ["8.24429495415054"], ["2.36644243122581"], ["-7.40636372927803"], ["1.72909084714798"], ["0.978869674096931"], ["-8.53169548885461"], ["-9.34442802201417"], ["0.437047985323883"], ["0.978869674096927"], ["-8.53169548885461"], ["-0.0739181907657454"], ["6.61738787282284"], ["8.24429495415053"], ["2.3664424312258"], ["16.8641461019704"], ["17.9094307346469"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"]]
-      buff.scan( /y=\"(.*?\d+)\"/ ).should == [["30"], ["0.0"], ["-10.0"], ["-5.98076211353316"], ["2.67949192431123"], ["3.81966011250105"], ["-4.27050983124843"], ["7.797900707726"], ["11.865267138484"], ["13.8196601125011"], ["10.7294901687516"], ["26.2373507245328"], ["24.1582338163552"], ["26.1803398874989"], ["29.2705098312484"], ["42.2943447643218"], ["34.8628965095479"], ["36.1803398874989"], ["44.2705098312484"], ["49.8356568610482"], ["39.8904379073655"], ["40.0"], ["50.0"], ["45.9807621135332"], ["37.3205080756888"], ["36.1803398874989"], ["44.2705098312484"], ["32.202099292274"], ["28.134732861516"], ["26.180339887499"], ["29.2705098312484"], ["13.7626492754672"], ["15.8417661836448"], ["13.8196601125011"], ["10.7294901687516"], ["-2.29434476432183"], ["5.13710349045212"], ["3.81966011250105"], ["-4.27050983124842"], ["-9.8356568610482"], ["0.109562092634533"], ["-2"], ["-9.0"], ["-2"], ["8.0"], ["1.0"], ["8.0"], ["18.0"], ["11.0"], ["18.0"], ["23.0"], ["30.0"], ["23.0"], ["33.0"], ["40.0"], ["33.0"], ["43.0"], ["50.0"], ["43.0"]]
+      buff.scan( /x=\"(.*?\d+)\"/ ).should == [["20"], ["20.0"], ["20.0"], ["35.0"], ["30.0"], ["31.755705045849464"], ["37.633557568774194"], ["47.40636372927803"], ["38.27090915285201"], ["39.02113032590307"], ["48.53169548885461"], ["49.34442802201417"], ["39.562952014676114"], ["39.02113032590307"], ["48.53169548885461"], ["40.07391819076575"], ["33.38261212717717"], ["31.755705045849467"], ["37.633557568774194"], ["23.135853898029612"], ["22.090569265353075"], ["20.000000000000004"], ["20.000000000000004"], ["4.9999999999999964"], ["9.999999999999998"], ["8.24429495415054"], ["2.36644243122581"], ["-7.406363729278031"], ["1.7290908471479796"], ["0.9788696740969307"], ["-8.531695488854606"], ["-9.344428022014174"], ["0.43704798532388267"], ["0.9788696740969272"], ["-8.53169548885461"], ["-0.07391819076574535"], ["6.617387872822837"], ["8.244294954150535"], ["2.366442431225803"], ["16.864146101970398"], ["17.909430734646932"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"], ["55"], ["58.5"], ["62.0"]]
+      buff.scan( /y=\"(.*?\d+)\"/ ).should == [["30"], ["0.0"], ["-10.0"], ["-5.98076211353316"], ["2.6794919243112254"], ["3.819660112501051"], ["-4.270509831248425"], ["7.797900707725995"], ["11.865267138483997"], ["13.819660112501051"], ["10.729490168751576"], ["26.237350724532774"], ["24.15823381635518"], ["26.180339887498945"], ["29.270509831248418"], ["42.29434476432182"], ["34.86289650954788"], ["36.180339887498945"], ["44.27050983124842"], ["49.8356568610482"], ["39.89043790736547"], ["40.0"], ["50.0"], ["45.98076211353316"], ["37.32050807568877"], ["36.180339887498945"], ["44.270509831248425"], ["32.202099292274"], ["28.134732861516"], ["26.180339887498953"], ["29.270509831248425"], ["13.762649275467243"], ["15.841766183644829"], ["13.819660112501055"], ["10.729490168751584"], ["-2.2943447643218278"], ["5.137103490452116"], ["3.8196601125010545"], ["-4.270509831248422"], ["-9.8356568610482"], ["0.10956209263453331"], ["-2"], ["-9.0"], ["-2"], ["8.0"], ["1.0"], ["8.0"], ["18.0"], ["11.0"], ["18.0"], ["23.0"], ["30.0"], ["23.0"], ["33.0"], ["40.0"], ["33.0"], ["43.0"], ["50.0"], ["43.0"]]
     end 
     
     it "user can override signal" do