Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
ruby-version: ['3.4', '3.3', '3.2']

steps:
- uses: actions/checkout@v4
Expand All @@ -25,8 +25,8 @@ jobs:
bundle install
bundle exec appraisal install
RAILS_ENV=test bundle exec rake dummy:db:reset
- name: Rubocop
run: rubocop
- name: Standard
run: bundle exec standardrb
- name: Run tests
run: |
RAILS_ENV=test bundle exec rake dummy:db:schema:load
Expand Down
66 changes: 0 additions & 66 deletions .rubocop.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# frozen_string_literal: true

# Standard Ruby configuration
# https://github.com/testdouble/standard

ruby_version: 3.2

ignore:
- 'bin/**/*'
- 'vendor/**/*'
- 'tmp/**/*'
- 'lib/generators/**/templates/**/*'

fix: true
15 changes: 0 additions & 15 deletions .travis.yml

This file was deleted.

27 changes: 18 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
# frozen_string_literal: true

appraise 'rails_6.1' do
gem 'rails', '~> 6.1'
gem 'tzinfo-data'
appraise "rails_7.0" do
gem "rails", "~> 7.0"
gem "rspec", "~> 3.12"
gem "rspec-rails", "~> 6.0"
gem "rails-controller-testing"
gem "sqlite3", "~> 1.4"
end

appraise 'rails_7.0' do
gem 'rails', '~> 7.0'
gem 'tzinfo-data'
appraise "rails_7.1" do
gem "rails", "~> 7.1"
gem "rspec", "~> 3.12"
gem "rspec-rails", "~> 6.1"
gem "rails-controller-testing"
gem "sqlite3", "~> 1.4"
end

appraise 'rails_7.1' do
gem 'rails', '~> 7.1'
gem 'tzinfo-data'
appraise "rails_8.0" do
gem "rails", "~> 8.0"
gem "rspec", "~> 3.13"
gem "rspec-rails", "~> 8.0"
gem "rails-controller-testing"
gem "sqlite3", "~> 2.1"
end
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# frozen_string_literal: true

source 'https://rubygems.org'
source "https://rubygems.org"

# Specify your gem's dependencies in slayer_rails.gemspec
gemspec

gem 'appraisal'
gem 'byebug'
gem 'nokogiri'
gem 'rspec-rails'
gem 'sqlite3'
gem 'tzinfo-data'
gem "appraisal"
gem "byebug"
gem "nokogiri"
gem "rspec-rails"
gem "sqlite3"
gem "tzinfo-data"
12 changes: 6 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# frozen_string_literal: true

require 'rubygems'
require 'bundler/setup'
require 'bundler/gem_tasks'
require "rubygems"
require "bundler/setup"
require "bundler/gem_tasks"

require 'rake'
require 'rspec/core/rake_task'
require "rake"
require "rspec/core/rake_task"

namespace :dummy do
require_relative 'spec/dummy/application'
require_relative "spec/dummy/application"
Dummy::Application.load_tasks
end

Expand Down
4 changes: 2 additions & 2 deletions config.ru
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'rubygems'
require 'bundler'
require "rubygems"
require "bundler"

Bundler.require :default, :development
6 changes: 4 additions & 2 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ source "https://rubygems.org"
gem "appraisal"
gem "byebug"
gem "nokogiri"
gem "rspec-rails"
gem "sqlite3"
gem "rspec-rails", "~> 6.0"
gem "sqlite3", "~> 1.4"
gem "tzinfo-data"
gem "rails", "~> 7.0"
gem "rspec", "~> 3.12"
gem "rails-controller-testing"

gemspec path: "../"
6 changes: 4 additions & 2 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ source "https://rubygems.org"
gem "appraisal"
gem "byebug"
gem "nokogiri"
gem "rspec-rails"
gem "sqlite3"
gem "rspec-rails", "~> 6.1"
gem "sqlite3", "~> 1.4"
gem "tzinfo-data"
gem "rails", "~> 7.1"
gem "rspec", "~> 3.12"
gem "rails-controller-testing"

