flamerb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21cf2de29fdc8d873003895b2c56cf75f7812471ba481f297ca86fcd28a344a2
-  data.tar.gz: 909ef801c9df9d4668165824959595af2d3eebae808d90858756ea4655efa16c
+  metadata.gz: 9454312b3e487a027ad473bbb28a5f2cc426e0c80c89fb465543b7973688d967
+  data.tar.gz: 916844f29bc26883c1cdd6996dab823013c2c5583ad84af2c9af0bfe71db59a5
 SHA512:
-  metadata.gz: 5b9839c63e4f8ab236d46c777fe183fc738b607dd20fc9fc648eae4e592b7ba6405164b9e59d97c18545dce030a7e18cbc5423f850343a8a301a771e6c22e53c
-  data.tar.gz: db0ef98dc5a90c962d2dac400f89d2c3ad49289debb5d81384e4821871b64de4c87631696f526505a1c6f11e1e4a2c1d8f2595da20fc2ac7e296a8dcb239c677
+  metadata.gz: 7ebf2d41b963182dc3163bffc71527269765775131e88958d8398257781ea283495e9f154eca5121598242ce273af9d6ee1385ff4386237becfcb04772a4f27b
+  data.tar.gz: a7d218f734570eb3aff0180e1d77f354d0b88c61053d76cb934f39b37bfc650c4b1c7398c32d76d14e99cbc4809760c8def8f2957e427ec8e47a019ba5a7bdb5

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v0.3.0 (2023-07-18)
+
+### Feat
+
+- problems with some templates
+
+### Fix
+
+- problems with solargraph
+
+## v0.2.2 (2023-07-14)
+
+### Fix
+
+- problems with rubocop
+
+## v0.2.1 (2023-07-13)
+
+### Fix
+
+- conflict with template location
+
 ## v0.2.0 (2023-07-13)
 
 ### Feat

data/bin/flamerb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require "pathname"
 
-source_path = (Pathname.new(__FILE__).dirname + '../lib').expand_path
+source_path = (Pathname.new(__FILE__).dirname + "../lib").expand_path
 $LOAD_PATH << source_path
 
-require 'flame'
+require "flame"
 
 if ARGV.empty?
   puts "Please provide a path for the new application"
@@ -21,6 +21,6 @@ ARGV << "--skip-jbuilder"
 ARGV << "--database=postgresql"
 ARGV << "-T"
 
-templates_path = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))
+templates_path = File.expand_path("../../templates", __FILE__)
 Flame::Generators::App.source_paths << Rails::Generators::AppGenerator.source_root << templates_path
 Flame::Generators::App.start

data/lib/flame/generators/app.rb

@@ -1,3 +1,4 @@
+require 'bundler'
 require "rails/generators"
 require "rails/generators/rails/app/app_generator"
 
@@ -16,8 +17,9 @@ module Flame
       end
 
       def generators
-        run("spring stop > /dev/null 2>&1 || true")
-        run("bundle install")
+        run "spring stop > /dev/null 2>&1 || true"
+        template "Gemfile.erb", "Gemfile", force: true
+        Bundler.with_unbundled_env { run "bundle install" }
         invoke "flame:haml"
         rails_command "db:create"
 
@@ -26,12 +28,14 @@ module Flame
         invoke "flame:devise"
         invoke "flame:vite"
 
-        generate("annotate:install")
-        template ".rubocop.yml", ".rubocop.yml"
-        template ".solargraph.yml", ".solargraph.yml"
-        run("bundle exec standardrb --fix-unsafely")
-        rails_command("db:migrate") if yes?("\nDo you want to run migrations? [y/n]")
+        if yes?("\nDo you want to run migrations? [y/n]")
+          rails_command("db:migrate")
+          generate("annotate:install")
+        end
         rails_command("db:seed") if yes?("\nDo you want to run seed? [y/n]")
+        template("rubocop.yml", ".rubocop.yml")
+        template("solargraph.yml", ".solargraph.yml")
+        run("bundle exec standardrb --fix-unsafely")
         welcome_message
 
         exit 0

data/lib/flame/generators/devise_generator.rb

@@ -2,79 +2,25 @@ require_relative "base"
 
 module Flame
   class DeviseGenerator < Generators::Base
-    APP_CONTROLLER = <<~RUBY
-      before_action :authenticate_user!, only: [:current]
-      protect_from_forgery with: :exception, unless: :json_request?
-
-      def current
-        render json: current_user
-      end
-
-
-      private
-
-      def json_request?
-        request.format.json?
-      end
-    RUBY
-
-    SESSION_CONTROLLER = <<~RUBY
-      class SessionsController < Devise::SessionsController
-        respond_to :json
-      
-        private
-      
-        def respond_with(resource, _opts = {})
-          render json: resource
-        end
-      
-        def respond_to_on_destroy
-          head :no_content
-        end
-      end
-    RUBY
-
     def install
       generate("devise:install")
       generate("devise", "User")
     end
 
-    def add_timeoutable
-      gsub_file(
-        "app/models/user.rb",
-        /^\s*devise\s*:[a-z_]+(?:,\s*:[a-z_]+)*\s*$/,
-        "  devise :database_authenticatable, :registerable, :timeoutable, timeout_in: 1.day"
-      )
+    def custom_user_model
+      template("app/models/user.rb", force: true)
     end
 
     def generate_session_controller
