polyamorous 0.6.3 → 0.6.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a960cff78a0b7755b3cb84f7d44ce6fd99f0db3
+  data.tar.gz: ed14c61ab54556d57ab445b50635b48466c36ba1
+SHA512:
+  metadata.gz: 4e826b11b91c37bbedc7bc9201c90515a5a4ba02e085ff9b0827dfe2da116bba36545526a720e205a9c4a878e66ba8c384bb6942174c038cc6d15083d5777614
+  data.tar.gz: 2dfd89eab419e1e5301c51b30f2edff793bd721f7ce27d4a6fe4726dde9c180afcfc15a5faf703b88d80b87a6f3457c2227e4d88ea399b08f3f5da632a11945c

data/lib/polyamorous/join_association.rb

@@ -22,6 +22,7 @@ module Polyamorous
       if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
         swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
           initialize_without_polymorphism(reflection, join_dependency, parent)
+          self.reflection.options[:polymorphic] = true
         end
       else
         initialize_without_polymorphism(reflection, join_dependency, parent)
@@ -29,12 +30,11 @@ module Polyamorous
     end
 
     def swapping_reflection_klass(reflection, klass)
-      reflection = reflection.clone
-      original_polymorphic = reflection.options.delete(:polymorphic)
-      reflection.instance_variable_set(:@klass, klass)
-      yield reflection
-    ensure
-      reflection.options[:polymorphic] = original_polymorphic
+      new_reflection = reflection.clone
+      new_reflection.instance_variable_set(:@options, reflection.options.clone)
+      new_reflection.options.delete(:polymorphic)
+      new_reflection.instance_variable_set(:@klass, klass)
+      yield new_reflection
     end
 
     def equality_with_polymorphism(other)

data/lib/polyamorous/version.rb

@@ -1,3 +1,3 @@
 module Polyamorous
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/polyamorous/join_association_spec.rb

@@ -5,6 +5,7 @@ module Polyamorous
     let(:join_dependency) { new_join_dependency Note, {} }
     let(:parent) { join_dependency.join_base }
     let(:reflection) { Note.reflect_on_association(:notable) }
+    let(:join_association) { JoinAssociation.new(reflection, join_dependency, parent, Article) }
     subject {
       join_dependency.build_join_association_respecting_polymorphism(
         reflection, parent, Person
@@ -23,5 +24,19 @@ module Polyamorous
         )
       )
     end
+
+    it 'leaves the orginal reflection intact for thread safety' do
+      reflection.instance_variable_set(:@klass, Article)
+      join_association.swapping_reflection_klass(reflection, Person) do |new_reflection|
+        new_reflection.options.should_not equal reflection.options
+        new_reflection.options.should_not have_key(:polymorphic)
+        new_reflection.klass.should == Person
+        reflection.klass.should == Article
+      end
+    end
+
+    it 'sets the polmorphic option to true after initializing' do
+      join_association.options[:polymorphic].should be_true
+    end
   end
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: polyamorous
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.6.4
 platform: ruby
 authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,14 +76,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
-description: ! "\n    This is just an extraction from Ransack/Squeel. You probably
-  don't want to use this\n    directly. It extends ActiveRecord's associations to
-  support polymorphic belongs_to\n    associations.\n  "
+description: "\n    This is just an extraction from Ransack/Squeel. You probably don't
+  want to use this\n    directly. It extends ActiveRecord's associations to support
+  polymorphic belongs_to\n    associations.\n  "
 email:
 - ernie@metautonomo.us
 executables: []
@@ -124,33 +113,26 @@ files:
 - spec/support/schema.rb
 homepage: http://github.com/ernie/polyamorous
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3873183726189601663
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3873183726189601663
 requirements: []
 rubyforge_project: polyamorous
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Loves/is loved by polymorphic belongs_to associations, Ransack, Squeel, MetaSearch...
 test_files:
 - spec/blueprints/articles.rb