rgviz-rails 0.44 → 0.45

data/README.rdoc

@@ -10,8 +10,18 @@ This library is built on top of rgviz[https://github.com/asterite/rgviz].
 
   gem install rgviz-rails
 
+=== Rails 3
+
+In your Gemfile
+
+  gem 'rgviz'
+  gem 'rgviz-rails', :require => 'rgviz_rails'
+
+=== Rails 2.x
+
 In your environment.rb
 
+  config.gem "rgviz"
   config.gem "rgviz-rails", :lib => 'rgviz_rails'
 
 === Usage
@@ -90,7 +100,7 @@ If you need to tweak a result before returning it, just include a block:
 
 You can invoke the rgviz method in your views. {Read more about this}[https://github.com/asterite/rgviz-rails/wiki/Showing-a-visualization-in-a-view].
 
-You can always do it the {old way}[http://code.google.com/apis/visualization/documentation/using_overview.html]. {Read more about this}
+You can always do it the {old way}[http://code.google.com/apis/visualization/documentation/using_overview.html].
 
 === Current Limitations
 * The *format* clause is ignored (If someone knows of a working icu library for ruby, please tell me)

data/lib/rgviz_rails/init.rb

@@ -2,75 +2,73 @@ require "rgviz_rails/view_helper"
 # includes the view helper to ActionView::Base
 ActionView::Base.send(:include, Rgviz::ViewHelper)
 
-def _define_rgviz_class
-  ::ActionController::Base.module_eval do
-    def render_with_rgviz(*args, &block)
-      if args.length == 1 && args[0].kind_of?(Hash)
-        hash = args.first
-        case hash[:rgviz]
-        when nil then render_without_rgviz *args, &block
-        else
-          model = hash[:rgviz]
-          conditions = hash[:conditions]
-          extensions = hash[:extensions]
-          query = params[:tq]
-          tqx = params[:tqx] || ''
+module Rgviz
+  def self._define_rgviz_class
+    ::ActionController::Base.module_eval do
+      def render_with_rgviz(*args, &block)
+        if args.length == 1 && args[0].kind_of?(Hash)
+          hash = args.first
+          case hash[:rgviz]
+          when nil then render_without_rgviz *args, &block
+          else
+            model = hash[:rgviz]
+            conditions = hash[:conditions]
+            extensions = hash[:extensions]
+            query = params[:tq]
+            tqx = params[:tqx] || ''
 
-          tqx = Rgviz::Tqx.parse(tqx)
+            tqx = Rgviz::Tqx.parse(tqx)
 
-          begin
-            executor = Rgviz::Executor.new model, query
-            options = {}
-            options[:conditions] = conditions if conditions
-            options[:extensions] = extensions if extensions
-            table = executor.execute options
+            begin
+              executor = Rgviz::Executor.new model, query
+              options = {}
+              options[:conditions] = conditions if conditions
+              options[:extensions] = extensions if extensions
+              table = executor.execute options
 
-            yield table if block_given?
+              yield table if block_given?
 
-            case tqx['out']
-            when 'json'
-              render_without_rgviz :text => Rgviz::JsRenderer.render(table, tqx)
-            when 'html'
-              render_without_rgviz :text => Rgviz::HtmlRenderer.render(table)
-            when 'csv'
-              csv_output = Rgviz::CsvRenderer.render(table)
-              if tqx['outFileName']
-                send_data csv_output, :filename => tqx['outFileName'], :type => 'text/csv'
+              case tqx['out']
+              when 'json'
+                render_without_rgviz :text => Rgviz::JsRenderer.render(table, tqx)
+              when 'html'
+                render_without_rgviz :text => Rgviz::HtmlRenderer.render(table)
+              when 'csv'
+                csv_output = Rgviz::CsvRenderer.render(table)
+                if tqx['outFileName']
+                  send_data csv_output, :filename => tqx['outFileName'], :type => 'text/csv'
+                else
+                  render_without_rgviz :text => csv_output
+                end
               else
-                render_without_rgviz :text => csv_output
+                render_without_rgviz :text => Rgviz::JsRenderer.render_error('not_supported', "Unsupported output type: #{out}", tqx)
+              end
+            rescue ParseException => e
+              case tqx['out']
+              when 'json'
+                render_without_rgviz :text => Rgviz::JsRenderer.render_error('invalid_query', e.message, tqx)
+              when 'html'
+                render_without_rgviz :text => "<b>Error:</b> #{e.message}"
+              when 'csv'
+                render_without_rgviz :text => "Error: #{e.message}"
+              else
+                render_without_rgviz :text => "<b>Unsupported output type:</b> #{out}"
               end
-            else
-              render_without_rgviz :text => Rgviz::JsRenderer.render_error('not_supported', "Unsupported output type: #{out}", tqx)
-            end
-          rescue ParseException => e
-            case tqx['out']
-            when 'json'
-              render_without_rgviz :text => Rgviz::JsRenderer.render_error('invalid_query', e.message, tqx)
-            when 'html'
-              render_without_rgviz :text => "<b>Error:</b> #{e.message}"
-            when 'csv'
-              render_without_rgviz :text => "Error: #{e.message}"
-            else
-              render_without_rgviz :text => "<b>Unsupported output type:</b> #{out}"
             end
           end
+        else
+          render_without_rgviz *args, &block
         end
-      else
-        render_without_rgviz *args, &block
       end
+      alias_method_chain :render, :rgviz
     end
-    alias_method_chain :render, :rgviz
   end
 end
 
-if Rails::VERSION::MAJOR == 2
-  config.after_initialize do
-    _define_rgviz_class
-  end
-else
+if Rails::VERSION::MAJOR > 2
   class Railtie < Rails::Railtie
     initializer "define rgviz class" do
-      _define_rgviz_class
+      Rgviz._define_rgviz_class
     end
   end
 end

data/lib/rgviz_rails/view_helper.rb

@@ -197,10 +197,11 @@ module Rgviz
 
       @first_time = 0
 
-      if defined? :raw
-        raw out
-      else
+
+      if Rails::VERSION::MAJOR == 2
         out
+      else
+        raw out
       end
     end
 

data/rails/init.rb

@@ -0,0 +1,5 @@
+if Rails::VERSION::MAJOR == 2
+  config.after_initialize do
+    Rgviz._define_rgviz_class
+  end
+end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
+  hash: 81
   prerelease: false
   segments: 
   - 0
-  - 44
-  version: "0.44"
+  - 45
+  version: "0.45"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 -03:00
+date: 2010-12-16 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,6 +49,7 @@ files:
 - lib/rgviz_rails/adapters/postgresql_adapter.rb
 - lib/rgviz_rails/adapters/sqlite_adapter.rb
 - lib/rgviz_rails/init.rb
+- rails/init.rb
 - spec/blueprints.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -69,6 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -77,6 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"