jinda 0.1.0 → 0.1.6.6

data/lib/generators/jinda/templates/app/assets/stylesheets/jqm/social.scss

@@ -0,0 +1,133 @@
+html * {
+	  font-family: 'Montserrat', sans-serif;
+	  box-sizing: border-box;
+}
+
+body {
+    background: #4688F1;
+    padding: 0;
+    margin: 0;
+}
+
+.login-box {
+    padding: 20px;
+    max-width: 480px;
+    margin: 5vh auto;
+    text-align: center;
+    letter-spacing: 1px;
+    position: relative;
+}
+
+.login-box:hover {
+	  box-shadow: 0 8px 17px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
+}
+
+.login-box h2 {
+    margin: 20px 0 20px;
+    padding: 0;
+    text-transform: uppercase;
+    color: #4688F1;
+}
+
+.social-button {
+	  background-position: 25px 0px;
+    box-sizing: border-box;
+    color: rgb(255, 255, 255);
+    cursor: pointer;
+    display: inline-block;
+    height: 50px;
+	  line-height: 50px;
+    text-align: left;
+    text-decoration: none;
+    text-transform: uppercase;
+    vertical-align: middle;
+    width: 100%;
+	  border-radius: 3px;
+    margin: 10px auto;
+    outline: rgb(255, 255, 255) none 0px;
+    padding-left: 20%;
+    transition: all 0.2s cubic-bezier(0.72, 0.01, 0.56, 1) 0s;
+	  -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+}
+
+#facebook-connect {
+    background: rgb(255, 255, 255) url('https://eswarasai.com/projects/social-login/img/facebook.svg') no-repeat scroll 5px 0px / 30px 50px padding-box border-box;
+    border: 1px solid rgb(60, 90, 154);
+}
+
+#facebook-connect:hover {
+	  border-color: rgb(60, 90, 154);
+	  background: rgb(60, 90, 154) url('https://eswarasai.com/projects/social-login/img/facebook-white.svg') no-repeat scroll 5px 0px / 30px 50px padding-box border-box;
+	  -webkit-transition: all .8s ease-out;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease-out;
+}
+
+#facebook-connect span {
+	  box-sizing: border-box;
+    color: rgb(60, 90, 154);
+    cursor: pointer;
+    text-align: center;
+    text-transform: uppercase;
+    border: 0px none rgb(255, 255, 255);
+    outline: rgb(255, 255, 255) none 0px;
+	  -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+}
+
+#facebook-connect:hover span {
+	  color: #FFF;
+	  -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+}
+
+#google-connect {
+    background: rgb(255, 255, 255) url('https://eswarasai.com/projects/social-login/img/google-plus.png') no-repeat scroll 5px 0px / 50px 50px padding-box border-box;
+    border: 1px solid rgb(220, 74, 61);
+}
+
+#google-connect:hover {
+	  border-color: rgb(220, 74, 61);
+	  background: rgb(220, 74, 61) url('https://eswarasai.com/projects/social-login/img/google-plus-white.png') no-repeat scroll 5px 0px / 50px 50px padding-box border-box;
+	  -webkit-transition: all .8s ease-out;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease-out;
+}
+
+#google-connect span {
+	  box-sizing: border-box;
+    color: rgb(220, 74, 61);
+    cursor: pointer;
+    text-align: center;
+    text-transform: uppercase;
+    border: 0px none rgb(220, 74, 61);
+    outline: rgb(255, 255, 255) none 0px;
+	  -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+}
+
+#google-connect:hover span {
+	  color: #FFF;
+	  -webkit-transition: all .3s ease;
+    -moz-transition: all .3s ease;
+    -ms-transition: all .3s ease;
+    -o-transition: all .3s ease;
+    transition: all .3s ease;
+}

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

@@ -19,14 +19,23 @@ class ArticlesController < ApplicationController
   end
 
   def create
+
     @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"])
     @article.save!
