acts-as-joinable 0.1.7.7 → 0.1.7.8

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.7.7"
+  s.version           = "0.1.7.8"
   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

@@ -66,8 +66,8 @@ module ActsAsJoinable
         class_name  = opts[:class_name] || nil
         sti         = (opts[:subclasses] || []).map { |i| i.to_s.camelize.constantize }
         # contexts defining the relationship between self and target
-        contexts    = [opts[:context] || []].flatten
-        context     = contexts.first
+        contexts    = [opts[:context] || []].flatten.map(&:to_s)
+        context     = contexts#.first
         # possible values of the context
         values      = [opts[:values] || opts[:value] || []].flatten.compact
         value       = values.first
@@ -100,7 +100,7 @@ module ActsAsJoinable
           end
           class_name    = opts[:class_name] || type.to_s.classify
           
-          join_context = (context || singular_type).to_s
+          join_context = (context.blank? ? [singular_type] : Array(context)).map(&:to_s)
           
           options = {
             :through              => :relationships,
@@ -131,18 +131,20 @@ module ActsAsJoinable
             #if join_context == class_name.underscore
               
 #            condition_string      << "(#{relationship_table}.#{relationship}_type IN (?))"
-            if join_context == class_name.underscore# && opposite_for(relationship).to_sym != :child
+            if join_context.include?(class_name.underscore)# && opposite_for(relationship).to_sym != :child
               #conditions            = [condition_string, [class_name]]
 #              if join_value
 #                condition_string      << "(#{relationship_table}.value = ?)"
 #                conditions            = [condition_string, join_value.to_s]
 #              end
             else
-              condition_string      << "(#{relationship_table}.context IN (?))"
-              condition_string      << " AND (#{relationship_table}.value = ?)" if join_value
-              join_contexts         = [join_context]#[join_context, class_name.underscore].uniq
-              conditions            = [condition_string, join_contexts]
-              conditions            << join_value.to_s if join_value
+              conditions = {:context => join_context.dup}
+              conditions[:value] = join_value unless join_value.blank?
+#              condition_string      << "(#{relationship_table}.context IN (?))"
+#              condition_string      << " AND (#{relationship_table}.value = ?)" if join_value
+#              join_contexts         = join_context.dup#[join_context, class_name.underscore].uniq
+#              conditions            = [condition_string, join_contexts]
+#              conditions            << join_value.to_s if join_value
             end
             
             through_options = {
@@ -159,6 +161,13 @@ module ActsAsJoinable
               through_options[:uniq] = true
             end
             
+            if join_context.length > 1
+              through_options[:readonly] = true
+              options[:readonly] = true
+            else
+              through_options.delete(:readonly)
+              options.delete(:readonly)
+            end
             
             unless has_association?(through_relationship)
               has_many through_relationship, through_options
@@ -295,7 +304,7 @@ module ActsAsJoinable
       
       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
+        eval_options[:context] = join_context.to_s unless join_context.to_s == options[:class_name].to_s.underscore.singularize
 
         eval_options[:value] = join_value unless join_value.blank?
         # has_many :users, :through => :child_relationships

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 75
   prerelease: false
   segments: 
   - 0
   - 1
   - 7
-  - 7
-  version: 0.1.7.7
+  - 8
+  version: 0.1.7.8
 platform: ruby
 authors: 
 - Lance Pollard