dragonfly 0.5.5 → 0.5.6

data/History.txt

@@ -1,3 +1,10 @@
+0.5.6 (2010-04-13)
+==================
+
+Fixes
+--------
+- Wasn't working properly with Single-Table Inheritance
+
 0.5.5 (2010-04-13)
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/dragonfly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]

data/lib/dragonfly/active_record_extensions/class_methods.rb

@@ -35,7 +35,10 @@ module Dragonfly
       end
       
       def dragonfly_apps_for_attributes
-        @dragonfly_apps_for_attributes ||= {}
+        @dragonfly_apps_for_attributes ||= begin
+          parent_class = ancestors[1]
+          parent_class.respond_to?(:dragonfly_apps_for_attributes) ? parent_class.dragonfly_apps_for_attributes.dup : {}
+        end
       end
 
     end

data/spec/dragonfly/active_record_extensions/migration.rb

@@ -14,6 +14,13 @@ class MigrationForTest < ActiveRecord::Migration
       t.string  :trailer_video_uid
       t.timestamps
     end
+    
+    create_table :cars do |t|
+      t.string :image_uid
+      t.string :reliant_image_uid
+      t.string :type
+    end
+    
   end
 
   def self.down

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -545,5 +545,31 @@ describe Item do
       end
     end
   end
+  
+  describe "inheritance" do
+    before(:all) do
+      @app = Dragonfly::App[:images]
+      ActiveRecord::Base.register_dragonfly_app(:image, @app)
+      Car.class_eval do
+        image_accessor :image
+      end
+      ReliantRobin.class_eval do
+        image_accessor :reliant_image
+      end
+    end
+    it "should allow assigning base class accessors" do
+      Car.create! :image => 'blah'
+    end
+    it "should not allow assigning subclass accessors in the base class" do
+      Car.new.should_not respond_to(:reliant_image=)
+    end
+    it "should allow assigning base class accessors in the subclass" do
+      ReliantRobin.create! :image => 'blah'
+    end
+    it "should allow assigning subclass accessors in the subclass" do
+      ReliantRobin.create! :reliant_image => 'blah'
+    end
+
+  end
 
 end

data/spec/dragonfly/active_record_extensions/models.rb

@@ -1,2 +1,6 @@
 class Item < ActiveRecord::Base
-end
+end
+class Car < ActiveRecord::Base
+end
+class ReliantRobin < Car
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Mark Evans