+      # if @article.save!
+      #   format.html { redirect_to @article, notice: 'Sample was successfully created.'  }
+      #   format.json { render :show, status: :created, location: @article }
+      # else
+      #   format.html { render :new }
+      #   format.json { render json: @article.errors, status: :unprocessable_entity }
+      # end
+      redirect_to @article
+
   end
 
   def my
@@ -40,14 +49,21 @@ class ArticlesController < ApplicationController
     # They contain everything that we get their forms select_article and edit_article
     article_id = $xvars["select_article"] ? $xvars["select_article"]["title"] : $xvars["p"]["article_id"]
     @article = Article.find(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"])
+    redirect_to @article
+
 
   end
 
   def destroy
+    if Rails.env.test? #Temp solution until fix test of current_ma_user
+      current_ma_user = $xvars["current_ma_user"]
+      #current_ma_user = @article.user
+    end
     if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @article.user
       @article.destroy
     end

data/lib/generators/jinda/templates/app/controllers/jinda_controller.rb

@@ -36,11 +36,13 @@ class JindaController < ApplicationController
   ####################################################################################################]
   # prepare xmain.runseq eg: how many form_step or total_step and step properties check if authorized
   ####################################################################################################]
+  # view menu by user selected what service (module and code) to run (not all services like menu did
+  # Its only one service 
   def init
     module_code, code = params[:s].split(":")
     @service= Jinda::Service.where(:module_code=> module_code, :code=> code).first
     # @service= Jinda::Service.where(:module_code=> params[:module], :code=> params[:service]).first
-    if @service && authorize_init?
+		if @service && authorize_init?
       xmain = create_xmain(@service)
       result = create_runseq(xmain)
       unless result
@@ -59,6 +61,8 @@ class JindaController < ApplicationController
   end
   ####################################################################################################]
   # run if, form, mail, output etc depend on icon in freemind
+	# action from @runseq.action == do,     form,			if,     output
+	# Then will call				def run_do, run_form, run_if, run_output
   ####################################################################################################]
   def run
     init_vars(params[:id])
@@ -76,6 +80,9 @@ class JindaController < ApplicationController
         redirect_to_root
       else
         service= @xmain.service
+				###############################################################################################
+				# Run View Form f created template by jinda rake follow freemind mm file
+				###############################################################################################
         if service
           @title= "Transaction ID #{@xmain.xid}: #{@xmain.name} / #{@runseq.name}"
           fhelp= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.md"
@@ -251,7 +258,8 @@ class JindaController < ApplicationController
         }
 
       else
-        v = v.to_unsafe_h unless v.class == String
+				# bug in to_unsalfe_h rails 5.1.6 https://github.com/getsentry/raven-ruby/issues/799
+        # v = v.to_unsafe_h unless v.class == String
         eval "@xvars[@runseq.code][k] = v"
       end
     }
