RubyGems - merb - Versions diffs - 0.5.1 → 0.5.2 - Mend

merb 0.5.1 → 0.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

data/Rakefile +1 -1
data/SVN_REVISION +1 -1
data/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb +1 -1
data/app_generators/merb/templates/config/merb_init.rb +1 -1
data/lib/merb.rb +1 -1
data/lib/merb/mixins/controller.rb +5 -3
data/lib/merb/mixins/general_controller.rb +8 -6
data/lib/merb/mixins/view_context.rb +34 -7
data/lib/merb/test/helper.rb +121 -12
data/lib/merb/test/multipart.rb +12 -4
data/lib/merb/test/rspec_matchers/controller_matchers.rb +2 -2
data/lib/merb/version.rb +2 -2
data/lib/tasks/merb.rake +1 -1
data/spec/merb/controller_spec.rb +10 -0
data/spec/merb/dispatch_spec.rb +4 -7
data/spec/merb/multipart_spec.rb +2 -1
data/spec/merb/request_spec.rb +1 -0
data/spec/merb/view_context_spec.rb +44 -12
data/spec/spec_helper.rb +3 -0
data/spec/spec_helpers/url_shared_behaviour.rb +2 -0
metadata +105 -98

data/Rakefile CHANGED

@@ -168,7 +168,7 @@ end
 task :release => :package do
   if ENV["RELEASE"]
