minirails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771b7f597898182a1fa53aface49303f6eb3185f
-  data.tar.gz: af5236b60849641f505d8a2a81fceccdfa12896f
+  metadata.gz: 2cb8f20cc209da625d6cf79ab1332e44f38451a3
+  data.tar.gz: cc5c4ca139366812a8f6db09a6fcc63f1092e192
 SHA512:
-  metadata.gz: 89cb680f0c831cabb870674a5ecf0a4bf67ddd90c22b283168bcc192681e121ab79a1e74c4bff83082a6d30af82199106cc4e7b72057175db4e951eb4df1db91
-  data.tar.gz: 37fe4d4613b58e30f15e22a24b39aaff7b5503940ad222f6407cbd27c63c2327334b7849846ad20b7ecfb7ab54d21a44159158ee5fe58354a4fbe0f84106dde4
+  metadata.gz: 555a831b642c9459d4bdd7536cc1149d86762fbb6b2f8cba23716bd43021ac19370a0c4a9b568c2cf712ead864231a6bfe5fdeb2c02bb7ee171ae624aeeada42
+  data.tar.gz: b5d49462ea1025d0a5c910180e6db6eea8483bd682f6a1b77bcb6d5513f274cde6c0c26a7ddec7f4aea8016c542bf60341dd9e1a8d3d2f4eee8b3aae968c261d

data/README.md

@@ -23,7 +23,7 @@ Create a file `myapp.rb` with the following content
 ```ruby
 # myapp.rb
 define do |app|
-  class ::MainController < ActionController::Base
+  class MainController < ActionController::Base
     def index
       render text: "Hello"
     end
@@ -79,18 +79,14 @@ define "source" do |app|
   ENV["DATABASE_URL"] = "postgresql://localhost/minirails_test"
 
   # Migrations
-  class CreateUsers < ActiveRecord::Migration
+  class Migrations < ActiveRecord::Migration
     def change
       create_table :users do |t|
         t.string :name
         t.string :email
       end
-    end
-  end
 
-  # Seeds (using migartions)
-  class CreateSomeUsersToStartWith < ActiveRecord::Migration
-    def change
+      # Seeds
       User.create! [
         {name: "Jon", email: "jon@example.com"},
         {name: "Hodor", email: "hodor@example.com"}
@@ -117,16 +113,61 @@ define "source" do |app|
 end
 ```
 
-## FAQ
 
-- **How to speed up loading?**
+### Non-rails apps
 
-  Run `$ minirails --fast` and then use `bin/minirails myapp.rb` instead
+You can start any rack compatible web app inside define block
+or even generic worker process (sidekiq, clock, whatever)
+by specifying `:type` option.
+
+```ruby
+# file: types.rb
+# usage: $ minirails types.rb
+
+# this is rails app
+define "rails" do |app|
+  app.routes.draw do
+    get "/", to: proc {|*| [200, {}, "Hello from Rails".lines] }
+  end
+end
+
+# with type: :rack you need to return Rack-compatible app
+define "rack", type: :rack do
+  proc {|*| [200, {}, "Hello from Rack".lines] }
+end
+
+# with type: :blank you can run anything
+define "worker", type: :blank do
+  loop do
+    $stderr.puts "Hello from worker"
+    sleep 1
+  end
+end
+```
 
+### Running worker with Rails env loaded
+```ruby
+define "my-rails-app" do |app|
+  app.routes.draw do
+    get "/", to: proc {|*| [200, {}, "Hello from Rails".lines] }
+  end
+end
 
-- **I'm getting "constant not found" errors!**
+# you can use :initialize option to load rails (or some rack)
+# before loading worker code (similar to `rake environment`)
+define "worker", type: :blank, initialize: "my-rails-app" do
+  loop do
+    Rails.logger.debug "Hello from worker with Rails env"
+    sleep 1
+  end
+end
+```
+
+## FAQ
 
-  You need to prefix your classes with `::` to put them in top level scope
+- **How to speed up loading?**
+
+  Run `$ minirails --fast` and then use `bin/minirails myapp.rb` instead
 
 
 ## Contributing

data/lib/minirails.rb

@@ -53,46 +53,38 @@ OPTIONS:
     end
 
     def start(specfile, num = nil)
-      builder = Builder.new(specfile)
+      self.builder = Builder.new(specfile)
       num ? builder.start(num.to_i) : builder.spawn
     end
+
+    attr_accessor :builder
   end
 
 
   class Builder < Struct.new(:specfile)
+
     # DSL API
-    def define(name = nil, &block)
-      apps << App.new(name, block)
+    def define(name = nil, opts = {}, &block)
+      type = opts[:type] || :rails
+      klazz = {
+        rails:  RailsApp,
+        rack:   RackApp,
+        blank:  App
+      }[type]
+
+      if opts[:initialize]
+        parent = apps.find {|a| a.name == opts[:initialize] }
+        apps << WrappedApp.new(klazz.new(name, block), parent)
+      else
+        apps << klazz.new(name, block)
+      end
     end
 
     # internals
     def start(num)
       boot
-
-      $stderr.puts "--> loading rails"
-      require "action_controller"
-      require "rails"
-      $stderr.puts "--> loading app"
-
-      Rack::Handler::WEBrick.run(endpoint(num), :Port => ENV["PORT"])
-    end
-
-    def endpoint(num)
-      apps[num].endpoint
-    rescue NameError => e
-      # autoloading has some crazy weird error
-      # and we can't just require activerecord upfront
-      # because if app is not using it there will
-      # be no database configuration
-      case e.message
-      when /uninitialized constant.*ActiveRecord/
-        $stderr.puts "--> loading activerecord"
-        require "active_record/railtie"
-      else
-        raise e
-      end
-
-      endpoint(num)
+      apps[num].init
+      apps[num].call
     end
 
     def spawn
@@ -119,11 +111,62 @@ OPTIONS:
     end
 
     def boot
-      eval File.read(specfile)
+      load specfile
     end
   end
 
   class App < Struct.new(:name, :block)
+    def init
+    end
+
+    def call
+      block.call
+    end
+  end
+
+  class WrappedApp < Struct.new(:app, :parent)
+    def name
+      app.name
+    end
+
+    def init
+      parent.init
+      app.init
+    end
+
+    def call
+      app.call
+    end
+  end
+
+  class RackApp < App
+    def init
+      require "rack"
+      @endpoint = block.call
+    end
+
+    def call
+      Rack::Handler::WEBrick.run(@endpoint, :Port => ENV["PORT"])
+    end
+  end
+
+  class RailsApp < RackApp
+    def init
+      $stderr.puts "--> loading rails"
+      require "action_controller"
+      require "rails"
+      $stderr.puts "--> loading app"
+
+      @endpoint = endpoint
+    end
+
+    def call
+      migrate
+      super
+    end
+
+    protected
+
     def build
       # basic rails app bootstrap
       app = Class.new(Rails::Application) do
@@ -143,23 +186,49 @@ OPTIONS:
       # execute 'define' block
       block.call(app)
 
+      # and finally return app object
+      app
+    end
+
+    def migrate
       # ActiveRecord post functions
-      if app.config.respond_to?(:active_record)
+      if @endpoint.config.respond_to?(:active_record)
         # load rake tasks
-        app.load_tasks
+        @endpoint.load_tasks
 
         # create and migrate database
         Rake::Task["db:drop"].invoke
         Rake::Task["db:create"].invoke
-        ActiveRecord::Migration.descendants.each {|e| e.migrate :up }
+        # run migrations in order they were defined in source file
+        ActiveRecord::Migration.descendants.sort_by {|c|
+          c.instance_methods(false).map {|m|
+            c.instance_method(m).source_location.last
+          }.min
+        }.each {|e| e.migrate :up }
       end
-
-      # and finally return app object
-      app
     end
 
     def endpoint
-      @endpoint ||= build
+      build
+    rescue NameError => e
+      # autoloading has some crazy weird error
+      # and we can't just require activerecord upfront
+      # because if app is not using it there will
+      # be no database configuration
+      case e.message
+      when /uninitialized constant.*ActiveRecord/
+        $stderr.puts "--> loading activerecord"
+        require "active_record/railtie"
+      else
+        raise e
+      end
+
+      endpoint
     end
   end
 end
+
+# Public DSL API
+def define(*args, &block)
+  Minirails.builder.define(*args, &block)
+end

data/lib/minirails/version.rb

@@ -1,3 +1,3 @@
 module Minirails
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minirails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tymon Tobolski