has-relationship 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/has_relationship/has_relationship.rb

@@ -4,7 +4,7 @@ module HasRelationship
       types = [types] unless types.kind_of?(Array)
 
       types.each do |type|
-        class_name = type.to_s.classify
+        class_name = options[:class_name] ? options[:class_name] : type.to_s.classify
     
         # default relationship: Class1_Class2, where Class1 is the class of this class, 
         #   Class2 is the class of that this class has a relationship with
@@ -26,7 +26,8 @@ module HasRelationship
         end
     
         relationship = options[:relationship] if options[:relationship] 
-        relationship_through = options[:singular] ? "relationship_through_#{relationship.to_s.tableize.singularize}".to_sym : "relationship_through_#{relationship.to_s.tableize}".to_sym
+        relationship = [relationship] unless relationship.kind_of?(Array)
+        relationship_through = options[:singular] ? "relationship_through_#{relationship.join("_").to_s.tableize.singularize}".to_sym : "relationship_through_#{relationship.join("_").to_s.tableize}".to_sym
 
         HasRelationship::Relationship.class_eval do
           belongs_to "relation2_#{class_name.downcase}".to_sym,  :class_name => class_name, :foreign_key => "relation2_id"
@@ -39,10 +40,10 @@ module HasRelationship
         class_eval do
           if options[:singular]
             has_one relationship_through, :as => :relation1, :dependent => :destroy, :class_name => "HasRelationship::Relationship", :conditions => {:relationship => relationship}
-            has_one resource_name, :through => relationship_through, :class_name => class_name, :source => "relation2_#{class_name.downcase}".to_s, :conditions => ["relationships.relation2_type = ? and relationships.relationship = ?", class_name, relationship]
+            has_one resource_name, :through => relationship_through, :class_name => class_name, :source => "relation2_#{class_name.downcase}".to_s, :conditions => ["relationships.relation2_type = ? and relationships.relationship in (?)", class_name, relationship], :select => options[:select]
           else
             has_many relationship_through, :as => :relation1, :dependent => :destroy, :class_name => "HasRelationship::Relationship", :conditions => {:relationship => relationship}
-            has_many resource_name, :through => relationship_through, :class_name => class_name, :source => "relation2_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation2_type = ? and relationships.relationship = ?", class_name, relationship]
+            has_many resource_name, :through => relationship_through, :class_name => class_name, :source => "relation2_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation2_type = ? and relationships.relationship in (?)", class_name, relationship], :select => options[:select]
           end
         end
       end
@@ -52,7 +53,7 @@ module HasRelationship
       types = [types] unless types.kind_of?(Array)
 
       types.each do |type|
-        class_name = type.to_s.classify
+        class_name = options[:class_name] ? options[:class_name] : type.to_s.classify
     
         # default relationship: Class2_Class1, where Class1 is the class of this class, 
         #   Class2 is the class of that this class has a relationship with
@@ -73,7 +74,9 @@ module HasRelationship
         end
     
         relationship = options[:relationship] if options[:relationship] 
-        relationship_through = options[:singular] ? "inverse_relationship_through_#{relationship.to_s.tableize.singularize}".to_sym : "inverse_relationship_through_#{relationship.to_s.tableize}".to_sym
+        relationship = [relationship] unless relationship.kind_of?(Array)
+        
+        relationship_through = options[:singular] ? "inverse_relationship_through_#{relationship.join("_").to_s.tableize.singularize}".to_sym : "inverse_relationship_through_#{relationship.join("_").to_s.tableize}".to_sym
 
         HasRelationship::Relationship.class_eval do
           belongs_to "relation1_#{class_name.downcase}".to_sym,  :class_name => class_name, :foreign_key => "relation1_id"
@@ -86,10 +89,10 @@ module HasRelationship
         class_eval do
           if options[:singular]
             has_one relationship_through, :as => :relation2, :dependent => :destroy, :class_name => "HasRelationship::Relationship", :conditions => {:relationship => relationship}
-            has_one resource_name, :through => relationship_through, :class_name => class_name, :source => "relation1_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation1_type = ? and relationships.relationship = ?", class_name, relationship]
+            has_one resource_name, :through => relationship_through, :class_name => class_name, :source => "relation1_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation1_type = ? and relationships.relationship in (?)", class_name, relationship], :select => options[:select]
           else
             has_many relationship_through, :as => :relation2, :dependent => :destroy, :class_name => "HasRelationship::Relationship", :conditions => {:relationship => relationship}
-            has_many resource_name, :through => relationship_through, :class_name => class_name, :source => "relation1_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation1_type = ? and relationships.relationship = ?", class_name, relationship]
+            has_many resource_name, :through => relationship_through, :class_name => class_name, :source => "relation1_#{class_name.downcase}".to_sym, :conditions => ["relationships.relation1_type = ? and relationships.relationship in (?)", class_name, relationship], :select => options[:select]
           end
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has-relationship
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andrew Hunter