fastapi 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2525e75aa5c0031710eb855e7b88fbec58da54c
-  data.tar.gz: edf91151449d92f84958abeddc80b7740d0dfebe
+  metadata.gz: 47b2122fceeb82a91d839618ae3bdb58b4308b71
+  data.tar.gz: 4882d978213c4e47f095d0cc1d32d82582eb5626
 SHA512:
-  metadata.gz: 1db9ce7a1ed042dbac5af7c06573c0db33deae42bf23044840ee0e6b59608a6f2e813743272781357774a75b1d40b46937a4c0276e20b12e5a626ba79f145d0c
-  data.tar.gz: 3a9bbd61b101d92836d8a5aa9718821aa38d90f7eb29ca8fd542bc3eb367d3f953ccec697b55a7daa4517dffa81dbd4dc5dca4bb2b0e359780aea834b5095452
+  metadata.gz: 5c631a6dbdc6f193e665712fb6ebf98fe3692a767d9c388d75397a19e733ab146731fb919f4d3ce5a67c73011bb82b3275051a485c67a1071f7a62b525415f25
+  data.tar.gz: f3ed523229b323df69b8d33a563d3ab6adc9d8e1018c9ec1ee3e795598fd81f93d93d864b8fa4ac97a55ac2e23e7516ffd33aaec2fb88e9811b82e573546a496

data/lib/fastapi.rb

@@ -689,10 +689,26 @@ class FastAPI
       model_lookup = {}
 
       @model.fastapi_fields.each do |field|
+
         if @model.reflect_on_all_associations(:belongs_to).map(&:name).include? field
-          model = field.to_s.classify.constantize
-          model_lookup[field] = model
-          belongs << model
+
+          class_name = @model.reflect_on_association(field).options[:class_name]
+
+          if class_name.nil?
+
+            model = field.to_s.classify.constantize
+            model_lookup[field] = model
+            belongs << {model: model, alias: field}
+
+          else
+
+            model = class_name.constantize
+            model_lookup[field] = model
+
+            belongs << {model: model, alias: field}
+
+          end
+
         elsif @model.reflect_on_all_associations(:has_many).map(&:name).include? field
           model = field.to_s.singularize.classify.constantize
           model_lookup[field] = model
@@ -700,6 +716,7 @@ class FastAPI
         elsif @model.column_names.include? field.to_s
           fields << field
         end
+
       end
 
       self_string = @model.to_s.tableize.singularize
@@ -725,16 +742,18 @@ class FastAPI
       end
 
       # Belongs fields (1 to 1)
-      belongs.each do |model|
+      belongs.each do |model_data|
 
-        model_string_field = model.to_s.tableize.singularize
-        model_string_table = model.to_s.tableize
+        model_string_table = model_data[:model].to_s.tableize
+        model_string_table_alias = model_data[:alias].to_s.pluralize
+
+        model_string_field = model_data[:alias].to_s
 
         # fields
-        model.fastapi_fields_sub.each do |field|
+        model_data[:model].fastapi_fields_sub.each do |field|
           field_string = field.to_s
           field_list << [
-            model_string_table,
+            model_string_table_alias,
             '.',
             field_string,
             ' as ',
@@ -748,8 +767,10 @@ class FastAPI
         joins << [
           'LEFT JOIN',
             model_string_table,
+          'AS',
+            model_string_table_alias,
           'ON',
-            model_string_table + '.id',
+            model_string_table_alias + '.id',
             '=',
             self_string_table + '.' + model_string_field + '_id'
         ].join(' ')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Keith Horwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj