jinda 0.7.7.4 → 1.0.0

data/lib/generators/jinda/templates/DOCKER.md

@@ -0,0 +1,188 @@
+# Docker Setup for Jinda Application
+
+This document explains the Docker configuration files and how to use them for development and deployment.
+
+## Docker Files Overview
+
+Your Jinda application includes several Docker configuration files:
+
+### 1. `Dockerfile`
+- **Purpose**: Builds the Rails application container
+- **Usage**: Used with `docker-compose-web.yml` for full stack deployment
+- **What it does**: 
+  - Sets up Ruby 3.3.0 environment
+  - Installs dependencies from Gemfile
+  - Copies entire application
+  - Configures Rails server on port 3000
+
+### 2. `docker-compose-mongodb.yml` (Recommended for Development)
+- **Purpose**: MongoDB only on standard port
+- **Best for**: Local development, CI/CD testing
+- **Port**: 27017 (standard MongoDB port)
+- **Usage**:
+  ```bash
+  docker compose -f docker-compose-mongodb.yml up -d
+  ```
+- **Why use this**: 
+  - Minimal setup
+  - Run Rails app locally with `rails server`
+  - Works with standard MongoDB tools
+  - No volume mount configuration needed
+
+### 3. `docker-compose.yml`
+- **Purpose**: Simple MongoDB container
+- **Port**: 27017 (standard MongoDB port)
+- **Usage**:
+  ```bash
+  docker compose up -d
+  ```
+
+### 4. `docker-compose-web.yml`
+- **Purpose**: Full stack with web app and MongoDB in containers
+- **Best for**: Production-like environment, full containerized development
+- **Ports**: 
+  - Rails: 3000
+  - MongoDB: 27017
+- **Important**: Edit this file before using for development with local gem modifications
+- **Usage**:
+  ```bash
+  docker compose -f docker-compose-web.yml up -d
+  ```
+
+## Getting Started
+
+### Option A: MongoDB Only (Recommended)
+
+This is the simplest approach for development:
+
+1. **Start MongoDB**:
+   ```bash
+   docker compose -f docker-compose-mongodb.yml up -d
+   ```
+
+2. **Verify MongoDB is running**:
+   ```bash
+   docker ps
+   ```
+
+3. **Run your Rails app locally**:
+   ```bash
+   bundle install
+   rails jinda:seed
+   rails server
+   ```
+
+4. **Stop MongoDB when done**:
+   ```bash
+   docker compose -f docker-compose-mongodb.yml down
+   ```
+
+### Option B: Full Stack (Web + MongoDB)
+
+Use this for containerized development or testing:
+
+1. **Edit `docker-compose-web.yml`** (optional, for local gem development):
+   ```yaml
+   services:
+     web:
+       volumes:
+         - .:/myapp
+         # Add your local gem paths:
+         - ~/mygem/jinda:/path/to/local/jinda
+         - ~/mygem/jinda_adminlte:/path/to/local/jinda_adminlte
+   ```
+
+2. **Start full stack**:
+   ```bash
+   docker compose -f docker-compose-web.yml up -d
+   ```
+
+3. **View logs**:
+   ```bash
+   docker compose -f docker-compose-web.yml logs -f web
+   ```
+
+4. **Access application**:
+   - Web: http://localhost:3000
+   - MongoDB: localhost:27017
+
+5. **Stop services**:
+   ```bash
+   docker compose -f docker-compose-web.yml down
+   ```
+
+## MongoDB Port Information
+
+All Docker configurations use the **standard MongoDB port 27017**:
+- Consistent with MongoDB defaults
+- Works with standard MongoDB clients
+- Compatible with CI/CD systems
+- No special configuration needed in mongoid.yml
+
+## For CI/CD
+
+Your CI pipeline should use `docker-compose-mongodb.yml`:
+
+```yaml
+# GitHub Actions example
+services:
+  mongodb:
+    image: mongo:latest
+    ports:
+      - 27017:27017
+```
+
+Then run tests with:
+```bash
+MONGODB_PORT=27017 rake test
+```
+
+## Troubleshooting
+
+### Port Already in Use
+If port 27017 is already in use:
+```bash
+# Check what's using the port
+lsof -i :27017
+
+# If it's an old container
+docker ps -a | grep mongo
+docker stop <container_name>
+docker rm <container_name>
+```
+
+### Cannot Connect to MongoDB
+1. Verify MongoDB is running:
+   ```bash
+   docker ps | grep mongo
+   ```
+
+2. Check logs:
+   ```bash
+   docker logs <container_name>
+   ```
+
+3. Test connection:
+   ```bash
+   mongosh mongodb://localhost:27017
+   ```
+
+### Volume Data Persistence
+To remove all data and start fresh:
+```bash
+docker compose -f docker-compose-mongodb.yml down -v
+```
+
+## Best Practices
+
+1. **Development**: Use `docker-compose-mongodb.yml` and run Rails locally
+2. **Testing**: Use MongoDB-only containers with standard port 27017
+3. **Production**: Use appropriate production Docker configurations (not these dev files)
+4. **Local Gem Development**: Edit `docker-compose-web.yml` volume mounts as needed
+5. **CI/CD**: Always use standard port 27017 for consistency
+
+## Additional Resources
+
+- [Docker Compose Documentation](https://docs.docker.com/compose/)
+- [MongoDB Docker Hub](https://hub.docker.com/_/mongo)
+- [Jinda Documentation](https://github.com/kul1/jinda)

data/lib/generators/jinda/templates/Dockerfile

@@ -1,14 +1,24 @@
-# https://docs.docker.com/compose/rails/
-FROM ruby:2.6.8
+# Dockerfile for Jinda Rails Application
+# This Dockerfile is used with docker-compose-web.yml for full stack deployment
+# It copies the entire application and sets up the web container
+# For CI/testing, use docker-compose-mongodb.yml for MongoDB only
+# Reference: https://docs.docker.com/compose/rails/
+
+FROM ruby:3.3.0
 RUN apt-get update -qq 
 RUN mkdir /myapp
 WORKDIR /myapp
+
+# Copy dependency files first for better layer caching
 COPY Gemfile /myapp/Gemfile
 COPY Gemfile.lock /myapp/Gemfile.lock
-# Fix from here
-RUN  gem install bundler:2.2.27
-# Fix end here
+COPY vendor /myapp/vendor
+
+# Install bundler and dependencies
+RUN gem install bundler:2.4.10
 RUN bundle install
+
+# Copy entire application (for full deployment)
 COPY . /myapp
 
 # Set Rails environment to production

data/lib/generators/jinda/templates/README.md

@@ -2,7 +2,7 @@
 Rails Application Generator using Freemind
 
 * [jinda](https://github.com/kul1/jinda)
-  - ![jinda-screen](https://user-images.githubusercontent.com/3953832/41832753-0143339a-7813-11e8-9ef9-c1601443c604.png)
+  - ![jinda-screen](doc/images/intro_old.png)
 
 ## Additional Extension themes also available at 
 * [jinda_adminlte](https://github.com/kul1/jinda_adminlte)
@@ -15,8 +15,8 @@ Rails Application Generator using Freemind
 
 These versions works for sure but others may do.
 
-* Ruby 2.7.0
-* Rails 6.0.3
+* Ruby 3.3.0
+* Rails 7.1.6
 * MongoDB 6 
     - Username:
     - Password:

data/lib/generators/jinda/templates/app/assets/config/manifest.js

@@ -1,4 +1,8 @@
 //= link_tree ../images
 //= link_directory ../stylesheets .css
 //= link application.js
+//= link logo_jinda.png
+//= link favicon.ico
+//= link jinda.css
+//= link sarabun.css
 

data/lib/generators/jinda/templates/app/assets/javascripts/application.js

@@ -1,15 +1,15 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jinda_jqm
-
-
+//= require rails-ujs
+//  require turbolinks
+//= require jindalte.js

data/lib/generators/jinda/templates/app/channels/application_cable/channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

data/lib/generators/jinda/templates/app/channels/application_cable/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

data/{test/dummy → lib/generators/jinda/templates}/app/controllers/adminltes_controller.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class AdminltesController < ApplicationController
 end

data/lib/generators/jinda/templates/app/controllers/api/v1/notes_controller.rb

@@ -1,81 +1,83 @@
-class Api::V1::NotesController < ApplicationController
-  before_action :load_note, only: [:show, :destroy]
-  # before_action :xload_current_ma_user, only: [:destroy]
-
-  def index
-    @notes = Note.desc(:created_at).page(params[:page]).per(10)
-    render json: @notes
-  end
-
-  def my
-    @notes = Note.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10)
-    render json: @notes
-  end
-
-  def show 
-  end
-
-  def edit
-    @note = Note.find(params[:id])
-    @page_title       = 'Edit Note'
-  end
-
-  def create
-    @note = Note.new(
-      title: params[:title],
-      body: params[:body],
-      user_id: params[:user])
-
-    @note.save!
-    render json: @note, status: :created
-  end
-
-
-  def update
-    # $xvars["select_note"] and $xvars["edit_note"]
-    # These are variables.
-    # They contain everything that we get their forms select_note and edit_note
-    note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
-    @note = Note.find(note_id)
-    @note.update(title: $xvars["edit_note"]["title"],
-                 body: $xvars["edit_note"]["body"])
-    redirect_to @note
-
-  end
-
-  def delete
-    # called by freemind
-  # Tobe called from other controller:jinda
-    @note_id = $xvars["select_note"] ? $xvars["select_note"]["id"] : $xvars["p"]["note_id"]
-    @note = Note.find(@note_id)
-    @note.destroy
-  end
-
-  def destroy
-    # called by rails menu my
-    if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @note.user
-      @note.destroy
+# frozen_string_literal: true
+
+module Api
+  module V1
+    class NotesController < ApplicationController
+      before_action :load_note, only: %i[show destroy]
+      # before_action :xload_current_ma_user, only: [:destroy]
+
+      def index
+        @notes = Note.desc(:created_at).page(params[:page]).per(10)
+        render json: @notes
+      end
+
+      def my
+        @notes = Note.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10)
+        render json: @notes
+      end
+
+      def show; end
+
+      def edit
+        @note       = Note.find(params[:id])
+        @page_title = 'Edit Note'
+      end
+
+      def create
+        @note = Note.new(
+          title: params[:title],
+          body: params[:body],
+          user_id: params[:user]
+        )
+
+        @note.save!
+        render json: @note, status: :created
+      end
+
+      def update
+        # $xvars["select_note"] and $xvars["edit_note"]
+        # These are variables.
+        # They contain everything that we get their forms select_note and edit_note
+        note_id = $xvars['select_note'] ? $xvars['select_note']['id'] : $xvars['p']['note_id']
+        @note   = Note.find(note_id)
+        @note.update(title: $xvars['edit_note']['title'],
+                     body: $xvars['edit_note']['body'])
+        redirect_to @note
+      end
+
+      def delete
+        # called by freemind
+        # Tobe called from other controller:jinda
+        @note_id = $xvars['select_note'] ? $xvars['select_note']['id'] : $xvars['p']['note_id']
+        @note    = Note.find(@note_id)
+        @note.destroy
+      end
+
+      def destroy
+        # called by rails menu my
+        @note.destroy if current_ma_user.role.upcase.split(',').include?('A') || current_ma_user == @note.user
+        redirect_to action: 'my'
+      end
+
+      def mail
+        NoteMailer.gmail(
+          $xvars['display_mail']['body'],
+          $xvars['select_note']['email'],
+          $xvars['display_mail']['title'],
+          xload_current_ma_user.email
+        )
+      end
+
+      private
+
+      # Tobe called from other controller:jinda
+      def xload_current_ma_user
+        @current_ma_user = User.find($xvars['user_id'])
+      end
+
+      def load_note
+        @note = Note.find(params[:id])
+      end
     end
-    redirect_to :action=>'my'
-  end
-
-  def mail
-    NoteMailer.gmail(
-                    $xvars["display_mail"]["body"],
-                    $xvars["select_note"]["email"],
-                    $xvars["display_mail"]["title"],
-                    xload_current_ma_user.email)
   end
-
-  private
-
-  # Tobe called from other controller:jinda
-  def xload_current_ma_user
-    @current_ma_user = User.find($xvars["user_id"])
-  end
-
-  def load_note
-    @note = Note.find(params[:id])
-  end
-
 end

data/lib/generators/jinda/templates/app/controllers/jinda_org/admins_controller.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class AdminsController < ApplicationController
   def update_role
-    user = User.find_by :code=> $xvars["select_user"]["code"]
-    user.update_attribute :role, $xvars["edit_role"]["role"]
+    user = User.find_by code: $xvars['select_user']['code']
+    user.update_attribute :role, $xvars['edit_role']['role']
   end
 end

data/lib/generators/jinda/templates/app/controllers/jinda_org/application_controller.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   before_action :prepare_meta_tags, if: -> { request.get? }
-  # CSRF protection is turned on with the protect_from_forgery method. 
+  # CSRF protection is turned on with the protect_from_forgery method.
   protect_from_forgery unless: -> { request.format.json? }
-  def prepare_meta_tags(options={})
+  def prepare_meta_tags(options = {})
     site_name   = DEFAULT_TITLE
-    title       = [controller_name, action_name].join(" ")
+    title       = [controller_name, action_name].join(' ')
     description = DEFAULT_DESCRIPTION
-    image       = options[:image] || href="/assets/images/logo.png"
-    keywords     = DEFAULT_KEYWORDS
+    image       = options[:image] || '/assets/images/logo.png'
+    keywords    = DEFAULT_KEYWORDS
     current_url = request.url
 
     # Let's prepare a nice set of defaults
     defaults = {
-      site:        site_name,
-      title:       title,
-      image:       image,
+      site: site_name,
+      title: title,
+      image: image,
       description: description,
-      keywords:    keywords,
+      keywords: keywords,
       twitter: {
         site_name: site_name,
         site: site_name,

data/lib/generators/jinda/templates/app/controllers/jinda_org/articles_controller.rb

@@ -1,87 +1,84 @@
+# frozen_string_literal: true
+
 class ArticlesController < ApplicationController
- before_action :load_articles, except: [:destroy] 
- before_action :load_my_articles, only: [:my]
- before_action :load_article, only: [:destroy, :edit]
+  before_action :load_articles, except: [:destroy]
+  before_action :load_my_articles, only: [:my]
+  before_action :load_article, only: %i[destroy edit]
 
-	def index
+  def index
     # before_action
-	end
+  end
 
   def my
     # before_action
   end
 
   def show
-    @article = Article.find(article_params)
+    @article     = Article.find(article_params)
     @commentable = @article
-    @comments = @commentable.comments.desc(:created_at).page(params[:page]).per(10)
-    @user = User.find(@article.user_id)
-    @show = Hash.new
-    @show = {:article => @article, :comments => @comments, :user => @user}
+    @comments    = @commentable.comments.desc(:created_at).page(params[:page]).per(10)
+    @user        = User.find(@article.user_id)
+    @show        = {}
+    @show        = { article: @article, comments: @comments, user: @user }
     prepare_meta_tags(title: @article.title,
                       description: @article.text,
                       keywords: @article.keywords)
   end
 
   def edit
-    @page_title       = 'Edit Article'
+    @page_title = 'Edit Article'
   end
 
   def create
     # Use Jinda $xvars
     @article = Article.new(
-                      title: $xvars["form_article"]["title"],
-                      text: $xvars["form_article"]["text"],
-                      keywords: $xvars["form_article"]["keywords"],
-                      body: $xvars["form_article"]["body"],
-                      user_id: $xvars["user_id"])
+      title: $xvars['form_article']['title'],
+      text: $xvars['form_article']['text'],
+      keywords: $xvars['form_article']['keywords'],
+      body: $xvars['form_article']['body'],
+      user_id: $xvars['user_id']
+    )
     @article.save!
   end
 
   def update
     @article = Article.find(params[:id])
     @article.update(
-                    title: params["article"]["title"],
-                    text: params["article"]["text"],
-                    keywords: params["article"]["keywords"],
-                    body: params["article"]["body"]
-										)
-    redirect_to :action=> 'show', :article_id => @article.id
+      title: params['article']['title'],
+      text: params['article']['text'],
+      keywords: params['article']['keywords'],
+      body: params['article']['body']
+    )
+    redirect_to action: 'show', article_id: @article.id
   end
 
   def j_update
     # Use Jinda $xvars
-		@article_id = $xvars["select_article"] ? $xvars["select_article"]["title"] : $xvars["p"]["article_id"]
-    @article = Article.find_by :id => @article_id
-    @article.update(title: $xvars["edit_article"]["article"]["title"],
-                    text: $xvars["edit_article"]["article"]["text"],
-                    keywords: $xvars["edit_article"]["article"]["keywords"],
-                    body: $xvars["edit_article"]["article"]["body"]
-										)
+    @article_id = $xvars['select_article'] ? $xvars['select_article']['title'] : $xvars['p']['article_id']
+    @article    = Article.find_by id: @article_id
+    @article.update(title: $xvars['edit_article']['article']['title'],
+                    text: $xvars['edit_article']['article']['text'],
+                    keywords: $xvars['edit_article']['article']['keywords'],
+                    body: $xvars['edit_article']['article']['body'])
   end
 
   def destroy
-    # Use Rails 
+    # Use Rails
     # before_action
 
-    if current_admin? || current_ma_user == @article.user
-      @article.destroy
-    end
+    @article.destroy if current_admin? || current_ma_user == @article.user
 
-      action = (current_admin? ? 'index' : 'my') 
-      redirect_to :action=> (current_admin? ? 'index' : 'my') 
+    (current_admin? ? 'index' : 'my')
+    redirect_to action: (current_admin? ? 'index' : 'my')
   end
 
   private
-  
-  def  current_admin?
-    if current_ma_user.role.upcase.split(',').include?("A") 
-      return true
-    else
-      return false
-    end
-  end
 
+  def current_admin?
+    return true if current_ma_user.role.upcase.split(',').include?('A')
+
+    false
+  end
 
   def load_articles
     @articles = Article.desc(:created_at).page(params[:page]).per(10)
@@ -106,5 +103,4 @@ class ArticlesController < ApplicationController
   def load_comments
     @comments = @article.comments.find_all
   end
-
 end