@@ -345,7 +353,7 @@ class JindaController < ApplicationController
     File.open('public/doc.html','w') {|f| f.puts html }
     respond_to do |format|
       format.html {
-        render :plain=> @print+html, :layout => 'layouts/_page'
+        render :plain=> @print+html, :layout => 'layouts/jqm/_page'
         # render :text=> Maruku.new(doc).to_html, :layout => false
         # format.html {
         #   h = RDoc::Markup::ToHtml.new

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

@@ -2,10 +2,10 @@
 <!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
 <node CREATED="1273819432637" ID="ID_1098419600" MODIFIED="1334737006485" TEXT="Jinda">
 <node CREATED="1273819462973" ID="ID_282419531" MODIFIED="1493705904561" POSITION="right" TEXT="services">
-<node CREATED="1275756501221" FOLDED="true" ID="ID_1720745721" MODIFIED="1507471632977" TEXT="users:User">
+<node CREATED="1275756501221" ID="ID_1720745721" MODIFIED="1528215844718" TEXT="users:User">
 <node CREATED="1278491598711" ID="ID_1662699954" MODIFIED="1494393920347" TEXT="role:m"/>
 <node CREATED="1279700865182" ID="ID_1266797279" MODIFIED="1357798847781" TEXT="link:info: /users"/>
-<node CREATED="1319015338880" ID="ID_189841353" MODIFIED="1330477824203" TEXT="link:pending tasks: /mindapp/pending"/>
+<node CREATED="1319015338880" ID="ID_189841353" MODIFIED="1528215866339" TEXT="link:pending tasks: /jinda/pending"/>
 <node CREATED="1275905802131" ID="ID_154000410" MODIFIED="1355422418892" TEXT="user:edit">
 <node CREATED="1275756515843" ID="ID_1108188320" MODIFIED="1330477833918" TEXT="enter_user:edit">
 <icon BUILTIN="attach"/>

data/lib/generators/jinda/templates/app/jinda/template/linkview.haml

@@ -0,0 +1,21 @@
+- @title= "My Articles"
+%p
+- @page_title  = 'All Articlces'
+= paginate @articles
+%table#article-table
+  %tr
+    %th Title
+    %th Description
+    %th Created
+    %th Updated
+    %th Delete
+    %th Edit  
+  - @articles.each do |article|
+    %tr
+      %td= link_to article.title, :controller=>"articles", :action=>"show", :id=>article.id
+      %td= article.text.html_safe
+      %td= article.created_at.strftime('%m/%d/%Y')
+      %td= article.updated_at.strftime('%m/%d/%Y')
+      %td(align='center')= link_to image_tag('delete.png', style:'border:none; float:none;'), "#", :onclick=>"if (confirm('Please Confirm')) {location.hash='/articles/destroy/#{article.id}';}"
+      %td(align='center')= link_to image_tag('pencil.png', style:'border:none; float:none;'), {controller: "jinda", action: "init", s: 'articles:xedit_article', article_id: article.id}, data: { confirm: "Please Confirm" }
+

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

@@ -6,6 +6,6 @@ class Jinda::Module
   field :name, :type => String
   field :role, :type => String
   field :seq, :type => Integer
-
+  field :icon, :type => String
   has_many :services, :class_name => "Jinda::Service"
 end

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

@@ -28,8 +28,10 @@ class User
   end
   
   def self.from_omniauth(auth)
-    where(auth.slice(:uid, :provider, :email)).first_or_create do |user|
-      case auth.provider 
+		# Rails now no longer support slice 
+    # where(auth.slice(:uid, :provider, :email)).first_or_create do |user|
+		where(uid: auth.uid, provider: auth.provider, email: auth.info.email).first_or_create do |user|
+			case auth.provider 
         when 'identity'
           identity = Identity.find auth.uid
           user.code = identity.code

data/lib/generators/jinda/templates/app/views/jinda/_menu.haml

@@ -21,4 +21,6 @@
         %li
           = link_to "Refresh", "#", :onclick=>"window.location.replace('/')"
         - if !login?    
-          = link_to image_tag( 'facebook-sign-in-button.png'), '/auth/facebook', rel: "external"  
+          .login-box
+            = link_to image_tag( 'facebook-continue-button.png'), '/auth/facebook', rel: "external", class: "facebook-connect.social-button" 
+            = link_to image_tag( 'google-continue-button.png'), '/auth/google_oauth2', rel: "external", class: "google-connect.social-button"

data/lib/generators/jinda/templates/app/views/jinda/_menu_mm.haml

@@ -3,9 +3,24 @@
   - unless m.role.blank?
     - next unless login?
     - next unless current_ma_user.role
-    - next unless current_ma_user.role.upcase.split(',').include?(m.role.upcase)
+    -# next unless current_ma_user.role.upcase.split(',').include?(m.role.upcase)
+    -# ####################### Remove w space in role ###################
+    - next unless current_ma_user.role.upcase.split(",").map!(&:strip).include?(m.role.upcase)
+
   %li
+    -# ########################### Main Display Menu ####################
     = m.name
+    -# ##################################################################
+    -# Code to display current login user role and required role for menu
+    -# ##################################################################
+    
+    -# if defined?(current_ma_user.role) && !current_ma_user.role.blank?
+      =# current_ma_user.role
+    -# if m.role?
+      =# m.role.upcase
+
+    -# ##################################################################
+      
     %ul
       - m.services.asc(:seq).each do |s|
         - next unless s.list
@@ -15,7 +30,7 @@
         - unless s.role.blank?
           - next unless login?
           - next unless current_ma_user.role
-          - next unless current_ma_user.role.upcase.split(',').include?(s.role.upcase)
+          - next unless current_ma_user.role.upcase.split(",").map!(&:strip).include?(s.role.upcase)
         - if s.code.downcase=="link"
           - name, url = s.name.split(":", 2)
           - url.strip!

data/lib/generators/jinda/templates/app/views/jinda/_static.haml

@@ -11,13 +11,3 @@
     = link_to "Pending Tasks", "#", :onclick=>"location.hash='/jinda/pending'", "data-role"=>"button"
     = link_to "Refresh", "#", :onclick=>"window.location.replace('/')", "data-role"=>"button"
     = link_to "About", "#", :onclick=>"location.hash='#about'", "data-role"=>"button"
-:javascript
-  function notice(msg) {
-    $("<div class='ui-loader ui-overlay-shadow ui-body-e ui-corner-all'><h1>"+ msg +"</h1></div>")
-      .css({ "display": "block", "opacity": 0.96, "top": $(window).scrollTop() + 100 })
-  		.appendTo( $('div[data-id="main"]') )
-  		.delay( 4000 )
-  		.fadeOut( 400, function(){
-  		  $(this).remove();
-  		});
-  }

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

@@ -14,17 +14,18 @@
 %ul  
   %li Rubygems 2.4.1
   %li Rails 5.1.4
-  %li rails new YOURAPP -skip-test-unit --skip-bundle --skip-active-record
+  %li rails new YOURAPP --skip-test-unit --skip-bundle --skip-active-record 
+  %li (rails new YOURAPP -BOT)
 
 
 %h2 Installation
 %ul
-  %li gem 'jinda', '~> 0.0.8'
+  %li add gem 'jinda', '~> 0.1.1'
   %li bundle
   %li rails generate jinda:install
   %li bundle
   %li rails generate jinda:config
-  %li rake db:seed, will create initial user:password admin:secret
+  %li rails jinda:seed, will create initial user:password admin:secret
   %li when update app/jinda/index.mm, run rake jinda:update
 
 %h2 Option: Themes available: Jinda_adminbsb, Jinda_adminlte

data/lib/generators/jinda/templates/app/views/jinda/run_form.haml

@@ -6,7 +6,7 @@
 - next_step = 'end_form'
 - if @help
   %div(data-role="collapsible" data-theme="e" data-content-theme="c" data-mini="true")
-    %h3 ตำแนะนำ
+    %h3 Help
     %p= markdown(@help)
 = form_tag({ :action => next_step } , {:multipart => true, :onSubmit=>'return validate()', :class=>form_class, "data-ajax"=>"#{ajax?(@ui)}"}) do
   = hidden_field_tag 'xmain_id', @xmain.id

data/lib/generators/jinda/templates/app/views/layouts/jqm/_full.haml

@@ -8,7 +8,7 @@
     = display_meta_tags 
     - if GMAP
       = javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false"
-    - if ADSENSE
+    -# if ADSENSE
       = render :partial => 'custom/adsense'        
   %body
     = render :partial => "jinda/menu"
@@ -27,15 +27,15 @@
         %div{"data-role" => "content"}
           = yield
       = render :partial => "jinda/static"
-:javascript
-  $(document).on("pagehide", 'div', function(e,ui) {
-    var page = $(e.target);
-    if(page.attr('data-cache') == 'never') {
-      page.remove();
-    }
-  });
-  $( document ).on( "pagechange", function(){
-    $.get("/jinda/ajax_notice", function(r) {$(r).appendTo('head').remove()});
-  });
+/ :javascript
+/   $(document).on("pagehide", 'div', function(e,ui) {
+/     var page = $(e.target);
+/     if(page.attr('data-cache') == 'never') {
+/       page.remove();
+/     }
+/   });
+/   $( document ).on( "pagechange", function(){
+/     $.get("/jinda/ajax_notice", function(r) {$(r).appendTo('head').remove()});
+/   });
 
 /= raw handle_ma_notice

data/lib/generators/jinda/templates/spec/controllers/articles_controller_spec.rb

@@ -0,0 +1,155 @@
+require 'rails_helper'
+require 'database_cleaner'
+
+
+
+RSpec.describe ArticlesController, type: :controller do
+
+
+    let(:valid_input) {
+      {:title => "My Title", :text => "My Item", :user_id => "admin"}
+    }
+
+    let(:invalid_input) {
+      {:title => "", :text => "", :user_id => ""}
+    }
+
+    @user = User.new(:uid => "admin", :provider => "Facebook", :email => "1.0@kul.asia", :role=> "a,m")
+
+
+    $xvars = {}
+    $xvars["form_article"] = {}
+
+    $xvars["form_article"]["title"] = "AAAAAA"
+    $xvars["form_article"]["text"] = "AAAAAA"
+    $xvars["form_article"]["body"] = "AAAAA"
+    $xvars["user_id"] = @user.id
+
+
+    $xvars["select_article"] = {}
+    $xvars["select_article"] = nil
+    $xvars["p"] = {}
+    $nxvars = {}
+    $xvars["edit_article"] = {}
+    $xvars["edit_article"]["article"] = {}
+    $xvars["edit_article"]["article"]["title"] = "BBBBB"
+    $xvars["edit_article"]["article"]["text"] = "BBBBB"
+    $xvars["edit_article"]["article"]["keywords"] = "BBBBB"
+    $xvars["edit_article"]["article"]["body"] = "BBBBB"
+    $xvars["current_ma_user"] = @user
+
+    let(:valid_attributes) {
+
+        {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"]}
+    }
+
+    let(:invalid_attributes) {
+      {}
+    }
+
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    it "returns a success response" do
+      article = Article.create! valid_input
+      get :index, params: {}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #show" do
+    it "returns a success response" do
+      article = Article.create! valid_input
+      get :show, params: {id: article.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns a success response" do
+      article = Article.create! valid_input
+      get :edit, params: {id: article.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Article" do
+        expect {
+          post :create, params: {article: valid_attributes}, session: valid_session
+        }.to change(Article, :count).by(1)
+
+      end
+
+      it "redirects to the created article" do
+        post :create, params: {article: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(Article.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'new' template)" do
+        post :create, params: {article: invalid_attributes}, session: valid_session
+        expect(response).not_to be_success
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        $xvars
+      }
+
+     it "updates the requested article" do
+        article = Article.create! valid_attributes
+        $xvars["p"]["article_id"] = article.to_param
+        put :update, params: {id: article.to_param, article: new_attributes}, session: valid_session
+        article.reload
+        expect(article.title).to eq "BBBBB"
+      end
+
+      it "redirects to the article" do
+        article = Article.create! valid_attributes
+        $xvars["p"]["article_id"] = article.to_param
+        put :update, params: {id: article.to_param, article: new_attributes}, session: valid_session
+        expect(response).to redirect_to(article)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'edit' template)" do
+        article = Article.create! valid_attributes
+        $xvars["p"]["article_id"] = article.to_param
+        put :update, params: {id: article.to_param, article: invalid_attributes}, session: valid_session
+        expect(response).not_to be_success
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+
+    it "destroys the requested article" do
+      article = Article.create! valid_attributes
+      #current_ma_user = article.user_id
+
+      expect {
+        delete :destroy, params: {id: article.to_param}, session: valid_session
+      }.to change(Article, :count).by(-1)
+    end
+
+    it "redirects to the articles list" do
+      article = Article.create! valid_attributes
+      delete :destroy, params: {id: article.to_param}, session: valid_session
+      expect(response).to redirect_to(articles_url)
+    end
+  end
+if DatabaseCleaner.clean
+  puts "Cleaning Database ............................................"
+end
+end