rgviz-rails 0.73 → 0.74

data/lib/rgviz_rails.rb

@@ -36,4 +36,8 @@ module RgvizRails
     end
     time
   end
+
+  def self.inherits_from_active_record(obj)
+    (obj.is_a?(Class) && obj < ActiveRecord::Base) || obj.is_a?(ActiveRecord::Relation)
+  end
 end

data/lib/rgviz_rails/init.rb

@@ -24,7 +24,7 @@ module Rgviz
               options[:conditions] = conditions if conditions
               options[:virtual_columns] = virtual_columns if virtual_columns
 
-              table = if model.is_a?(Class) && model < ActiveRecord::Base
+              table = if RgvizRails.inherits_from_active_record(model)
                         Rgviz::Executor.new(model).execute query, options
                       elsif model.respond_to? :execute
                         model.execute query, options

data/lib/rgviz_rails/view_helper.rb

@@ -88,7 +88,7 @@ module Rgviz
       raise "Must specify a :kind" unless kind
       raise "Must specify a :url" unless url
 
-      custom_executor = (url.is_a?(Class) and url < ActiveRecord::Base) || url.respond_to?(:execute) || url.is_a?(Rgviz::Table) || url.is_a?(Array)
+      custom_executor = RgvizRails.inherits_from_active_record(url) || url.respond_to?(:execute) || url.is_a?(Rgviz::Table) || url.is_a?(Array)
       url = url_for url unless custom_executor
 
       # Parse the query
@@ -195,7 +195,7 @@ module Rgviz
           executor_options[:conditions] = conditions if conditions
           executor_options[:virtual_columns] = virtual_columns if virtual_columns
 
-          table = if url.is_a?(Class) and url < ActiveRecord::Base
+          table = if RgvizRails.inherits_from_active_record(url)
                     Rgviz::Executor.new(url).execute(query, executor_options)
                   elsif url.respond_to?(:execute)
                     url.execute(query, executor_options)

metadata

@@ -1,45 +1,55 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rgviz-rails
-version: !ruby/object:Gem::Version
-  version: '0.73'
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 74
+  version: "0.74"
 platform: ruby
-authors:
+authors: 
 - Ary Borenszweig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-29 00:00:00 -03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rgviz
-  requirement: &70257227777720 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.46'
-  type: :runtime
   prerelease: false
-  version_requirements: *70257227777720
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70257227776920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 46
+        version: "0.46"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: *70257227776920
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: aborenszweig@manas.com.ar
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/rgviz_rails.rb
 - lib/rgviz_rails/executor.rb
 - lib/rgviz_rails/js_renderer.rb
@@ -52,28 +62,35 @@ files:
 - lib/rgviz_rails/init.rb
 - rails/init.rb
 - README.markdown
+has_rdoc: false
 homepage: http://github.com/asterite/rgviz-rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: rgviz for rails
 test_files: []
+