mindapp2 0.1.1.3 → 0.1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ca2a989063372c90e29e535d78a7937475b3b5
-  data.tar.gz: 84a15e61d67a63f7d448d1052a6f80a6f2eaccf6
+  metadata.gz: f98ae0e79b453c96b3885e456567ad57075fc4a3
+  data.tar.gz: 22af5026f14c62e2476da32679445e1da618a901
 SHA512:
-  metadata.gz: e588c812aab568cfc48e0d3dd5869440236764ddbb4716ea5b924ffeed9cc342de968064f1de86b4eb949a853d0f7d670e653d4f0b248a4d9590929133506c34
-  data.tar.gz: b0814b1d78403f69fd9b78c975148a1a3a45611809295c9454ce1839d04d5ab5621ce30a19289b28491b75328171457b8036c43634ee6569e88a7eb56a07c67b
+  metadata.gz: 0335bf8bc98e78e3915d85bbec3cc70b50aab6791ce9cfe7cfe061018c07f92ad2ea13474df4dbd60bb0b5c8aa997ce0596726966c38b791b17637a8b3ab4212
+  data.tar.gz: f6de98de2161ecbd0c2570681739ac5bf21d36087abb49fc926f135d2183d0da1ad15354bac0008d3e6ad8caf07e8c04e8e6556ff693a58d399d049e9e33f272

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## v0.1.4
+
+* replaced current_user to current_ma_user for social plug-in: Facebook Login
+* add Facebook Login

data/README.md

@@ -1,18 +1,18 @@
 # Mindapp2
-## v0.1.1.3
+## v0.1.1.4
 
 This is an extended version of Mindapp with mixed workflow and rails app. Mindapp2 maintain workflow feature with upgrade to most update ruby and rails.
 
 ## Changelog
 
-* update for Rails 5.1.1
+* update for Rails 5.1.2
 
 ## Prerequisites
 
 These versions works for sure but others may do.
 
 * Ruby 2.4.1
-* Rails 5.1.1
+* Rails 5.1.2
 * MongoDB 6
 * Freemind 1.0.1
 
@@ -32,7 +32,7 @@ app without ActiveRecord
 
 ## Add mindapp to your Gemfile:
 
-    gem 'mindapp2', '~> 0.1.1.3' 
+    gem 'mindapp2'
 
 For Development (most updated)
 

data/lib/generators/mindapp/install_generator.rb

@@ -13,6 +13,7 @@ module Mindapp
         route "resources :identities"
         route "resources :sessions"
         route "post '/auth/:provider/callback' => 'sessions#create'"
+        route "get '/auth/:provider/callback' => 'sessions#create'"
         route "get '/auth/failure' => 'sessions#failure'"
         route "get '/logout' => 'sessions#destroy', :as => 'logout'"
         route "get ':controller(/:action(/:id))(.:format)'"
@@ -56,8 +57,8 @@ module Mindapp
         initializer "mindapp.rb" do
 %q{# encoding: utf-8
 MM = "#{Rails.root}/app/mindapp/index.mm"
-DEFAULT_TITLE = 'Mindapp'
-DEFAULT_HEADER = 'Mindapp'
+DEFAULT_TITLE = 'Mindapp2'
+DEFAULT_HEADER = 'Mindapp2'
 GMAP = false
 NEXT = "Next >"
 # comment IMAGE_LOCATION to use cloudinary (specify params in config/cloudinary.yml)
@@ -103,6 +104,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
     :on_failed_registration=> lambda { |env|
       IdentitiesController.action(:new).call(env)
   }
+  provider :facebook, ENV['FACEBOOK_API'], ENV['FACEBOOK_KEY']
 end
 }
         end
@@ -145,6 +147,8 @@ end
         gem "redcarpet"
         gem 'bcrypt-ruby', '~> 3.0.0'
         gem 'omniauth-identity'
+        gem 'omniauth-facebook'
+        gem 'dotenv-rails'
         gem 'cloudinary'
         gem 'kaminari'
         gem 'kaminari-mongoid'
@@ -171,7 +175,11 @@ end
       end
 
       def finish
-        puts "Mindapp installation finish, please run bundle install again to install additional gems. Then run rails generate mindapp:mongoid"
+        puts "Mindapp installation finish, please run the following command:\n"
+        puts "----------------------------------------\n"
+        puts "bundle install\n"
+        puts "rails generate mindapp:mongoid\n"
+        puts "----------------------------------------\n"
       end
 
     end

data/lib/generators/mindapp/mongoid_generator.rb

@@ -22,7 +22,12 @@ module Mindapp
         end
       end
       def finish
-        puts "Mongoid finished configured for rails 5 and heroku.\nNext: To set up user/password as admin/secret\n      run 'rake mindapp:seed' "
+        puts "Mongoid finished configured for rails 5 and heroku.\n"
+        puts "Next: To set up user/password as admin/secret\n"
+        puts "Please run the following command:\n"
+        puts "----------------------------------------\n"
+        puts "rake mindapp:seed\n"
+        puts "----------------------------------------\n"
       end
     end
   end

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

@@ -30,7 +30,7 @@ class ArticlesController < ApplicationController
   end
 
   def my
-    @articles = Article.where(user_id: current_user).desc(:created_at).page(params[:page]).per(10)
+    @articles = Article.where(user_id: current_ma_user).desc(:created_at).page(params[:page]).per(10)
     @page_title       = 'Member Login'
   end
 
@@ -48,7 +48,7 @@ class ArticlesController < ApplicationController
   end
 
   def destroy
-    if current_user.role.upcase.split(',').include?("A") || current_user == @article.user
+    if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @article.user
       @article.destroy
     end
       redirect_to :action=>'index'

data/lib/generators/mindapp/templates/app/controllers/mindapp_controller.rb

@@ -25,7 +25,7 @@ class MindappController < ApplicationController
     redirect_to action:"pending"
   end
   def ajax_notice
-    if notice=Mindapp::Notice.recent(current_user, request.env["REMOTE_ADDR"])
+    if notice=Mindapp::Notice.recent(current_ma_user, request.env["REMOTE_ADDR"])
       notice.update_attribute :unread, false
       js = "notice('#{notice.message}');"
     else
@@ -123,7 +123,7 @@ class MindappController < ApplicationController
     @runseq.start ||= Time.now
     @runseq.status= 'R' # running
     $runseq_id= @runseq.id
-    $user_id= current_user.try(:id)
+    $user_id= current_ma_user.try(:id)
     set_global
     controller = Kernel.const_get(@xvars['custom_controller']).new
     result = controller.send(@runseq.code)
@@ -148,23 +148,23 @@ class MindappController < ApplicationController
   def run_output
     init_vars(params[:id])
     service= @xmain.service
-    disp= get_option("display")
-    display = (disp && !affirm(disp)) ? false : true
+    disp= get_option("ma_display")
+    ma_display = (disp && !affirm(disp)) ? false : true
     if service
       f= "app/views/#{service.module.code}/#{service.code}/#{@runseq.code}.html.erb"
       @ui= File.read(f)
       if Mindapp::Doc.where(:runseq_id=>@runseq.id).exists?
         @doc= Mindapp::Doc.where(:runseq_id=>@runseq.id).first
         @doc.update_attributes :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
-                               :xmain=>@xmain, :runseq=>@runseq, :user=>current_user,
-                               :ip=> get_ip, :service=>service, :display=>display,
-                               :secured => @xmain.service.secured
+                               :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+                               :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+                               :ma_secured => @xmain.service.ma_secured
       else
         @doc= Mindapp::Doc.create :name=> @runseq.name,
                                   :content_type=>"output", :data_text=> render_to_string(:inline=>@ui, :layout=>"utf8"),
