jinda 0.7.7.4 → 1.0.0

data/config/routes.rb

@@ -1,30 +1,44 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   # start jiinda method routes
-  jinda_methods = ['pending', 'status', 'search', 'doc', 'doc_print', 'logs', 'ajax_notice']
-  jinda_methods += ['init', 'run', 'run_mail', 'document', 'run_do', 'run_form', 'end_form']
-  jinda_methods += ['run_redirect', 'run_direct_to','run_if']
-  jinda_methods += ['error_logs', 'notice_logs', 'cancel', 'run_output', 'end_output']
-  jinda_methods.each do |aktion| get "/jinda/#{aktion}" => "jinda##{aktion}" end
-  post '/jinda/init' => 'jinda#init'
-  post '/jinda/pending' => 'jinda#index'
-  post '/jinda/end_form' => 'jinda#end_form'
-  post '/jinda/end_output' => 'jinda#end_output'
+  jinda_methods  = %w[pending status search doc doc_print logs ajax_notice]
+  jinda_methods += %w[init run run_mail document run_do run_form end_form]
+  jinda_methods += %w[run_redirect run_direct_to run_if]
+  jinda_methods += %w[error_logs notice_logs cancel run_output end_output]
+  jinda_methods.each do |aktion|
+    get "/jinda/#{aktion}" => "jinda##{aktion}"
+  end
+
+  # Define the actions array
+  jinda_actions = %w[init pending end_form end_output]
+  # Generate routes for each action
+  jinda_actions.each do |action|
+    post "/jinda/#{action}" => "jinda##{action}"
+  end
+
   # end jinda method routes
   post '/auth/:provider/callback' => 'sessions#create'
   get '/auth/:provider/callback' => 'sessions#create'
   get '/auth/failure' => 'sessions#failure'
   get '/logout' => 'sessions#destroy', :as => 'logout'
-  get '/articles/my' => 'articles#my'
-  get '/articles/my/destroy' => 'articles#destroy'
-  get '/articles/show' => 'articles/show'
-  get '/articles/edit' => 'articles/edit'
-  get '/docs/my' => 'docs/my'
-  get '/notes/my' => 'notes/my'
-  get '/docs/my/destroy' => 'docs#destroy'
-  get '/notes/my/destroy/:id' => 'notes#destroy'
-  get '/notes/destroy/:id' => 'notes#destroy'
-  get '/jinda/document/:id' => 'jinda#document'
-  resources :articles do resources :comments end
+
+  # Define the actions array
+  actions = %w[my destroy show edit]
+
+  # Define modules and generate routes for each module and action
+  %w[articles jobs docs notes].each do |module_name|
+    actions.each do |action|
+      get "/#{module_name}/#{action}" => "#{module_name}##{action}"
+      get "/#{module_name}/my/destroy" => "#{module_name}#destroy"
+      get "/#{module_name}/my/destroy/:id" => "#{module_name}#destroy"
+    end
+  end
+
+  resources :articles do
+    resources :comments
+  end
+  resources :jobs
   resources :comments
   resources :notes
   resources :docs
@@ -32,13 +46,18 @@ Rails.application.routes.draw do
   resources :identities
   resources :sessions
   resources :password_resets
-  resources :jinda, :only => [:index, :new]
+  resources :jinda, only: %i[index new]
+  get '/jinda/document/:id' => 'jinda#document'
   # root :to => 'jinda#index'
   # api
   get '/api/v1/notes/my' => 'api/v1/notes#my'
   post '/api/v1/notes' => 'api/v1/notes#create', as: 'api_v1_notes'
   namespace :api do
-  namespace :v1 do resources :notes, :only => [:index] end
+    namespace :v1 do
+      resources :notes, only: [:index]
+    end
   end
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 end
+# Define Routes constant
+# Routes = Rails.application.routes

data/lib/generators/jinda/config_generator.rb

@@ -1,29 +1,32 @@
+# frozen_string_literal: true
+
 module Jinda
