joint 0.3 → 0.3.1

data/lib/joint.rb

@@ -5,11 +5,14 @@ require 'wand'
 module Joint
   autoload :Version, 'joint/version'
 
+  def self.configure(model)
+    model.class_inheritable_accessor :attachment_names
+    model.attachment_names = Set.new
+  end
+
   module ClassMethods
     def attachment(name)
-      self.class.class_inheritable_accessor :attachment_names unless self.class.respond_to?(:attachment_names)
-      self.class.attachment_names ||= Set.new
-      self.class.attachment_names << name
+      self.attachment_names << name
 
       after_save     :save_attachments
       after_save     :destroy_nil_attachments

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.3'
+  Version = '0.3.1'
 end

data/test/test_joint.rb

@@ -9,6 +9,15 @@ class Asset
   attachment :file
 end
 
+class BaseModel
+  include MongoMapper::Document
+  plugin Joint
+  attachment :file
+end
+
+class Image < BaseModel; attachment :image end
+class Video < BaseModel; attachment :video end
+
 module JointTestHelpers
   def all_files
     [@file, @image, @image2, @test1, @test2]
@@ -25,6 +34,10 @@ module JointTestHelpers
   def grid
     @grid ||= Mongo::Grid.new(MongoMapper.database)
   end
+  
+  def key_names
+    [:id, :name, :type, :size]
+  end
 end
 
 class JointTest < Test::Unit::TestCase
@@ -49,9 +62,29 @@ class JointTest < Test::Unit::TestCase
     end
 
     should "add keys for each attachment" do
-      [:image, :file].each do |attachment|
-        [:id, :name, :type, :size].each do |key|
-          Asset.keys.should include("#{attachment}_#{key}")
+      key_names.each do |key|
+        Asset.keys.should include("image_#{key}")
+        Asset.keys.should include("file_#{key}")
+      end
+    end
+
+    context "with inheritance" do
+      should "add attachment to attachment_names" do
+        BaseModel.attachment_names.should == Set.new([:file])
+      end
+
+      should "inherit attachments from superclass, but not share other inherited class attachments" do
+        Image.attachment_names.should == Set.new([:file, :image])
+        Video.attachment_names.should == Set.new([:file, :video])
+      end
+
+      should "add inherit keys from superclass" do
+        key_names.each do |key|
+          BaseModel.keys.should include("file_#{key}")
+          Image.keys.should     include("file_#{key}")
+          Image.keys.should     include("image_#{key}")
+          Video.keys.should     include("file_#{key}")
+          Video.keys.should     include("video_#{key}")
         end
       end
     end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  version: "0.3"
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency