eager_record 0.1.3 → 0.2.0

data/lib/eager_record/eager_preloading.rb

@@ -67,7 +67,7 @@ module EagerRecord
       end
   
       def load_target_with_eager_preloading
-        if @reflection.options[:conditions].nil? && (!@owner.new_record? || foreign_key_present)
+        if !buggy_options?(@reflection) && (!@owner.new_record? || foreign_key_present)
           if !loaded?
             if originating_collection = @owner.instance_variable_get(:@originating_collection)
               @owner.class.__send__(:preload_associations, originating_collection, @reflection.name)
@@ -77,6 +77,16 @@ module EagerRecord
         end
         load_target_without_eager_preloading
       end
+
+      private
+
+      BUGGY_OPTIONS = [ :conditions, :finder_sql, :order ]
+
+      def buggy_options?(reflection)
+        reflection.options.any? do |(key, value)|
+          BUGGY_OPTIONS.include?(key) && value.present?
+        end
+      end
     end
   end
 end

data/lib/eager_record/unmarshallable.rb

@@ -6,7 +6,7 @@ module EagerRecord
   #
   class Unmarshallable
     instance_methods.each do |method|
-      undef_method(method) unless method =~ /__.+__/ || method.to_sym == :respond_to?
+      undef_method(method) unless method =~ /__.+__/ || method.to_sym == :respond_to? || method.to_sym == :object_id
     end
 
     class <<self

data/lib/eager_record/version.rb

@@ -1,3 +1,3 @@
 module EagerRecord
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eager_record
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mat Brown
@@ -15,13 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 -05:00
-default_executable: 
+date: 2013-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,7 +46,21 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: EagerRecord extends ActiveRecord to automate association preloading. Each time a collection of more than one record is loaded from the database, each record remembers the collection that it is part of; then when one of those records has an association accessed, EagerRecord triggers a preload_associations for all the records in the originating collection. Never worry about that :include option again!
 email: mat@patch.com
 executables: []
@@ -42,14 +71,13 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
+- lib/eager_record/eager_preloading.rb
 - lib/eager_record/scoped_preloading.rb
-- lib/eager_record/version.rb
 - lib/eager_record/unmarshallable.rb
-- lib/eager_record/eager_preloading.rb
+- lib/eager_record/version.rb
 - lib/eager_record.rb
 - README.rdoc
 - History.txt
-has_rdoc: true
 homepage: http://github.com/outoftime/eager_record
 licenses: []
 
@@ -79,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: eager_record
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Automatic association preloading for ActiveRecord collections.