-    sh %{rubyforge add_release merb merb "#{ENV["RELEASE"]}" pkg/#{NAME}-#{Merb::VERSION}.gem}
+    puts %{rubyforge add_release merb merb "#{ENV["RELEASE"]}" pkg/#{NAME}-#{Merb::VERSION}.gem}
   else
     puts "Usage: rake release RELEASE='Clever tag line goes here'"
   end

data/SVN_REVISION CHANGED

	@@ -1 +1 @@
1	- ~~1274~~
1	+ 1297

data/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb CHANGED

@@ -131,7 +131,7 @@
 		<div class="header">
 			<h1><%= @exception.name.humanize %> <sup class="error_<%= @exception.class::STATUS %>"><%= @exception.class::STATUS %></sup></h1>
 			<% if show_details = ::Merb::Config[:exception_details] -%>
-				<h2><%= @exception.message %></h2>
+				<h2><%= ERB::Util.html_escape @exception.message %></h2>
 			<% else -%>
 				<h2>Sorry about that...</h2>
 			<% end -%>

data/app_generators/merb/templates/config/merb_init.rb CHANGED

@@ -13,5 +13,5 @@ puts "Loading Application..."
 Merb::BootLoader.load_application
 # Load environment-specific configuration
-environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment)
+environment_config = File.join(Merb.root, 'config', 'environments', Merb.environment + '.rb')
 require environment_config if File.exist?(environment_config)

data/lib/merb.rb CHANGED

@@ -79,7 +79,7 @@ module Merb
 		end
 		def load_paths
-			[ "/app/models/**/*.rb",
+			@load_paths ||= [ "/app/models/**/*.rb",
 				"/app/controllers/application.rb",
 				"/app/controllers/**/*.rb",
 				"/app/helpers/**/*.rb",

data/lib/merb/mixins/controller.rb CHANGED

@@ -64,10 +64,12 @@ module Merb
     #
     # +url+ - URL to redirect to; it can be either a relative or
     # fully-qualified URL.
+    # +permanent+ - Whether to use permanent redirection.
     #
-    def redirect(url)
-      Merb.logger.info("Redirecting to: #{url}")
-      set_status(302)
+    def redirect(url, permanent = false)
+      status = permanent ? 301 : 302
+      Merb.logger.info("Redirecting to: #{url} status: #{status}")
+      set_status(status)
       headers['Location'] = url
       "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"
     end

data/lib/merb/mixins/general_controller.rb CHANGED

@@ -161,7 +161,7 @@ module Merb
     end
     # +format_extension+ dictates when named route URLs generated by the url
-    # method will have a file extension. It will return either false or the format
+    # method will have a file extension. It will return either nil or the format
     # extension to append.
     #
     # ==== Configuration Options
@@ -192,12 +192,14 @@ module Merb
     #   # => /products/3
     #
     def format_extension(new_params={})
-      use_format = Merb::Config[:use_format_in_urls]
-      if use_format.nil?
-        prms = params.merge(new_params)
-        use_format = prms[:format] != 'html' && prms[:format]
+      format = params.merge(new_params)[:format] || 'html'
+      if format != 'html' || always_use_format_extension?
+        format || 'html'
       end
-      use_format
+    end
+    def always_use_format_extension?
+      Merb::Config[:use_format_in_urls]
     end

data/lib/merb/mixins/view_context.rb CHANGED

@@ -488,9 +488,6 @@ module Merb
     #
     #   throw_content(:header, "Hello World")
     #
-    # In Haml Templates, use the
-    #
-    #
     def throw_content(name, content = "", &block)
       content << capture(&block) if block_given?
       controller.thrown_content[name] << content
@@ -507,12 +504,42 @@ module Merb
       _buffer( binding ) << string
     end
+    # Creates a generic HTML tag. You can invoke it a variety of ways.
+    #
+    #   tag :div
+    #   # <div></div>
+    #
+    #   tag :div, 'content'
+    #   # <div>content</div>
+    #
+    #   tag :div, :class => 'class'
+    #   # <div class="class"></div>
+    #
+    #   tag :div, 'content', :class => 'class'
+    #   # <div class="class">content</div>
+    #
+    #   tag :div do
+    #     'content'
+    #   end
+    #   # <div>content</div>
+    #
+    #   tag :div, :class => 'class' do
+    #     'content'
+    #   end
+    #   # <div class="class">content</div>
+    #
+    def tag(name, contents = nil, attrs = {}, &block)
+      attrs = contents if contents.is_a?(Hash)
+      contents = capture(&block) if block_given?
+      open_tag(name, attrs) + contents.to_s + close_tag(name)
+    end
     # Creates the opening tag with attributes for the provided +name+
     # attrs is a hash where all members will be mapped to key="value"
     #
     # Note: This tag will need to be closed
     def open_tag(name, attrs = nil)
-      "<#{name}#{(' ' + attrs.to_html_attributes) if attrs && !attrs.empty?}>"
+      "<#{name}#{' ' + attrs.to_html_attributes if attrs && !attrs.empty?}>"
     end
     # Creates a closing tag
@@ -525,7 +552,7 @@ module Merb
     # +name+ : the name of the tag to create
     # +attrs+ : a hash where all members will be mapped to key="value"
     def self_closing_tag(name, attrs = nil)
-      "<#{name}#{' ' + attrs.to_html_attributes if attrs}/>"
-    end
-  end
+      "<#{name}#{' ' + attrs.to_html_attributes if attrs && !attrs.empty?}/>"
+    end
+  end
 end

data/lib/merb/test/helper.rb CHANGED

@@ -1,5 +1,6 @@
 require 'merb/test/fake_request'
 require 'merb/test/hpricot'
+require 'merb/test/multipart'
 include HpricotTestHelper
 module Merb
@@ -14,16 +15,41 @@ module Merb
       end
       # For integration/functional testing
-      def request(verb, path)
+      #
+      # This helper is the basis of the <tt>get</tt>, <tt>post</tt>, <tt>put</tt>, and <tt>delete</tt> helper
+      #
+      # By default a fake request is yielded to the block for local modification.
+      # +opts+ takes any options that you want pass to the methods, plus some reserved ones
+      #
+      # ===Yielding
+      # You can get the request helper to yield either a fake request object, or a controller
+      # Do this with the +:yield+ option.  Values can be +:request+, or +:controller+.  +:request+ is default
+      # When you yield the controller, it is available inside the block with the controller method, so you don't need to
+      # explicitly set it in the block chute.
+      # ====Example
+      #   request( :get, '/', :yields => :controller) do |controller|
+      #     controller.stub!(:render)
+      #   end
+      #
+      # You can also pass in a fake request object which may be useful if your yielding a controller.
+      # Use the opts[:fake_request] to do this.
+      # ====Example
+      #   request( :get, '/', :yields => :controller, :fake_request => @my_fake_request) do
+      #     controller.stub!(:render)
+      #   end
+      def request(verb, path, opts = {}, &block)
         response = StringIO.new
-        @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
-        yield @request if block_given?
-        @controller, @action = Merb::Dispatcher.handle @request, response
+        request = opts.delete(:fake_request) || Merb::Test::FakeRequest.with(path, opts.merge(:request_method => (verb.to_s.upcase rescue 'GET')))
+        yield_to_controller = opts.delete(:yields)
+        if yield_to_controller == :controller
+          request_yielding_controller(request, response, &block)
+        else
+          request_yielding_request(request, response, &block)
+        end
       end
       # Makes a get request routed to +path+ with any options encoded into the
       # request url
       # Example
@@ -31,7 +57,7 @@ module Merb
       #   get "/users", :user => {:login => "dave", :email => "email@example.com"}
       # }}}
       def get(path, opts = {}, &block)
-        request("GET",path_with_options(path,opts), &block)
+        request("GET", path, opts, &block)
       end
       # Makes a post request routed to +path+ with any options encoded into the
@@ -41,7 +67,7 @@ module Merb
       #   post "/users", :user => {:login => "dave", :email => "email@example.com"}
       # }}}
       def post(path, opts = {}, &block)
-        request("POST", path_with_options(path,opts), &block)
+        request("POST",path, opts, &block)
       end
       # Makes a put request routed to +path+ with any options encoded into the
@@ -51,7 +77,7 @@ module Merb
       #   put "/users/1", :user => {:login => "dave", :email => "email@example.com"}
       # }}}
       def put(path,opts = {}, &block)
-        request("PUT", path_with_options(path,opts), &block)
+        request("PUT",path, opts, &block)
       end
       # Makes a delete request routed to +path+ with any options encoded into the request url
@@ -60,7 +86,21 @@ module Merb
       #   delete "/users/1", :user => {:login => "dave", :email => "email@example.com"}
       # }}}
       def delete(path, opts= {}, &block)
-        request("DELETE", path_with_options(path,opts), &block)
+        request("DELETE",path, opts, &block)
+      end
+      # Posts multipart form data to a path
+      # pass the +path+ to send and the parameters.  For file uploads, just include a file as the option value.
+      # ===Example
+      # multipart_post("/my_collection", :foo => "bar", :user => { :login => "joe", :image => File.open("my_image.png")})
+      def multipart_post(path, params = {}, &block)
+        multipart_request(path, params.merge!(:request_method => 'POST'), &block)
+      end
+      # Posts multipart form data to a path
+      # Same as +multipart_post+ but used for PUT(ting) data to the server
+      def multipart_put(path, params = {}, &block)
+        multipart_request(path, params.merge!(:request_method => 'PUT'), &block)
       end
       def controller
@@ -130,6 +170,75 @@ module Merb
         path = path << "?" << params_to_query_string(opts) unless opts.empty?
         path
       end
+      protected
+      def request_yielding_request(request, response, &block)
+        # response = StringIO.new
+        # @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
+        @request = request
+        yield @request if block_given?
+        @controller, @action = Merb::Dispatcher.handle @request, response
+      end
+      def request_yielding_controller(request, response, &block)
+        # response = StringIO.new
+        # @request = Merb::Test::FakeRequest.with(path, :request_method => (verb.to_s.upcase rescue 'GET'))
+        @request = Merb::Request.new(request)
+        check_request_for_route(@request)
+        dispatch_fake_request(@request, response, &block)
+      end
+      def multipart_request(path, params = {}, &block)
+        response = StringIO.new
+        request = request_with_multipart_params(path, params)
+        check_request_for_route(request)
+        dispatch_fake_request(request, response, &block)
+      end
+      def check_request_for_route(request)
+        if request.route_params.empty?
+          raise ControllerExceptions::BadRequest, "No routes match the request"
+        elsif request.controller_name.nil?
+          raise ControllerExceptions::BadRequest, "Route matched, but route did not specify a controller"
+        end
+      end
+      # Used for yielding a controller with request and multipart helpers
+      def dispatch_fake_request(request, response, status = 200, &block)
+        klass = request.controller_class
+        @controller = klass.build(request, response, status)
+        @controller.send(:setup_session)
+        @controller.stub!(:setup_session).and_return(true)
+        yield @controller if block_given?
+        @controller.dispatch(request.action)
+        [@controller, request.action]
+        rescue => exception
+          exception = Dispatcher.send(:controller_exception, exception)
+          @controller, @action = Dispatcher.send(:dispatch_exception, request, response, exception)
+      end
+      def request_with_multipart_params(path, params = {})
+        request_method = params.delete(:request_method) || "GET"
+        request = Merb::Test::FakeRequest.new(:request_uri => path)
+        m = Merb::Test::Multipart::Post.new(params)
+        body, head = m.to_multipart
+        request['REQUEST_METHOD'] = request_method
+        request['CONTENT_TYPE'] = head
+        request['CONTENT_LENGTH'] = body.length
+        request.post_body = body
+        Merb::Request.new(request)
+      end
     end
   end
 end

data/lib/merb/test/multipart.rb CHANGED

@@ -38,12 +38,19 @@ module Merb
           push_params(params)
         end
-        def push_params(params)
+        def push_params(params, prefix = nil)
           params.sort_by {|k| k.to_s}.each do |key, value|
+            param_key = prefix.nil? ? key : "#{prefix}[#{key}]"
             if value.respond_to?(:read)
-              @multipart_params << FileParam.new(key, value.path, value.read)
+              @multipart_params << FileParam.new(param_key, value.path, value.read)
             else
-              @multipart_params << Param.new(key, value)
+              if value.is_a?(Hash) || value.is_a?(Mash)
+                value.keys.each do |k|
+                  push_params(value, param_key)
+                end
+              else
+                @multipart_params << Param.new(param_key, value)
+              end
             end
           end
         end
@@ -52,7 +59,8 @@ module Merb
           query = @multipart_params.collect { |param| "--" + BOUNDARY + "\r\n" + param.to_multipart }.join("") + "--" + BOUNDARY + "--"
           return query, CONTENT_TYPE
         end
-      end
+      end
     end
   end
 end

data/lib/merb/test/rspec_matchers/controller_matchers.rb CHANGED

@@ -5,7 +5,7 @@ module Merb
       class BeRedirect
         def matches?(target)
           @target = target
-          target == 302
+          [301, 302].include? target
         end
         def failure_message
           "expected to redirect"
@@ -75,7 +75,7 @@ module Merb
           (400..499).include?(@target.status)
         end
-        def failurs_message
+        def failure_message
           "expected #{@target} to be missing but was #{@target.status}"
         end

data/lib/merb/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Merb
-  VERSION = '0.5.1' unless defined?(::Merb::VERSION)
+  VERSION = '0.5.2' unless defined?(::Merb::VERSION)
   class << self
     def svn_revision
@@ -41,6 +41,6 @@ module Merb
   # You should never check in to trunk with this changed.  It should
   # stay 'svn'.  Change it to nil in release tags.
   unless defined?(::Merb::RELEASE)
-    RELEASE = "svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
+    RELEASE = nil #"svn#{" r#{svn_revision_from_file}" if svn_revision_from_file}"
   end
 end

data/lib/tasks/merb.rake CHANGED

@@ -1,7 +1,7 @@
 def install_merb_script
   script_filepath = Merb.root / 'script/merb'
   FileUtils.rm script_filepath if File.exist? script_filepath
-  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
+  tmpl = "#!/usr/bin/env ruby\nrequire File.expand_path(File.dirname(__FILE__)+'/../config/merb/boot')\nrequire File.expand_path(File.dirname(__FILE__)+'/../framework/merb/server')\nMerb::Server.run\n"
   File.open(script_filepath, 'wb') {|f|
     f.write tmpl
     f.chmod(0744)

data/spec/merb/controller_spec.rb CHANGED

@@ -94,6 +94,9 @@ describe "Controller", "redirect spec helpers" do
     end
     def show
     end
+    def permanent
+      redirect("/foo",:permanent)
+    end
   end
   before(:each) do
@@ -113,4 +116,11 @@ describe "Controller", "redirect spec helpers" do
     @controller.should_not redirect
     @controller.should_not redirect_to("/foo")
   end
+  it "should be able to match permanent redirects" do
+    @controller.dispatch('permanent')
+    @controller.status.should be_redirect
+    @controller.should redirect
+    @controller.should redirect_to("/foo")
+  end
 end

data/spec/merb/dispatch_spec.rb CHANGED

@@ -1,11 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/controllers/dispatch_spec_controllers'
-$TESTING = true
+require_fixtures '/controllers/dispatch_spec_controllers'
 describe Merb::Dispatcher do
-  before(:all) do
+  before :all do
     Merb::Config[:allow_reloading] = false
     Merb::Router.prepare do |r|
       r.resource :icon
@@ -288,6 +285,7 @@ describe Merb::Dispatcher do
     controller.params[:id].should == '1'
     controller.body.should == :edit
   end
   it "should handle request: GET /posts/1/edit and return Posts#edit" do
     controller, action = request(:get, '/posts/1/edit')
     controller.class.should == Posts
@@ -336,7 +334,6 @@ describe Merb::Dispatcher do
     controller.body.should == :create
   end
   it "should handle request: POST /posts.xml and return Posts#create format xml" do
     controller, action = request(:post, '/posts.xml')
     controller.class.should == Posts
@@ -526,6 +523,6 @@ describe Merb::Dispatcher do
     it "should support actionargs with nil as defaults" do
       controller, action = request(:get, '/bar/bam?a=1')
       controller.body.should == "1 nil"
-    end
+    end
   end
 end

data/spec/merb/multipart_spec.rb CHANGED

@@ -46,4 +46,5 @@ describe Merb::Test::Multipart::Post, '.to_multipart' do
     content_type.should == "multipart/form-data, boundary=----------0xKhTmLbOuNdArY"
     query.should == "------------0xKhTmLbOuNdArY\r\nContent-Disposition: form-data; name=\"file\"; filename=\"file.txt\"\r\nContent-Type: text/plain\r\n\r\nfile contents\r\n------------0xKhTmLbOuNdArY\r\nContent-Disposition: form-data; name=\"normal\"\r\n\r\nnormal_param\r\n------------0xKhTmLbOuNdArY--"
   end
-end
+end

data/spec/merb/request_spec.rb CHANGED

@@ -272,6 +272,7 @@ describe Merb::Request do
     lambda {request.method}.should_not raise_error
     request.method.should == :get
   end
   it "multipart_params should return an empty hash if the request is not multipart" do
     request = Merb::Request.new(@in)

data/spec/merb/view_context_spec.rb CHANGED

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../spec_helper'
+require_fixtures '/controllers/render_spec_controllers'
 describe "View Context", "image tag" do
@@ -309,26 +310,57 @@ describe "View Context", "throw_content, catch_content" do
 end
 describe Merb::ViewContextMixin do
+  # The use of this here is to avoid conflict with the tag()
+  # Hpricot test helper invoked via match_tag() when testing the
+  # tag() view context helper.
+  class FakeViewContext
+    include Merb::ErubisCaptureMixin, Merb::ViewContextMixin
+  end
+  before :each do
+    @view = FakeViewContext.new
+  end
   it "should render the start of a tag" do
-    open_tag(:div).should == "<div>"
+    @view.open_tag(:div).should match_tag(:div)
   end
   it "should render the start of a tag with attributes" do
-    tag = open_tag(:div, :id => 1, :class => "CLASS")
-    tag.should match_tag(:div, :id => "1", :class => "CLASS")
+    @view.open_tag(:div, :id => 1, :class => "CLASS").
+      should match_tag(:div, :id => "1", :class => "CLASS")
   end
   it "should render a self closing tag" do
-    self_closing_tag(:br).should == "<br/>"
+    @view.self_closing_tag(:br).should match_tag(:br)
   end
   it "should render a self closing tag with attributes" do
-    self_closing_tag(:img, :src => "SOURCE").should match_tag(:img, :src => "SOURCE")
+    @view.self_closing_tag(:img, :src => "SOURCE").
+      should match_tag(:img, :src => "SOURCE")
   end
   it "should render a closing tag" do
-    close_tag(:div).should == "</div>"
+    @view.close_tag(:div).should == "</div>"
+  end
+  it 'should render a tag with content' do
+    @view.tag(:div, 'divs rool').should match_tag(:div, :content => 'divs rool')
+  end
+  it 'should render a tag with content and attributes' do
+    @view.tag(:div, 'divs rool', :class => 'classy').
+      should match_tag(:div, :content => 'divs rool', :class => 'classy')
+  end
+  it 'should render a tag using a block for its contents' do
+    @view.tag(:div) do
+      'divs rool'
+    end.should match_tag(:div, :content => 'divs rool')
+  end
+  it 'should render a tag with attributes using a block for its contents' do
+    @view.tag(:div, :class => 'classy') do
+      'divs rool'
+    end.should match_tag(:div, :content => 'divs rool', :class => 'classy')
   end
 end

data/spec/spec_helper.rb CHANGED

@@ -14,6 +14,9 @@ require 'merb'
 require 'merb/test/helper'
 FIXTURES = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures')) unless defined?(FIXTURES)
+def require_fixtures(path)
+  require File.expand_path(File.join(FIXTURES, path))
+end
 require File.join(File.dirname(__FILE__), "spec_helpers", "url_shared_behaviour")

data/spec/spec_helpers/url_shared_behaviour.rb CHANGED

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/models/router_spec_models')
 describe "class with general url generation", :shared => true do
   before(:all) do

metadata CHANGED

@@ -1,33 +1,90 @@
 --- !ruby/object:Gem::Specification
-rubygems_version: 0.9.4
-specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-date: 2008-01-10 00:00:00 -08:00
-summary: Merb == Mongrel + Erb. Pocket rocket web framework.
-require_paths:
-- lib
-email: ez@engineyard.com
-homepage: http://merb.devjavu.com
-rubyforge_project:
-description: Merb == Mongrel + Erb. Pocket rocket web framework.
-autorequire:
-default_executable:
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: 1.8.4
-  version:
+  version: 0.5.2
 platform: ruby
-signing_key:
-cert_chain:
-post_install_message:
 authors:
 - Ezra Zygmuntowicz
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2008-01-14 00:00:00 -06:00
+default_executable:
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongrel
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: erubis
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: rubigen
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
+    version:
+description: Merb == Mongrel + Erb. Pocket rocket web framework.
+email: ez@engineyard.com
+executables:
+- merb
+extensions: []
+extra_rdoc_files:
+- README
+- LICENSE
+- TODO
 files:
 - LICENSE
 - README
@@ -401,81 +458,31 @@ files:
 - test_unit_generators/merb_model_test/templates/model_test_unit_template.erb
 - script/destroy
 - script/generate
-test_files: []
+has_rdoc: true
+homepage: http://merb.devjavu.com
+post_install_message:
 rdoc_options: []
-extra_rdoc_files:
-- README
-- LICENSE
-- TODO
-executables:
-- merb
-extensions: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 1.8.4
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: "0"
+  version:
 requirements:
 - install the json gem to get faster json parsing
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongrel
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: erubis
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: rubigen
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: rake
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: ruby2ruby
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Version::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    version:
+rubyforge_project:
+rubygems_version: 0.9.5
+signing_key:
+specification_version: 2
+summary: Merb == Mongrel + Erb. Pocket rocket web framework.
+test_files: []