tiny-rails 0.0.2 → 0.1.0

data/README.md

@@ -3,12 +3,26 @@
 Scaffold for tiny Rails apps based on José Valim's Rails Lightweight Stack
 [code](https://gist.github.com/1942658)
 
+
 ## Installation
 
 Install it using:
 
     $ gem install tiny-rails
 
+
+## WTF?! Why would I use this?
+
+Although the generated application code could be used on a production server,
+the idea is to try to give you a really basic application to try out new Rails
+gems, create spikes and to provide an isolated small Rails environment for
+reproducing bugs to support bug reports.
+
+You could also use this to create a single page application with all rails
+features like code reloading and the asset pipeline without having to set up
+a Sinatra application from the ground app.
+
+
 ## Usage
 
 ```terminal
@@ -28,6 +42,10 @@ This will give you a pretty basic application that you can run with `rackup`
 or you prefferend server. It even supports code reloading for the generated
 controller!
 
+You can also fire up a console to play around with the generated app running
+`tiny-rails console`. If you want to use Pry, you can just add the `pry-rails`
+gem to your Gemfile.
+
 
 ## Addons
 
@@ -54,6 +72,9 @@ folder.
 Here's a list of the addons bundled with the gem:
 
 * [activerecord](https://github.com/fgrehm/tiny-rails/blob/master/addons/activerecord.rb)
+* [coffeescript](https://github.com/fgrehm/tiny-rails/blob/master/addons/coffeescript.rb)
+* [jquery](https://github.com/fgrehm/tiny-rails/blob/master/addons/jquery.rb)
+* [client_side_validations](https://github.com/fgrehm/tiny-rails/blob/master/addons/client_side_validations.rb)
 
 
 ### Building your own addon

data/addons/activerecord.rb

@@ -2,13 +2,16 @@ gem 'activerecord', '~> 3.2'
 gem 'sqlite3'
 
 template 'activerecord/models.rb', 'models.rb'
+
 require_models_code = <<-CODE
   # Enable code reloading for models
   require_dependency 'models'
 CODE
-inject_into_file 'tiny_rails_controller.rb', "\n#{require_models_code}", :after => /class TinyRailsController < ActionController::Base/
+inject_into_file 'application_controller.rb', "\n#{require_models_code}", :after => /class ApplicationController < ActionController::Base/
 
-config_db_code = <<-CODE
+application <<-CODE
+  # We need to override the configuration method here, otherwise Rails will
+  # try to load the yaml configuration file at config/database.yml
   def config.database_configuration
     {
       'development' =>
@@ -21,7 +24,8 @@ config_db_code = <<-CODE
     }
   end
 CODE
-application "\n#{config_db_code}"
+
+inject_into_file 'boot.rb', "\nrequire \"active_record/railtie\"", :after => /require ['"]action_controller\/railtie['"]/
 
 template 'activerecord/migrate', 'migrate'
 chmod 'migrate', 0755

data/addons/client_side_validations.rb

@@ -7,13 +7,4 @@ gem 'client_side_validations'
 sentinel = {:after => "#= require jquery\n"}
 inject_into_file 'application.coffee', "#= require rails.validations\n", sentinel
 
-initializer_code = <<-CODE
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  unless html_tag =~ /^<label/
-    %{<div class="field_with_errors">\#{html_tag}<label for="\#{instance.send(:tag_id)}" class="message">\#{instance.error_message.first}</label></div>}.html_safe
-  else
-    %{<div class="field_with_errors">\#{html_tag}</div>}.html_safe
-  end
-end
-CODE
-initializer initializer_code
+initializer 'require "tiny-rails/app/initializers/client_side_validations"'

data/lib/tiny-rails/actions.rb

@@ -32,19 +32,23 @@ module TinyRails
       end
     end
 
-    # Adds a line inside the Application class on boot.rb.
+    # Appends a line inside the TinyRailsApp class on boot.rb.
     #
     #   application do
     #     "config.assets.enabled = true"
     #   end
     def application(data=nil, &block)
-      sentinel = /class TinyRailsApp < Rails::Application/i
       data = block.call if !data && block_given?
 
-      inject_into_file 'boot.rb', "\n  #{data}", :after => sentinel
+      data = "\n#{data}" unless data =~ /^\n/
+      data << "\n" unless data =~ /\n$/
+
+      inject_into_file 'boot.rb', data, :after => /^  config\.secret_token = .+\n/
     end
 
     def initializer(data)
+      data = open(data) { |io| io.read } if data =~ /https?:\/\//
+
       if File.exists? 'initializers.rb'
         append_file 'initializers.rb', "\n#{data}"
       else
@@ -52,16 +56,29 @@ module TinyRails
       end
     end
 
+    def migration(data)
+      data << "\n" unless data =~ /\n$/
+
+      inject_into_file 'migrate', data, :after => /^ActiveRecord::Schema\.define do\n/
+    end
+
+    def route(new_route)
+      new_route << "\n" unless new_route =~ /\n$/
+
+      inject_into_file 'boot.rb', new_route, :after => /TinyRailsApp\.routes\.draw do\n/
+    end
+
     # Self explanatory :P
     def enable_asset_pipeline!
       return if File.read('boot.rb') =~ /^  config\.assets\.enabled = true$/
 
-      code = <<-CONFIG
+      application <<-CONFIG
+  # Enable asset pipeline
   config.assets.enabled = true
   config.assets.debug   = true
   config.assets.paths << File.dirname(__FILE__)
 CONFIG
-      application "\n#{code}"
+      inject_into_file 'boot.rb', "\nrequire \"sprockets/railtie\"", :after => /require ['"]action_controller\/railtie['"]/
     end
 
     def addon(path)

data/lib/tiny-rails/app/initializers/client_side_validations.rb

@@ -0,0 +1,7 @@
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  unless html_tag =~ /^<label/
+    %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe
+  else
+    %{<div class="field_with_errors">#{html_tag}</div>}.html_safe
+  end
+end

data/lib/tiny-rails/cli.rb

@@ -2,8 +2,9 @@ require 'thor'
 require 'thor/group'
 
 require 'tiny-rails/actions'
-require 'tiny-rails/commands/new'
 require 'tiny-rails/commands/add'
+require 'tiny-rails/commands/console'
+require 'tiny-rails/commands/new'
 
 module TinyRails
   class CLI < Thor
@@ -21,5 +22,10 @@ module TinyRails
       addons = Array(addons)
       Commands::Add.start(addons)
     end
+
+    desc 'console', 'Starts the tiny-rails console'
+    def console
+      Commands::Console.start
+    end
   end
 end

data/lib/tiny-rails/commands/console.rb

@@ -0,0 +1,26 @@
+module TinyRails
+  module Commands
+    class Console < Thor::Group
+      include Thor::Actions
+      include Actions
+
+      # TODO: Move to a base command
+      def self.source_root
+        "#{File.expand_path('../../../../templates', __FILE__)}/"
+      end
+
+      def guard_inside_tiny_rails_app
+        unless File.exists?('boot.rb')
+          puts "Can't start console from outside a TinyRails application, please change to a TinyRails application directory first.\n"
+          exit(1)
+        end
+      end
+
+      def start_console
+        require './boot.rb'
+        require 'rails/commands/console'
+        Rails::Console.start(TinyRailsApp)
+      end
+    end
+  end
+end

data/lib/tiny-rails/commands/new.rb

@@ -22,7 +22,7 @@ module TinyRails
           .gitignore
           Gemfile
           boot.rb
-          tiny_rails_controller.rb
+          application_controller.rb
           index.html.erb
           server
           config.ru

data/lib/tiny-rails/version.rb

@@ -1,3 +1,3 @@
 module TinyRails
-	VERSION = "0.0.2"
+	VERSION = "0.1.0"
 end

data/spec/actions_spec.rb

@@ -55,12 +55,12 @@ describe TinyRails::Actions do
   describe '#application' do
     let(:boot_rb) { File.read 'boot.rb' }
 
-    before { action :create_file, 'boot.rb', "class TinyRailsApp < Rails::Application\nend" }
+    before { action :create_file, 'boot.rb', "class TinyRailsApp\n  config.secret_token = 'something'\nend" }
 
     it 'includes data in TinyRailsApp definition' do
-      assets_enable = 'config.assets.enabled = true'
+      assets_enable = '  config.assets.enabled = true'
       action :application, assets_enable
-      boot_rb.should =~ /class TinyRailsApp < Rails::Application\n  #{Regexp.escape(assets_enable)}/
+      boot_rb.should =~ /class TinyRailsApp\n  config\.secret_token = 'something'\n\n#{Regexp.escape(assets_enable)}/
     end
 
     it 'includes provided block contents in TinyRailsApp definition' do
@@ -74,11 +74,25 @@ describe TinyRails::Actions do
     end
   end
 
+  describe '#route' do
+    let(:boot_rb) { File.read 'boot.rb' }
+
+    before do
+      action :create_file, 'boot.rb', "TinyRailsApp.routes.draw do\nend"
+    end
+
+    it 'includes data in routes definitions' do
+      new_route = '  match "foo" => "tiny_rails#bar"'
+      action :route, new_route
+      boot_rb.should =~ /TinyRailsApp\.routes.draw do\n#{Regexp.escape(new_route)}end/
+    end
+  end
+
   describe '#enable_asset_pipeline!' do
     let(:boot_rb) { File.read 'boot.rb' }
 
     before do
-      action :create_file, 'boot.rb', "class TinyRailsApp < Rails::Application\nend"
+      action :create_file, 'boot.rb', "require \"action_controller/railtie\"\nclass TinyRailsApp\n  config.secret_token = 'something'\nend"
       action :enable_asset_pipeline!
     end
 
@@ -94,6 +108,10 @@ describe TinyRails::Actions do
       boot_rb.should =~ /^  config\.assets\.paths << File\.dirname\(__FILE__\)$/
     end
 
+    it 'require sprockets railtie' do
+      boot_rb.should =~ /^require "sprockets\/railtie"/
+    end
+
     it 'does not duplicate configs' do
       10.times { action :enable_asset_pipeline! }
       boot_rb.should have_a_single_occurence_of('config.assets.enabled = true')
@@ -102,9 +120,11 @@ describe TinyRails::Actions do
 
   describe '#initializer' do
     let(:initializers_rb) { File.read 'initializers.rb' }
+    let(:remote_code)     { StringIO.new('remote code') }
 
     before do
       action :initializer, '# Ruby code...'
+      generator.stub(:open).and_yield(remote_code)
     end
 
     it 'creates an initializers.rb file if it doesnt exist' do
@@ -115,5 +135,23 @@ describe TinyRails::Actions do
       action :initializer, '# More code...'
       initializers_rb.should =~ /\n# More code.../
     end
+
+    it 'supports appending a remote file' do
+      action :initializer, 'http://path.to/gist'
+      initializers_rb.should =~ /\nremote code/
+    end
+  end
+
+  describe '#migration' do
+    let(:migrate) { File.read 'migrate' }
+
+    before do
+      action :create_file, 'migrate', "ActiveRecord::Schema.define do\nend"
+      action :migration, '  create_table :users'
+    end
+
+    it 'appends to schema definition on migrate file' do
+      migrate.should =~ /ActiveRecord::Schema.define do\n  create_table :users\nend/
+    end
   end
 end

data/spec/commands/add_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
-# TODO: Move these specs to spec/actions_spec.rb
 describe TinyRails::Commands::Add do
   before do
     Dir.exist?('.tmp') ? FileUtils.rm_rf('.tmp/*') : Dir.mkdir('.tmp')
     @original_wd = Dir.pwd
     FileUtils.cd '.tmp'
-    %w(.gitignore tiny_rails_controller.rb boot.rb Gemfile).each do |file|
+    %w(.gitignore application_controller.rb boot.rb Gemfile).each do |file|
       `touch #{file}`
     end
   end

data/spec/commands/console_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe TinyRails::Commands::Console do
+  before do
+    Dir.exist?('.tmp') ? FileUtils.rm_rf('.tmp/*') : Dir.mkdir('.tmp')
+    @original_wd = Dir.pwd
+    FileUtils.cd '.tmp'
+    `touch boot.rb`
+
+    class ::TinyRailsApp; end
+    class ::Rails
+      class Console
+      end
+    end
+
+    Rails::Console.stub(:start)
+
+    command = described_class.new
+    @required_files = []
+    command.stub(:require) do |file|
+      @required_files << file
+    end
+
+    capture(:stdout) { command.invoke_all }
+  end
+
+  after { FileUtils.cd @original_wd }
+
+  it 'requires boot.rb file' do
+    @required_files.should include('./boot.rb')
+  end
+
+  it 'requires rails command' do
+    @required_files.should include('rails/commands/console')
+  end
+
+  it 'starts rails console' do
+    Rails::Console.should have_received(:start).with(TinyRailsApp)
+  end
+end

data/spec/commands/new_spec.rb

@@ -18,7 +18,7 @@ describe TinyRails::Commands::New do
       .gitignore
       Gemfile
       boot.rb
-      tiny_rails_controller.rb
+      application_controller.rb
       index.html.erb
       server
       config.ru

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'tiny-rails'
 require 'tiny-rails/cli'
 
+require 'rspec-spies'
+
 Dir['./spec/support/**/*.rb'].each { |file| require file }
 
 RSpec.configure do |config|

data/templates/Gemfile

@@ -3,5 +3,6 @@ source :rubygems
 # Required by active_support
 gem "tzinfo"
 
+gem "tiny-rails"
 gem "actionpack",   "~> 3.2"
 gem "railties",     "~> 3.2"

data/templates/activerecord/migrate

@@ -8,21 +8,21 @@ def confirm_drop_db?
   answer.blank? || answer =~ /^y/
 end
 
-exit 0 unless confirm_drop_db?
-
 config = TinyRailsApp.config.database_configuration[Rails.env]
 
-# DROP DATABASE
 require 'pathname'
 path = Pathname.new(config['database'])
 file = path.absolute? ? path.to_s : File.join(Rails.root, path)
-FileUtils.rm(file)
 
-# CREATE DATABASE
+exit 0 if File.exist?(file) && !confirm_drop_db?
+
+# "Drop" database
+FileUtils.rm(file) if File.exist?(file)
+
+# Creates database
 ActiveRecord::Base.establish_connection(config)
 ActiveRecord::Base.connection
 
-
 ActiveRecord::Schema.define do
   create_table "posts" do |t|
     t.string "title"

data/templates/{tiny_rails_controller.rb → application_controller.rb}

@@ -1,4 +1,4 @@
-class TinyRailsController < ActionController::Base
+class ApplicationController < ActionController::Base
   append_view_path File.dirname(__FILE__)
 
   def index

data/templates/boot.rb

@@ -3,17 +3,14 @@ $:.unshift Dir.pwd
 require 'bundler'
 Bundler.setup :default
 
+require "tiny-rails"
 require "rails"
-require "rails/all"
+
+require "action_controller/railtie"
 
 Bundler.require :default
 
 class TinyRailsApp < Rails::Application
-  routes.append do
-    match "/" => "tiny_rails#index"
-    match "/favicon.ico", :to => proc {|env| [200, {}, [""]] }
-  end
-
   config.consider_all_requests_local = true
 
   config.active_support.deprecation = :log
@@ -29,6 +26,11 @@ class TinyRailsApp < Rails::Application
   config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
 end
 
+require 'initializers' if File.exists?('initializers.rb')
+
 TinyRailsApp.initialize!
 
-require 'initializers' if File.exists?('initializers.rb')
+TinyRailsApp.routes.draw do
+  match "/" => "application#index"
+  match "/favicon.ico", :to => proc {|env| [200, {}, [""]] }
+end

data/templates/server

@@ -2,15 +2,6 @@
 
 require './boot'
 
-if ARGV[0] == '-v' || ARGV[0] == '--verbose'
-  puts ">> Starting Rails lightweight stack"
-  Rails.configuration.middleware.each do |middleware|
-    puts "use #{middleware.inspect}"
-  end
-  puts "run #{Rails.application.class.name}.routes"
-end
-
-
 options = {
   :environment => nil,
   :pid         => nil,

data/tiny-rails.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.9'
   gem.add_development_dependency 'rspec', '~> 2.0'
+  gem.add_development_dependency 'rspec-spies', '~> 2.1'
   gem.add_development_dependency 'guard-rspec', '~> 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -81,6 +81,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-spies
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -119,12 +135,15 @@ files:
 - bin/tiny-rails
 - lib/tiny-rails.rb
 - lib/tiny-rails/actions.rb
+- lib/tiny-rails/app/initializers/client_side_validations.rb
 - lib/tiny-rails/cli.rb
 - lib/tiny-rails/commands/add.rb
+- lib/tiny-rails/commands/console.rb
 - lib/tiny-rails/commands/new.rb
 - lib/tiny-rails/version.rb
 - spec/actions_spec.rb
 - spec/commands/add_spec.rb
+- spec/commands/console_spec.rb
 - spec/commands/new_spec.rb
 - spec/fixtures/sample_addon_1.rb
 - spec/fixtures/sample_addon_2.rb
@@ -134,11 +153,11 @@ files:
 - templates/Gemfile
 - templates/activerecord/migrate
 - templates/activerecord/models.rb
+- templates/application_controller.rb
 - templates/boot.rb
 - templates/config.ru
 - templates/index.html.erb
 - templates/server
-- templates/tiny_rails_controller.rb
 - tiny-rails.gemspec
 homepage: http://github.com/fgrehm/tiny-rails
 licenses: []
@@ -154,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1156523687678209514
+      hash: -4104238879239819067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1156523687678209514
+      hash: -4104238879239819067
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -173,6 +192,7 @@ summary: A generator for tiny Rails apps
 test_files:
 - spec/actions_spec.rb
 - spec/commands/add_spec.rb
+- spec/commands/console_spec.rb
 - spec/commands/new_spec.rb
 - spec/fixtures/sample_addon_1.rb
 - spec/fixtures/sample_addon_2.rb