jinda 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 270299e97f9a8656002d344e027b0dae973ffa4de5aea1a09c17b057ac1ff013
-  data.tar.gz: c56bd2a9f51bd551bae663b87004dd94a89103c4ebdc02abd54fea862a90ab8f
+  metadata.gz: 14a8e0de198f0e7a005ef69aee6d54e675168afea12c2e4f35d01c1dbcab457d
+  data.tar.gz: f3324931dea17255d9f9150476ec12d4789ce9ba9da7c17149452c076d3dde96
 SHA512:
-  metadata.gz: c81b86cb7774c918d0483f0c883c408cf286741f0c3395af64bb760adc916aa85c93e8648319ea5a75982b34ed6d5eb0e4d079890a2602cc8965ba13eb1abf65
-  data.tar.gz: c588613108ec0a86eb83590198889f74d7e0a00b49b7ab3daca6129342e5060b75b004cc58724d967c07a90f1e7dd2536914e0ee02f5448f943055355a807c26
+  metadata.gz: df655fea57ffaca3d5ebb317114b7b8058c80acdc208fac62dd5cadffb4222deecce991f3371a2581e34f17778b7d25b3924e1705dbf8958192daf75d8694879
+  data.tar.gz: 5e70fdb8fad32c2c0d859e8e6f77d6a662597594e30c2189804ca5edf46d325efc711a0929911b20248fe9ab7f0d19fca703001be3240f074973716daef2ce08

data/README.md

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

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/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.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,40 +43,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'
@@ -406,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'