ziya 2.0.4 → 2.0.5

data/README.txt

@@ -1,6 +1,7 @@
 ziya
     by Fernand Galiana
     ziya.rubyforge.org
+    git://github.com/derailed/ziya.git
 
 == RELEASES
 
@@ -8,8 +9,9 @@ ziya
   2.0.1 - Additional support for 5.02 + Added donut chart from 5.03
   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
-
+  2.0.4 - Fixed missing encoding on composite urls - published gem on github
+  2.0.5 - Fixed merb app support issue
+  
 == DESCRIPTION:
 
 ZiYa allows you to easily display graphs in your ruby based applications by leveraging
@@ -25,6 +27,8 @@ managers will love you for it !!
 	Video            : http://www.youtube.com/watch?v=axIMmMHdXzo ( Out of date but you'll get the basics... )
 	Documentation    : http://ziya.liquidrail.com/docs
 	Forum            : http://groups.google.com/group/ziya-plugin
+	Repositories     : http://rubyforge.org/projects/ziya 
+	                   git://github.com/derailed/ziya.git
 
 
 == FEATURES:
@@ -50,6 +54,27 @@ managers will love you for it !!
 
 *  Theme support. You can change the appearance and behavior of any charts by introducing
    new themes under the public/charts/themes directory.
+
+== REQUIREMENTS:
+
+  ZiYa depends on the logging gem version > 0.9.0  
+
+== INSTALL:
+  
+  On rubyforge
+  
+  sudo gem install ziya
+  
+  or github
+  
+  sudo gem install derailed-ziya
+  
+  cd to your application directory and issue the following command
+  
+  > ziyafy
+  
+  This will copy the necessary themes and flash files to run ziya in your application 
+  public/charts directory.
       
 == SYNOPSIS:
   
@@ -191,21 +216,6 @@ managers will love you for it !!
                 radius:       5
                 fill_alpha:  80
   
-== REQUIREMENTS:
-
-  ZiYa depends on the logging gem version > 0.9.0  
-
-== INSTALL:
-
-  sudo gem install ziya
-  
-  cd to your application directory and issue the following command
-  
-  > ziyafy
-  
-  This will copy the necessary themes and flash files to run ziya in your application 
-  public/charts directory.
-
 == LICENSE:
 
 (The MIT License)

data/lib/ziya/charts/base.rb

@@ -56,7 +56,7 @@ module Ziya::Charts
       @options     = {}
       @series_desc = []
       @theme       = default_theme
-      @render_mode = Base.all_styles
+      @render_mode = Base.mode_reset
       initialize_components
       load_helpers( Ziya.helpers_dir ) if Ziya.helpers_dir
     end
@@ -67,10 +67,10 @@ module Ziya::Charts
     end
     
     # don't render stylesheets just gen code for chart stylesheet and data
-    def self.data_only() 1; end
+    def self.mode_data() 1; end
     
     # renders everything
-    def self.all_styles() 0; end
+    def self.mode_reset() 0; end
     
     # -------------------------------------------------------------------------
     # Default ZiYa theme
@@ -84,7 +84,12 @@ module Ziya::Charts
       Dir.foreach(helper_dir) do |helper_file| 
         next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/
         Ziya.logger.debug( ">>> ZiYa loading custom helper `#{$1}" )        
-        require_dependency File.join(helper_dir, $1)        
+        # check rails env for autoloader ?
+        if defined?(RAILS_ROOT) 
+          require_dependency File.join(helper_dir, $1) 
+        else
+          require 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 }
         # if Ziya::Helpers.const_defined?(helper_module_name)
@@ -451,7 +456,7 @@ module Ziya::Charts
     # -------------------------------------------------------------------------
     # Check if we should do the all monty or just render the instance styles
     def render_parents?      
-      (@render_mode == Base.all_styles)
+      (@render_mode == Base.mode_reset)
     end
     
     # -------------------------------------------------------------------------

data/lib/ziya/version.rb

@@ -2,7 +2,7 @@ module Ziya
   module Version
     MAJOR = 2
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
     
     # Returns the version string for the library.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ziya
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-31 00:00:00 -06:00
+date: 2008-09-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency