sinatra_more 0.3.41 → 0.3.42

data/.gitignore

@@ -0,0 +1,25 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+webrat.log
+tmp/**/*
+.rvmrc
+Gemfile.lock

data/Gemfile

@@ -1,8 +1,3 @@
 source :rubygems
 
-gem "jeweler"
-gem "builder"
-gem "xml-simple"
-gem "warden"
-gem "tmail"
 gemspec

data/README.rdoc

@@ -2,11 +2,11 @@
 
 == Notice
 
-Worth noting here is that sinatra_more is still undergoing minor bug fixes and I will manage pull requests but _development has stopped_. The reason for this is that this project has been superseded by another project called the {Padrino Framework}[http://www.padrinorb.com]. 
+Worth noting here is that sinatra_more is still undergoing minor bug fixes and I will manage pull requests but <b>development has stopped</b>. The reason for this is that this project has been superseded by another project called the {Padrino Framework}[http://www.padrinorb.com].
 
-{Padrino}[http://www.padrinorb.com] is definately the place to look in the future 
-for a modular extension to Sinatra. Note that {Padrino}[http://github.com/padrino/padrino-framework] contains
-everything from sinatra_more but is far more ambitious and larger in scope. 
+{Padrino}[http://www.padrinorb.com] is definately the place to look in the future
+for modular extensions to Sinatra. Note that {Padrino}[http://github.com/padrino/padrino-framework] contains
+everything from sinatra_more but is far more ambitious and larger in scope.
 
 Padrino development is already well underway towards a 1.0 release, has a larger number of core developers, and a number of production applications have already been deployed. The idea for Padrino is to start with Sinatra and follow that philosophy but to super-charge the functionality adding support for development code reloading, advanced route definitions, I18n localization support, baked-in orm support, baked-in code generators, multi-app support, admin dashboard, authentication logic, view helpers, and more.
 
@@ -24,11 +24,11 @@ The canonical example of how to create an entire simple web application with Sin
   get '/' do
     'Hello world!'
   end
-  
+
 and then to run the application:
 
   $ ruby myapp.rb
-  
+
 The extreme simplicity of the framework is quite refreshing. I have been using Sinatra a great deal
 for recent projects. First for small and simple json and xml web services and then even
 for more complex full-featured applications. This gem represents my attempt to make it as fun and easy
@@ -36,12 +36,12 @@ as possible to code increasingly advanced view-heavy web applications in Sinatra
 
 == Introduction
 
-Note: This library is still experimental and may not be ready for production just yet. 
+Note: This library is still experimental and may not be ready for production just yet.
 That being said the gem is being actively used on a number of sinatra projects.
 In addition, the gem has fairly solid test coverage ensuring that everything works as expected.
 
-This will be a plugin which expands sinatra's capabilities in a variety of ways. 
-Note that all extensions have been created to work with haml, erb, and erubis. 
+This will be a plugin which expands sinatra's capabilities in a variety of ways.
+Note that all extensions have been created to work with haml, erb, and erubis.
 This gem is intended to be template-agnostic in providing helpers wherever possible.
 
 Let me expand briefly on what I want to accomplish with this gem. I love sinatra but if I want to use it
@@ -49,8 +49,8 @@ for any non-trivial application I very quickly miss a lot of the extra tools pro
 
 Now the obvious question is "Why not just use rails then?" Well, in many cases that might be the right decision.
 Still, at least until version 3 comes along, Rails is quite a large framework with a 'take it or leave it' attitude.
-Personally, I have come to love the spirit of sinatra which acts as a thin wrapper on top of rack 
-often allowing middleware to do most of the work and pulling in additional complexity only as required. 
+Personally, I have come to love the spirit of sinatra which acts as a thin wrapper on top of rack
+often allowing middleware to do most of the work and pulling in additional complexity only as required.
 
 My goal with this extension is to match the spirit of Sinatra and at the same time create a standard library
 of tools, helpers and components that will make Sinatra suitable for more complex applications.
@@ -71,13 +71,13 @@ Keep in mind, the user will be able to pull in these components seperately and l
 Please help me brainstorm and fork the project if you have any ideas to contribute.
 
 == Installation
- 
+
 If you want to use the WardenPlugin component, then the 'warden' gem would need to be installed.
 
 To install sinatra_more, simply grab the latest version from gemcutter:
 
   $ sudo gem install sinatra_more
-  
+
 Now you are ready to use this gem in your sinatra project.
 
 == Usage
@@ -85,7 +85,7 @@ Now you are ready to use this gem in your sinatra project.
 This extension can be easily registered into any existing sinatra application. You can require
 different components based on which pieces are useful for your particular application.
 
-  # app.rb 
+  # app.rb
   require 'sinatra/base'
   require 'sinatra_more' # or require 'sinatra_more/markup_plugin' for precise inclusion
 
@@ -161,7 +161,7 @@ methods should be very familiar to anyone who has used rails view helpers.
 * <tt>javascript_include_tag(*sources)</tt>
   * Returns an html script tag for each of the sources provided.
   * <tt>javascript_include_tag 'application', 'special'</tt>
-  
+
 ==== Form Helpers
 
 * <tt>form_tag(url, options={}, &block)</tt>
@@ -233,7 +233,7 @@ A form_tag might look like:
         = check_box_tag :confirm_delete
     - field_set_tag(:class => 'buttons') do
       = submit_tag "Remove"
-    
+
 ==== FormBuilders
 
 * <tt>form_for(object, url, settings={}, &block)</tt>
@@ -278,7 +278,7 @@ The following are fields provided by AbstractFormBuilder that can be used within
   * <tt>f.submit "Update", :class => 'long'</tt>
 * <tt>image_submit(source, options={})</tt>
   * <tt>f.image_submit "submit.png", :class => 'long'</tt>
-  
+
 A form_for using these basic fields might look like:
 
   - form_for @user, '/register', :id => 'register' do |f|
@@ -304,7 +304,7 @@ A form_for using these basic fields might look like:
         = location.text_field :city
     %p
       = f.submit "Create", :class => 'button'
-  
+
 There is also a StandardFormBuilder which builds on the abstract fields that can be used within a form_for:
 
 * <tt>text_field_block(field, options={}, label_options={})</tt>
@@ -323,7 +323,7 @@ There is also a StandardFormBuilder which builds on the abstract fields that can
   * <tt>submit_block(:username, :class => 'big')</tt>
 * <tt>image_submit_block(source, options={})</tt>
   * <tt>image_submit_block('submit.png', :class => 'big')</tt>
-  
+
 A form_for using these standard fields might look like:
 
   - form_for @user, '/register', :id => 'register' do |f|
@@ -366,7 +366,7 @@ The form builder can even be made into the default builder when form_for is invo
   # anywhere in the sinatra application
   set :default_builder, 'MyCustomFormBuilder'
 
-And there you have it, a fairly complete form builder solution for sinatra. 
+And there you have it, a fairly complete form builder solution for sinatra.
 I hope to create or merge in an even better 'default' form_builder in the near future.
 
 ==== Format Helpers
@@ -413,31 +413,31 @@ such as partials (with support for :collection) into the templating system.
 Using render plugin helpers is extremely simple. If you want to render an erb template in your view path:
 
   erb_template 'path/to/my/template'
-  
+
 or using haml templates works just as well:
 
   haml_template 'path/to/haml/template'
-  
+
 There is also a method which renders the first view matching the path and removes the need to define an engine:
 
   render_template 'path/to/any/template'
-  
+
 It is worth noting these are mostly for convenience. When I had more complex view files in sinatra, I got tired of writing:
 
   haml :"the/path/to/file"
   erb "/path/to/file".to_sym
-  
+
 Finally, we have the all-important partials support for rendering mini-templates onto a page:
 
   partial 'photo/_item', :object => @photo, :locals => { :foo => 'bar' }
   partial 'photo/_item', :collection => @photos
-  
+
 This works as you would expect and also supports the collection counter inside the partial <tt>item_counter</tt>
 
   # /views/photo/_item.haml
   # Access to collection counter with <partial_name>_counter i.e item_counter
   # Access the object with the partial_name i.e item
-  
+
 And that concludes the render plugin for now but I am open to adding more methods as time progresses.
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/renderplugin>
@@ -463,7 +463,7 @@ provided to make interacting with warden dead simple.
   * Forces a user to return to a fail path unless they are authorized
   * Used to require a user be authenticated before routing to an action
   * <tt>must_be_authorized!('/login')</tt>
-  
+
 There are a few configuration options and details you need to be aware of. By default, the WardenPlugin
 assumes you have a User class which represents the authenticating class type. If your user class has a different
 name then you need to specify that as follows:
@@ -492,7 +492,7 @@ Using this plugin you also do need to define your own routes for managing warden
     authenticate_user!
     redirect "/dashboard"
   end
-  
+
   post '/unauthenticated/?' do
     flash[:notice] = "That username and password are not correct!"
     status 401
@@ -506,9 +506,9 @@ Using this plugin you also do need to define your own routes for managing warden
 
 I was made aware of other sinatra/warden plugins which work very similarly to the system I outline for this plugin.
 Most notably is the sinatra_warden plugin by Justin Smestad (http://github.com/jsmestad/sinatra_warden)
-Eventually I plan to vendor that gem or just remove support for this piece of my plugin completely. 
+Eventually I plan to vendor that gem or just remove support for this piece of my plugin completely.
 
-If anybody has any thoughts on this or the warden integration in general, please let me know. 
+If anybody has any thoughts on this or the warden integration in general, please let me know.
 Nonetheless, there is a certain convenience for me having access to a plug-and-play warden solution directly from this gem.
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/wardenplugin>
@@ -597,22 +597,22 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 This component provides Sinatra with an enhanced url routing system which enables named route aliases to be defined
 and used throughout your application to refer to urls. The benefits of this is that instead of having to hard-code route urls
 into every area of your application, now we can just define the urls in a single spot and then attach an alias
-which can be used to refer to the url throughout the rest. 
+which can be used to refer to the url throughout the rest.
 
 Let's take a look at how to define named route mappings:
 
   # /app/routes/example.rb
   require 'sinatra_more'
-  
+
   class RoutingDemo < Sinatra::Application
-    register SinatraMore::RoutingPlugin  
-    
+    register SinatraMore::RoutingPlugin
+
     # Define the named route mappings
     map(:account).to("/the/accounts/:name/and/:id")
     map(:accounts).to("/the/accounts/index")
-    
+
     # Configure the routes using the named alias
-    get(:account)  { "name: params[:name] - id: params[:id]" }    
+    get(:account)  { "name: params[:name] - id: params[:id]" }
     get(:accounts) { "I am the body for the url /the/accounts/index" }
   end
 
@@ -635,13 +635,13 @@ The routing system also supports url route configuration namespaces:
 
   # /app/routes/example.rb
   map(:admin, :show).to("/admin/:id/show")
-  
+
   namespace :admin do
     get :show do
       "admin show for #{params[:id]}"
     end
   end
-  
+
 You could also define the route aliases themselves using a namespace for convenience:
 
   # /app/routes/example.rb
@@ -649,12 +649,12 @@ You could also define the route aliases themselves using a namespace for conveni
     namespace.map(:show).to("/admin/:id/show")
     namespace.map(:destroy).to("/admin/:id/destroy")
   end
-  
+
   namespace :admin do
     get :show do
       "admin show for #{params[:id]}"
     end
-    
+
     get :destroy do
       "admin destroy for #{params[:id]}"
     end
@@ -665,17 +665,17 @@ You can then reference the urls using the same <tt>url_for</tt> method:
   <%= link_to 'admin page', url_for(:admin, :show, :id => 25) %>
   <%= link_to 'admin page', url_for(:admin, :update, :id => 25) %>
   <%= link_to 'admin page', url_for(:admin, :show, :id => 25) %>
-  
+
 You can freely use both named route aliases and traditional Sinatra routes in the same application without conflict.
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/routingplugin>
-  
+
 == Sinatra Generators
 
 In addition to the support provided above, sinatra_more also comes preloaded with flexible code generators for Sinatra
 powered in part by the excellent Thor gem (incidentally also used in the Rails 3 generators). These generators are intended
 to allow for easy code generation both in creating new applications and building on existing ones. The generators have been
-built to be as library-agnostic as possible, supporting a myriad of test frameworks, js libraries, mocking libraries, etc. 
+built to be as library-agnostic as possible, supporting a myriad of test frameworks, js libraries, mocking libraries, etc.
 
 The usage for the generator is quite simple:
 
@@ -684,19 +684,19 @@ The usage for the generator is quite simple:
 The simplest possible command to generate a base application would be:
 
   $ sinatra_gen demo_app .
-  
-This would construct a Sinatra application DemoApp (which extends from Sinatra::Application) 
-inside the folder 'demo_app' at our current path. Inside the application there would be configuration and 
+
+This would construct a Sinatra application DemoApp (which extends from Sinatra::Application)
+inside the folder 'demo_app' at our current path. Inside the application there would be configuration and
 setup performed for the default components.
 
 You can also define specific components to be used:
 
   $ sinatra_gen demo_app . --test=rspec --renderer=haml --mock=rr --script=jquery --orm datamapper
-  
+
 There is also support for aliases for each component within the command:
 
   $ sinatra_gen demo_app . -t=rspec -r=haml -m=rr -s=jquery -d=datamapper
-  
+
 The available components and their default options are listed below:
 
 * test:     <tt>bacon</tt>  (default), <tt>shoulda</tt>, <tt>rspec</tt>, <tt>testspec</tt>, <tt>riot</tt>
@@ -713,7 +713,7 @@ The necessary bundler command can be executed automatically through the generato
 or this can be done manually through executing command <tt>gem bundle</tt> in the terminal at the root of the generated application.
 If not executed manually, the bundling will be performed automatically the first time the application attempts to boot.
 Note that this command only has to be performed when the application is first generated or when the Gemfile is modified.
- 
+
 The generator framework within sinatra_more is extensible and additional components and tools can be added easily.
 This would be achieved through forking our project and reading through the code in <tt>/generators/sinatra_generator.rb</tt> and
 the setup instructions inside the relevant files within <tt>/generators/components/</tt>. We are happy to accept pull requests
@@ -727,7 +727,7 @@ We are also planning to add generator actions such as:
 * Migrations generation
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/generator>
-  
+
 == Acknowledgements
 
 * Thanks to kelredd (http://github.com/kelredd) for the <tt>sinatra_helpers</tt> code that helped me to create erb capture and concat methods.
@@ -745,6 +745,7 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 * Rob Holland      - Added couchrest ORM component to generator
 * Bill Turner      - Added several form builder and helper fixes
 * Adrian (orangea) - Fixes to content_for and tests
+* Indrek Juhkam (indrekj) - Support for AS3 and fixes to select_tag
 
 == Known Issues
 
@@ -756,7 +757,7 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 * Ruby5     - <http://ruby5.envylabs.com/episodes/24-episode-23-october-30-2009/stories/183-sinatra-more>
 
 == 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

data/Rakefile

@@ -1,32 +1,8 @@
-# $ rake version:bump:patch release
-
+# $ EDIT version.rb, rake release
 require 'rubygems'
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "sinatra_more"
-    gem.summary = "Expands sinatra to allow for complex applications"
-    gem.description = "Expands sinatra with standard helpers and tools to allow for complex applications"
-    gem.email = "nesquena@gmail.com"
-    gem.homepage = "http://github.com/nesquena/sinatra_more"
-    gem.authors = ["Nathan Esquenazi"]
-    gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
-    gem.add_runtime_dependency     "tilt",          ">= 0.2"
-    gem.add_runtime_dependency     "thor",          ">= 0.11.8"
-    gem.add_runtime_dependency     "activesupport", "< 3.0.0"
-    gem.add_runtime_dependency     "bundler",       ">= 0.9.2"
-    gem.add_development_dependency "haml",          ">= 2.2.14"
-    gem.add_development_dependency "shoulda",       ">= 2.10.2"
-    gem.add_development_dependency "mocha",         ">= 0.9.7"
-    gem.add_development_dependency "rack-test",     ">= 0.5.0"
-    gem.add_development_dependency "webrat",        ">= 0.5.1"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -58,4 +34,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "sinatra_more #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -160,11 +160,13 @@ module SinatraMore
     end
 
     # Returns the options tags for a select based on the given option items
-    def options_for_select(option_items, selected_value=nil)
+    def options_for_select(option_items, selected_values=[])
       return '' if option_items.blank?
+      selected_values = [selected_values].compact unless selected_values.is_a?(Array)
       option_items.collect { |caption, value|
         value ||= caption
-        content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
+        selected = selected_values.find {|v| v.to_s =~ /^(#{value}|#{caption})$/}
+        content_tag(:option, caption, :value => value, :selected => !!selected)
       }.join("\n")
     end
 

data/lib/sinatra_more/version.rb

@@ -0,0 +1,3 @@
+module SinatraMore
+  VERSION = "0.3.42"
+end

data/sinatra_more.gemspec

@@ -1,288 +1,40 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sinatra_more/version"
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.41"
+  s.version = SinatraMore::VERSION
+  s.platform    = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2011-01-21}
+  s.email = %q{nesquena@gmail.com}
+  s.date = %q{2011-02-18}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
-  s.email = %q{nesquena@gmail.com}
-  s.executables = ["sinatra_gen"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc",
-    "TODO"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "IDEAS.md",
-    "LICENSE",
-    "README.rdoc",
-    "ROADMAP",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "bin/sinatra_gen",
-    "generators/base_app/.gitignore",
-    "generators/base_app/Gemfile",
-    "generators/base_app/app/.empty_directory",
-    "generators/base_app/app/helpers/.empty_directory",
-    "generators/base_app/app/helpers/view_helpers.rb",
-    "generators/base_app/app/mailers/.empty_directory",
-    "generators/base_app/app/models/.empty_directory",
-    "generators/base_app/app/routes/.empty_directory",
-    "generators/base_app/app/routes/main.rb.tt",
-    "generators/base_app/app/views/.empty_directory",
-    "generators/base_app/config.ru.tt",
-    "generators/base_app/config/boot.rb.tt",
-    "generators/base_app/config/dependencies.rb.tt",
-    "generators/base_app/lib/.empty_directory",
-    "generators/base_app/log/.empty_directory",
-    "generators/base_app/public/images/.empty_directory",
-    "generators/base_app/public/images/.gitignore",
-    "generators/base_app/public/javascripts/.empty_directory",
-    "generators/base_app/public/stylesheets/.empty_directory",
-    "generators/base_app/test/models/.empty_directory",
-    "generators/base_app/test/routes/.empty_directory",
-    "generators/base_app/test/test_config.rb.tt",
-    "generators/base_app/tmp/.empty_directory",
-    "generators/base_app/vendor/gems/.empty_directory",
-    "generators/components/component_actions.rb",
-    "generators/components/files/jquery-1.3.2.min.js",
-    "generators/components/files/lowpro.js",
-    "generators/components/files/prototype.js",
-    "generators/components/files/right-min.js",
-    "generators/components/files/right-olds-min.js",
-    "generators/components/mocks/mocha_mock_gen.rb",
-    "generators/components/mocks/rr_mock_gen.rb",
-    "generators/components/orms/activerecord_orm_gen.rb",
-    "generators/components/orms/couchrest_orm_gen.rb",
-    "generators/components/orms/datamapper_orm_gen.rb",
-    "generators/components/orms/mongomapper_orm_gen.rb",
-    "generators/components/orms/sequel_orm_gen.rb",
-    "generators/components/renderers/erb_renderer_gen.rb",
-    "generators/components/renderers/haml_renderer_gen.rb",
-    "generators/components/scripts/jquery_script_gen.rb",
-    "generators/components/scripts/prototype_script_gen.rb",
-    "generators/components/scripts/rightjs_script_gen.rb",
-    "generators/components/tests/bacon_test_gen.rb",
-    "generators/components/tests/riot_test_gen.rb",
-    "generators/components/tests/rspec_test_gen.rb",
-    "generators/components/tests/shoulda_test_gen.rb",
-    "generators/components/tests/testspec_test_gen.rb",
-    "generators/generator_actions.rb",
-    "generators/skeleton_generator.rb",
-    "lib/sinatra_more.rb",
-    "lib/sinatra_more/mailer_plugin.rb",
-    "lib/sinatra_more/mailer_plugin/mail_object.rb",
-    "lib/sinatra_more/mailer_plugin/mailer_base.rb",
-    "lib/sinatra_more/markup_plugin.rb",
-    "lib/sinatra_more/markup_plugin/asset_tag_helpers.rb",
-    "lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb",
-    "lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb",
-    "lib/sinatra_more/markup_plugin/form_helpers.rb",
-    "lib/sinatra_more/markup_plugin/format_helpers.rb",
-    "lib/sinatra_more/markup_plugin/output_helpers.rb",
-    "lib/sinatra_more/markup_plugin/tag_helpers.rb",
-    "lib/sinatra_more/render_plugin.rb",
-    "lib/sinatra_more/render_plugin/render_helpers.rb",
-    "lib/sinatra_more/routing_plugin.rb",
-    "lib/sinatra_more/routing_plugin/named_route.rb",
-    "lib/sinatra_more/routing_plugin/routing_helpers.rb",
-    "lib/sinatra_more/support_lite.rb",
-    "lib/sinatra_more/warden_plugin.rb",
-    "lib/sinatra_more/warden_plugin/warden_helpers.rb",
-    "sinatra_more.gemspec",
-    "test/active_support_helpers.rb",
-    "test/fixtures/mailer_app/app.rb",
-    "test/fixtures/mailer_app/views/demo_mailer/sample_mail.erb",
-    "test/fixtures/mailer_app/views/sample_mailer/anniversary_message.erb",
-    "test/fixtures/mailer_app/views/sample_mailer/birthday_message.erb",
-    "test/fixtures/markup_app/app.rb",
-    "test/fixtures/markup_app/views/capture_concat.erb",
-    "test/fixtures/markup_app/views/capture_concat.haml",
-    "test/fixtures/markup_app/views/content_for.erb",
-    "test/fixtures/markup_app/views/content_for.haml",
-    "test/fixtures/markup_app/views/content_tag.erb",
-    "test/fixtures/markup_app/views/content_tag.haml",
-    "test/fixtures/markup_app/views/fields_for.erb",
-    "test/fixtures/markup_app/views/fields_for.haml",
-    "test/fixtures/markup_app/views/form_for.erb",
-    "test/fixtures/markup_app/views/form_for.haml",
-    "test/fixtures/markup_app/views/form_tag.erb",
-    "test/fixtures/markup_app/views/form_tag.haml",
-    "test/fixtures/markup_app/views/link_to.erb",
-    "test/fixtures/markup_app/views/link_to.haml",
-    "test/fixtures/markup_app/views/mail_to.erb",
-    "test/fixtures/markup_app/views/mail_to.haml",
-    "test/fixtures/markup_app/views/meta_tag.erb",
-    "test/fixtures/markup_app/views/meta_tag.haml",
-    "test/fixtures/markup_app/views/yield_content.erb",
-    "test/fixtures/markup_app/views/yield_content.haml",
-    "test/fixtures/render_app/app.rb",
-    "test/fixtures/render_app/views/erb/test.erb",
-    "test/fixtures/render_app/views/haml/test.haml",
-    "test/fixtures/render_app/views/template/_user.haml",
-    "test/fixtures/render_app/views/template/haml_template.haml",
-    "test/fixtures/render_app/views/template/some_template.haml",
-    "test/fixtures/routing_app/app.rb",
-    "test/fixtures/routing_app/views/index.haml",
-    "test/fixtures/warden_app/app.rb",
-    "test/fixtures/warden_app/views/dashboard.haml",
-    "test/generators/test_skeleton_generator.rb",
-    "test/helper.rb",
-    "test/mailer_plugin/test_mail_object.rb",
-    "test/mailer_plugin/test_mailer_base.rb",
-    "test/markup_plugin/test_asset_tag_helpers.rb",
-    "test/markup_plugin/test_form_builder.rb",
-    "test/markup_plugin/test_form_helpers.rb",
-    "test/markup_plugin/test_format_helpers.rb",
-    "test/markup_plugin/test_output_helpers.rb",
-    "test/markup_plugin/test_tag_helpers.rb",
-    "test/test_mailer_plugin.rb",
-    "test/test_render_plugin.rb",
-    "test/test_routing_plugin.rb",
-    "test/test_warden_plugin.rb",
-    "vendor/pony/lib/pony.rb",
-    "vendor/pony/spec/base.rb",
-    "vendor/pony/spec/pony_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/nesquena/sinatra_more}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Expands sinatra to allow for complex applications}
-  s.test_files = [
-    "test/active_support_helpers.rb",
-    "test/fixtures/mailer_app/app.rb",
-    "test/fixtures/markup_app/app.rb",
-    "test/fixtures/render_app/app.rb",
-    "test/fixtures/routing_app/app.rb",
-    "test/fixtures/warden_app/app.rb",
-    "test/generators/test_skeleton_generator.rb",
-    "test/helper.rb",
-    "test/mailer_plugin/test_mail_object.rb",
-    "test/mailer_plugin/test_mailer_base.rb",
-    "test/markup_plugin/test_asset_tag_helpers.rb",
-    "test/markup_plugin/test_form_builder.rb",
-    "test/markup_plugin/test_form_helpers.rb",
-    "test/markup_plugin/test_format_helpers.rb",
-    "test/markup_plugin/test_output_helpers.rb",
-    "test/markup_plugin/test_tag_helpers.rb",
-    "test/test_mailer_plugin.rb",
-    "test/test_render_plugin.rb",
-    "test/test_routing_plugin.rb",
-    "test/test_warden_plugin.rb"
-  ]
+  s.summary = s.description
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency     "sinatra",       ">= 0.9.2"
+  s.add_dependency     "tilt",          ">= 0.2"
+  s.add_dependency     "thor",          ">= 0.11.8"
+  s.add_dependency     "activesupport"
+  s.add_dependency     "bundler",       ">= 0.9.2"
+  s.add_development_dependency "haml",      ">= 2.2.14"
+  s.add_development_dependency "shoulda",   ">= 2.10.2"
+  s.add_development_dependency "mocha",     ">= 0.9.7"
+  s.add_development_dependency "rack-test", ">= 0.5.0"
+  s.add_development_dependency "webrat",     ">= 0.5.1"
+  s.add_development_dependency "jeweler"
+  s.add_development_dependency "builder"
+  s.add_development_dependency "tmail"
+  s.add_development_dependency "xml-simple"
+  s.add_development_dependency "warden"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<builder>, [">= 0"])
-      s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_runtime_dependency(%q<warden>, [">= 0"])
-      s.add_runtime_dependency(%q<tmail>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra_more>, [">= 0"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_runtime_dependency(%q<tilt>, [">= 0.2"])
-      s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_runtime_dependency(%q<activesupport>, ["< 3.0.0"])
-      s.add_runtime_dependency(%q<bundler>, [">= 0.9.2"])
-      s.add_development_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
-    else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<builder>, [">= 0"])
-      s.add_dependency(%q<xml-simple>, [">= 0"])
-      s.add_dependency(%q<warden>, [">= 0"])
-      s.add_dependency(%q<tmail>, [">= 0"])
-      s.add_dependency(%q<sinatra_more>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-      s.add_dependency(%q<tilt>, [">= 0.2"])
-      s.add_dependency(%q<thor>, [">= 0.11.8"])
-      s.add_dependency(%q<activesupport>, ["< 3.0.0"])
-      s.add_dependency(%q<bundler>, [">= 0.9.2"])
-      s.add_dependency(%q<haml>, [">= 2.2.14"])
-      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-      s.add_dependency(%q<mocha>, [">= 0.9.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-      s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    end
-  else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<builder>, [">= 0"])
-    s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<warden>, [">= 0"])
-    s.add_dependency(%q<tmail>, [">= 0"])
-    s.add_dependency(%q<sinatra_more>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 2.2.14"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    s.add_dependency(%q<haml>, [">= 2.2.14"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    s.add_dependency(%q<haml>, [">= 2.2.14"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.2"])
-    s.add_dependency(%q<tilt>, [">= 0.2"])
-    s.add_dependency(%q<thor>, [">= 0.11.8"])
-    s.add_dependency(%q<activesupport>, ["< 3.0.0"])
-    s.add_dependency(%q<bundler>, [">= 0.9.2"])
-    s.add_dependency(%q<haml>, [">= 2.2.14"])
-    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
-    s.add_dependency(%q<mocha>, [">= 0.9.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
-    s.add_dependency(%q<webrat>, [">= 0.5.1"])
-  end
+  s.rubyforge_project = "sinatra_more"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end