jinda 0.6.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e04cd357d30062a6b765e150ef9ed68f727431fd8aa38d95b89bc6c6724adff
-  data.tar.gz: 82d27af5714824521aca90a0250177a615cfb4a7c75c7d925f3d9d6b9dddf876
+  metadata.gz: '042968bc00874bfb253e1896812521a4805d587be5470ea5f8149a32bb301e88'
+  data.tar.gz: 8d1cf09efbefda3e8beb9d7023d7aee88cafe86a22ee0d4b9de2356cd494a8a5
 SHA512:
-  metadata.gz: 8764b341b8ff83145342f8bef2463deb743f9e357db9174ed0459e017433ceb1d791ec267fbd90a66aae97eacc13f90cfeab3da9a60f00872f97f53e8eb55002
-  data.tar.gz: 9d96d1c74a3a99822de78c346537fc744a15fdeb6cd9c6a414011cf8b80f20751b35dc6143bb737dd6c5a8ce8b05969c17b768872306bb0dbdda2b293f412327
+  metadata.gz: d3090a6c9d17d67bc8f4a01f5274703346104a5fd30020dd8176ed8a56c998c046e290af3fa1b1499f89da8e7472df86ff81220a83bef65962b6918653e9bfc7
+  data.tar.gz: fa18290337837f65b553de8a27901a706ea7b6086b884c958f0158f91d3dd872549390b9c9f8d7d574e91fd3226df761ee419cc0f8f16212709f6733e5598325

data/README.md

@@ -40,7 +40,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.6.0'
+    gem 'jinda', '~> 0.6.2'
 
 For Development (most updated)
 

data/lib/generators/jinda/install_generator.rb

@@ -19,7 +19,7 @@ module Jinda
         gem 'bson', '4.4.2'
         gem 'mongoid', '7.1.0.rc0'
         gem 'turbolinks_render'
-        gem 'nokogiri', '1.10.9'
+        gem 'nokogiri', '1.10.10'
         gem 'haml', '~> 5.1', '>= 5.1.2'
         gem 'haml-rails', '~> 2.0.1'
         gem 'mail'

data/lib/generators/jinda/templates/Dockerfile

@@ -0,0 +1,24 @@
+# https://docs.docker.com/compose/rails/
+FROM ruby:2.6.3
+RUN apt-get update -qq 
+RUN mkdir /myapp
+WORKDIR /myapp
+COPY Gemfile /myapp/Gemfile
+# COPY Gemfile.lock /myapp/Gemfile.lock
+
+RUN bundle install
+COPY . /myapp
+
+# Set Rails environment to production
+# ENV RAILS_ENV production
+# RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+#    && apt install -y nodejs
+
+# Add a script to be executed every time the container starts.
+COPY entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
+EXPOSE 3000
+
+# Start the main process.
+CMD ["rails", "server", "-b", "0.0.0.0"]

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

@@ -12,8 +12,10 @@ class ArticlesController < ApplicationController
   end
 
   def show
-    @article = Article.find(params[:article_id])
-    @comments = @article.comments.desc(:created_at).page(params[:page]).per(10)
+    @article = Article.find(article_params)
+    @commentable = @article
+    @comments = @commentable.comments.desc(:created_at).page(params[:page]).per(10)
+
     prepare_meta_tags(title: @article.title,
                       description: @article.text,
                       keywords: @article.keywords)
@@ -92,7 +94,7 @@ class ArticlesController < ApplicationController
   end
 
   def article_params
-    params[:article_id]
+    [params[:article_id], params[:id]].detect { |p| !p.nil? }
   end
 
   def load_edit_article

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

@@ -1,19 +1,31 @@
 class CommentsController < ApplicationController
+  before_action :comment_params, only: [:create]
+  before_action :load_commmentable
+
+  def index
+    @comments = @commentable.comments 
+  end
 
   def create
-    @article = Article.find(article_params["article_id"])
-    @comment = @article.comments.new(comment_params)
+    @comment = @commentable.comments.new comment_params
     @comment.save!
-    redirect_to controller: 'articles', action: 'show', article_id: @article
+    redirect_to [@commentable], notice: "Comment created"
   end
 
   private
 
-  def article_params
-    params.require(:comment).permit(:article_id)
-  end
+  # def article_params
+  #   params.require(:comment).permit(:article_id)
+  # end
 
   def comment_params
-    params.require(:comment).permit(:body, :article_id, :user_id)
+    resource = request.path.split('/')[1]                                
+    commentable_id = "#{resource.singularize.to_sym}_id" #:article_id
+    params.require(:comment).permit(:body, :user_id, commentable_id.to_sym)
   end
+
+  def load_commmentable                                                        
+    resource, id = request.path.split('/')[1,2]                                
+    @commentable = resource.singularize.classify.constantize.find(id)          
+  end     
 end

data/lib/generators/jinda/templates/app/jinda/index.mm

@@ -25,7 +25,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1275752678377" ID="ID_1348489452" MODIFIED="1588883079396" TEXT="admins:Admin">
+<node CREATED="1275752678377" FOLDED="true" ID="ID_1348489452" MODIFIED="1602251558474" TEXT="admins:Admin">
 <node CREATED="1275752688167" ID="ID_229996461" MODIFIED="1275752690948" TEXT="role:a"/>
 <node CREATED="1282722836614" ID="ID_1213363124" MODIFIED="1330477902602" TEXT="edit_role:edit user role">
 <node CREATED="1282722862918" ID="ID_1190117882" MODIFIED="1330477922159" TEXT="select_user:select user">
@@ -44,7 +44,7 @@
 <node CREATED="1275790679363" ID="ID_829325467" MODIFIED="1511159696044" TEXT="link: logs: /jinda/logs"/>
 <node CREATED="1507573166973" ID="ID_351025910" MODIFIED="1511159700908" TEXT="link: docs: /jinda/doc"/>
 </node>
-<node CREATED="1273706796854" ID="ID_1003882979" MODIFIED="1588964401951" TEXT="devs: Developer">
+<node CREATED="1273706796854" FOLDED="true" ID="ID_1003882979" MODIFIED="1602251560242" TEXT="devs: Developer">
 <node CREATED="1275373154914" ID="ID_340725299" MODIFIED="1275373158632" TEXT="role:d"/>
 <node CREATED="1275788317299" ID="ID_716276608" MODIFIED="1511159716471" TEXT="link: error_logs: /jinda/error_logs"/>
 <node CREATED="1275788317299" ID="ID_1570419198" MODIFIED="1587858894833" TEXT="link: notice_logs: /jinda/notice_logs"/>
@@ -87,7 +87,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_554831343" MODIFIED="1592926786394" TEXT="notes: Notes">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_554831343" MODIFIED="1602251562724" TEXT="notes: Notes">
 <node CREATED="1493489768542" ID="ID_737469676" MODIFIED="1589772615102" TEXT="link:My Notes: /notes/my">
 <node CREATED="1493490295677" ID="ID_514416082" MODIFIED="1493490302239" TEXT="role:m"/>
 </node>
@@ -151,7 +151,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1493393619430" ID="ID_328863650" MODIFIED="1592785024002" TEXT="articles: Article">
+<node CREATED="1493393619430" FOLDED="true" ID="ID_328863650" MODIFIED="1602251538059" TEXT="articles: Article">
 <node CREATED="1493419096527" ID="ID_1521905276" MODIFIED="1493478060121" TEXT="link: All Articles: /articles"/>
 <node CREATED="1493489768542" FOLDED="true" ID="ID_1376361427" MODIFIED="1589757167952" TEXT="link: My article: /articles/my">
 <node CREATED="1493490295677" ID="ID_628476988" MODIFIED="1493490302239" TEXT="role:m"/>
@@ -199,7 +199,7 @@
 </node>
 </node>
 </node>
-<node CREATED="1493664700564" ID="ID_704959130" MODIFIED="1592950100226" TEXT="comments: Comment">
+<node CREATED="1493664700564" FOLDED="true" ID="ID_704959130" MODIFIED="1602251564023" TEXT="comments: Comment">
 <icon BUILTIN="button_cancel"/>
 <node CREATED="1493665155709" ID="ID_1973520751" MODIFIED="1591392666652" TEXT="new_comment: New Comment">
 <icon BUILTIN="button_cancel"/>
@@ -281,7 +281,7 @@
 <node CREATED="1273819855875" ID="ID_1429503284" MODIFIED="1330477311102" TEXT="a: admin"/>
 <node CREATED="1273819859775" ID="ID_568365839" MODIFIED="1330477315009" TEXT="d: developer"/>
 </node>
-<node CREATED="1273819456867" FOLDED="true" ID="ID_1677010054" MODIFIED="1591392810437" POSITION="left" TEXT="models">
+<node CREATED="1273819456867" ID="ID_1677010054" MODIFIED="1602123498759" POSITION="left" TEXT="models">
 <node CREATED="1292122118499" FOLDED="true" ID="ID_1957754752" MODIFIED="1493705885123" TEXT="person">
 <node CREATED="1292122135809" ID="ID_1617970069" MODIFIED="1332878659106" TEXT="fname"/>
 <node CREATED="1292122150362" ID="ID_1200135538" MODIFIED="1332878662388" TEXT="lname"/>
