rgviz-rails 0.42 → 0.43

data/lib/rgviz_rails/executor.rb

@@ -517,16 +517,32 @@ module Rgviz
       col = klass.send(:columns).select{|x| x.name == name}.first
       return [klass, col, joins] if col
       
-      idx = name.index '_'
-      return nil if not idx
-      
-      before = name[0 ... idx]
-      name = name[idx + 1 .. -1]
-      
-      assoc = klass.send :reflect_on_association, before.to_sym
-      raise "Unknown association #{before}" unless assoc
-      klass = assoc.klass
-      joins << assoc
+      offset = 0
+      while true
+        idx = name.index '_', offset
+        if not idx
+          # Try to see if the name is an association, and refer to the id
+          assoc = klass.send :reflect_on_association, name.to_sym
+          if assoc
+            col = klass.send(:columns).select{|x| x.name == assoc.association_foreign_key}.first
+            return [klass, col, joins] if col  
+          end
+          return nil
+        end
+        
+        before = name[0 ... idx]
+        new_name = name[idx + 1 .. -1]
+        
+        assoc = klass.send :reflect_on_association, before.to_sym
+        if assoc
+          name = new_name
+          klass = assoc.klass
+          joins << assoc
+          break
+        end
+        
+        offset = idx + 1
+      end
     end
   end
   

data/spec/blueprints.rb

@@ -23,3 +23,10 @@ Person.blueprint do
   birthday { Sham::date }
   city
 end
+
+Pet.blueprint do
+  name
+  age { Sham::number }
+  birthday { Sham::date }
+  the_city { City.make }
+end

data/spec/models/pet.rb

@@ -0,0 +1,3 @@
+class Pet < ActiveRecord::Base
+  belongs_to :the_city, :class_name => 'City', :foreign_key => 'city_id'
+end

data/spec/rgviz/executor_spec.rb

@@ -5,11 +5,12 @@ include Rgviz
 
 describe Executor do
   before :each do
-    [Person, City, Country].each &:delete_all
+    [Person, Pet, City, Country].each &:delete_all
   end
   
   def exec(query, options = {})
-    exec = Executor.new Person, query
+    clazz = options[:class] || Person
+    exec = Executor.new clazz, query
     exec.execute options
   end
   
@@ -286,6 +287,14 @@ describe Executor do
   
   it_processes_single_select_column "1 options no_values", 'c0', :number, nil, "1"
   
+  it_processes_single_select_column "1 where city is null", 'c0', :number, 1, "1" do
+    Person.make :city => nil
+  end
+  
+  it_processes_single_select_column "the_city_name where the_city_name = 'foo'", 'the_city_name', :string, 'foo', "the_city_name", :class => Pet do
+    Pet.make :the_city => (City.make :name => 'foo')
+  end
+  
   it "processes pivot" do
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 1000
     Person.make :name => 'Eng', :birthday => '2000-01-12', :age => 500 

data/spec/spec_helper.rb

@@ -32,9 +32,19 @@ ActiveRecord::Schema.define do
     t.datetime "updated_at"
     t.integer  "city_id"
   end
+  
+  create_table "pets", :force => true do |t|
+    t.string   "name"
+    t.integer  "age"
+    t.date     "birthday"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "city_id"
+  end
 end
 
 require File.dirname(__FILE__) + '/models/person'
+require File.dirname(__FILE__) + '/models/pet'
 require File.dirname(__FILE__) + '/models/city'
 require File.dirname(__FILE__) + '/models/country'
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 0
-  - 42
-  version: "0.42"
+  - 43
+  version: "0.43"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - spec/models/city.rb
 - spec/models/country.rb
 - spec/models/person.rb
+- spec/models/pet.rb
 - spec/rgviz/executor_spec.rb
 - README
 has_rdoc: true