Crystal v0.30.0 changes (#1126)

* Annotate return types of, and implement abstract methods

* Upgrade to Crystal v0.30.0

* shard updates

* Update granite to latest DSL

* update specs and fix auth generator

* template fixes

* use compatible garnet-spec

* fix specs

* update version in docker file

Author: drujensen

Dockerfile

@@ -1,4 +1,4 @@
-FROM crystallang/crystal:0.29.0
+FROM crystallang/crystal:0.30.0
 
 # Install Dependencies
 ARG DEBIAN_FRONTEND=noninteractive

shard.yml

@@ -19,8 +19,8 @@ dependencies:
     version: ~> 0.3.0
 
   cli:
-    github: mosop/cli
-    version: ~> 0.7.0
+    github: drujensen/cli
+    version: ~> 0.8.0
 
   compiled_license:
     github: elorest/compiled_license
@@ -32,23 +32,23 @@ dependencies:
 
   liquid:
     github: TechMagister/liquid.cr
-    version: ~> 0.3.0
+    #version: ~> 0.3.0
 
   micrate:
     github: amberframework/micrate
     version: ~> 0.3.3
 
   pg:
     github: will/crystal-pg
-    version: ~> 0.16.1
+    version: ~> 0.18.0
 
   mysql:
     github: crystal-lang/crystal-mysql
-    version: ~> 0.6.0
+    version: ~> 0.8.0
 
   sqlite3:
     github: crystal-lang/crystal-sqlite3
-    version: ~> 0.12.0
+    version: ~> 0.13.0
 
   redis:
     github: stefanwille/crystal-redis
@@ -68,7 +68,7 @@ dependencies:
 
   teeplate:
     github: mosop/teeplate
-    version: ~> 0.7.0
+    version: ~> 0.8.0
 
   exception_page:
     github: crystal-loot/exception_page

spec/amber/cli/commands/init_spec.cr

@@ -22,7 +22,7 @@ module Amber::CLI
       [camel_case, snake_case].each do |arg|
         MainCommand.run ["generate", "model", "-y", arg]
         filename = snake_case
-        granite_table_name = "table_name #{snake_case}s"
+        granite_table_name = "table #{snake_case}s"
         src_filepath = "./src/models/#{filename}.cr"
         spec_filepath = "./spec/models/#{filename}_spec.cr"
         File.exists?(src_filepath).should be_true

spec/amber/router/cookies_spec.cr

@@ -40,7 +40,7 @@ module Amber::Router
 
       cookies.set "that & guy", "foo & bar => baz"
 
-      cookie_header(cookies).should eq "that%20%26%20guy=foo%20%26%20bar%20%3D%3E%20baz; path=/"
+      cookie_header(cookies).should eq "that+%26+guy=foo+%26+bar+%3D%3E+baz; path=/"
     end
 
     it "sets the cookie with expiration" do

spec/support/fixtures/cli_fixtures.cr

@@ -56,16 +56,16 @@ module CLIFixtures
   def expected_post_model
     <<-MODEL
     class Post < Granite::Base
-      adapter pg
-      table_name posts
+      connection pg
+      table posts
 
       belongs_to :user
 
-      primary id : Int64
-      field title : String
-      field body : String
-      field published : Bool
-      field likes : Int32
+      column id : Int64, primary: true
+      column title : String?
+      column body : String?
+      column published : Bool?
+      column likes : Int32?
       timestamps
     end
 

src/amber/cli/templates/app/config/database.cr.ecr

@@ -1,5 +1,5 @@
 require "granite/adapter/<%= @database %>"
 
-Granite::Adapters << Granite::Adapter::<%= @database.capitalize %>.new({name: "<%= @database %>", url: Amber.settings.database_url})
+Granite::Connections << Granite::Adapter::<%= @database.capitalize %>.new(name: "<%= @database %>", url: Amber.settings.database_url)
 Granite.settings.logger = Amber.settings.logger.dup
 Granite.settings.logger.not_nil!.progname = "Granite"

src/amber/cli/templates/app/shard.yml.ecr

@@ -23,7 +23,7 @@ dependencies:
 
   granite:
     github: amberframework/granite
-    version: ~> 0.16.0
+    version: ~> 0.17.0
 
   quartz_mailer:
     github: amberframework/quartz-mailer
@@ -36,22 +36,22 @@ dependencies:
 <% case @database when "pg" -%>
   pg:
     github: will/crystal-pg
-    version: ~> 0.16.1
+    version: ~> 0.18.0
 <% when "mysql" -%>
   mysql:
     github: crystal-lang/crystal-mysql
-    version: ~> 0.6.0
+    version: ~> 0.8.0
 <% when "sqlite" -%>
   sqlite3:
     github: crystal-lang/crystal-sqlite3
-    version: ~> 0.12.0
+    version: ~> 0.13.0
 <% end -%>
 
   citrine-i18n:
     github: amberframework/citrine-i18n
-    version: 0.3.2
+    version: 0.4.0
 
 development_dependencies:
   garnet_spec:
     github: amberframework/garnet-spec
-    version: ~> 0.2.1
+    version: 0.2.1

src/amber/cli/templates/auth/src/models/{{name}}.cr.ecr

@@ -2,12 +2,12 @@ require "crypto/bcrypt/password"
 
 class <%= class_name %> < Granite::Base
   include Crypto
-  adapter <%= config.database %>
-  <%= "table_name #{table_name}" %>
+  connection <%= config.database %>
+  <%= "table #{table_name}" %>
 
-  primary id : Int64
+  column id : Int64, primary: true
 <% @fields.reject{|f| f.hidden }.each do |field| -%>
-  field <%= field.name %> : <%= field.cr_type %>
+  column <%= field.name %> : <%= field.cr_type %>?
 <% end -%>
 <% if config.database != "sqlite" -%>
   timestamps

src/amber/cli/templates/model/src/models/{{name}}.cr.ecr

@@ -1,13 +1,13 @@
 class <%= class_name %> < Granite::Base
-  adapter <%= config.database %>
-  <%= "table_name #{table_name}" %>
+  connection <%= config.database %>
+  <%= "table #{table_name}" %>
 <% @fields.select{|f| f.reference? }.each do |field| %>
   belongs_to :<%= field.name %>
 <% end -%>
 
-  primary id : Int64
+  column id : Int64, primary: true
 <% @fields.reject{|f| f.hidden || f.reference? }.each do |field| -%>
-  field <%= field.name %> : <%= field.cr_type %>
+  column <%= field.name %> : <%= field.cr_type %>?
 <% end -%>
 <% if config.database != "sqlite" -%>
   timestamps

src/amber/controller/filters.cr

@@ -80,6 +80,12 @@ module Amber::Controller
       filters[filter.precedence] << filter
     end
 
+    def each(&block : {Symbol, Array(Filter)} -> _)
+      filters.each do |key, filter|
+        yield({key, filter})
+      end
+    end
+
     def run(precedence : Symbol, action : Symbol, except_action : Symbol | Nil = nil)
       filters[precedence].each do |filter|
         next if except_filter_and_has_action?(filter, except_action)