acts-as-joinable 0.1.6.3 → 0.1.6.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "acts-as-joinable"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.1.6.3"
+  s.version           = "0.1.6.5"
   s.summary           = "ActsAsJoinable: DRYing up Many-to-Many Relationships in ActiveRecord"
   s.homepage          = "http://github.com/viatropos/acts-as-joinable"
   s.email             = "lancejpollard@gmail.com"

data/lib/acts_as_joinable/core.rb

@@ -87,10 +87,11 @@ module ActsAsJoinable
         wanted_classes.pop
         
         joins.each do |type|
-          singular_type = type.to_s.singularize
           if association_type == :has_one
+            singular_type = type.to_s.to_sym
             plural_type   = type.to_s.pluralize.to_sym
           else
+            singular_type = type.to_s.singularize.to_sym
             plural_type   = type.to_s.to_sym
           end
           class_name    = opts[:class_name] || type.to_s.classify
@@ -146,15 +147,28 @@ module ActsAsJoinable
               through_options[:uniq] = true
             end
             
+            
             unless has_association?(through_relationship)
               has_many through_relationship, through_options
             end
-            
-            add_association(relationship.to_s, plural_type, options, join_context, join_value, nestable, &block)
+                          
+            add_association(relationship.to_s, plural_type, options, join_context, join_value, &block)
             
             if association_type == :has_one
-              add_has_one(singular_type, plural_type, through_relationship, class_name)
+              add_has_one(singular_type, plural_type, through_relationship, class_name, join_context, join_value, options)
+            end
+            
+            if nestable
+              accepts_nested_attributes_for plural_type.to_sym
+              if association_type == :has_one
+                define_method "#{singular_type}_attributes=" do |params|
+                  params = params.first if params.is_a?(Array)
+                  
+                  self.send("#{plural_type}_attributes=", [params])
+                end
+              end
             end
+            
           end
         end
       end
@@ -173,7 +187,7 @@ module ActsAsJoinable
         self.reflect_on_all_associations.map(&:name).include?(name.to_sym)
       end
       
-      def add_has_one(singular_type, plural_type, relationship_with_context, class_name)
+      def add_has_one(singular_type, plural_type, relationship_with_context, class_name, join_context, join_value, options)
         define_method singular_type do
           send(plural_type).last
         end
@@ -198,7 +212,7 @@ module ActsAsJoinable
         end
       end
       
-      def add_association(relationship, plural_type, options, join_context, join_value, nestable, &block)
+      def add_association(relationship, plural_type, options, join_context, join_value, &block)
         eval_options = {}
         eval_options[:context] = join_context unless join_context.to_s == options[:class_name].to_s.underscore.singularize
 
@@ -223,7 +237,6 @@ module ActsAsJoinable
               end
             EOF
           end
-          accepts_nested_attributes_for plural_type.to_sym if nestable
         end
       end
       

data/test/test_acts_as_joinable.rb

@@ -61,9 +61,8 @@ class ActsAsJoinableTest < ActiveRecord::TestCase
         
         parent  = SubGroup.create!(
           :title => "subgroup with has_one :cover_image",
-          :cover_images_attributes => [{:title => "an image"}]
+          :cover_image_attributes => {:title => "an image"}
         )
-        
         assert_equal 1, Asset.count
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 1
   - 6
-  - 3
-  version: 0.1.6.3
+  - 5
+  version: 0.1.6.5
 platform: ruby
 authors: 
 - Lance Pollard