-                                  :xmain=>@xmain, :runseq=>@runseq, :user=>current_user,
-                                  :ip=> get_ip, :service=>service, :display=>display,
-                                  :secured => @xmain.service.secured
+                                  :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+                                  :ip=> get_ip, :service=>service, :ma_display=>ma_display,
+                                  :ma_secured => @xmain.service.ma_secured
       end
       @message = defined?(MSG_NEXT) ? MSG_NEXT : "Next &gt;"
       @message = "สิ้นสุดการทำงาน" if @runseq.end
@@ -174,8 +174,8 @@ class MindappController < ApplicationController
       ma_log "Error: service not found"
       redirect_to_root
     end
-    #display= get_option("display")
-    unless display
+    #ma_display= get_option("ma_display")
+    unless ma_display
       end_action
     end
   end
@@ -186,9 +186,9 @@ class MindappController < ApplicationController
     @ui= File.read(f).html_safe
     @doc= Mindapp::Doc.create :name=> @runseq.name,
                               :content_type=>"mail", :data_text=> render_to_string(:inline=>@ui, :layout=>false),
-                              :xmain=>@xmain, :runseq=>@runseq, :user=>current_user,
-                              :ip=> get_ip, :service=>service, :display=>false,
-                              :secured => @xmain.service.secured
+                              :xmain=>@xmain, :runseq=>@runseq, :user=>current_ma_user,
+                              :ip=> get_ip, :service=>service, :ma_display=>false,
+                              :ma_secured => @xmain.service.ma_secured
     eval "@xvars[:#{@runseq.code}] = url_for(:controller=>'mindapp', :action=>'document', :id=>@doc.id)"
     mail_from = get_option('from')
     # sender= render_to_string(:inline=>mail_from) if mail_from
@@ -228,7 +228,7 @@ class MindappController < ApplicationController
     @xmain.status= 'R' # running
     @xmain.save
     @runseq.status='F'
-    @runseq.user= current_user
+    @runseq.user= current_ma_user
     @runseq.stop= Time.now
     @runseq.save
     next_runseq= @xmain.runseqs.where(:rstep=> @runseq.rstep+1).first unless next_runseq
@@ -260,8 +260,8 @@ class MindappController < ApplicationController
         :filename=> params.original_filename,
         :content_type => params.content_type || 'application/zip',
         :data_text=> '',
-        :display=>true,
-        :secured => @xmain.service.secured )
+        :ma_display=>true,
+        :ma_secured => @xmain.service.ma_secured )
     if defined?(IMAGE_LOCATION)
       filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
       File.open(filename,"wb") { |f| f.write(params.read) }
@@ -283,7 +283,7 @@ class MindappController < ApplicationController
         :filename=> params.original_filename,
         :content_type => params.content_type || 'application/zip',
         :data_text=> '',
-        :display=>true, :secured => @xmain.service.secured )
+        :ma_display=>true, :ma_secured => @xmain.service.ma_secured )
     if defined?(IMAGE_LOCATION)
       filename = "#{IMAGE_LOCATION}/f#{Param.gen(:asset_id)}"
       File.open(filename,"wb") { |f| f.write(params.read) }
@@ -388,12 +388,12 @@ class MindappController < ApplicationController
                           :name=>service.name,
                           :ip=> get_ip,
                           :status=>'I', # init
