simply_stored 0.3.7 → 0.3.8

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =============
 
+0.3.8
+
+- Fix loading of has_many/has_one associations for inherited relations.
+
 - Pre-populate the parent object on has_many and has_one associations so that user.posts.first.user
   doesn't reload the user.
 

data/lib/simply_stored/couch/has_many.rb

@@ -163,7 +163,7 @@ module SimplyStored
             :dependent => :nullify,
             :through => nil,
             :class_name => name.to_s.singularize.camelize,
-            :foreign_key => owner_clazz.name.singularize.underscore.foreign_key
+            :foreign_key => nil
           }.update(options)
           @name, @options = name, options
           

data/lib/simply_stored/couch/has_one.rb

@@ -64,7 +64,7 @@ module SimplyStored
           options = {
             :dependent => :nullify,
             :class_name => name.to_s.singularize.camelize,
-            :foreign_key => owner_clazz.name.singularize.underscore.foreign_key
+            :foreign_key => nil
           }.update(options)
           @name, @options = name, options
           

data/lib/simply_stored/instance_methods.rb

@@ -175,7 +175,7 @@ module SimplyStored
     end
     
     def find_associated(from, to, options = {})
-      foreign_key = options.delete(:foreign_key).gsub(/_id$/, '')
+      foreign_key = (options.delete(:foreign_key) || self.class.name.singularize.underscore.foreign_key ).gsub(/_id$/, '')
       view_options = {}
       view_options[:reduce] = false
       view_options[:descending] = options[:descending] if options[:descending]

data/lib/simply_stored.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
 require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
 module SimplyStored
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
 end

data/test/couchdb/couch_has_many_test.rb

@@ -155,6 +155,15 @@ class CouchHasManyTest < Test::Unit::TestCase
         assert_equal [post], user.posts(:force_reload => true)
       end
       
+      should "use the correct view when handling inheritance" do
+        problem = Problem.create
+        big_problem = BigProblem.create
+        issue = Issue.create(:name => 'Thing', :problem => problem)
+        assert_equal 1, problem.issues.size
+        issue.update_attributes(:problem_id => nil, :big_problem_id => big_problem.id)
+        assert_equal 1, big_problem.issues.size
+      end
+      
       context "when adding items" do
         should "add the item to the internal cache" do
           daddy = User.new(:title => "Mr.")

data/test/couchdb/couch_has_one_test.rb

@@ -26,6 +26,15 @@ class CouchHasOneTest < Test::Unit::TestCase
       assert_equal instance, instance.identity.instance      
     end
     
+    should "use the correct view when handling inheritance" do
+      problem = Problem.create
+      big_problem = BigProblem.create
+      issue = Issue.create(:name => 'Thing', :problem => problem)
+      assert_equal issue, problem.issue
+      issue.update_attributes(:problem_id => nil, :big_problem_id => big_problem.id)
+      assert_equal issue, big_problem.issue
+    end
+    
     should "verify the given options for the accessor method" do
       instance = Instance.create
       assert_raise(ArgumentError) do

data/test/fixtures/couch.rb

@@ -208,3 +208,24 @@ class Servant
   
   belongs_to :master
 end
+
+class Issue
+  include SimplyStored::Couch
+  
+  belongs_to :problem
+  belongs_to :big_problem
+  
+  property :name
+end
+
+class Problem
+  include SimplyStored::Couch
+  
+  has_many :issues
+  has_one :issue
+end
+
+class BigProblem < Problem
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss