sinatra_more 0.3.10 → 0.3.11

data/README.rdoc

@@ -136,8 +136,8 @@ methods should be very familiar to anyone who has used rails view helpers.
   * <tt>link_to('/dashboard', :class => 'blocky') { ...content... }</tt>
 * <tt>mail_to(email, caption=nil, mail_options={})</tt>
   * Creates a mailto link tag to the specified email_address
-  * <tt>mail_to "me@demo.com"</tt> # => <a href="mailto:me@demo.com">me@demo.com</a>
-  * <tt>mail_to "me@demo.com", "My Email"</tt> # => <a href="mailto:me@demo.com">My Email</a>
+  * <tt>mail_to "me@demo.com"</tt>
+  * <tt>mail_to "me@demo.com", "My Email", :subject => "Feedback", :cc => 'test@demo.com'</tt>
 * <tt>image_tag(url, options={})</tt>
   * Creates an image element with given url and options
   * <tt>image_tag('icons/avatar.png')</tt>
@@ -263,7 +263,7 @@ The following are fields provided by AbstractFormBuilder that can be used within
 * <tt>submit(caption, options={})</tt>
   * <tt>f.submit "Update", :class => 'long'</tt>
 * <tt>image_submit(source, options={})</tt>
-  * <tt>f.submit "submit.png", :class => 'long'</tt>
+  * <tt>f.image_submit "submit.png", :class => 'long'</tt>
   
 A form_for using these basic fields might look like:
 
@@ -595,7 +595,9 @@ The simplest possible command to generate a base application would be:
   
 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:
+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
   
@@ -610,17 +612,27 @@ The available components and their default options are listed below:
 * mock:     <tt>mocha</tt>  (default), <tt>rr</tt>
 * script:   <tt>jquery</tt> (default), <tt>prototype</tt>, <tt>rightjs</tt>
 * orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>
+
+The generator uses the <tt>bundler</tt> gem to resolve any application dependencies when the application is newly created.
+The necessary bundler command can be executed automatically through the generator with
+
+  $ sinatra_gen demo_app . --run_bundler # alias -b
+
+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 highly extensible and additional components and tools can easily be added. 
+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
 for additional component types not originally included (although helping us maintain them would also be appreciated).
 
-We are planning to add additional generator actions such as:
+We are also planning to add generator actions such as:
 
-* Model generator (working for any of the available orms listed)
-* Routes generator 
-* Migrations generator
+* Model generation (working for any of the available orms listed)
+* Routes generation
+* Mailer generation
+* Migrations generation
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/generator>
   
@@ -630,7 +642,8 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 * Thanks to sbfaulkner for the <tt>sinatra-helpers</tt> code that I browsed through many times while starting this library.
 * Thanks to vestel for the excellent modified <tt>pony</tt> fork which in part powers the mailer_plugin (http://github.com/vestel/pony)
 * Thanks to focat and sinatra-content-for library (http://github.com/focat/sinatra-content-for) for a good content_for starting point
-* Thanks to wycats and all for the awesome Thor gem which made creating the sinatra generator relatively painless
+* Thanks to wycats and others for the awesome Thor gem which made creating the sinatra generator relatively painless
+* Thanks to wycats and others for the bundler gem which made bundling the required gems for an application easy
 
 == Contributors
 

data/ROADMAP

@@ -0,0 +1,78 @@
+Working with lipsiadmin:
+
+1) Proof of concept for the Sinatra Framework
+2) Adding in additional features to the current sinatra_more (more generators, helpers, etc)
+3) Split plugin up into individual gems for better organization
+4) Porting of lipsiadmin over to sinatra
+5) First produciton application
+6) Build Sinatra Framework Website
+
+Use Bundler for managing dependencies: 
+ * http://github.com/wycats/bundler
+ * http://www.engineyard.com/blog/2009/using-the-rubygems-bundler-for-your-app/
+
+Framework structure:
+
+ * sinatra-core    (the existing sinatra framework)          <= from Sinatra
+ * sinatra-helpers (adds the markup and renderer helpers)    <= from MarkupPlugin, RenderPlugin
+ * sinatra-mailer  (mail handling for sinatra applications)  <= from MailerPlugin
+ * sinatra-gen     (easy generation of and for sinatra apps) <= from Generator
+ * sinatra-admin   (admin management dashboard for content)  <= from Lipsiadmin (ported)
+ * sinatra-cache   (page and fragment caching support)       
+ * sinatra-mapping (sinatra route mapping system)
+
+'sinatra-mapping' Routing Concept:
+
+    namespace :admin do
+      get :show do
+        ...
+      end
+    end
+ 
+    get :accounts do
+     ...
+    end
+ 
+    map(:admin, :show).to("/my-admin/:id/show")
+    map(:accounts).to("/show-me-my/accounts")
+ 
+    # or
+ 
+    map :admin do |namespace|
+     namespace.map(:show).to("/my-admin/:id/show")
+    end
+ 
+    # and to use
+    link_to "Show Admin", admin_show_path(:id => 5)
+    link_to "Accounts", accounts_path
+    # or maybe
+    link_to "Show Admin", url_for(:admin, :show, :id => 5)
+    link_to "Accounts", url_for(:accounts)
+  
+'sinatra-cache' Caching concept:
+
+    # in models
+    class Person
+      def something_expensive
+        Sinatra::Cache.get('key')
+        Sinatra::Cache.set('key', value)
+        Sinatra::Cache.fetch('key') { 'value' }
+      end
+    end
+
+    # fragment in route
+    get '/cache2' do
+      cache 'cache2', :expiry => 10 do
+        'Hello Cache2'
+      end
+    end
+
+    # fragment in view
+    # /views/test.haml
+    - cache 'test', :expiry => 10 do
+      = partial 'item', :collection => @items
+
+    # page
+    get '/example', :cache => true do
+      haml_template 'accounts/index'
+    end

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_runtime_dependency     "tilt",          ">= 0.2"
     gem.add_runtime_dependency     "thor",          ">= 0.11.8"
     gem.add_runtime_dependency     "activesupport", ">= 2.2.2"
+    gem.add_runtime_dependency     "bundler"
     gem.add_development_dependency "haml",          ">= 2.2.1"
     gem.add_development_dependency "shoulda",       ">= 2.10.2"
     gem.add_development_dependency "mocha",         ">= 0.9.7"

data/TODO

@@ -1,12 +1,6 @@
-= UNFINISHED
+= RESOURCES
 
-* Add support for model, routes, migration generator types based on components
-* Add support for form.fields_for (one-to-one, nested and many associations like in rails)
-* Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
-* Become total warden solution (basically just require warden gem installed, do everything else)
-  * Look into removing overlapping methods and simply leverage sinatra_warden
-  * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
-* Check out the following sinatra extensions:
+- Check out the following sinatra extensions:
   * http://github.com/emk/sinatra-url-for/
   * http://github.com/wbzyl/sinatra-static-assets
   * http://github.com/hallison/sinatra-mapping/
@@ -14,8 +8,28 @@
   * http://github.com/giraffesoft/classy_resources
   * http://github.com/nakajima/capinatra
   * http://github.com/deadprogrammer/spork
+  * http://github.com/gioext/sinatra-memcache
+  * http://github.com/kematzy/sinatra-cache
   * http://r18n.rubyforge.org/#sinatra
 
+= UNFINISHED
+
+== Generator
+
+  * Add support for model, routes, migration generator types based on components
+  * Add support for bundler (http://github.com/wycats/bundler) to make setting up a generated app easy
+
+== MarkupPlugin
+
+  * Add support for form.fields_for (one-to-one, nested and many associations like in rails)
+  * Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
+  
+== WardenPlugin
+
+  * Become total warden solution (basically just require warden gem installed, do everything) (?)
+  * Look into removing overlapping methods and simply leveraging sinatra_warden
+  * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
+
 = COMPLETED
 
 * Add support for button tag method, mail_to helper

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/generators/base_app/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+log/**/*
+tmp/**/*
+vendor/gems/gems
+vendor/gems/specifications
+vendor/gems/doc
+vendor/gems/environment.rb

data/generators/base_app/Gemfile

@@ -0,0 +1,13 @@
+clear_sources
+source 'http://gemcutter.org'
+# Base requirements
+gem 'sinatra'
+gem 'sinatra_more'
+gem 'rack-flash'
+gem 'warden'
+gem 'bcrypt-ruby', :require_as => 'bcrypt'
+
+# Component requirements
+
+# Testing requirements
+gem 'rack-test', :require_as => 'rack/test', :only => :testing

data/generators/base_app/config.ru.tt

@@ -1,6 +1,6 @@
 RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
 
-require File.dirname(__FILE__) + '/app.rb'
+require File.dirname(__FILE__) + '/config/boot.rb'
 
 FileUtils.mkdir_p 'log' unless File.exists?('log')
 log = File.new("log/sinatra.log", "a")

data/generators/base_app/config/boot.rb.tt

@@ -1,13 +1,12 @@
 # This file is merely for beginning the boot process, check dependencies.rb for more information
+require 'rubygems'
+require 'sinatra/base'
 
 RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
 ROOT_DIR = File.dirname(__FILE__) + '/../' unless defined? ROOT_DIR
 
 # Helper method for file references.
-#
-# @param args [Array] Path components relative to ROOT_DIR.
-# @example Referencing a file in config called settings.yml:
-#   root_path("config", "settings.yml")
+# root_path("config", "settings.yml")
 def root_path(*args)
   File.join(ROOT_DIR, *args)
 end
@@ -26,6 +25,18 @@ class <%= @class_name %> < Sinatra::Application
   set :default_builder, 'StandardFormBuilder'
   set :environment, RACK_ENV if defined?(RACK_ENV)
 
+  # Attempts to require all dependencies with bundler, if this fails, bundle and then try again
+  def self.bundler_require_dependencies(environment=nil)
+    require 'bundler'
+    require File.expand_path(File.join(File.dirname(__FILE__), '/../vendor', 'gems', 'environment'))
+    Bundler.require_env(environment)
+  rescue LoadError => e
+    puts "Bundler must be run to resolve dependencies!"
+    system('gem bundle')
+    puts "Retrying with dependencies resolved..."
+    retry
+  end
+
   # Dependencies contains all required gems and core configuration
   require File.dirname(__FILE__) + '/dependencies.rb'
 end

data/generators/base_app/config/dependencies.rb.tt

@@ -1,7 +1,7 @@
 # Dependencies contains all required gems, helpers and core configuration
 
 class <%= @class_name %> < Sinatra::Application
-  %w[rubygems rack-flash warden sinatra_more bcrypt].each { |gem| require gem }
+  bundler_require_dependencies
   
   # Required middleware
   use Rack::Session::Cookie

data/generators/base_app/test/test_config.rb.tt

@@ -1,4 +1,5 @@
 RACK_ENV = 'test' unless defined?(RACK_ENV)
-%w[rubygems sinatra/base].each {|gem| require gem }
-require 'rack/test'
-require File.dirname(__FILE__) + "/../app"
+require File.dirname(__FILE__) + "/../config/boot"
+Bundler.require_env(:testing)
+
+# Test configuration

data/generators/components/component_actions.rb

@@ -1,27 +1,29 @@
 module SinatraMore
   module ComponentActions
-    # Injects require statement into target file
-    # insert_require('active_record', :path => "test/test_config.rb", :indent => 2)
-    # options = { :path => '...', :indent => 2, :after => /.../ }
-    def insert_require(*libs)
-      options = libs.extract_options!
-      options.reverse_merge!(:indent => 0, :after => /require\sgem.*?\n/)
-      multiple_gem_require = "%w[#{libs.join(' ')}].each { |lib| require lib }\n"
-      req = indent_spaces(options[:indent]) + (libs.size == 1 ? "require '#{libs}'\n" : multiple_gem_require)
-      inject_into_file(options[:path], req, :after => options[:after])
+    # Adds all the specified gems into the Gemfile for bundler
+    # require_dependencies 'activerecord'
+    # require_dependencies 'mocha', 'bacon', :env => :testing
+    def require_dependencies(*gem_names)
+      options = gem_names.extract_options!
+      gem_names.each { |lib| insert_into_gemfile(lib, options) }
     end
 
-    # Returns space characters of given count
-    # indent_spaces(2)
-    def indent_spaces(count)
-      ' ' * count
+    # Inserts a required gem into the Gemfile to add the bundler dependency
+    # insert_dependency_to_gemfile(name)
+    # insert_dependency_to_gemfile(name, :env => :testing)
+    def insert_into_gemfile(name, options={})
+      after_pattern = "# Component requirements\n"
+      after_pattern = "# #{options[:env].to_s.capitalize} requirements\n" if environment = options[:env]
+      include_text = "gem '#{name}'" << (environment ? ", :only => #{environment.inspect}" : "") << "\n"
+      options.merge!(:content => include_text, :after => after_pattern)
+      inject_into_file('Gemfile', options[:content], :after => options[:after])
     end
 
     # Injects the test class text into the test_config file for setting up the test gen
     # insert_test_suite_setup('...CLASS_NAME...')
     # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test\n")
     def insert_test_suite_setup(suite_text, options={})
-      options.reverse_merge!(:path => "test/test_config.rb", :after => /require.*?app.*?\n/)
+      options.reverse_merge!(:path => "test/test_config.rb", :after => /Test configuration\n/)
       inject_into_file(options[:path], suite_text.gsub(/CLASS_NAME/, @class_name), :after => options[:after])
     end
 
@@ -33,5 +35,11 @@ module SinatraMore
       include_text = indent_spaces(options[:indent]) + "include #{library_name}\n"
       inject_into_file(options[:path], include_text, :after => options[:after])
     end
+
+    # Returns space characters of given count
+    # indent_spaces(2)
+    def indent_spaces(count)
+      ' ' * count
+    end
   end
 end

data/generators/components/mocks/mocha_mock_gen.rb

@@ -1,7 +1,7 @@
 module SinatraMore
   module MochaMockGen
     def setup_mock
-      insert_require 'mocha', :path => "test/test_config.rb", :after => "require 'rack/test'\n"
+      require_dependencies 'mocha', :env => :testing
       insert_mocking_include "Mocha::API", :path => "test/test_config.rb"
     end
   end

data/generators/components/mocks/rr_mock_gen.rb

@@ -1,7 +1,7 @@
 module SinatraMore
   module RrMockGen
     def setup_mock
-      insert_require 'rr', :path => "test/test_config.rb", :after => "require 'rack/test'\n"
+      require_dependencies 'rr', :env => :testing
       insert_mocking_include "RR::Adapters::RRMethods", :path => "test/test_config.rb"
     end
   end

data/generators/components/orms/activerecord_orm_gen.rb

@@ -29,8 +29,8 @@ end
 AR
 
 RAKE = <<-RAKE
-require 'active_record'
 require 'sinatra/base'
+require 'active_record'
 
 namespace :db do
   desc "Migrate the database"
@@ -63,7 +63,16 @@ end
 MIGRATION
 
   USER = <<-USER
-class User < ActiveRecord::Base  
+class User < ActiveRecord::Base
+  before_save :encrypt_password
+  
+  attr_accessor :password, :password_confirmation
+  
+  def validate
+    errors.add :password, "must not be empty" if self.crypted_password.blank? && password.blank?
+    errors.add :password, "must match password confirmation" unless password == password_confirmation
+  end
+  
   def self.authenticate(username, password)
     user = User.first(:conditions => { :username => username })
     user && user.has_password?(password) ? user : nil
@@ -80,7 +89,7 @@ end
 USER
     
     def setup_orm
-      insert_require 'active_record', :path => "config/dependencies.rb", :indent => 2
+      require_dependencies 'activerecord'
       create_file("config/initializers/active_record.rb", AR)
       create_file("Rakefile", RAKE)
       create_file("db/migrate/001_create_users.rb", MIGRATION)

data/generators/components/orms/datamapper_orm_gen.rb

@@ -21,6 +21,12 @@ class User
   property :email,    String
   property :crypted_password, String
 
+  attr_accessor :password, :password_confirmation
+  
+  before :save, :encrypt_password
+  
+  validates_present :password, :password_confirmation
+
   def self.authenticate(username, password)
     user = User.first(:username => username)
     user && user.has_password?(password) ? user : nil
@@ -38,7 +44,7 @@ User.auto_upgrade!
 USER
     
     def setup_orm
-      insert_require 'dm-core', :path => "config/dependencies.rb", :indent => 2
+      require_dependencies 'dm-core'
       create_file("config/initializers/data_mapper.rb", DM)
       create_file("app/models/user.rb", USER)
     end

data/generators/components/orms/mongomapper_orm_gen.rb

@@ -91,7 +91,7 @@ end
 AUTH
 
     def setup_orm
-      insert_require 'mongo_mapper', :path => "config/dependencies.rb", :indent => 2
+      require_dependencies 'mongo_mapper'
       create_file("config/initializers/mongo_db.rb", MONGO)
       create_file("lib/ext/mongo_mapper.rb", CONCERNED)
       create_file("app/models/user.rb", USER)

data/generators/components/orms/sequel_orm_gen.rb

@@ -13,35 +13,47 @@ end
 SEQUEL
 
     USER = <<-USER
-class User < Sequel::Model(:users)
-  unless table_exists?
-    set_schema do
-      primary_key :id
-      string :name
-      string :username
-      string :email
-      string :crypted_password
+    class User < Sequel::Model(:users)
+      unless table_exists?
+        set_schema do
+          primary_key :id
+          string :name
+          string :username
+          string :email
+          string :crypted_password
+        end
+        create_table
+      end
+
+      attr_accessor :password, :password_confirmation
+
+      def self.authenticate(username, password)
+        user = User.filter(:username => username).first
+        user && user.has_password?(password) ? user : nil
+      end
+
+      def encrypt_password
+        return if password.blank?
+        self.crypted_password = BCrypt::Password.create(password)
+      end
+
+      def has_password?(password)
+        BCrypt::Password.new(crypted_password) == password
+      end
+
+      def before_save
+        encrypt_password
+      end
+
+      def validate
+        errors.add :password, "must not be empty" if self.crypted_password.blank? && password.blank?
+        errors.add :password, "must match password confirmation" unless password == password_confirmation
+      end
     end
-    create_table
-  end
-  
-  def self.authenticate(username, password)
-    user = User.filter(:username => username).first
-    user && user.has_password?(password) ? user : nil
-  end
-  
-  def encrypt_password
-    self.crypted_password = BCrypt::Password.create(password)
-  end
-  
-  def has_password?(password)
-    BCrypt::Password.new(crypted_password) == password
-  end
-end
 USER
 
     def setup_orm
-      insert_require 'sequel', :path => "config/dependencies.rb", :indent => 2
+      require_dependencies 'sequel'
       create_file("config/initializers/sequel.rb", SEQUEL)
       create_file("app/models/user.rb", USER)
     end

data/generators/components/renderers/erb_renderer_gen.rb

@@ -1,7 +1,7 @@
 module SinatraMore
   module ErbRendererGen    
     def setup_renderer
-      insert_require 'erb', :path => "config/dependencies.rb", :indent => 2
+      require_dependencies 'erubis'
     end
   end
 end

data/generators/components/renderers/haml_renderer_gen.rb

@@ -10,8 +10,9 @@ end
 HASSLE
     
     def setup_renderer
-      insert_require('haml', 'sass', 'hassle', :path => 'config/dependencies.rb', :indent => 2)
+      require_dependencies 'haml', 'hassle'
       create_file("config/initializers/hassle.rb", HASSLE)
+      empty_directory('public/stylesheets/sass')
     end
   end
 end

data/generators/components/tests/bacon_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      insert_require 'bacon', :path => "test/test_config.rb"
+      require_dependencies 'bacon', :env => :testing
       insert_test_suite_setup BACON_SETUP
     end
     

data/generators/components/tests/riot_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      insert_require 'riot', :path => "test/test_config.rb"
+      require_dependencies 'riot', :env => :testing
       insert_test_suite_setup RIOT_SETUP
     end
     

data/generators/components/tests/rspec_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      insert_require 'spec', :path => "test/test_config.rb"
+      require_dependencies 'spec', :env => :testing
       insert_test_suite_setup RSPEC_SETUP
     end
     

data/generators/components/tests/shoulda_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      insert_require 'test/unit', 'shoulda', :path => "test/test_config.rb"
+      require_dependencies 'test/unit', 'shoulda', :env => :testing
       insert_test_suite_setup SHOULDA_SETUP
     end
     

data/generators/components/tests/testspec_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      insert_require 'test/spec', :path => "test/test_config.rb"
+      require_dependencies 'test/spec', :path => "test/test_config.rb"
       insert_test_suite_setup TESTSPEC_SETUP
     end
     

data/generators/skeleton_generator.rb

@@ -12,11 +12,12 @@ module SinatraMore
     include Thor::Actions
     include SinatraMore::GeneratorActions
     include SinatraMore::ComponentActions
-    
+
     desc "Description:\n\n\tsinatra_gen is the sinatra_more generators which generate or build on Sinatra applications."
 
     argument :name, :desc => "The name of your sinatra app"
     argument :path, :desc => "The path to create your app"
+    class_option :run_bundler, :aliases => '-b', :default => false, :type => :boolean
 
     # Definitions for the available customizable components
     component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel]
@@ -40,5 +41,13 @@ module SinatraMore
         execute_component_setup(comp, choice)
       end
     end
+
+    # Bundle all required components using bundler and Gemfile
+    def bundle_dependencies
+      if options[:run_bundle]
+        say "Bundling application dependencies using bundler..."
+        in_root { run 'gem bundle' }
+      end
+    end
   end
 end

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2009-11-12}
   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}
@@ -23,11 +23,13 @@ Gem::Specification.new do |s|
      ".gitignore",
      "LICENSE",
      "README.rdoc",
+     "ROADMAP",
      "Rakefile",
      "TODO",
      "VERSION",
      "bin/sinatra_gen",
-     "generators/base_app/app.rb.tt",
+     "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",
@@ -168,6 +170,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tilt>, [">= 0.2"])
       s.add_runtime_dependency(%q<thor>, [">= 0.11.8"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -178,6 +181,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<tilt>, [">= 0.2"])
       s.add_dependency(%q<thor>, [">= 0.11.8"])
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -189,6 +193,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tilt>, [">= 0.2"])
     s.add_dependency(%q<thor>, [">= 0.11.8"])
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

data/test/generators/test_skeleton_generator.rb

@@ -42,20 +42,27 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match /Applying.*?prototype.*?script/, buffer
       assert_match /Applying.*?erb.*?renderer/, buffer
     end
+    should "output gem files for base app" do
+      silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--script=none']) }
+      assert_match_in_file(/gem 'sinatra'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'sinatra_more'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'rack-flash'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'rack-test'/, '/tmp/sample_app/Gemfile')
+    end
   end
 
-  context "the generator for mock component" do
+  context "a generator for mock component" do
     should "properly generate for rr" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--mock=rr', '--script=none']) }
       assert_match /Applying.*?rr.*?mock/, buffer
-      assert_match_in_file(/require 'rr'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'rr'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/class.*?include RR::Adapters::RRMethods/m, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate default for mocha" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--mock=mocha', '--script=none']) }
       assert_match /Applying.*?mocha.*?mock/, buffer
-      assert_match_in_file(/require 'mocha'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'mocha'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/class.*?include Mocha::API/m, '/tmp/sample_app/test/test_config.rb')
     end
   end
@@ -66,7 +73,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       SinatraMore::SkeletonGenerator.instance_eval("undef setup_orm if respond_to?('setup_orm')")
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
       assert_match /Applying.*?sequel.*?orm/, buffer
-      assert_match_in_file(/require 'sequel'/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'sequel'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/SequelInitializer/, '/tmp/sample_app/config/initializers/sequel.rb')
       assert_match_in_file(/class User < Sequel::Model/, '/tmp/sample_app/app/models/user.rb')
     end
@@ -74,7 +81,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate for activerecord" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
       assert_match /Applying.*?activerecord.*?orm/, buffer
-      assert_match_in_file(/require 'active_record'/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'activerecord'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/ActiveRecordInitializer/, '/tmp/sample_app/config/initializers/active_record.rb')
       assert_match_in_file(/Migrate the database/, '/tmp/sample_app/Rakefile')
       assert_match_in_file(/CreateUsers < ActiveRecord::Migration/, '/tmp/sample_app/db/migrate/001_create_users.rb')
@@ -84,7 +91,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate default for datamapper" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
-      assert_match_in_file(/require 'dm-core'/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'dm-core'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/DataMapperInitializer/, '/tmp/sample_app/config/initializers/data_mapper.rb')
       assert_match_in_file(/class User.*?include DataMapper::Resource/m, '/tmp/sample_app/app/models/user.rb')
     end
@@ -92,7 +99,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate for mongomapper" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
       assert_match /Applying.*?mongomapper.*?orm/, buffer
-      assert_match_in_file(/require 'mongo_mapper'/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'mongo_mapper'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/MongoDbInitializer/, '/tmp/sample_app/config/initializers/mongo_db.rb')
       assert_match_in_file(/class User.*?include MongoMapper::Document/m, '/tmp/sample_app/app/models/user.rb')
     end
@@ -102,13 +109,14 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate default for erb" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--renderer=erb', '--script=none']) }
       assert_match /Applying.*?erb.*?renderer/, buffer
-      assert_match_in_file(/require 'erb'/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'erubis'/, '/tmp/sample_app/Gemfile')
     end
 
     should "properly generate for haml" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--renderer=haml','--script=none']) }
       assert_match /Applying.*?haml.*?renderer/, buffer
-      assert_match_in_file(/haml.*sass.*hassle.*require/, '/tmp/sample_app/config/dependencies.rb')
+      assert_match_in_file(/gem 'haml'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'hassle'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/HassleInitializer/, '/tmp/sample_app/config/initializers/hassle.rb')
     end
   end
@@ -138,35 +146,35 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly default generate for bacon" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=bacon', '--script=none']) }
       assert_match /Applying.*?bacon.*?test/, buffer
-      assert_match_in_file(/require 'bacon'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'bacon'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Bacon::Context/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for riot" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
       assert_match /Applying.*?riot.*?test/, buffer
-      assert_match_in_file(/require 'riot'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'riot'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Riot::Situation/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for rspec" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
-      assert_match_in_file(/require 'spec'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'spec'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for shoulda" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=shoulda', '--script=none']) }
       assert_match /Applying.*?shoulda.*?test/, buffer
-      assert_match_in_file(/test\/unit.*shoulda.*require/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'shoulda'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for testspec" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=testspec', '--script=none']) }
       assert_match /Applying.*?testspec.*?test/, buffer
-      assert_match_in_file(/require 'test\/spec'/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/gem 'test\/spec'/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Test::Unit::TestCase/, '/tmp/sample_app/test/test_config.rb')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -08:00
+date: 2009-11-12 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   type: :development
@@ -116,11 +126,13 @@ files:
 - .gitignore
 - LICENSE
 - README.rdoc
+- ROADMAP
 - Rakefile
 - TODO
 - VERSION
 - bin/sinatra_gen
-- generators/base_app/app.rb.tt
+- 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

data/generators/base_app/app.rb.tt

@@ -1,5 +0,0 @@
-%w[rubygems sinatra/base].each { |gem| require gem }
-
-class <%= @class_name %> < Sinatra::Application
-  load(File.dirname(__FILE__) + '/config/boot.rb')
-end