jun 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a23824148b7546d35ec51bc05200095f47bb5ffcb3604597a2c1606b893ae1c5
-  data.tar.gz: e6e03e5e69d3cebd025a9194de2488539a096c9864fbb53b720f43c5f7d5f68b
+  metadata.gz: 0ab6ae7fad2bb74ce92d8ef4a6c0b44c5016b04f02f6721d372694cb3b86c9a5
+  data.tar.gz: 5da3c8f0d65029c88022c5b8d37e00e3f92f20ed0cb7592975118eb2608bd11f
 SHA512:
-  metadata.gz: 0a50ed3137ed9926647d32e534c908a1f6bca9e235a6de53f6969932be97dca05bbb44dec9bffd4d3de3b1b5d96cdcc227b2c0728a176a3433dd98cb85e0b403
-  data.tar.gz: 78931eee706054b9b6f85585b3dd0af3055a9ff6641439802aea254c1f3c0c23292802e4c40147f17bea8e72b6d6e1ce5fe3b85455260ef559ca9dedeadcc40e
+  metadata.gz: e99d2117bacaf90fd4400bf68725545ce2fd00f9a0292b22ba321cf3af195c1cb6900fcb0f2e66a98277351d7653c13e097270de1b85f8e2050b126e6c5c316b
+  data.tar.gz: e81734bc3e01a3682537a928f050c243c2ecb5ee90f15ba10262b872bc8a618d87ba4b4da9d34d108efa2c6d3b33e2230e4a9eed26f685c5d20bb5fcc287a7b8

data/README.md

@@ -1,32 +1,35 @@
 # Jun
 
-Jun is a simple, Rails-inspired web application framework. It is built with the goal of learning more about Rails internals. Not meant for production use.
+[![Gem Version](https://badge.fury.io/rb/jun.svg)](https://badge.fury.io/rb/jun)
 
-## Installation
+Jun is a simple, [Rails](https://github.com/rails/rails)-inspired web application framework. This is a rough implementation, built with the goal of learning more about Rails internals. Not meant for production use.
 
-Add this line to your application's Gemfile:
+## Getting Started
 
-```ruby
-gem 'jun'
-```
+Install the gem:
 
-And then execute:
+```
+$ gem install jun
+```
 
-    $ bundle
+Then, create a new Jun application:
 
-Or install it yourself as:
+```
+$ jun new my_app
+```
 
-    $ gem install jun
+Change directory into `my_app` and start up the server:
 
-## Usage
+```
+$ cd my_app
+$ bin/jun server
+```
 
-_TBD_
+Visit `http://localhost:6291` to view your app.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## License
 

data/jun.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email = ["zspesic@gmail.com"]
 
   spec.summary = "A simple Ruby web framework."
-  spec.description = "A simple web framework inspired by Rails."
+  spec.description = "A simple web framework inspired by Rails. Not meant for production use."
   spec.homepage = "https://github.com/zokioki/jun"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.6.0"

data/lib/jun/action_controller/base.rb

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
+require_relative "metal"
+require_relative "callbacks"
 require_relative "rendering"
+require_relative "redirecting"
 
 module Jun
   module ActionController
-    class Base
+    class Base < Metal
+      include Jun::ActionController::Callbacks
       include Jun::ActionController::Rendering
-
-      attr_accessor :request, :response
-
-      def handle_response(action)
-        public_send(action)
-        render(action) unless response_rendered?
-
-        response
-      end
+      include Jun::ActionController::Redirecting
     end
   end
 end

data/lib/jun/action_controller/callbacks.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Jun
+  module ActionController
+    module Callbacks
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      def handle_response(action)
+        self.class.before_actions.each do |callback|
+          callback.call(self) if callback.match?(action)
+        end
+
+        super
+      end
+
+      module ClassMethods
+        def before_action(method_name, options = {})
+          before_actions << Callback.new(method_name, options)
+        end
+
+        def before_actions
+          @before_actions ||= []
+        end
+      end
+
+      class Callback
+        def initialize(method_name, options)
+          @method_name = method_name
+          @options = options
+        end
+
+        def match?(action)
+          return true unless @options[:only]&.any?
+
+          @options[:only].include?(action.to_sym)
+        end
+
+        def call(controller)
+          controller.send(@method_name)
+        end
+      end
+    end
+  end
+end

data/lib/jun/action_controller/metal.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Jun
+  module ActionController
+    class Metal
+      attr_accessor :request, :response
+
+      def handle_response(action)
+        public_send(action)
+        render(action) unless response_rendered?
+
+        response
+      end
+
+      private
+
+      def response_rendered?
+        !!@_response_rendered
+      end
+    end
+  end
+end

data/lib/jun/action_controller/redirecting.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Jun
+  module ActionController
+    module Redirecting
+      def redirect_to(location, options = {})
+        return if response_rendered?
+
+        response.location = location
+        response.status = options[:status] || 302
+        response.write("<html><body>You are being <a href=\"#{response.location}\">redirected</a>.</body></html>")
+
+        @_response_rendered = true
+      end
+    end
+  end
+end

data/lib/jun/action_controller/rendering.rb

@@ -71,10 +71,6 @@ module Jun
 
       private
 
-      def response_rendered?
-        !!@_response_rendered
-      end
-
       def views_path
         dirname = self.class.name.sub(/Controller\z/, "").underscore
         Jun.root.join("app/views/#{dirname}")

data/lib/jun/action_dispatch/routing/mapper.rb

@@ -9,10 +9,19 @@ module Jun
         end
 
         def get(path, to:, as: nil)
-          controller, action = to.split("#")
-          path = path.to_s.start_with?("/") ? path.to_s : "/#{path}"
+          add_route(:get, path, to: to, as: as)
+        end
+
+        def post(path, to:, as: nil)
+          add_route(:post, path, to: to, as: as)
+        end
+
+        def patch(path, to:, as: nil)
+          add_route(:patch, path, to: to, as: as)
+        end
 
-          @route_set.add_route("GET", path, controller, action, as)
+        def delete(path, to:, as: nil)
+          add_route(:delete, path, to: to, as: as)
         end
 
         def root(to:)
@@ -22,6 +31,22 @@ module Jun
         def resources(plural_name)
           get "/#{plural_name}", to: "#{plural_name}#index", as: plural_name.to_s
           get "/#{plural_name}/new", to: "#{plural_name}#new", as: "new_#{plural_name.to_s.singularize}"
+          post "/#{plural_name}", to: "#{plural_name}#create"
+          get "/#{plural_name}/:id", to: "#{plural_name}#show", as: plural_name.to_s.singularize
+          get "/#{plural_name}/:id/edit", to: "#{plural_name}#edit", as: "edit_#{plural_name.to_s.singularize}"
+          patch "/#{plural_name}/:id", to: "#{plural_name}#update"
+          delete "/#{plural_name}/:id", to: "#{plural_name}#destroy"
+        end
+
+        private
+
+        def add_route(method, path, to:, as: nil)
+          method = method.to_s.upcase
+          controller, action = to.split("#")
+          path = path.to_s.start_with?("/") ? path.to_s : "/#{path}"
+          as ||= path.sub("/", "")
+
+          @route_set.add_route(method, path, controller, action, as)
         end
       end
     end

data/lib/jun/action_dispatch/routing/route_set.rb

@@ -35,18 +35,21 @@ module Jun
         end
 
         def call(env)
+          return welcome_response if @routes.none?
+
           request = Rack::Request.new(env)
 
           if route = find_route(request)
             route.dispatch(request)
           else
-            [404, { "Content-Type" => "text/plain" }, ["Not found"]]
+            not_found_response
           end
         end
 
         def add_route(*args)
           route = Route.new(*args)
           @routes.push(route)
+          define_url_helper(route)
 
           route
         end
@@ -59,6 +62,50 @@ module Jun
           mapper = Jun::ActionDispatch::Routing::Mapper.new(self)
           mapper.instance_eval(&block)
         end
+
+        def url_helpers
+          @url_helpers ||= Module.new.extend(url_helpers_module).include(url_helpers_module)
+        end
+
+        private
+
+        def url_helpers_module
+          @url_helpers_module ||= Module.new
+        end
+
+        def define_url_helper(route)
+          path_name = "#{route.name}_path"
+
+          url_helpers_module.define_method(path_name) do |*args|
+            options = args.last.is_a?(Hash) ? args.pop : {}
+            path = route.path
+            path_tokens = path.scan(/:\w+/)
+
+            path_tokens.each.with_index do |token, index|
+              path.sub!(token, args[index])
+            end
+
+            path
+          end
+        end
+
+        def not_found_response
+          response = Rack::Response.new
+          response.content_type = "text/plain"
+          response.status = 404
+          response.write("Not found")
+          response.finish
+        end
+
+        def welcome_response
+          template_filepath = File.expand_path("welcome.html.erb", __dir__)
+          template = Tilt::ERBTemplate.new(template_filepath)
+
+          response = Rack::Response.new
+          response.content_type = "text/html"
+          response.write(template.render)
+          response.finish
+        end
       end
     end
   end

data/lib/jun/action_dispatch/routing/welcome.html.erb

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Welcome to Jun</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <style>
+      body {
+        font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+        background-color: #fff3f3;
+        color: #7d3737;
+      }
+
+      ::selection {
+        background-color: #ffbdb6;
+      }
+
+      .root {
+        margin-top: 4rem;
+        text-align: center;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div class="root">
+      <h1>Welcome to Jun</h1>
+      <small>Jun v<%= Jun::VERSION %> | Ruby v<%= RUBY_VERSION %> (<%= RUBY_PLATFORM %>)</small>
+    </div>
+  </body>
+</html>

data/lib/jun/{active_record.rb → active_record/base.rb}

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
-require_relative "connection_adapters/sqlite_adapter"
+require_relative "../connection_adapters/sqlite_adapter"
+require_relative "./persistence"
 
 module ActiveRecord
   class Base
+    include ActiveRecord::Persistence
+
     def initialize(attributes = {})
       @attributes = attributes
+      @new_record = true
     end
 
     def method_missing(name, *args)
@@ -21,12 +25,19 @@ module ActiveRecord
     end
 
     def self.all
-      find_by_sql("SELECT * FROM #{table_name}")
+      ActiveRecord::Relation.new(self)
+    end
+
+    def self.where(*args)
+      all.where(*args)
     end
 
     def self.find_by_sql(sql)
       connection.execute(sql).map do |attributes|
-        new(attributes)
+        object = new(attributes)
+        object.instance_variable_set("@new_record", false)
+
+        object
       end
     end
 

data/lib/jun/active_record/migration.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Migration
+    def up
+      raise NoMethodError, "Subclass must implement method."
+    end
+
+    def down
+      raise NoMethodError, "Subclass must implement method."
+    end
+
+    def add_column(table_name, column_name, column_type, options = {})
+      sql = ["ALTER TABLE #{table_name} ADD COLUMN #{column_name}"]
+
+      sql << column_type.to_s.upcase
+      sql << "NOT NULL" if options[:null] == false
+      sql << "DEFAULT #{options[:default]}" if options[:default]
+      sql << "UNIQUE" if options[:unique] == true
+
+      execute(sql.join(" "))
+    end
+
+    def remove_column(table_name, column_name)
+      execute("ALTER TABLE #{table_name} DROP COLUMN #{column_name};")
+    end
+
+    def create_table(table_name, options = {})
+      sql = "CREATE TABLE IF NOT EXISTS #{table_name}"
+      column_options = []
+
+      if options[:id] || !options.key?(:id)
+        column_options << {
+          name: :id,
+          type: :integer,
+          primary_key: true,
+          null: false
+        }
+      end
+
+      column_options += options.fetch(:columns, [])
+
+      columns_sql = column_options.map do |column|
+        next(column) if column.is_a?(String)
+
+        column_sql = []
+
+        column_sql << column[:name]
+        column_sql << column[:type]&.to_s&.upcase
+        column_sql << "PRIMARY KEY" if column[:primary_key] == true
+        column_sql << "NOT NULL" if column[:null] == false
+        column_sql << "DEFAULT #{column[:default]}" if column[:default]
+        column_sql << "UNIQUE" if column[:unique] == true
+
+        column_sql.compact.join(" ")
+      end
+
+      sql += " (#{columns_sql.join(", ")})"
+      sql += ";"
+
+      execute(sql)
+    end
+
+    def drop_table(table_name)
+      execute("DROP TABLE IF EXISTS #{table_name};")
+    end
+
+    def rename_table(old_table_name, new_table_name)
+      execute("ALTER TABLE #{old_table_name} RENAME TO #{new_table_name};")
+    end
+
+    def execute(*args)
+      ActiveRecord::Base.connection.execute(*args)
+    end
+  end
+end

data/lib/jun/active_record/migrator.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Migrator
+    ALLOWED_DIRECTIONS = %w[up down].freeze
+
+    def initialize(direction:)
+      unless ALLOWED_DIRECTIONS.include?(direction.to_s)
+        raise ArgumentError, "direction must be one of: #{ALLOWED_DIRECTIONS.inspect}"
+      end
+
+      @direction = direction.to_s
+    end
+
+    def call
+      process_migrations!
+    end
+
+    private
+
+    def process_migrations!
+      files_to_process = up_migration? ? pending_migration_files : processed_migration_files.last(1)
+
+      files_to_process.each do |filepath|
+        require filepath
+
+        filename = filepath.split("/").last.sub(".rb", "")
+        migration_version = filename.split("_").first
+        migration_class_name = filename.split("_", 2).last.camelize
+        migration_class = Object.const_get(migration_class_name)
+
+        migration_class.new.public_send(@direction)
+        up_migration? ? add_to_schema_migrations(migration_version) :
+                        remove_from_schema_migrations(migration_version)
+
+        migration_verb = up_migration? ? "processed" : "rolled back"
+        puts "Migration #{migration_verb} (#{filename})."
+      end
+
+      dump_schema! if files_to_process.any?
+    end
+
+    def up_migration?
+      @direction == "up"
+    end
+
+    def pending_migration_files
+      @pending_migration_files ||= migration_files - processed_migration_files
+    end
+
+    def processed_migration_files
+      @processed_migration_files ||= migration_files.select do |filepath|
+        file_version = filepath.split("/").last.split("_").first
+        processed_versions.include?(file_version)
+      end
+    end
+
+    def migration_files
+      @migration_files ||= Dir.glob(Jun.root.join("db/migrate/*.rb")).sort
+    end
+
+    def processed_versions
+      ActiveRecord::Base.connection.execute("SELECT * FROM schema_migrations;").map do |attributes|
+        attributes[:version]
+      end
+    end
+
+    def add_to_schema_migrations(version)
+      ActiveRecord::Base.connection.execute("INSERT INTO schema_migrations (version) VALUES (#{version});")
+    end
+
+    def remove_from_schema_migrations(version)
+      ActiveRecord::Base.connection.execute("DELETE FROM schema_migrations WHERE version = #{version};")
+    end
+
+    def dump_schema!
+      Jun::CLI.process_command(["db:schema:dump"])
+    end
+  end
+end

data/lib/jun/active_record/persistence.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Persistence
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def create(attributes = {})
+        object = new(attributes)
+        object.save
+
+        object
+      end
+
+      def primary_key=(value)
+        @primary_key = value.to_sym
+      end
+
+      def primary_key
+        defined?(@primary_key) ? @primary_key : :id
+      end
+    end
+
+    def save
+      if new_record?
+        result = self.class.connection.execute("INSERT INTO #{self.class.table_name} (#{@attributes.keys.join(",")}) VALUES (#{@attributes.values.map { |v| "'#{v}'" }.join(",")}) RETURNING *;")
+        @attributes[self.class.primary_key] = result.first[self.class.primary_key]
+        @new_record = false
+      else
+        self.class.connection.execute("UPDATE #{self.class.table_name} SET #{@attributes.map { |k, v| "#{k} = #{v}" }.join(",")} WHERE id = #{id};")
+      end
+
+      true
+    end
+
+    def new_record?
+      @new_record
+    end
+
+    def persisted?
+      !new_record?
+    end
+  end
+end

data/lib/jun/active_record/relation.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  class Relation
+    def initialize(klass)
+      @klass = klass
+      @where_clauses = []
+    end
+
+    def where!(condition)
+      clause = condition.is_a?(String) ? condition : condition.map { |k, v| "#{k} = #{v}" }.join(" AND ")
+      @where_clauses << clause
+
+      self
+    end
+
+    def where(condition)
+      clone.where!(condition)
+    end
+
+    def to_sql
+      sql = "SELECT * FROM #{@klass.table_name}"
+      sql += " WHERE #{@where_clauses.join(" AND ")}" if @where_clauses.any?
+
+      sql
+    end
+
+    def records
+      @records ||= @klass.find_by_sql(to_sql)
+    end
+
+    alias to_a records
+
+    def first
+      records.first
+    end
+
+    def each(&block)
+      records.each(&block)
+    end
+  end
+end

data/lib/jun/active_support/core_ext/array/conversion.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Array
+  def to_sentence(delimiter: ", ", last_delimiter: "and")
+    return "" if none?
+    return self.first if one?
+
+    "#{self[0...-1].join(delimiter)} #{last_delimiter} #{self[-1]}"
+  end
+end

data/lib/jun/active_support/core_ext.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Dir[File.expand_path("core_ext/**/*.rb", __dir__)].sort.each do |filepath|
+  require_relative filepath
+end

data/lib/jun/application.rb

@@ -14,5 +14,32 @@ module Jun
     def routes
       @routes ||= Jun::ActionDispatch::Routing::RouteSet.new
     end
+
+    def initialize!
+      return false if initialized? || Jun.application.nil?
+
+      # Add app/* directories to autoload paths.
+      Jun::ActiveSupport::Dependencies.autoload_paths += Jun.root.join("app").children
+
+      # Set up routes and make its helpers available to controllers & views.
+      require Jun.root.join("config/routes.rb")
+      url_helpers = Jun.application.routes.url_helpers
+      Jun::ActionController::Base.include(url_helpers)
+      Jun::ActionView::Base.include(url_helpers)
+
+      # Include all helpers in app/helpers directory.
+      Dir.glob(Jun.root.join("app/helpers/**/*.rb")).each do |filepath|
+        helper_class_name = File.basename(filepath, ".rb").camelize
+        helper_class = Object.const_get(helper_class_name)
+
+        Jun::ActionView::Base.include(helper_class)
+      end
+
+      @initialized = true
+    end
+
+    def initialized?
+      !!@initialized
+    end
   end
 end

data/lib/jun/cli/commands/db/create.rb

@@ -6,7 +6,27 @@ module Jun
       module DB
         class Create < Base
           def process(*args)
-            puts "Creating database..."
+            db_filepath = Jun.root.join("db/app.db")
+
+            if File.exist?(db_filepath)
+              puts "Database already exists."
+            else
+              File.open(db_filepath, "w") {}
+              create_schema_migrations_table
+              puts "Created database in #{db_filepath}."
+            end
+          end
+
+          private
+
+          def create_schema_migrations_table
+            ActiveRecord::Base.connection.execute(
+              <<~SQL
+                CREATE TABLE IF NOT EXISTS schema_migrations (
+                  version text NOT NULL PRIMARY KEY
+                );"
+              SQL
+            )
           end
         end
       end

data/lib/jun/cli/commands/db/drop.rb

@@ -6,7 +6,10 @@ module Jun
       module DB
         class Drop < Base
           def process(*args)
-            puts "Dropping database..."
+            db_filepath = Jun.root.join("db/app.db")
+
+            File.delete(db_filepath) if File.exist?(db_filepath)
+            puts "Dropped database."
           end
         end
       end

data/lib/jun/cli/commands/db/migrate.rb

@@ -6,7 +6,7 @@ module Jun
       module DB
         class Migrate < Base
           def process(*args)
-            puts "Running migrations..."
+            ActiveRecord::Migrator.new(direction: :up).call
           end
         end
       end

data/lib/jun/cli/commands/db/rollback.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jun
+  module CLI
+    module Commands
+      module DB
+        class Rollback < Base
+          def process(*args)
+            ActiveRecord::Migrator.new(direction: :down).call
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jun/cli/commands/db/schema/dump.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Jun
+  module CLI
+    module Commands
+      module DB
+        module Schema
+          class Dump < Base
+            def process(*args)
+              schema_filepath = Jun.root.join("db/schema.sql")
+              db_filepath = Jun.root.join("db/app.db")
+
+              Bundler.with_original_env do
+                system("bundle exec sqlite3 #{db_filepath} .schema > #{schema_filepath}")
+              end
+
+              puts "Database schema updated."
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jun/cli/commands/db/schema/load.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Jun
+  module CLI
+    module Commands
+      module DB
+        module Schema
+          class Load < Base
+            def process(*args)
+              schema_filepath = Jun.root.join("db/schema.sql")
+              db_filepath = Jun.root.join("db/app.db")
+
+              Bundler.with_original_env do
+                system("bundle exec sqlite3 #{db_filepath} < #{schema_filepath}")
+              end
+
+              populate_schema_migrations!
+
+              puts "Database schema loaded."
+            end
+
+            private
+
+            def populate_schema_migrations!
+              migration_files = Dir.glob(Jun.root.join("db/migrate/*.rb")).sort
+
+              migration_files.each do |filepath|
+                filename = filepath.split("/").last.sub(".rb", "")
+                migration_version = filename.split("_").first
+
+                add_to_schema_migrations(migration_version)
+              end
+            end
+
+            def add_to_schema_migrations(version)
+              ActiveRecord::Base.connection.execute("INSERT INTO schema_migrations (version) VALUES (#{version});")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jun/cli/commands/db/seed.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Jun
+  module CLI
+    module Commands
+      module DB
+        class Seed < Base
+          def process(*args)
+            seed_filepath = Jun.root.join("db/seed.rb")
+            abort("No seed file found.") unless File.exist?(seed_filepath)
+
+            load seed_filepath
+            puts "Seeding complete."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jun/cli/commands/generate/migration.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Jun
+  module CLI
+    module Commands
+      module Generate
+        class Migration < Base
+          def process(*args)
+            migration_name = args.first
+
+            template_filepath = File.expand_path("../../generator_templates/migration.rb.erb", __dir__)
+            template = Tilt::ERBTemplate.new(template_filepath)
+            template_locals = { migration_name: migration_name }
+
+            filename = "#{Time.now.to_i}_#{migration_name}.rb"
+            filepath = Jun.root.join("db/migrate/#{filename}")
+            file_body = template.render(nil, template_locals)
+
+            filepath.dirname.mkpath
+            File.open(filepath, "w") { |f| f.write(file_body) }
+            puts "created #{filename}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jun/cli/commands/new.rb

@@ -26,17 +26,20 @@ module Jun
             "README.md",
             "app/controllers/application_controller.rb",
             "app/helpers/application_helper.rb",
+            "app/models/application_record.rb",
             "app/views/layouts/application.html.erb",
+            "bin/console",
             "config/application.rb",
+            "config/environment.rb",
             "config/routes.rb",
-            "db/app.db"
+            "db/seeds.rb"
           ]
 
           FileUtils.mkdir_p(app_name)
 
           FileUtils.chdir(app_name) do
             templates.each do |filepath|
-              template_filepath = File.expand_path("../generators/new/#{filepath}.erb", __dir__)
+              template_filepath = File.expand_path("../generator_templates/new_app/#{filepath}.erb", __dir__)
               template = Tilt::ERBTemplate.new(template_filepath)
               template_locals = { app_name: app_name }
               file_body = template.render(nil, template_locals)
@@ -47,6 +50,8 @@ module Jun
               puts "created #{filepath}"
             end
 
+            FileUtils.chmod("u+x", "bin/console")
+
             puts "Installing dependencies..."
             Bundler.with_original_env { system("bundle install") }
           end

data/lib/jun/cli/commands/server.rb

@@ -6,7 +6,7 @@ module Jun
       class Server < Base
         def process(*args)
           if Jun.root
-            system("rerun --background -- rackup -p 3001")
+            system("rerun --background -- rackup -p 6291")
           else
             abort("Command \"#{self.class.command_name}\" must be run inside of a Jun app.")
           end

data/lib/jun/cli/generator_templates/migration.rb.erb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class <%= migration_name.camelize %> < ActiveRecord::Migration
+  def up
+
+  end
+
+  def down
+
+  end
+end

data/lib/jun/cli/generator_templates/new_app/app/models/application_record.rb.erb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationRecord < ActiveRecord::Base
+end

data/lib/jun/cli/generator_templates/new_app/bin/console.erb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "jun"
+
+require "irb"
+IRB.start(__FILE__)

data/lib/jun/cli/generator_templates/new_app/config/application.rb.erb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "jun"
+
+# Require gems listed in the Gemfile, including any gems specified
+# in the current environment group (e.g. :development, :production).
+Bundler.require(*Jun.groups)
+
+module <%= app_name.camelize %>
+  class Application < Jun::Application
+  end
+end

data/lib/jun/cli/generator_templates/new_app/config/environment.rb.erb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Load the Jun application.
+require_relative "application"
+
+# Initialize the application.
+Jun.application.initialize!

data/lib/jun/cli/{generators/new → generator_templates/new_app}/config.ru.erb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
-require_relative "config/application"
-require_relative "config/routes"
+require_relative "config/environment"
 
 run Jun.application

data/lib/jun/cli/generator_templates/new_app/db/seeds.rb.erb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file is used by the `jun db:seed` command and should include
+# any necessary logic for seeding the database.
+#
+# Example:
+#
+#   User.create(name: "Sam", occupation: "author")
+#   Post.create(title: "How to Build a Bird House")

data/lib/jun/cli.rb

@@ -11,7 +11,12 @@ module Jun
         Jun::CLI::Commands::New,
         Jun::CLI::Commands::DB::Create,
         Jun::CLI::Commands::DB::Migrate,
+        Jun::CLI::Commands::DB::Rollback,
+        Jun::CLI::Commands::DB::Seed,
         Jun::CLI::Commands::DB::Drop,
+        Jun::CLI::Commands::DB::Schema::Dump,
+        Jun::CLI::Commands::DB::Schema::Load,
+        Jun::CLI::Commands::Generate::Migration,
         Jun::CLI::Commands::Server,
         Jun::CLI::Commands::Version
       ].freeze

data/lib/jun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jun
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/jun.rb

@@ -3,10 +3,13 @@
 require "pathname"
 
 require_relative "jun/version"
-require_relative "jun/active_support/inflector"
+require_relative "jun/active_support/core_ext"
 require_relative "jun/active_support/dependencies"
 require_relative "jun/action_dispatch/routing/route_set"
-require_relative "jun/active_record"
+require_relative "jun/active_record/base"
+require_relative "jun/active_record/migration"
+require_relative "jun/active_record/migrator"
+require_relative "jun/active_record/relation"
 require_relative "jun/action_controller/base"
 require_relative "jun/application"
 
@@ -22,6 +25,14 @@ module Jun
       project_root_path
     end
 
+    def env
+      ENV["JUN_ENV"] || ENV["RACK_ENV"] || "development"
+    end
+
+    def groups
+      [:default, env]
+    end
+
     private
 
     def project_root_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jun
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Zoran
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-description: A simple web framework inspired by Rails.
+description: A simple web framework inspired by Rails. Not meant for production use.
 email:
 - zspesic@gmail.com
 executables:
@@ -127,33 +127,52 @@ files:
 - jun.gemspec
 - lib/jun.rb
 - lib/jun/action_controller/base.rb
+- lib/jun/action_controller/callbacks.rb
+- lib/jun/action_controller/metal.rb
+- lib/jun/action_controller/redirecting.rb
 - lib/jun/action_controller/rendering.rb
 - lib/jun/action_dispatch/routing/mapper.rb
 - lib/jun/action_dispatch/routing/route_set.rb
+- lib/jun/action_dispatch/routing/welcome.html.erb
 - lib/jun/action_view/base.rb
 - lib/jun/action_view/helpers.rb
 - lib/jun/action_view/helpers/url_helper.rb
-- lib/jun/active_record.rb
+- lib/jun/active_record/base.rb
+- lib/jun/active_record/migration.rb
+- lib/jun/active_record/migrator.rb
+- lib/jun/active_record/persistence.rb
+- lib/jun/active_record/relation.rb
+- lib/jun/active_support/core_ext.rb
+- lib/jun/active_support/core_ext/array/conversion.rb
+- lib/jun/active_support/core_ext/string/inflector.rb
 - lib/jun/active_support/dependencies.rb
-- lib/jun/active_support/inflector.rb
 - lib/jun/application.rb
 - lib/jun/cli.rb
 - lib/jun/cli/commands/base.rb
 - lib/jun/cli/commands/db/create.rb
 - lib/jun/cli/commands/db/drop.rb
 - lib/jun/cli/commands/db/migrate.rb
+- lib/jun/cli/commands/db/rollback.rb
+- lib/jun/cli/commands/db/schema/dump.rb
+- lib/jun/cli/commands/db/schema/load.rb
+- lib/jun/cli/commands/db/seed.rb
+- lib/jun/cli/commands/generate/migration.rb
 - lib/jun/cli/commands/new.rb
 - lib/jun/cli/commands/server.rb
 - lib/jun/cli/commands/version.rb
-- lib/jun/cli/generators/new/Gemfile.erb
-- lib/jun/cli/generators/new/README.md.erb
-- lib/jun/cli/generators/new/app/controllers/application_controller.rb.erb
-- lib/jun/cli/generators/new/app/helpers/application_helper.rb.erb
-- lib/jun/cli/generators/new/app/views/layouts/application.html.erb.erb
-- lib/jun/cli/generators/new/config.ru.erb
-- lib/jun/cli/generators/new/config/application.rb.erb
-- lib/jun/cli/generators/new/config/routes.rb.erb
-- lib/jun/cli/generators/new/db/app.db.erb
+- lib/jun/cli/generator_templates/migration.rb.erb
+- lib/jun/cli/generator_templates/new_app/Gemfile.erb
+- lib/jun/cli/generator_templates/new_app/README.md.erb
+- lib/jun/cli/generator_templates/new_app/app/controllers/application_controller.rb.erb
+- lib/jun/cli/generator_templates/new_app/app/helpers/application_helper.rb.erb
+- lib/jun/cli/generator_templates/new_app/app/models/application_record.rb.erb
+- lib/jun/cli/generator_templates/new_app/app/views/layouts/application.html.erb.erb
+- lib/jun/cli/generator_templates/new_app/bin/console.erb
+- lib/jun/cli/generator_templates/new_app/config.ru.erb
+- lib/jun/cli/generator_templates/new_app/config/application.rb.erb
+- lib/jun/cli/generator_templates/new_app/config/environment.rb.erb
+- lib/jun/cli/generator_templates/new_app/config/routes.rb.erb
+- lib/jun/cli/generator_templates/new_app/db/seeds.rb.erb
 - lib/jun/connection_adapters/sqlite_adapter.rb
 - lib/jun/version.rb
 homepage: https://github.com/zokioki/jun

data/lib/jun/cli/generators/new/config/application.rb.erb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require "jun"
-
-Jun::ActiveSupport::Dependencies.autoload_paths += Jun.root.join("app").children
-
-# Include all helpers in app/helpers directory
-Dir.glob(Jun.root.join("app/helpers/**/*.rb")).each do |filepath|
-  helper_class_name = File.basename(filepath, ".rb").camelize
-  helper_class = Object.const_get(helper_class_name)
-
-  Jun::ActionView::Base.include(helper_class)
-end
-
-module <%= app_name.camelize %>
-  class Application < Jun::Application
-  end
-end