Skip to content

Commit

Permalink
Remove the dependency of sam.cr in generators
Browse files Browse the repository at this point in the history
  • Loading branch information
yao committed Aug 13, 2023
1 parent 2d0ba35 commit e43469c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion spec/generators/migration_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe Jennifer::Generators::Migration do
args = Sam::Args.new({} of String => String, %w(CreateArticles))

it "creates migration" do
described_class.new(args).render
described_class.new(args.raw).render
expected_content = File.read("./spec/fixtures/generators/migration.cr")
migration_path = Dir["./scripts/migrations/*.cr"].sort.last

Expand Down
8 changes: 4 additions & 4 deletions spec/generators/model_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ describe Jennifer::Generators::Model do
args = Sam::Args.new({} of String => String, %w(Article title:string text:text?))

it "creates model" do
described_class.new(args).render
described_class.new(args.raw).render
expected_content = File.read("./spec/fixtures/generators/model.cr")
model_path = "./scripts/models/article.cr"
File.exists?(model_path).should be_true
File.read(model_path).should eq(expected_content)
end

it "creates migration" do
described_class.new(args).render
described_class.new(args.raw).render
expected_content = File.read("./spec/fixtures/generators/create_migration.cr")
migration_path = Dir["./scripts/migrations/*.cr"].sort.last

Expand All @@ -30,15 +30,15 @@ describe Jennifer::Generators::Model do
args = Sam::Args.new({} of String => String, %w(Article title:string text:text? author:reference))

it "creates model" do
described_class.new(args).render
described_class.new(args.raw).render
expected_content = File.read("./spec/fixtures/generators/model_with_references.cr")
model_path = "./scripts/models/article.cr"
File.exists?(model_path).should be_true
File.read(model_path).should eq(expected_content)
end

it "creates migration" do
described_class.new(args).render
described_class.new(args.raw).render
expected_content = File.read("./spec/fixtures/generators/create_migration_with_references.cr")
migration_path = Dir["./scripts/migrations/*.cr"].sort.last

Expand Down
4 changes: 2 additions & 2 deletions src/jennifer/generators/base.cr
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require "ecr"
module Jennifer
module Generators
abstract class Base
getter name : String, args : Sam::Args
getter name : String, args : Array(Float64 | Int32 | String)

def initialize(@args)
@name = @args[0].as(String)
Expand All @@ -21,7 +21,7 @@ module Jennifer
end

private def definitions
args.raw[1..-1]
args[1..-1]
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions src/jennifer/sam.cr
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ end
Sam.namespace "generate" do
desc "Generates migration template. Usage - generate:migration <migration_name>"
task "migration" do |_, args|
Jennifer::Generators::Migration.new(args).render
Jennifer::Generators::Migration.new(args.raw).render
end

desc "Generates model and migrations template. Usage - generate:model <ModelName>"
task "model" do |_, args|
Jennifer::Generators::Model.new(args).render
Jennifer::Generators::Model.new(args.raw).render
end
end

0 comments on commit e43469c

Please sign in to comment.