acts-as-joinable 0.0.1.6 → 0.0.1.7

data/README.markdown

@@ -67,15 +67,16 @@ If you would like to define accessors that scope the relationship based on the `
 If you need more fine-grained control over each relationship scope, you can use a block:
 
     class Post < ActiveRecord::Base
-      acts_as_joinable_on :assets do
-        has_one  :featured_image, where(:...)
-        has_many :thumbnails
-      end
-      acts_as_joinable_on :tags
+      acts_as_joinable_on :tags, :assets
     end
     
     @post                  = Post.new
     @post.featured_image   = Image.first
     @post.thumbnails       = Image.all
     
-The goal of this is to make it so you never have to create migrations or new classes, or rewrite the same code over and over again.  Instead, you can just define `scopes` for cherry-picking the habtm items you'd like.
+The goal of this is to make it so you never have to create migrations or new classes, or rewrite the same code over and over again.  Instead, you can just define `scopes` for cherry-picking the habtm items you'd like.
+
+Has 2 key properties on the join model that are pretty common:
+
+- context: what the meaning of the join is
+- position: what position the join is in relation to the context

data/Rakefile

@@ -5,15 +5,15 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "acts-as-joinable"
   s.authors           = ["Lance Pollard"]
-  s.version           = "0.0.1.6"
+  s.version           = "0.0.1.7"
   s.summary           = "ActsAsJoinable: DRYing up Many-to-Many Relationships in ActiveRecord"
-  s.homepage          = "http://github.com/viatropos/cockpit"
+  s.homepage          = "http://github.com/viatropos/acts-as-joinable"
   s.email             = "lancejpollard@gmail.com"
   s.description       = "DRYing up Many-to-Many Relationships in ActiveRecord"
   s.has_rdoc          = false
   s.rubyforge_project = "acts-as-joinable"
   s.platform          = Gem::Platform::RUBY
-  s.files             = %w(README.markdown Rakefile init.rb MIT-LICENSE) + Dir["{lib,rails,test}/**/*"] - Dir["test/tmp"]
+  s.files             = %w(README.markdown Rakefile init.rb MIT-LICENSE) + Dir["{lib,rails,test,app}/**/*"] - Dir["test/tmp"]
   s.require_path      = "lib"
 end
 

data/app/models/relationship.rb

@@ -0,0 +1,3 @@
+class ActsAsJoinable::Relationship < ActiveRecord::Base
+  acts_as_relationship
+end

data/lib/acts-as-joinable.rb

@@ -1,7 +1,15 @@
 module ActsAsJoinable
   
   def self.models
-    @models ||= Dir[Rails.root + "/app/models/*.rb"].collect { |f| File.basename f, '.rb' }
+    unless @models
+      if defined?(Rails)
+        @models = Dir[Dir.pwd + "/app/models/*.rb"].collect { |f| File.basename f, '.rb' }
+      else
+        @models = []
+      end
+    end
+    
+    @models
   end
   
   def self.models=(value)
@@ -26,8 +34,8 @@ module ActsAsJoinable
         class_inheritable_reader(:acts_as_joinable_config)
         
         class_eval do
-          has_many :parent_relationships, :class_name => 'ActsAsJoinable::Relationship', :as => :child
-          has_many :child_relationships,  :class_name => 'ActsAsJoinable::Relationship', :as => :parent
+          has_many :parent_relationships, :class_name => 'ActsAsJoinable::Relationship', :as => :child, :dependent => :destroy
+          has_many :child_relationships,  :class_name => 'ActsAsJoinable::Relationship', :as => :parent, :dependent => :destroy
           
           def self.joinable?
             true
@@ -56,4 +64,5 @@ end
 
 ActiveRecord::Base.send(:include, ActsAsJoinable) if defined?(ActiveRecord::Base)
 
+Dir["#{File.dirname(__FILE__)}/../app/models/*"].each { |c| require c if File.extname(c) == ".rb" }
 Dir["#{File.dirname(__FILE__)}/acts_as_joinable/*"].each { |c| require c if File.extname(c) == ".rb" }

data/lib/acts_as_joinable/core.rb

@@ -18,6 +18,8 @@ module ActsAsJoinable
           as    = options[:as] || :parent
         end
         
+        class_name = options[:class_name] || nil
+        
         contexts = options[:contexts] || []
         contexts = contexts.map(&:to_s).inject({}) {|hash, i| hash[i] = i.empty? ? i : "#{i}_"; hash}
         
@@ -43,8 +45,8 @@ module ActsAsJoinable
             :conditions  => sql,
             :through     => relationship_type,
             :source      => role,
-            :class_name  => type.classify,
-            :source_type => type.classify
+            :class_name  => class_name ? class_name : type.classify,
+            :source_type => class_name ? class_name : type.classify
           }
           
           relationship_options = {
@@ -59,14 +61,13 @@ module ActsAsJoinable
             has_many type,              joined_options
             has_many relationship_type, relationship_options
           end
-          
+
           contexts.each do |context, context_prefix|
             context_type      = "#{context_prefix}#{type}".to_sym
             relationship_type = "#{context_prefix}#{singular_type}_relationships".to_sym
             has_many relationship_type, relationship_options.merge(
               :conditions => ["#{ActsAsJoinable::Relationship.table_name}.context = ?", context.to_s]
             )
-           
             has_many context_type,  joined_options.merge(
               :through     => relationship_type,
               :before_add  => lambda do |parent, child|
@@ -123,6 +124,10 @@ module ActsAsJoinable
         relationships_for(role, type, context, :include => opposite_for(role)).map(&role)
       end
       
+      def join_for(role, type, context)
+        joins_for(role, type, context).first
+      end
+      
       def set_joined(role, type, context, value)
         relationship = relationship_for(role, type, context, value) || ActsAsJoinable::Relationship.new
         clazz        = get_join_class(type)

data/rails/init.rb

@@ -1,3 +1,3 @@
 require 'acts-as-joinable'
 
-ActiveRecord::Base.send :include, ActsAsJoinable
+ActiveRecord::Base.send(:include, ActsAsJoinable)

data/test/database.rb

@@ -32,6 +32,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.references :parent, :polymorphic => true
     t.references :child, :polymorphic => true
     t.string :context
+    t.integer :position
     t.timestamps
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-joinable
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 0
   - 1
-  - 6
-  version: 0.0.1.6
+  - 7
+  version: 0.0.1.7
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 -07:00
+date: 2010-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -43,8 +43,9 @@ files:
 - test/lib/tag.rb
 - test/test_acts_as_joinable.rb
 - test/test_helper.rb
+- app/models/relationship.rb
 has_rdoc: true
-homepage: http://github.com/viatropos/cockpit
+homepage: http://github.com/viatropos/acts-as-joinable
 licenses: []
 
 post_install_message: