From 59f81d2d776007a5b52cbf4336375185e599994c Mon Sep 17 00:00:00 2001
From: Chris Anderson <jchris@grabb.it>
Date: Tue, 14 Oct 2008 15:30:38 -0700
Subject: [PATCH] removed metaprogramming

---
 lib/couchrest/core/model.rb       | 42 ++++++++++++++++++-------------
 spec/couchrest/core/model_spec.rb |  5 ++--
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/lib/couchrest/core/model.rb b/lib/couchrest/core/model.rb
index 7d1678f..6d08cf2 100644
--- a/lib/couchrest/core/model.rb
+++ b/lib/couchrest/core/model.rb
@@ -297,20 +297,25 @@ module CouchRest
             'map' => map_function
           }
         end
-
+        generated_design_doc['views'][method_name]['couchrest-defaults'] = opts
         self.design_doc_fresh = false
+        method_name
+      end
 
-        self.meta_class.instance_eval do
-          define_method method_name do |*args|
-            query = opts.merge(args[0] || {})
-            query[:raw] = true if query[:reduce]
-            unless design_doc_fresh
-              refresh_design_doc
-            end
-            raw = query.delete(:raw)
-            view_name = "#{design_doc_slug}/#{method_name}"
-            fetch_view_with_docs(view_name, query, raw)
-          end
+      def method_missing m, *args
+        if opts = has_view?(m)
+          query = args.shift || {}
+          view(m, opts.merge(query), *args)
+        else
+          super
+        end
+      end
+
+      # returns true if the there is a view named this in the design doc
+      def has_view?(view)
+        view = view.to_s
+        if generated_design_doc['views'][view]
+          generated_design_doc['views'][view]["couchrest-defaults"]
         end
       end
 
@@ -321,26 +326,29 @@ module CouchRest
 
       # Dispatches to any named view.
       def view name, query={}, &block
-        name = name.to_s
+        unless design_doc_fresh
+          refresh_design_doc
+        end
+        query[:raw] = true if query[:reduce]        
+        raw = query.delete(:raw)
         view_name = "#{design_doc_slug}/#{name}"
-        fetch_view_with_docs(view_name, query, true, &block)
+        fetch_view_with_docs(view_name, query, raw, &block)
       end
 
       private
 
       def fetch_view_with_docs name, opts, raw=false, &block
-        
         if raw
           fetch_view name, opts, &block
         else
           begin
             view = fetch_view name, opts.merge({:include_docs => true}), &block
-            view['rows'].collect{|r|new(r['doc'])} if view
+            view['rows'].collect{|r|new(r['doc'])} if view['rows']
           rescue
             # fallback for old versions of couchdb that don't 
             # have include_docs support
             view = fetch_view name, opts, &block
-            view['rows'].collect{|r|new(database.get(r['id']))} if view
+            view['rows'].collect{|r|new(database.get(r['id']))} if view['rows']
           end
         end
       end
diff --git a/spec/couchrest/core/model_spec.rb b/spec/couchrest/core/model_spec.rb
index 1d75feb..d350335 100644
--- a/spec/couchrest/core/model_spec.rb
+++ b/spec/couchrest/core/model_spec.rb
@@ -431,7 +431,7 @@ describe CouchRest::Model do
       # register methods with method-missing, for local dispatch. method
       # missing lookup table, no heuristics.
       view = Course.view :by_title
-      designed = Course.by_title :raw => true
+      designed = Course.by_title
       view.should == designed
     end
     it "should get them" do
@@ -445,7 +445,8 @@ describe CouchRest::Model do
         # puts "course"
         courses << course
       end
-      courses[0]["key"].should =='aaa'
+      # courses.should == 'x'
+      courses[0]["doc"]["title"].should =='aaa'
     end
   end