-                          :user=>current_user,
+                          :user=>current_ma_user,
                           :xvars=> {
                               :service_id=>service.id,
                               :p=>params.to_unsafe_h,
                               :id=>params[:id],
-                              :user_id=>current_user.try(:id),
+                              :user_id=>current_ma_user.try(:id),
                               :custom_controller=>custom_controller,
                               :host=>request.host,
                               :referer=>request.env['HTTP_REFERER']
@@ -412,16 +412,16 @@ class MindappController < ApplicationController
       action= freemind2action(activity.elements['icon'].attributes['BUILTIN']) if activity.elements['icon']
       return false unless action
       i= i + 1
-      output_display= false
+      output_ma_display= false
       if action=='output'
-        display= get_option_xml("display", activity)
-        if display && !affirm(display)
-          output_display= false
+        ma_display= get_option_xml("ma_display", activity)
+        if ma_display && !affirm(ma_display)
+          output_ma_display= false
         else
-          output_display= true
+          output_ma_display= true
         end
       end
-      j= j + 1 if (action=='form' || output_display)
+      j= j + 1 if (action=='form' || output_ma_display)
       @xvars['referer'] = activity.attributes['TEXT'] if action=='redirect'
       if action!= 'if'
         scode, name= text.split(':', 2)
@@ -459,7 +459,7 @@ class MindappController < ApplicationController
     end
     $xmain= @xmain; $xvars= @xvars
     $runseq_id= @runseq.id
-    $user_id= current_user.try(:id)
+    $user_id= current_ma_user.try(:id)
   end
   def init_vars_by_runseq(runseq_id)
     @runseq= Mindapp::Runseq.find runseq_id
@@ -476,7 +476,7 @@ class MindappController < ApplicationController
                            :filename=> (params[:file_name]||''),
                            :content_type => (params[:content_type] || 'application/zip'),
                            :data_text=> '',
-                           :display=>true
+                           :ma_display=>true
       path = (IMAGE_LOCATION || "tmp")
       File.open("#{path}/f#{doc.id}","wb") { |f|
         f.puts(params[:content])
@@ -487,8 +487,8 @@ class MindappController < ApplicationController
     end
   end
   def do_search
-    if current_user.secured?
-      @docs = GmaDoc.search_secured(@q.downcase, params[:page], PER_PAGE)
+    if current_ma_user.ma_secured?
+      @docs = GmaDoc.search_ma_secured(@q.downcase, params[:page], PER_PAGE)
     else
       @docs = GmaDoc.search(@q.downcase, params[:page], PER_PAGE)
     end

data/lib/generators/mindapp/templates/app/controllers/sessions_controller.rb

@@ -8,9 +8,10 @@ class SessionsController < ApplicationController
   # then use attribute 'data-ajax'=>'false'
   # see app/views/sessions/new.html.erb for sample
   def create
-    user = User.from_omniauth(request.env["omniauth.auth"])
+    auth = request.env["omniauth.auth"]
+    user = User.from_omniauth(auth)
     session[:user_id] = user.id
-    redirect_to '/mindapp/pending'
+    refresh_to root_path
   rescue
     redirect_to root_path, :alert=> "Authentication failed, please try again."
   end

data/lib/generators/mindapp/templates/app/controllers/users_controller.rb

@@ -2,12 +2,12 @@
 class UsersController < ApplicationController
   def index
     @today = Date.today
-    @xmains = current_user.xmains.in(status:['R','I']).asc(:created_at)
+    @xmains = current_ma_user.xmains.in(status:['R','I']).asc(:created_at)
   end
 
   # mindapp methods
   def update_user
-    # can't use session, current_user inside mindapp methods
+    # can't use session, current_ma_user inside mindapp methods
     $user.update_attribute :email, $xvars["enter_user"]["user"]["email"]
   end
   def change_password

data/lib/generators/mindapp/templates/app/models/mindapp/doc.rb

@@ -14,7 +14,7 @@ class Mindapp::Doc
   belongs_to :user
   belongs_to :service, :class_name => "Mindapp::Service"
   field :ip, :type => String
-  field :demontrate, :type => Boolean
+  field :ma_display, :type => Boolean
   field :ma_secured, :type => Boolean
 
   def self.search(q, page, per_page=PER_PAGE)

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

@@ -5,26 +5,32 @@ class User
   field :code, :type => String
   field :email, :type => String
   field :role, :type => String
+  field :user, :type => String
   belongs_to :identity, :polymorphic => true, :optional => true
   has_many :xmains, :class_name => "Mindapp::Xmain"
 
   def has_role(role1)
     return role.upcase.split(',').include?(role1.upcase)
   end
+  
   def self.from_omniauth(auth)
-    where(:provider=> auth["provider"], :uid=> auth["uid"]).first || create_with_omniauth(auth)
-  end
-  def self.create_with_omniauth(auth)
-    identity = Identity.find auth.uid
-    create! do |user|
-      user.provider = auth.provider
-      user.uid = auth.uid
-      user.code = identity.code
-      user.email = identity.email
-      user.role = "M"
+    where(auth.slice(:uid, :provider, :email)).first_or_create do |user|
+      case auth.provider 
+        when 'identity'
+          identity = Identity.find auth.uid
+          user.code = identity.code
+          user.email = identity.email
+        else
+          user.email = auth.info.email
+          user.uid = auth.uid
+          user.provider = auth.provider
+          user.code = auth.info.name
+          user.role = "M"
+        end
+      end
     end
-  end
-  def secured?
+         
+  def ma_secured?
     role.upcase.split(',').include?(ma_secured_ROLE)
   end
 end

data/lib/generators/mindapp/templates/app/views/articles/edit_article/select_article.html.erb

@@ -1,8 +1,8 @@
 <%
-  if current_user.role.upcase.split(',').include?("A")
+  if current_ma_user.role.upcase.split(',').include?("A")
     article = Article.all.desc(:created_at)
   else
-    article = Article.where(user: current_user).desc(:created_at)
+    article = Article.where(user: current_ma_user).desc(:created_at)
   end
 %>
 <div class="field" data-role="fieldcontain">

data/lib/generators/mindapp/templates/app/views/articles/index.haml

@@ -17,7 +17,7 @@
       %td= article.updated_at
       %td(align='center')
         - next unless login?
-        - unless current_user.role.upcase.split(',').include?("A")
+        - unless current_ma_user.role.upcase.split(',').include?("A")
           - next unless article.user
-          - next unless current_user == article.user
+          - next unless current_ma_user == article.user
         = link_to image_tag('delete.png', style:'border:none; float:none;'), "#", :onclick=>"if (confirm('Please Confirm')) {location.hash='/articles/destroy/#{article.id}';}"

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

@@ -1,12 +1,9 @@
-- head = login? ? current_user.code : DEFAULT_HEADER
+- head = login? ? current_ma_user.code : DEFAULT_HEADER
 %div{"data-context" => "a#default", "data-hash" => "crumbs", "data-id" => "menu", "data-role" => "panel"}
   #main{"data-role" => "page"}
     %div{"data-role" => "header", "data-theme" => "b", "data-backbtn"=>"false"}
       %h1= head
     %div{"data-role" => "content", "data-id" => "menu_mm"}
-
-
-
       %ul{"data-role" => "listview", "data-theme" => "g"}
         %li
           %a{"data-panel" => "main", "data-id" => "home", :href => "/mindapp"} Home
@@ -23,3 +20,5 @@
             %a{:href=>new_identity_path, "data-panel" => "main"} Sign Up
         %li
           = link_to "Refresh", "#", :onclick=>"window.location.replace('/')"
+        - if !login?    
+          = link_to image_tag( 'facebook-sign-in-button.png'), 'auth/facebook', rel: "external"  

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

@@ -2,8 +2,8 @@
 - Mindapp::Module.all.asc(:seq).each do |m|
   - unless m.role.blank?
     - next unless login?
-    - next unless current_user.role
-    - next unless current_user.role.upcase.split(',').include?(m.role.upcase)
+    - next unless current_ma_user.role
+    - next unless current_ma_user.role.upcase.split(',').include?(m.role.upcase)
   %li
     = m.name
     %ul
@@ -14,8 +14,8 @@
           - next if (!eval(s.rule))
         - unless s.role.blank?
           - next unless login?
-          - next unless current_user.role
-          - next unless current_user.role.upcase.split(',').include?(s.role.upcase)
+          - next unless current_ma_user.role
+          - next unless current_ma_user.role.upcase.split(',').include?(s.role.upcase)
         - if s.code.downcase=="link"
           - name, url = s.name.split(":", 2)
           - url.strip!

data/lib/generators/mindapp/templates/app/views/mindapp/_pending_page.haml

@@ -13,7 +13,7 @@
     - @runseq= Mindapp::Runseq.find(xmain.current_runseq)
     - next unless @runseq
     - next unless %w(form output pdf).include?(@runseq.action)
-    - next if @xmain.runseqs.first==@xmain.current_runseq && @xmain.user!=current_user
+    - next if @xmain.runseqs.first==@xmain.current_runseq && @xmain.user!=current_ma_user
     - next unless authorize?
     %tr
       %td= link_to xmain.xid, :controller=>"mindapp", :action=>"run", :id=>xmain.id

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

@@ -1,18 +1,19 @@
 %div(style="text-align:center")
-  = image_tag "logo.png"
+= image_tag "logo_mindapp.png"
+
   
 %h2 You are working on 
 %ul
-  %li gem 'mindapp2', '~> 0.1.1.3'
+  %li gem 'mindapp2', '~> 0.1.1.4'
 
 %h2 Requirements
 %ul
-  %li Rails 5.1.1
+  %li Rails 5.1.2
   %li Rubygems 2.4.1
 
 %h2 Installation
 %ul
-  %li gem 'mindapp2', '~> 0.1.1.3'
+  %li gem 'mindapp2', '~> 0.1.1.4'
   %li bundle
   %li rails generate mindapp:install
   %li bundle

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

@@ -1,7 +1,7 @@
 .head
   = step(@runseq.form_step, @xvars['total_form_steps'])
 %p
-- user = current_user || User.new
+- user = current_ma_user || User.new
 - form_class = 'formtastic'
 - next_step = 'end_form'
 - if @help

data/lib/generators/mindapp/templates/app/views/users/index.haml

@@ -1,12 +1,12 @@
 .field(data-role="fieldcontain")
   %label.ui-input-text Name
-  = b current_user.code
+  = b current_ma_user.code
 .field(data-role="fieldcontain")
   %label.ui-input-text Email
-  = b current_user.email
+  = b current_ma_user.email
 .field(data-role="fieldcontain")
   %label.ui-input-text Role
-  = b current_user.role
+  = b current_ma_user.role
 
 - if @xmains
   %h2 Pending Tasks

data/lib/generators/mindapp/templates/app/views/users/user/enter_user.html.erb

@@ -1,5 +1,5 @@
 <%
-  user = current_user
+  user = current_ma_user
 %>
 <h3><%= user.code %></h3>
 <%= fields_for user do |f| %>

data/lib/mindapp2.rb

@@ -1,4 +1,4 @@
-require "mindapp2/version"
+require 'mindapp2/version'
 require 'mindapp2/railtie'
 
 module Mindapp

data/lib/mindapp2/helpers.rb

@@ -74,12 +74,12 @@ module Mindapp
       %w(call ws redirect invoke email).include? s
     end
     def set_global
-      $xmain= @xmain ; $runseq = @runseq ; $user = current_user ; $xvars= @xmain.xvars; $ip = request.env["REMOTE_ADDR"]
+      $xmain= @xmain ; $runseq = @runseq ; $user = current_ma_user ; $xvars= @xmain.xvars; $ip = request.env["REMOTE_ADDR"]
     end
     def authorize? # use in pending tasks
       @runseq= @xmain.runseqs.find @xmain.current_runseq
       return false unless @runseq
-      @user = current_user
+      @user = current_ma_user
       set_global
       return false unless eval(@runseq.rule) if @runseq.rule
       return true if true_action?(@runseq.action)
@@ -94,8 +94,8 @@ module Mindapp
     def authorize_init? # use when initialize new transaction
       # check module role
       mrole = @service.module.role
-      return false if mrole && !current_user
-      return false if mrole && !current_user.has_role(mrole)
+      return false if mrole && !current_ma_user
+      return false if mrole && !current_ma_user.has_role(mrole)
 
       # check step 1 role
       xml= @service.xml
@@ -103,11 +103,11 @@ module Mindapp
       role= get_option_xml("role", step1) || ""
   #    rule= get_option_xml("rule", step1) || true
       return true if role==""
-      unless current_user
+      unless current_ma_user
         return role.blank?
       else
-        return false unless current_user.role
-        return current_user.has_role(role)
+        return false unless current_ma_user.role
+        return current_ma_user.has_role(role)
       end
     end
     def ma_log(message)
@@ -179,7 +179,7 @@ module Mindapp
     end
 
     # methods that I don't know where they came from
-    def current_user
+    def current_ma_user
       if session[:user_id]
         return @user ||= User.find(session[:user_id]['$oid'])
       else
@@ -241,7 +241,7 @@ module Mindapp
             rule= get_option_xml("rule", s) || ""
             ma_service= Mindapp::Service.find_or_create_by :module_code=> ma_module.code, :code=> scode, :name=> sname
             ma_service.update_attributes :xml=>s.to_s, :name=>sname,
-              :list=>listed(s), :ma_secured=>secured?(s),
+              :list=>listed(s), :ma_secured=>ma_secured?(s),
               :module_id=>ma_module.id, :seq => seq,
               :confirm=> get_option_xml("confirm", xml),
               :role => role, :rule => rule, :uid=> ma_service.id.to_s
@@ -254,7 +254,7 @@ module Mindapp
             rule= get_option_xml("rule", step1) || ""
             ma_service= Mindapp::Service.find_or_create_by :module_code=> ma_module.code, :code=> scode
             ma_service.update_attributes :xml=>s.to_s, :name=>sname,
-              :list=>listed(s), :ma_secured=>secured?(s),
+              :list=>listed(s), :ma_secured=>ma_secured?(s),
               :module_id=>ma_module.id, :seq => seq,
               :confirm=> get_option_xml("confirm", xml),
               :role => role, :rule => rule, :uid=> ma_service.id.to_s
@@ -309,7 +309,7 @@ module Mindapp
     end
     def own_xmain?
       if $xmain
-        return current_user.id==$xvars['user_id']
+        return current_ma_user.id==$xvars['user_id']
       else
         # if eval on first step would return true so user can start service
         return true
@@ -336,7 +336,7 @@ module Mindapp
       end
       return !icons.include?("closed")
     end
-    def secured?(node)
+    def ma_secured?(node)
       icons=[]
       node.each_element("icon") do |nn|
         icons << nn.attributes["BUILTIN"]

data/lib/mindapp2/version.rb

@@ -1,3 +1,3 @@
 module Mindapp
-  VERSION = "0.1.1.3"
+  VERSION = "0.1.1.4"
 end

data/mindapp2.gemspec

@@ -6,7 +6,7 @@ require "mindapp2/version"
 Gem::Specification.new do |spec|
   spec.name          = "mindapp2"
   spec.version       = Mindapp::VERSION
-  spec.authors       = ["Korakot Leemakdej", "Prateep Kul"]
+  spec.authors       = [ "Prateep Kul", "Korakot Leemakdej"]
   spec.email         = ["1.0@kul.asia"]
 
   spec.summary       = %q{Rails workflow from mind map}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mindapp2
 version: !ruby/object:Gem::Version
-  version: 0.1.1.3
+  version: 0.1.1.4
 platform: ruby
 authors:
-- Korakot Leemakdej
 - Prateep Kul
+- Korakot Leemakdej
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -97,6 +98,7 @@ files:
 - lib/generators/mindapp/templates/app/assets/images/cross.png
 - lib/generators/mindapp/templates/app/assets/images/delete.png
 - lib/generators/mindapp/templates/app/assets/images/external-link.png
+- lib/generators/mindapp/templates/app/assets/images/facebook-sign-in-button.png
 - lib/generators/mindapp/templates/app/assets/images/facebooksmall.png
 - lib/generators/mindapp/templates/app/assets/images/favicon.ico
 - lib/generators/mindapp/templates/app/assets/images/freemind(mm).png
@@ -347,4 +349,3 @@ signing_key:
 specification_version: 4
 summary: Rails workflow from mind map
 test_files: []
-has_rdoc: