radical 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28490e420f7e00fe1ccfc2497977b944e1249a89198bde5241eba97e470265bd
-  data.tar.gz: b14efd9cfd3e37b24e42c2deaa2c6152051bab21d1d222da9c79dcfefd26bd81
+  metadata.gz: 5a2836f72234086fb3981b282d57216a2d324ecdd2f14e3b38a1ce57b2757be3
+  data.tar.gz: 14de9ad7784177b1ee837c9b12d2888ffdf50ea268bbcdffc0f3d6a54238a312
 SHA512:
-  metadata.gz: 45bba97d128d5055b4a086ae6257fd62bddeac75f62826a08018e72080b56bc7883bbaaaa5386445d66695d8c07cb5375ebe3c737c86be9def6c9b786d5873de
-  data.tar.gz: f521e7304e9635bb46c195dbea3548f3b4d69a354322c08d1b906c510af5933b80f6d8e9367fc3f8228af6bf315ccefd6037f50e75b5a4cfdc9efd9af1f9e0e0
+  metadata.gz: 15fd6c727f86820b1644a984d3d125ed02d65aa7aed4f1cfb292a216fda7a6d9b2f232bb680c9ab05417bddf410c6a75495dce74edd2fc278f7a9b7589d0da4b
+  data.tar.gz: 82c51dc592446f8a4492ba36e11e947aa20a8f937ae78b541d952a4156a88fac25b25eaec3d2de583a88a42cccd5de18297ec7b2eeba4f9eb69a7b2cb11bfeb4

data/.rubocop.yml

@@ -1,4 +1,2 @@
-Style/FrozenStringLiteralComment:
-  Enabled: false
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,19 +1,30 @@
 # Changelog
+
 All notable changes to this project will be documented in this file
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 # [Unreleased]
 
-# 1.0.2
+# 1.1.0 (2021-12-06)
+
+- *Breaking* `root`, `resource` and `resources` methods no longer take class constants
+- *Breaking* Move route class methods to `Routes` class instead of `App`
+- *Breaking* Create migration class, use migration classes in migrate!
+- *Breaking* Make routes take symbols or strings, not classes to better line up with models
+- *Breaking* Move connection string handling to database
+- Make everything use `frozen_string_literal`
+- Purposefully never add callbacks, `before_action` or autoloading
+
+# 1.0.2 (2021-12-02)
 
 - Set default views / migrations paths
 
-# 1.0.1
+# 1.0.1 (2021-12-02)
 
 - Fix changelog link in gemspec
 
-## 1.0.0
+# 1.0.0 (2021-12-01)
 
 - Very basic understanding of how much memory it takes for a basic ruby app
 - Start to integrate controllers and routing

data/README.md

@@ -27,8 +27,12 @@ class Home < Radical::Controller
   end
 end
 
+class Routes < Radical::Routes
+  root 'Home'
+end
+
 class App < Radical::App
-  root Home
+  routes Routes
 end
 
 run App

data/lib/radical/app.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rack'
 require 'rack/flash'
 require 'rack/csrf'
 
-require_relative 'router'
+require_relative 'routes'
 require_relative 'env'
 
 # The main entry point for a Radical application
@@ -31,24 +33,8 @@ require_relative 'env'
 module Radical
   class App
     class << self
-      def root(klass)
-        router.add_root(klass)
-      end
-
-      def resource(klass)
-        router.add_actions(klass, actions: Router::RESOURCE_ACTIONS)
-      end
-
-      def resources(*classes, &block)
-        prefix = "#{router.route_prefix(@parents)}/" if instance_variable_defined?(:@parents)
-
-        router.add_routes(classes, prefix: prefix)
-
-        return unless block
-
-        @parents ||= []
-        @parents << classes.last
-        block.call
+      def routes(route_class)
+        @routes ||= route_class
       end
 
       def env
@@ -56,7 +42,7 @@ module Radical
       end
 
       def app
