acts-as-joinable 0.1.0 → 0.1.1

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.0"
+  s.version           = "0.1.1"
   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

@@ -40,11 +40,11 @@ module ActsAsJoinable
       #   acts_as_joinable_on :tenants, :as => :parent
       # User
       def initialize_acts_as_joinable_on_core
-        joins     = acts_as_joinable_config.dup
-        block     = joins.pop
-        options   = joins.extract_options!
+        joins       = acts_as_joinable_config.dup
+        block       = joins.pop
+        options     = joins.extract_options!
         if joins.empty?
-          joins   = ActsAsJoinable.models
+          joins     = ActsAsJoinable.models
           relationships      = [:child]
         else
           relationships      = [options[:as] || :parent].flatten.map(&:to_sym)
@@ -54,7 +54,7 @@ module ActsAsJoinable
         
         association_type = options[:limit] == 1 ? :has_one : :has_many
         
-        scope_name = options[:named_scope]
+        scope_name  = options[:named_scope]
         
         joins.map!(&:to_sym)
         
@@ -125,16 +125,11 @@ module ActsAsJoinable
             
             join_value = value
             if join_context
-              unless join_context == class_name.underscore
-                condition_string = "(#{ActsAsJoinable::Relationship.table_name.to_s}.context IN (?))"
-                unless join_value
-#                  join_value = singular_type.to_s
-                end
-                condition_string << " AND (#{ActsAsJoinable::Relationship.table_name.to_s}.value = ?)" if join_value
-                join_contexts = [join_context, class_name.underscore]
-                conditions = [condition_string, join_contexts]
-                conditions << join_value.to_s if join_value
-              end
+              condition_string = "(#{ActsAsJoinable::Relationship.table_name.to_s}.context IN (?))"
+              condition_string << " AND (#{ActsAsJoinable::Relationship.table_name.to_s}.value = ?)" if join_value
+              join_contexts = [join_context, class_name.underscore]
+              conditions = [condition_string, join_contexts]
+              conditions << join_value.to_s if join_value
               
               through_options = {
                 :class_name => "ActsAsJoinable::Relationship",
@@ -162,22 +157,7 @@ module ActsAsJoinable
             #send(method_scope)
             # has_many :child_users, :through => :child_relationships
             add_association(relationship.to_s, plural_type, options, join_context, join_value, nestable, &block)
-            
-            if association_type == :has_one
-              define_method singular_type do
-                send(plural_type).first
-              end
-              define_method "#{singular_type}=" do |value|
-                send(relationship_with_context).destroy_all
-                send(plural_type) << value
-              end
-              define_method "#{singular_type}_id" do
-                send(singular_type).id rescue nil
-              end
-              define_method "#{singular_type}_id=" do |id|
-                send("#{singular_type}=", class_name.constantize.find(id))
-              end
-            end
+            add_has_one(singular_type, plural_type, relationship_with_context, class_name) if association_type == :has_one
           end
         end
       end
@@ -192,16 +172,25 @@ module ActsAsJoinable
         role.to_s == "parent" ? "child" : "parent"
       end
       
+      def add_has_one(singular_type, plural_type, relationship_with_context, class_name)
+        define_method singular_type do
+          send(plural_type).last
+        end
+        define_method "#{singular_type}=" do |value|
+#          send(relationship_with_context).delete_all
+          send(plural_type) << value
+        end
+        define_method "#{singular_type}_id" do
+          send(singular_type).id rescue nil
+        end
+        define_method "#{singular_type}_id=" do |id|
+          send("#{singular_type}=", class_name.constantize.find(id))
+        end
+      end
+      
       def add_association(relationship, plural_type, options, join_context, join_value, nestable, &block)
         eval_options = {:context => join_context}
         eval_options[:value] = join_value unless join_value.blank?
-        send(:has_many, "#{relationship}_#{plural_type}".to_sym, options) do
-          class_eval <<-EOF
-            def construct_join_attributes(associate)
-              super.merge(#{eval_options.inspect})
-            end
-          EOF
-        end
         # has_many :users, :through => :child_relationships
         
         unless self.reflect_on_all_associations.map(&:name).include?(plural_type.to_sym)
@@ -211,8 +200,8 @@ module ActsAsJoinable
                 super.merge(#{eval_options.inspect})
               end
             EOF
+          
           end
-            
           accepts_nested_attributes_for plural_type.to_sym if nestable
         end
       end

data/test/test_helper.rb

@@ -13,6 +13,7 @@ require 'logger'
 this = File.expand_path(File.dirname(__FILE__))
 
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
+# b.class.reflect_on_all_associations.detect {|i| i.name == :child_location_relationship}
 
 require File.expand_path(File.join(this, '/../lib/acts-as-joinable'))
 require File.join(this, "database")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -05:00
 default_executable: 
 dependencies: []