Changed Endpoint to be a factory instead of a single class. Much more sane encapsulation of behavior this way.

Author: Michael Bleigh

.rspec

@@ -1,3 +1,2 @@
 --color
---format=nested
---fail-fast
+--format=nested

README.markdown

@@ -0,0 +1,62 @@
+# Grape
+
+Grape is a REST-like API micro-framework for Ruby. It is built to complement existing web application frameworks such as Rails and Sinatra by providing a simple DSL to easily provide APIs. It has built-in support for common conventions such as multiple formats, subdomain/prefix restriction, and versioning.
+
+## Installation
+
+Grape is available as a gem, to install it just install the gem:
+
+    gem install grape
+    
+## Basic Usage
+
+Grape APIs are Rack applications that are created by subclassing `Grape::API`. Below is a simple example showing some of the more common features of Grape in the context of recreating parts of the Twitter API.
+
+    class Twitter::API < Grape::Base
+      version '1'
+      
+      helpers do
+        def current_user
+          @current_user ||= User.authorize!(env)
+        end
+      end
+      
+      resource :statuses do
+        formats :rss, :atom
+        
+        get :public_timeline do
+          Tweet.limit(20)
+        end
+      
+        get :home_timeline do
+          current_user.home_timeline
+        end
+        
+        post :update do
+          Tweet.create(
+            :text => params[:status]
+          )
+        end
+      end
+    end
+    
+    # Rack endpoint
+    Twitter::API.statuses.timelines.get(:public_timeline)
+    
+    class Twitter::API::User < Grape::Resource::ActiveRecord
+      represents ::User
+      
+      property :status, lambda{|u| u.latest_status}, Twitter::API::Status
+    end
+    
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2010 Michael Bleigh and Intridea, Inc. See LICENSE for details.

lib/grape/api.rb

@@ -122,8 +122,8 @@ def build_endpoint(&block)
         b.use Grape::Middleware::Versioner, :versions => (version if version.is_a?(Array)) if version
         b.use Grape::Middleware::Formatter, :default_format => default_format || :json
 
-        endpoint = Grape::Endpoint.new(&block)
-        endpoint.send :extend, helpers
+        endpoint = Grape::Endpoint.generate(&block)
+        endpoint.send :include, helpers
         b.run endpoint
 
         b.to_app

lib/grape/endpoint.rb

@@ -7,8 +7,20 @@ module Grape
   # on the instance level of this class may be called
   # from inside a `get`, `post`, etc. block.
   class Endpoint
-    def initialize(&block)
-      @block = block
+    def self.generate(&block)
+      c = Class.new(Grape::Endpoint)
+      c.class_eval do
+        @block = block
+      end
+      c
+    end
+    
+    class << self
+      attr_accessor :block
+    end
+    
+    def self.call(env)
+      new.call(env)
     end
 
     attr_reader :env, :request
@@ -52,19 +64,12 @@ def header(key = nil, val = nil)
       end
     end
 
-    def reset!
-      @params = nil
-      @env = nil
-      @request = nil
-      @header = {}
-    end
-    
     def call(env)
-      reset!
       @env = env
+      @header = {}
       @request = Rack::Request.new(@env)
 
-      response_text = instance_eval &@block
+      response_text = instance_eval &self.class.block
 
       [status, header, [response_text]]
     end

spec/grape/endpoint_spec.rb

@@ -84,4 +84,21 @@ def app; subject end
     post '/new', :text => 'def'
     last_response.body.should == 'def'
   end
+  
+  it 'should reset all instance variables (except block) between calls' do
+    subject.helpers do
+      def memoized
+        @memoized ||= params[:howdy]
+      end
+    end
+    
+    subject.get('/hello') do
+      memoized
+    end
+    
+    get '/hello?howdy=hey'
+    last_response.body.should == 'hey'
+    get '/hello?howdy=yo'
+    last_response.body.should == 'yo'
+  end
 end