gemspec path: "../"
8 changes: 5 additions & 3 deletions gemfiles/rails_6.1.gemfile → gemfiles/rails_8.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ source "https://rubygems.org"
gem "appraisal"
gem "byebug"
gem "nokogiri"
gem "rspec-rails"
gem "sqlite3"
gem "rspec-rails", "~> 8.0"
gem "sqlite3", "~> 2.1"
gem "tzinfo-data"
gem "rails", "~> 6.1"
gem "rails", "~> 8.0"
gem "rspec", "~> 3.13"
gem "rails-controller-testing"

gemspec path: "../"
8 changes: 4 additions & 4 deletions lib/generators/command/command_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
module Slayer
module Generators
class CommandGenerator < NamedBase
desc 'This generator creates new Slayer::Commands'
desc "This generator creates new Slayer::Commands"

source_root File.expand_path('templates', __dir__)
check_class_collision suffix: 'Command'
source_root File.expand_path("templates", __dir__)
check_class_collision suffix: "Command"

def create_command_files
template 'command.rb', File.join('app', 'commands', class_path, "#{file_name}_command.rb")
template "command.rb", File.join("app", "commands", class_path, "#{file_name}_command.rb")
end
end
end
Expand Down
12 changes: 6 additions & 6 deletions lib/generators/form/form_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
module Slayer
module Generators
class FormGenerator < NamedBase
desc 'This generator creates new Slayer::Forms'
desc "This generator creates new Slayer::Forms"

source_root File.expand_path('templates', __dir__)
check_class_collision suffix: 'Form'
source_root File.expand_path("templates", __dir__)
check_class_collision suffix: "Form"

argument :name, type: :string
argument :fields, type: :array, required: false,
desc: 'The attributes of the generated form. name:String completed:Boolean'
desc: "The attributes of the generated form. name:String completed:Boolean"

def initialize(args, *options) # :nodoc:
super
args.shift
@fields = args.map { |a| a.split(':') }
@fields = args.map { |a| a.split(":") }
end

def create_form_files
template 'form.rb', File.join('app', 'forms', class_path, "#{file_name}_form.rb")
template "form.rb", File.join("app", "forms", class_path, "#{file_name}_form.rb")
end
end
end
Expand Down
12 changes: 6 additions & 6 deletions lib/generators/scaffold/scaffold_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
module Slayer
module Generators
class ScaffoldGenerator < NamedBase
desc 'This generator creates a new Slayer::Commands and a corresponding Slayer::Form'
desc "This generator creates a new Slayer::Commands and a corresponding Slayer::Form"

source_root File.expand_path('templates', __dir__)
check_class_collision suffix: 'Command'
source_root File.expand_path("templates", __dir__)
check_class_collision suffix: "Command"

argument :name, type: :string
argument :fields, type: :array, required: false,
desc: 'The attributes of the generated form. name:String completed:Boolean'
desc: "The attributes of the generated form. name:String completed:Boolean"

def initialize(args, *options) # :nodoc:
super
@args = args
end

def create_command_files
generate 'slayer:command', file_name.to_s
generate "slayer:command", file_name.to_s
end

def create_form_files
generate 'slayer:form', @args.join(' ').to_s
generate "slayer:form", @args.join(" ").to_s
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions lib/generators/slayer_base.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'rails/generators'
require 'rails/generators/named_base'
require "rails/generators"
require "rails/generators/named_base"

module Slayer
module Generators
Expand Down
24 changes: 12 additions & 12 deletions lib/slayer_rails.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# frozen_string_literal: true

require 'active_support'
require 'active_model'
require 'active_record'
require 'slayer'
require "active_support"
require "active_model"
require "active_record"
require "slayer"

require 'slayer_rails/version'
require 'slayer_rails/extensions/form'
require 'slayer_rails/extensions/transaction'
require 'slayer_rails/extensions/translation'
require "slayer_rails/version"
require "slayer_rails/extensions/form"
require "slayer_rails/extensions/transaction"
require "slayer_rails/extensions/translation"

require 'generators/slayer_base'
require 'generators/command/command_generator'
require 'generators/form/form_generator'
require 'generators/scaffold/scaffold_generator'
require "generators/slayer_base"
require "generators/command/command_generator"
require "generators/form/form_generator"
require "generators/scaffold/scaffold_generator"

module Slayer
class Form
Expand Down
Loading