-    module Generators
-        class ConfigGenerator < Rails::Generators::Base
-            def self.source_root
-                File.dirname(__FILE__) + "/templates"
-            end
-            desc "Backup Files"
-            def backup_files
-                st="      "
-                # inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv "omniauth.rb",  "omniauth.rb.bak") : (puts "new omniauth.rb created")}
-                # inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv "mongoid.rb", "omniauth.rb.bak") : (puts "new mongoid.rb created")}
-                (File.file? ".env") ? (FileUtils.mv ".env", ".env-bak") : (puts "backup .env")
-            end
-            desc "gen_image_store"
-            def gen_image_store
-                # FileUtils.cp "cloudinary.yml","config/cloudinary.yml"
-                # FileUtils.cp "dot.env",".env"
-                # FileUtils.cp "dot.rspec",".rspec"
-                empty_directory "upload" # create upload directory just in case
-            end
-            desc "Set up omniauth config"
-            def setup_omniauth
-                # gem 'bcrypt-ruby', '~> 3.0.0'
-                # gem 'omniauth-identity'
-                initializer "omniauth.rb" do
-                  %q{
+  module Generators
+    class ConfigGenerator < Rails::Generators::Base
+      def self.source_root
+        "#{File.dirname(__FILE__)}/templates"
+      end
+      desc "Backup Files"
+      def backup_files
+        # inside("config/initializers") {(File.file? "omniauth.rb") ? (FileUtils.mv "omniauth.rb",  "omniauth.rb.bak") : (puts "new omniauth.rb created")}
+        # inside("config/initializers") {(File.file? "mongoid.rb") ? (FileUtils.mv "mongoid.rb", "omniauth.rb.bak") : (puts "new mongoid.rb created")}
+        File.file?(".env") ? (FileUtils.mv ".env", ".env-bak") : (Rails.logger.debug "backup .env")
+      end
+      desc "gen_image_store"
+      def gen_image_store
+        # FileUtils.cp "cloudinary.yml","config/cloudinary.yml"
+        # FileUtils.cp "dot.env",".env"
+        # FileUtils.cp "dot.rspec",".rspec"
+        empty_directory "upload" # create upload directory just in case
+      end
+      desc "Set up omniauth config"
+      def setup_omniauth
+        # gem 'bcrypt-ruby', '~> 3.0.0'
+        # gem 'omniauth-identity'
+        initializer "omniauth.rb" do
+          "
+                    require 'omniauth'
+                    require 'omniauth'
                     Rails.application.config.middleware.use OmniAuth::Builder do
                       provider :identity,
                                :fields => [:code, :email],
@@ -34,69 +37,87 @@ module Jinda
                       provider :google_oauth2, ENV['GOOGLE_CLIENT_ID'], ENV['GOOGLE_CLIENT_SECRET'], skip_jwt: true
                     end
 
+                    # Allow both POST and GET requests for OmniAuth (Rails 7 compatibility)
+                    OmniAuth.config.allowed_request_methods = [:post, :get]
+
                     # https://stackoverflow.com/questions/11461084/handle-omniautherror-invalid-credentials-for-identity-login
                     OmniAuth.config.on_failure = Proc.new { |env|
                       OmniAuth::FailureEndpoint.new(env).redirect_to_failure
                     }
-                    
-                  }
-                end
-            end
 
-            desc "Set up mongoid config"
-            def setup_mongoid
-                generate "mongoid:config"
-                inject_into_file 'config/mongoid.yml', :after => '  # raise_not_found_error: true' do
-                    "\n    raise_not_found_error: false"
-                end
-
-                inject_into_file 'config/mongoid.yml', :after => '  # belongs_to_required_by_default: true' do
-                    "\n    belongs_to_required_by_default: false"
-                end
-                inject_into_file 'config/mongoid.yml', :after => '  # app_name: MyApplicationName' do
-                    "\n\nproduction:" +
-                        "\n  clients:" +
-                        "\n    default:" +
-                        "\n      uri: <%= ENV['MONGODB_URI'] %>" +
-                        "\n  options:" +
-                        "\n    raise_not_found_error: false" +
-                        "\n    belongs_to_required_by_default: false\n"
-                end
-            end
+                  "
+        end
+      end
 