-      create_file(
-        "app/controllers/sessions_controller.rb",
-        SESSION_CONTROLLER
-      )
+      template("app/controllers/sessions_controller.rb", force: true)
     end
 
     def modify_session_route
-      gsub_file(
-        "config/routes.rb",
-        /devise_for\s*:\s*users/,
-        <<~RUBY
-          devise_for :users, defaults: {format: :json}, controllers: {sessions: "sessions"}
-          get "/users/current", to: "application#current", defaults: {format: :json}
-
-          get "*path", to: "pages#index", constraints: ->(request) do
-            !request.xhr? && request.format.html?
-          end
-        RUBY
-      )
+      template("config/routes.rb", force: true)
     end
 
     def modify_app_controller
-      inject_into_class(
-        "app/controllers/application_controller.rb",
-        "ApplicationController",
-        APP_CONTROLLER
-      )
+      template("app/controllers/application_controller.rb", force: true)
     end
 
     def insert_secret_key

data/lib/flame/generators/haml_generator.rb

@@ -3,7 +3,7 @@ require_relative "base"
 module Flame
   class HamlGenerator < Generators::Base
     def convert_erb_to_haml
-      run("HAML_RAILS_DELETE_ERB=true rails haml:erb2haml")
+      run("HAML_RAILS_DELETE_ERB=true bundle exec rails haml:erb2haml")
     end
   end
 end

data/lib/flame/version.rb

@@ -1,5 +1,5 @@
 module Flame
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
   RUBY_VERSION = "3.2.2"
   RAILS_VERSION = "6.1.7"
 end

data/templates/app/controllers/application_controller.rb

@@ -0,0 +1,14 @@
+class ApplicationController < ActionController::Base
+  before_action :authenticate_user!, only: [:current]
+  protect_from_forgery with: :exception, unless: :json_request?
+
+  def current
+    render json: current_user
+  end
+
+  private
+
+  def json_request?
+    request.format.json?
+  end
+end

data/templates/app/controllers/sessions_controller.rb

@@ -0,0 +1,13 @@
+class SessionsController < Devise::SessionsController
+  respond_to :json
+
+  private
+
+  def respond_with(resource, _opts = {})
+    render json: resource
+  end
+
+  def respond_to_on_destroy
+    head :no_content
+  end
+end

data/templates/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ApplicationRecord
+  devise :database_authenticatable, :registerable, :timeoutable, timeout_in: 1.day
+end

data/templates/config/routes.rb

@@ -0,0 +1,8 @@
+Rails.application.routes.draw do
+  devise_for :users, defaults: {format: :json}, controllers: {sessions: "sessions"}
+  get "/users/current", to: "application#current", defaults: {format: :json}
+
+  get "*path", to: "pages#index", constraints: ->(request) do
+    !request.xhr? && request.format.html?
+  end
+end

data/templates/rubocop.yml

@@ -0,0 +1,25 @@
+inherit_mode:
+  merge:
+    - Exclude
+require:
+  - standard
+  # problem with block_single_line_braces solved by: https://github.com/castwide/vscode-solargraph/issues/118#issuecomment-505348192
+  - standard/cop/block_single_line_braces
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-factory_bot
+  - rubocop-rails
+inherit_gem:
+  standard: config/base.yml
+  standard-performance: config/base.yml
+  standard-custom: config/base.yml
+AllCops:
+  SuggestExtensions: false
+  TargetRubyVersion: 3.2
+  NewCops: enable
+  Exclude:
+    - node_modules/**/*
+    - public/**/*
+    - vendor/**/*
+RSpec:
+  Enabled: true # enable rubocop-rspec cops

data/templates/solargraph.yml

@@ -0,0 +1,26 @@
+---
+include:
+  - "**/*.rb"
+  - "app/**/*.rb"
+  - "config/**/*.rb"
+  - "lib/**/*.rb"
+exclude:
+  - vendor/**/*
+  - ".bundle/**/*"
+require:
+  - actioncable
+  - actionmailer
+  - actionpack
+  - actionview
+  - activejob
+  - activemodel
+  - activerecord
+  - activestorage
+  - activesupport
+domains: []
+reporters:
+  - rubocop  # diagnostics
+require_paths: []
+plugins:
+  - solargraph-rails
+max_files: 20000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flamerb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - n0tbot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 6.1.7
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.29'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.60.0
 description: Flame is a powerful Ruby gem designed to simplify and streamline application
   development by providing a comprehensive set of tools and functionalities.
 email:
@@ -76,7 +118,11 @@ files:
 - lib/flame/generators/vite_generator.rb
 - lib/flame/version.rb
 - templates/Gemfile.erb
+- templates/app/controllers/application_controller.rb
+- templates/app/controllers/sessions_controller.rb
+- templates/app/models/user.rb
 - templates/app/views/layouts/application.html.haml
+- templates/config/routes.rb
 - templates/db/seeds.rb
 - templates/eslintrc.js
 - templates/frontend/assets/react.svg
@@ -102,6 +148,8 @@ files:
 - templates/frontend/store/slices/userSlice.js
 - templates/frontend/theme/index.js
 - templates/jsconfig.json
+- templates/rubocop.yml
+- templates/solargraph.yml
 - templates/spec/support/database_cleaner.rb
 - templates/spec/support/factory_bot.rb
 - templates/spec/support/shoulda_matchers.rb