jinda 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b84fcc19349e4dc4ecaf04277c5de4b5e83a59c102c8f89de93cde6f563be5d
-  data.tar.gz: aa08af1a7565d4b873ab2989365c2186298341d412da536919cecfad295187df
+  metadata.gz: a1d1eebb536ba8765d34f26028668acb9f824553c869b50a88d1f073763c4ed6
+  data.tar.gz: 216f6fd05bd095dd168d13019c9931cbe9d541a2893b13550820c282709037ae
 SHA512:
-  metadata.gz: a5a7180d9bde1efc58adfa2d069f0640566c75b7d0d1162885ab57896361af6e1fc35bbaf19eb9ab52406ed9bb0bfb8fb053d718b5dfaba3f5d2a6f4956a884e
-  data.tar.gz: c9c79c5b4a4e82aaa406b3ad4c42258217fed3dba81a05772063df643b30aaa4e3f4811c6320dd9d143d6b747d5f2d2641e88c13c09668e0071aef49f8c3f685
+  metadata.gz: eea8d30604497f1e4f85ff351a4dc4a210700c21a450d9dc59dff0fd327829a62e4b78f78648601cf164364f20d4ba6619a6cc3a5e2d95c637c0c7c54a900be7
+  data.tar.gz: 2a4d7a166ed604490eb8a9a1fc0ae0c13027ee3dca3fc3dee350f92a72427f963f0dfc2a33c0357ec734f16ddaee9bbdd21ccc1a5e425c115bf99f75afe7d5db

data/README.md

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

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

@@ -11,7 +11,6 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery.turbolinks
 //= require jquery_ujs
 //= require jqm/jquery.mobile.splitview
 //= require jqm/jquery.mobile-1.2.1

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

@@ -1,6 +1,6 @@
 class ArticlesController < ApplicationController
   before_action :load_article, only: [:show, :destroy]
-  before_action :load_comments, only: :show
+  before_action :load_comments, only: [:show]
 
 	def index
     @articles = Article.desc(:created_at).page(params[:page]).per(10)
@@ -15,11 +15,9 @@ class ArticlesController < ApplicationController
   def edit
     @article = Article.find(params[:id])
     @page_title       = 'Member Login'
-
   end
 
   def create