-            desc "Setup Dockerfile"
-            def setup_docker
-              puts "      Setup Docker files"
-              FileUtils.cp source_paths[0]+"/"+"Dockerfile", "Dockerfile"
-              FileUtils.cp source_paths[0]+"/"+"docker-compose.yml", "docker-compose.yml"
-              FileUtils.cp source_paths[0]+"/"+"entrypoint.sh", "entrypoint.sh"
-            end
+      desc "Set up mongoid config"
+      def setup_mongoid
+        generate "mongoid:config -f"
+        inject_into_file "config/mongoid.yml", after: "  # raise_not_found_error: true" do
+          "\n    raise_not_found_error: false"
+        end
 
-            def finish
-                puts "      configured omniauth.\n"
-                puts "      configured Mongoid.\n"
-                puts "\n"
-                puts "      To set user/password as admin/secret run:\n"
-                puts "-----------------------------------------\n"
-                puts "rails jinda:seed\n"
-                puts "-----------------------------------------\n"
-                puts "      To test with rspec  run:"
-                puts "-----------------------------------------\n"
-                puts "rspec\n"
-                puts "-----------------------------------------\n"
-                puts "      To config rspec run:"
-                puts "rails g jinda:rspec\n"
-                puts "run $chromediver for Capybara & Chrome\n"
-                puts "-----------------------------------------\n"
-                puts "      To config minitest run:"
-                puts "-----------------------------------------\n"
-                puts "rails g jinda:minitest\n"
-                puts "-----------------------------------------\n"
-                puts "      To login with facebook"
-                puts "-----------------------------------------\n"
-                puts "Please config. in .env or restore from .env-bak \n"
-                puts "-----------------------------------------\n"
-            end
+        inject_into_file "config/mongoid.yml", after: "  # belongs_to_required_by_default: true" do
+          "\n    belongs_to_required_by_default: false"
+        end
+        inject_into_file "config/mongoid.yml", after: "  # app_name: MyApplicationName" do
+          "\n\nproduction:" \
+            "\n  clients:" \
+            "\n    default:" \
+            "\n      uri: <%= ENV['MONGODB_URI'] %>" \
+            "\n  options:" \
+            "\n    raise_not_found_error: false" \
+            "\n    belongs_to_required_by_default: false\n"
         end
+      end
+
+      desc "Setup Dockerfile"
+      def setup_docker
+        Rails.logger.debug "      Setup Docker files"
+        FileUtils.cp "#{source_paths[0]}/Dockerfile", "Dockerfile"
+        FileUtils.cp "#{source_paths[0]}/docker-compose.yml", "docker-compose.yml"
+        FileUtils.cp "#{source_paths[0]}/docker-compose-mongodb.yml", "docker-compose-mongodb.yml"
+        FileUtils.cp "#{source_paths[0]}/docker-compose-web.yml", "docker-compose-web.yml"
+        FileUtils.cp "#{source_paths[0]}/entrypoint.sh", "entrypoint.sh"
+        FileUtils.cp "#{source_paths[0]}/DOCKER.md", "DOCKER.md"
+      end
+
+      def finish
+        Rails.logger.debug "      configured omniauth.\n"
+        Rails.logger.debug "      configured Mongoid.\n"
+        Rails.logger.debug "\n"
+        Rails.logger.debug "      To set user/password as admin/secret run:\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "rails jinda:seed\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "      Docker options (MongoDB on standard port 27017):"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "MongoDB only (recommended for development):\n"
+        Rails.logger.debug "  docker compose -f docker-compose-mongodb.yml up -d\n"
+        Rails.logger.debug "\n"
+        Rails.logger.debug "Full stack with web container:\n"
+        Rails.logger.debug "  docker compose -f docker-compose-web.yml up -d\n"
+        Rails.logger.debug "  Note: Edit docker-compose-web.yml for local gem paths\n"
+        Rails.logger.debug "\n"
+        Rails.logger.debug "Simple MongoDB only:\n"
+        Rails.logger.debug "  docker compose -f docker-compose.yml up -d\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "      To test with rspec  run:"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "rspec\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "      To config rspec run:"
+        Rails.logger.debug "rails g jinda:rspec\n"
+        Rails.logger.debug "run $chromediver for Capybara & Chrome\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "      To config minitest run:"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "rails g jinda:minitest\n"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "      To login with facebook"
+        Rails.logger.debug "-----------------------------------------\n"
+        Rails.logger.debug "Please config. in .env or restore from .env-bak \n"
+        Rails.logger.debug "-----------------------------------------\n"
+      end
     end
+  end
 end