load association.rb first, to fix load error on older version of motion.

siuying · Dec 17, 2012 · 57582e3 · 57582e3
1 parent 7924faa
commit 57582e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/nano_store.rb b/lib/nano_store.rb
@@ -11,7 +11,8 @@
     app.files.unshift(file)
   end
 
-  # Load finder first
+  # Load finder and association first
+  app.files.unshift(File.join(File.dirname(__FILE__), 'nano_store/association.rb'))
   app.files.unshift(File.join(File.dirname(__FILE__), 'nano_store/finder.rb'))
 
   app.pods ||= Motion::Project::CocoaPods.new(app)

diff --git a/lib/nano_store/model.rb b/lib/nano_store/model.rb
@@ -82,7 +82,7 @@ def delete(*args)
   class Model < NSFNanoObject
     include ModelInstanceMethods
     extend ModelClassMethods
-    extend ::NanoStore::FinderMethods
+    extend FinderMethods
 
     include AssociationInstanceMethods
     extend AssociationClassMethods