@@ -305,7 +305,7 @@
 <node CREATED="1292243471343" ID="ID_1859608350" MODIFIED="1310195256623" TEXT="lat: float"/>
 <node CREATED="1292243477436" ID="ID_48497260" MODIFIED="1310195262534" TEXT="lng: float"/>
 </node>
-<node CREATED="1493418879485" FOLDED="true" ID="ID_1995497233" MODIFIED="1583097163789" TEXT="article">
+<node CREATED="1493418879485" ID="ID_1995497233" MODIFIED="1602529325998" TEXT="article">
 <node CREATED="1493418891110" ID="ID_364756011" MODIFIED="1493418905253" TEXT="title"/>
 <node CREATED="1493418906868" ID="ID_1676483995" MODIFIED="1493418911919" TEXT="text"/>
 <node CREATED="1493487131376" ID="ID_1334057464" MODIFIED="1538328284823" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot;">
@@ -320,18 +320,6 @@
 <node CREATED="1494181636998" ID="ID_229502630" MODIFIED="1494181660419" TEXT="body"/>
 <node CREATED="1497913676275" ID="ID_404103076" MODIFIED="1497913685065" TEXT="keywords"/>
 </node>
-<node CREATED="1493418915637" FOLDED="true" ID="ID_429078131" MODIFIED="1583097162517" TEXT="comment">
-<node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
-<node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1493418986711" TEXT="belongs_to :article">
-<icon BUILTIN="edit"/>
-</node>
-<node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1493643146424" TEXT="belongs_to :user">
-<icon BUILTIN="edit"/>
-</node>
-<node CREATED="1493718512191" ID="ID_173203253" MODIFIED="1493718583874" TEXT="validates :body, :user_id, :article_id, presence: true">
-<icon BUILTIN="edit"/>
-</node>
-</node>
 <node CREATED="1494040082403" FOLDED="true" ID="ID_864577403" MODIFIED="1583097161145" TEXT="picture">
 <node CREATED="1494040091583" ID="ID_679208099" MODIFIED="1494040119098" TEXT="picture"/>
 <node CREATED="1494040120208" ID="ID_1266154874" MODIFIED="1494040125130" TEXT="description"/>
@@ -361,6 +349,21 @@
 <icon BUILTIN="edit"/>
 </node>
 </node>
+<node CREATED="1493418915637" ID="ID_429078131" MODIFIED="1602591443455" TEXT="comment">
+<node CREATED="1493418939760" ID="ID_1251093062" MODIFIED="1493418943423" TEXT="body"/>
+<node CREATED="1493418945686" ID="ID_911071644" MODIFIED="1602529513657" TEXT="belongs_to :article, :class_name =&gt; &quot;Article&quot;  ">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1493643129947" ID="ID_588013696" MODIFIED="1602110865206" TEXT="belongs_to :user, :class_name =&gt; &quot;User&quot;  ">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1601847760278" ID="ID_1288333428" MODIFIED="1602591549062" TEXT="belongs_to :commentable, polymorphic: true ">
+<icon BUILTIN="edit"/>
+</node>
+<node CREATED="1602591560333" ID="ID_598892151" MODIFIED="1602592677709" TEXT="index({ commentable_id: 1, commentable_type: 1}) ">
+<icon BUILTIN="edit"/>
+</node>
+</node>
 </node>
 </node>
 </map>

data/lib/generators/jinda/templates/app/models/comment.rb

@@ -4,8 +4,10 @@ class Comment
   # jinda begin
   include Mongoid::Timestamps
   field :body, :type => String
-  belongs_to :article
-  belongs_to :user, :class_name => "User"
-  validates :body, :user_id, :article_id, presence: true
+  belongs_to :article, :class_name => "Article"  
+  belongs_to :user, :class_name => "User"  
+  belongs_to :job, :class_name => "Job"  
+  belongs_to :commentable, polymorphic: true 
+  index({ commentable_id: 1, commentable_type: 1}) 
   # jinda end
 end

data/lib/generators/jinda/templates/app/views/articles/show.html.haml

@@ -17,7 +17,8 @@
 -# 
 - if login?
   %h3 Add a comment:
-  = form_for([@comment, @article.comments.build]) do |f|
+  =# form_for([@comment, @article.comments.build]) do |f|
+  = form_with(model: [@article, Comment.new], local: true) do |f|
     = f.hidden_field :article_id, :value => @article.id
     = f.label :body, "Comment"
     = f.text_area :body

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml

@@ -33,7 +33,7 @@
         %div.inner
           %b Installation
           %ul
-            %li add gem 'jinda', '0.5.8' to Gemfile then $ bundle
+            %li add gem 'jinda', '0.6.5' to Gemfile then $ bundle
             %li rails generate jinda:install, then bundle
             %li rails generate jinda:config
             %li rails jinda:seed, will create initial user:password admin:secret

data/lib/generators/jinda/templates/config/mongoid.yml-docker

@@ -0,0 +1,182 @@
+development:
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
+    default:
+      # Mongoid can connect to a URI accepted by the driver:
+      # uri: mongodb://user:password@mongodb.domain.com:27017/shop263603_development
+
+      # Otherwise define the parameters separately.
+      # This defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: shop263603_development
+      # Provides the hosts the default client can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        # - localhost:27017
+        - mongodb
+      options:
+        # Note that all options listed below are Ruby driver client options (the mongo gem).
+        # Please refer to the driver documentation of the version of the mongo gem you are using
+        # for the most up-to-date list of options.
+        #
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. Note that all authentication
+        # mechanisms require username and password, with the exception of :mongodb_x509.
+        # Default on mongoDB 3.0 is :scram, default on 2.4 and 2.6 is :plain.
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against.
+        # (default: the database specified above or admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
+        # local_threshold: 0.015
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
+
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 10)
+        # connect_timeout: 10
+
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether to do peer certification validation. (default: true)
+        # ssl_verify: true
+
+        # The file containing concatenated certificate authority certificates
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+        
+        # Whether to truncate long log lines. (default: true)
+        # truncate_logs: true
+
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serialization. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+    raise_not_found_error: false
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Raise an error when defining a field with the same name as an
+    # existing method. (default: false)
+    # duplicate_fields_exception: false
+
+    # Use Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
+
+    # Set the Mongoid and Ruby driver log levels when not in a Rails
+    # environment. The Mongoid logger will be set to the Rails logger
+    # otherwise.(default: :info)
+    # log_level: :info
+
+    # Control whether `belongs_to` association is required. By default
+    # `belongs_to` will trigger a validation error if the association
+    # is not present. (default: true)
+    # belongs_to_required_by_default: true
+    belongs_to_required_by_default: false
+
+    # Application name that is printed to the mongodb logs upon establishing a
+    # connection in server versions >= 3.4. Note that the name cannot exceed 128 bytes.
+    # app_name: MyApplicationName
+
+production:
+  clients:
+    default:
+      uri: <%= ENV['MONGODB_URI'] %>
+  options:
+    raise_not_found_error: false
+    belongs_to_required_by_default: false
+
+
+    # Use background indexes by default if `background` option not specified. (default: false)
+    # background_indexing: false
+test:
+  clients:
+    default:
+      database: shop263603_test
+      hosts:
+        - localhost:27017
+      options:
+        read:
+          mode: :primary
+        max_pool_size: 1

data/lib/generators/jinda/templates/config/mongoid.yml-localhost

@@ -0,0 +1,182 @@
+development:
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
+    default:
+      # Mongoid can connect to a URI accepted by the driver:
+      # uri: mongodb://user:password@mongodb.domain.com:27017/shop263603_development
+
+      # Otherwise define the parameters separately.
+      # This defines the name of the default database that Mongoid can connect to.
+      # (required).
+      database: shop263603_development
+      # Provides the hosts the default client can connect to. Must be an array
+      # of host:port pairs. (required)
+      hosts:
+        - localhost:27017
+        # - mongodb
+      options:
+        # Note that all options listed below are Ruby driver client options (the mongo gem).
+        # Please refer to the driver documentation of the version of the mongo gem you are using
+        # for the most up-to-date list of options.
+        #
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. Note that all authentication
+        # mechanisms require username and password, with the exception of :mongodb_x509.
+        # Default on mongoDB 3.0 is :scram, default on 2.4 and 2.6 is :plain.
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against.
+        # (default: the database specified above or admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 0.015)
+        # local_threshold: 0.015
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
+
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 10)
+        # connect_timeout: 10
+
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether to do peer certification validation. (default: true)
+        # ssl_verify: true
+
+        # The file containing concatenated certificate authority certificates
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+        
+        # Whether to truncate long log lines. (default: true)
+        # truncate_logs: true
+
+  # Configure Mongoid specific options. (optional)
+  options:
+    # Includes the root model name in json serialization. (default: false)
+    # include_root_in_json: false
+
+    # Include the _type field in serialization. (default: false)
+    # include_type_for_serialization: false
+
+    # Preload all models in development, needed when models use
+    # inheritance. (default: false)
+    # preload_models: false
+
+    # Raise an error when performing a #find and the document is not found.
+    # (default: true)
+    # raise_not_found_error: true
+    raise_not_found_error: false
+
+    # Raise an error when defining a scope with the same name as an
+    # existing method. (default: false)
+    # scope_overwrite_exception: false
+
+    # Raise an error when defining a field with the same name as an
+    # existing method. (default: false)
+    # duplicate_fields_exception: false
+
+    # Use Active Support's time zone in conversions. (default: true)
+    # use_activesupport_time_zone: true
+
+    # Ensure all times are UTC in the app side. (default: false)
+    # use_utc: false
+
+    # Set the Mongoid and Ruby driver log levels when not in a Rails
+    # environment. The Mongoid logger will be set to the Rails logger
+    # otherwise.(default: :info)
+    # log_level: :info
+
+    # Control whether `belongs_to` association is required. By default
+    # `belongs_to` will trigger a validation error if the association
+    # is not present. (default: true)
+    # belongs_to_required_by_default: true
+    belongs_to_required_by_default: false
+
+    # Application name that is printed to the mongodb logs upon establishing a
+    # connection in server versions >= 3.4. Note that the name cannot exceed 128 bytes.
+    # app_name: MyApplicationName
+
+production:
+  clients:
+    default:
+      uri: <%= ENV['MONGODB_URI'] %>
+  options:
+    raise_not_found_error: false
+    belongs_to_required_by_default: false
+
+
+    # Use background indexes by default if `background` option not specified. (default: false)
+    # background_indexing: false
+test:
+  clients:
+    default:
+      database: shop263603_test
+      hosts:
+        - localhost:27017
+      options:
+        read:
+          mode: :primary
+        max_pool_size: 1

data/lib/generators/jinda/templates/docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3'
+services:
+  web:
+    build: .
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
+    volumes:
+      - .:/myapp
+    ports:
+      - "3000:3000"
+    depends_on:
+      - mongodb
+
+  mongodb:
+    image: mongo
+    ports:
+      - "27017:27017"

data/lib/generators/jinda/templates/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+# change mongoid.yml for docker
+cp /myapp/config/mongoid.yml-docker /myapp/config/mongoid.yml
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /myapp/tmp/pids/server.pid
+# Compile the assets
+# bundle exec rake assets:precompile
+# Add admin user
+rake jinda:seed
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"

data/lib/jinda/helpers.rb

@@ -645,7 +645,10 @@ module Jinda
         if a[:edit]
           doc += "  #{a[:text]}\n"
         else
-          doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
+          # Fixed: Capitalize only first char
+          # doc += "  field :#{a[:code]}, :type => #{a[:type].capitalize}\n"
+          a[:type][0] = a[:type][0].capitalize 
+          doc += "  field :#{a[:code]}, :type => #{a[:type]}\n"
         end
       end
       doc += "  #{@etext}\n"

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.6.0"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.5
 platform: ruby
 authors:
 - Prateep Kul
 - Korakot Leemakdej
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -43,40 +29,40 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.11
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.11
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.11
 description: 'Generate Rails workflow from mind map: Freemind'
@@ -96,6 +82,7 @@ files:
 - lib/generators/jinda/install_generator.rb
 - lib/generators/jinda/minitest_generator.rb
 - lib/generators/jinda/rspec_generator.rb
+- lib/generators/jinda/templates/Dockerfile
 - lib/generators/jinda/templates/README.md
 - lib/generators/jinda/templates/app/assets/config/manifest.js
 - lib/generators/jinda/templates/app/assets/images/4dcity-old.ico
@@ -351,9 +338,13 @@ files:
 - lib/generators/jinda/templates/app/views/users/pwd/enter.html.erb
 - lib/generators/jinda/templates/app/views/users/user/enter_user.html.erb
 - lib/generators/jinda/templates/config/cloudinary.yml
+- lib/generators/jinda/templates/config/mongoid.yml-docker
+- lib/generators/jinda/templates/config/mongoid.yml-localhost
 - lib/generators/jinda/templates/db/seeds.rb
+- lib/generators/jinda/templates/docker-compose.yml
 - lib/generators/jinda/templates/dot/dot.env
 - lib/generators/jinda/templates/dotrspec
+- lib/generators/jinda/templates/entrypoint.sh
 - lib/generators/jinda/templates/jinda.yml
 - lib/generators/jinda/templates/public/404.html
 - lib/generators/jinda/templates/public/422.html
@@ -391,7 +382,7 @@ homepage: https://github.com/kul1/jinda
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -406,8 +397,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'
 test_files: []