-        router = self.router
+        router = @routes.router
         env = self.env
 
         @app ||= Rack::Builder.app do
@@ -91,10 +77,6 @@ module Radical
         end
       end
 
-      def router
-        @router ||= Router.new
-      end
-
       def call(env)
         app.call(env)
       end

data/lib/radical/controller.rb

@@ -1,4 +1,6 @@
 # typed: true
+# frozen_string_literal: true
+
 require 'rack/utils'
 require 'rack/request'
 require 'rack/response'

data/lib/radical/database.rb

@@ -1,40 +1,67 @@
+# frozen_string_literal: true
+
 require 'sqlite3'
 require_relative 'table'
+require_relative 'migration'
 
 module Radical
   class Database
     class << self
-      attr_accessor :connection, :migrations_path
+      attr_writer :connection_string
+      attr_accessor :migrations_path
+
+      def connection_string
+        @connection_string || ENV['DATABASE_URL']
+      end
+
+      def connection
+        conn = SQLite3::Database.new(connection_string)
+        conn.results_as_hash = true
+        conn.type_translation = true
+
+        @connection ||= conn
+      end
+
+      def prepend_migrations_path(path)
+        self.migrations_path = path
+      end
 
       def db
         connection
       end
 
-      def migrate!
-        @migrate = true
+      def migration(file)
+        context = Module.new
+        context.class_eval(File.read(file), file)
+        const = context.constants.find do |constant|
+          context.const_get(constant).ancestors.include?(Radical::Migration)
+        end
+
+        context.const_get(const)
+      end
 
+      def migrate!
         db.execute 'create table if not exists radical_migrations ( version integer primary key )'
 
-        pending_migrations.each do |migration|
-          puts "Executing migration #{migration}"
-          sql = eval File.read(migration)
-          db.execute sql
-          db.execute 'insert into radical_migrations (version) values (?)', [version(migration)]
+        pending_migrations.each do |file|
+          puts "Executing migration #{file}"
+
+          v = version(file)
+
+          migration(file).migrate!(db: db, version: v)
         end
       end
 
       def rollback!
-        @rollback = true
-
         db.execute 'create table if not exists radical_migrations ( version integer primary key )'
 
-        migration = applied_migrations.last
+        file = applied_migrations.last
 
-        puts "Rolling back migration #{migration}"
+        puts "Rolling back migration #{file}"
 
-        sql = eval File.read(migration)
-        db.execute sql
-        db.execute 'delete from radical_migrations where version = ?', [version(migration)]
+        v = version(file)
+
+        migration(file).rollback!(db: db, version: v)
       end
 
       def applied_versions
@@ -59,34 +86,6 @@ module Radical
       def version(filename)
         filename.split(File::SEPARATOR).last.split('_').first.to_i
       end
-
-      def migration(&block)
-        block.call
-      end
-
-      def change(&block)
-        @change = true
-
-        block.call
-      end
-
-      def up(&block)
-        block.call
-      end
-
-      def down(&block)
-        block.call
-      end
-
-      def create_table(name, &block)
-        return "drop table #{name}" if @change && @rollback
-
-        table = Table.new(name)
-
-        block.call(table)
-
-        "create table #{name} ( id integer primary key, #{table.columns.join(',')} )"
-      end
     end
   end
 end

data/lib/radical/env.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # typed: true
 
 module Radical

data/lib/radical/form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/csrf'
 
 module Radical

data/lib/radical/migration.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Radical
+  class Migration
+    class << self
+      def change(&block)
+        @change = block
+      end
+
+      def up(&block)
+        @up = block
+      end
+
+      def down(&block)
+        @down = block
+      end
+
+      def create_table(name, &block)
+        return drop_table(name) if @change && @rollback
+
+        table = Table.new(name)
+
+        block.call(table)
+
+        "create table #{name} ( id integer primary key, #{table.columns.join(',')} )"
+      end
+
+      def drop_table(name)
+        "drop table #{name}"
+      end
+
+      def migrate!(db:, version:)
+        db.execute(@change&.call || @up&.call)
+        db.execute 'insert into radical_migrations (version) values (?)', [version]
+      end
+
+      def rollback!(db:, version:)
+        @rollback = true
+
+        db.execute(@change&.call || @down&.call)
+        db.execute 'delete from radical_migrations where version = ?', [version]
+      end
+    end
+  end
+end

data/lib/radical/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'database'
 
 module Radical
@@ -7,17 +9,6 @@ module Radical
     class << self
       attr_accessor :table_name
 
-      def database(name)
-        conn = SQLite3::Database.new name
-        conn.results_as_hash = true
-        conn.type_translation = true
-        Database.connection = conn
-      end
-
-      def prepend_migrations_path(path)
-        Database.migrations_path = path
-      end
-
       def db
         Database.connection
       end

data/lib/radical/router.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 # typed: true
+
 require 'rack'
 require 'sorbet-runtime'
 
@@ -77,7 +79,7 @@ module Radical
         next unless klass.method_defined?(method)
 
         path = "/#{prefix}#{name}#{suffix}"
-        path = Regexp.new("^#{path.gsub(/:(\w+)/, '(?<\1>[a-zA-Z0-9_]+)')}$")
+        path = Regexp.new("^#{path.gsub(/:(\w+)/, '(?<\1>[a-zA-Z0-9_]+)')}$").freeze
 
         if %i[index create show update destroy].include?(method) && !klass.method_defined?(:"#{klass.route_name}_path")
           klass.define_method :"#{klass.route_name}_path" do |obj = nil|

data/lib/radical/routes.rb

@@ -0,0 +1,48 @@
+# typed: true
+# frozen_string_literal: true
+
+require_relative 'router'
+
+module Radical
+  class Routes
+    class << self
+      extend T::Sig
+
+      sig { returns(Router) }
+      def router
+        @router ||= Router.new
+      end
+
+      sig { params(name: T.any(String, Symbol)).void }
+      def root(name)
+        klass = Object.const_get(name)
+
+        router.add_root(klass)
+      end
+
+      sig { params(names: T.any(String, Symbol)).void }
+      def resource(*names)
+        classes = names.map { |c| Object.const_get(c) }
+
+        classes.each do |klass|
+          router.add_actions(klass, actions: Router::RESOURCE_ACTIONS)
+        end
+      end
+
+      sig { params(names: T.any(String, Symbol), block: T.nilable(T.proc.void)).void }
+      def resources(*names, &block)
+        classes = names.map { |c| Object.const_get(c) }
+
+        prefix = "#{router.route_prefix(@parents)}/" if instance_variable_defined?(:@parents)
+
+        router.add_routes(classes, prefix: prefix)
+
+        return unless block
+
+        @parents ||= []
+        @parents << classes.last
+        block.call
+      end
+    end
+  end
+end

data/lib/radical/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Radical
   class Table
     attr_accessor :columns

data/lib/radical/view.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erubi'
 require 'tilt'
 

data/lib/radical.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'radical/app'
 require_relative 'radical/controller'
 require_relative 'radical/view'
 require_relative 'radical/model'
+require_relative 'radical/migration'
+require_relative 'radical/routes'

data/radical.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |spec|
   spec.platform      = Gem::Platform::RUBY
   spec.name          = 'radical'
-  spec.version       = '1.0.2'
+  spec.version       = '1.1.0'
   spec.author        = 'Sean Walker'
   spec.email         = 'sean@swlkr.com'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radical
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Walker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -198,8 +198,10 @@ files:
 - lib/radical/database.rb
 - lib/radical/env.rb
 - lib/radical/form.rb
+- lib/radical/migration.rb
 - lib/radical/model.rb
 - lib/radical/router.rb
+- lib/radical/routes.rb
 - lib/radical/table.rb
 - lib/radical/view.rb
 - radical.gemspec