-
     @article = Article.new(
                       title: $xvars["form_article"]["title"],
                       text: $xvars["form_article"]["text"],
@@ -27,15 +25,19 @@ class ArticlesController < ApplicationController
                       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
 
+		# comment out to use jinda_controller end_action
+    # redirect_to @article
+    #   if @article.save!
+		#		 # format.html { redirect_to @article, notice: 'Sample was successfully created.'  }
+    #       format.html { redirect_to @article  }
+    #       format.json { render :show, status: :created, location: @article }
+		#		 end
+    #   else
+    #     format.html { render :new }
+    #     format.json { render json: @article.errors, status: :unprocessable_entity }
+    #   end
+	
   end
 
   def my
@@ -47,19 +49,23 @@ class ArticlesController < ApplicationController
     # $xvars["select_article"] and $xvars["edit_article"]
     # These are variables.
     # 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_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
-
-
+    @article.update(title: $xvars["edit_article"]["title"],
+                    text: $xvars["edit_article"]["text"],
+                    keywords: $xvars["edit_article"]["keywords"],
+                    body: $xvars["edit_article"]["body"]
+										)
+    # redirect_to @article
+		# comment out to use jinda_controller end_action
   end
 
   def destroy
+		# duplicated from jinda_controller
+		# Expected to use in jinda)controller
+	#
+    current_ma_user = Jinda::User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
     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
@@ -67,13 +73,14 @@ class ArticlesController < ApplicationController
     if current_ma_user.role.upcase.split(',').include?("A") || current_ma_user == @article.user
       @article.destroy
     end
-      redirect_to :action=>'index'
+      #redirect_to :action=>'index'
+      redirect_to :action=>'my'
   end
 
   private
 
   def load_article
-    @article = Article.find(params[:id])
+		@article = Article.find(params.require(:article_id))
   end
 
   def load_comments

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

@@ -247,19 +247,25 @@ class JindaController < ApplicationController
   def end_form
     init_vars(params[:xmain_id])
     eval "@xvars[@runseq.code] = {} unless @xvars[@runseq.code]"
+		# Search for uploaded file name if exist
     params.each { |k,v|
       if params[k].respond_to? :original_filename
         get_image(k, params[k])
-      elsif params[k]['filename'].respond_to? :original_filename
-        eval "@xvars[@runseq.code][k] = v"
+			# check if params of array in form eg: edit_article	
+      elsif params[k].is_a?(ActionController::Parameters)
         params[k].each { |k1,v1|
-          next unless v1.respond_to?(:original_filename)
+					# eval "@xvars[@runseq.code][k1] = params.require(k1).permit(k1)"
+					eval "@xvars[@runseq.code][k1] = v1" 
+					next unless v1.respond_to?(:original_filename)
           get_image1(k, k1, params[k][k1])
         }
-
       else
 				# 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
+				# Solution:
+				# https://stackoverflow.com/questions/34949505/rails-5-unable-to-retrieve-hash-values-from-parameter
+				# v = v.to_unsafe_h unless v.class == String
+				# v = params.require[k] unless v.class == String
+        v = v.to_s unless v.class == String
         eval "@xvars[@runseq.code][k] = v"
       end
     }

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

@@ -9,7 +9,7 @@ class SessionsController < ApplicationController
   # see app/views/sessions/new.html.erb for sample
   def create
     auth = request.env["omniauth.auth"]
-    user = User.from_omniauth(auth)
+    user = Jinda::User.from_omniauth(auth)
     session[:user_id] = user.id
     if params.permit[:remember_me]
       cookies.permanent[:auth_token] = user.auth_token

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

@@ -153,7 +153,7 @@
 <node CREATED="1493418879485" ID="ID_1995497233" MODIFIED="1493718770637" 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="1493487186856" TEXT="belongs_to :user">
+<node CREATED="1493487131376" ID="ID_1334057464" MODIFIED="1538239863609" TEXT="belongs_to :user, class_name =&gt; &quot;Jinda::User&quot;">
 <icon BUILTIN="edit"/>
 </node>
 <node CREATED="1493705838166" ID="ID_408271104" MODIFIED="1493705877062" TEXT="has_many :comments">

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

@@ -5,7 +5,7 @@ class Article
   include Mongoid::Timestamps
   field :title, :type => String
   field :text, :type => String
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
   has_many :comments
   validates :title, :text, :user_id, presence: true
   field :body, :type => String

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

@@ -10,7 +10,7 @@ class Jinda::Xmain
   field :name, :type => String
   field :ip, :type => String
   field :status, :type => String
-  belongs_to :user
+  belongs_to :user, :class_name => "Jinda::User"
   field :xvars, :type => Hash
   field :current_runseq, :type => String
   # Jinda end

data/lib/jinda/helpers.rb

@@ -233,7 +233,8 @@ module Jinda
       #   return nil
       # end
       #@user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
-      @user ||= User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
+      @user ||= Jinda::User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
+			return @user
     end
 
     def ui_action?(s)

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 end

data/lib/tasks/jinda.rake

@@ -19,7 +19,7 @@ namespace :jinda do
     unless Identity.where(code:"admin").exists?
       identity= Identity.create :code => "admin", :email => "admin@test.com", :password => "secret",
 				:password_confirmation => "secret", :image => "https://user-images.githubusercontent.com/3953832/42472827-50ed8cbc-8388-11e8-8982-fa523c25288f.png"
-      User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
+      Jinda::User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
 				:email => identity.email, :role => "M,A,D", :auth_token => "71JxMH5fxi23zinBoq1uKA", :image => identity.image
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -341,7 +341,6 @@ files:
 - lib/generators/jinda/templates/app/models/jinda/xmain.rb
 - lib/generators/jinda/templates/app/models/param.rb
 - lib/generators/jinda/templates/app/models/person.rb
-- lib/generators/jinda/templates/app/models/user.rb
 - lib/generators/jinda/templates/app/views/adminbsbs/content.haml
 - lib/generators/jinda/templates/app/views/admins/edit_role/edit_role.html.erb
 - lib/generators/jinda/templates/app/views/admins/edit_role/select_user.html.erb

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

@@ -1,63 +0,0 @@
-class User
-  include Mongoid::Document
-  before_create {generate_token(:auth_token)}
-  field :provider, :type => String
-  field :uid, :type => String
-  field :code, :type => String
-  field :email, :type => String
-  field :role, :type => String
-  field :user, :type => String
-  field :auth_token, :type => String
-  field :password_reset_token, :type => String
-  field :password_reset_sent_at,:type => DateTime
-	field :image, :type => String
-
-
-  belongs_to :identity, :polymorphic => true, :optional => true
-  has_many :xmains, :class_name => "Jinda::Xmain"
-
-  ## Add to create forgot password
-  def generate_token(column)
-    begin
-      self[column] = SecureRandom.urlsafe_base64
-    end
-    #end while User.exists?(column => self[column])
-  end
-
-  def has_role(role1)
-    return role.upcase.split(',').include?(role1.upcase)
-  end
-  
-  def self.from_omniauth(auth)
-		# 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
-          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"
-					user.image = auth.info.image
-        end
-      end
-    end
-         
-  def ma_secured?
-    role.upcase.split(',').include?(ma_secured_ROLE)
-  end
-  
-  def send_password_reset
-    generate_token(:password_reset_token)
-    self.password_reset_sent_at = Time.zone.now
-    save!
-    UserMailer.password_reset(self).deliver
-end
-
-
-end