rgviz-rails 0.47 → 0.48

data/lib/rgviz_rails/executor.rb

@@ -3,9 +3,8 @@ module Rgviz
     attr_reader :model_class
     attr_reader :adapter
 
-    def initialize(model_class, query)
+    def initialize(model_class)
       @model_class = model_class
-      @query = query
       @selects = []
       @joins = {}
       @labels = {}
@@ -25,7 +24,8 @@ module Rgviz
       end
     end
 
-    def execute(options = {})
+    def execute(query, options = {})
+      @query = query
       @query = Parser.parse(@query, options) unless @query.kind_of?(Query)
 
       @table = Table.new

data/lib/rgviz_rails/init.rb

@@ -14,17 +14,23 @@ module Rgviz
             model = hash[:rgviz]
             conditions = hash[:conditions]
             extensions = hash[:extensions]
-            query = params[:tq]
+            query = params[:tq] || 'select *'
             tqx = params[:tqx] || ''
 
             tqx = Rgviz::Tqx.parse(tqx)
 
             begin
-              executor = Rgviz::Executor.new model, query
+              if model.is_a? Class and model < ActiveRecord::Base
+                executor = Rgviz::Executor.new model
+              elsif model.respond_to? :execute
+                executor = model
+              else
+                raise "The parameter to :rgviz => ... must extend from ActiveRecord::Base or respond to execute"
+              end
               options = {}
               options[:conditions] = conditions if conditions
               options[:extensions] = extensions if extensions
-              table = executor.execute options
+              table = executor.execute query, options
 
               yield table if block_given?
 

data/spec/rgviz/executor_spec.rb

@@ -9,8 +9,8 @@ describe Executor do
   end
 
   def exec(query, options = {})
-    exec = Executor.new Person, query
-    exec.execute options
+    exec = Executor.new Person
+    exec.execute query, options
   end
 
   def format_datetime(date)

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 47
-  version: "0.47"
+  - 48
+  version: "0.48"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -03:00
+date: 2011-07-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +70,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -81,14 +78,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: rgviz for rails