jinda 0.7.3 → 0.7.5.5

data/lib/generators/jinda/templates/spec/rails_helper.rb

@@ -6,8 +6,6 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } # Add this a
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'
 require 'spec_helper'
-require 'support/factory_bot'
-Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
 RSpec.configure  do |config|
   

data/lib/generators/jinda/templates/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require 'valid_attribute'
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+	config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   # config.include SpecTestHelper, :type => :controller
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -42,12 +45,12 @@ RSpec.configure do |config|
         uncommitted transaction data setup over the spec's database connection.
       MSG
     end
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.clean_with(:deletion)
   end
 
   config.before(:each, :js => true) do
     #DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.strategy = :deletion
   end
 
   config.before(:each, type: :feature) do
@@ -60,7 +63,7 @@ RSpec.configure do |config|
       # under test that does *not* share a database connection with the
       # specs, so use truncation strategy.
       # DatabaseCleaner.strategy = :truncation
-      DatabaseCleaner[:mongoid].strategy = :truncation
+      DatabaseCleaner[:mongoid].strategy = :deletion
 
     end
   end

data/lib/generators/jinda/templates/spec/support/databasecleaner.rb

@@ -0,0 +1,13 @@
+RSpec.configure do |config|
+    config.before(:suite) do
+    DatabaseCleaner[:mongoid].strategy = :deletion
+  end
+
+  config.before(:each) do
+    DatabaseCleaner[:mongoid].start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner[:mongoid].clean
+  end
+end

data/lib/jinda/themes.rb

@@ -6,7 +6,7 @@
 # ##########################################################################
 def get_login_user_info
   if current_ma_user.present?
-    $user_image = current_ma_user.image
+    $user_image = ((current_ma_user.image != "") ? current_ma_user.image :  asset_url("user.png", :width => "48"))
     $user_name = current_ma_user.code
     $user_email = current_ma_user.email
     $user_id = current_ma_user.try(:id)
@@ -18,6 +18,13 @@ def get_login_user_info
   end
   return $user_image, $user_name, $user_email,$user_id
 end
+# search image from User in Article/View/Show
+def get_user_image(user_id)
+  user_image = User.find(user_id).image
+  user_image = ((user_image != "") ? user_image :  asset_url("user.png", :width => "48"))
+  return user_image
+end
+
 
 def name2code(s)
   # rather not ignore # symbol cause it could be comment
@@ -91,8 +98,8 @@ def markdown(text)
     flash[:notice] = "This ruby version not support #{error}"
     return
   end
-    red = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
-    red.render(erbified).html_safe
+  red = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
+  red.render(erbified).html_safe
 end
 def align_text(s, pixel=3)
   "<span style='position:relative; top:-#{pixel}px;'>#{s}</span>".html_safe

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-  VERSION = "0.7.3"
+  VERSION = "0.7.5.5"
 end

data/lib/tasks/jinda.rake

@@ -16,11 +16,20 @@ namespace :jinda do
 
   desc "generate admin user"
   task :seed=> :environment 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,
-				:email => identity.email, :role => "M,A,D", :auth_token => "71JxMH5fxi23zinBoq1uKA", :image => identity.image
+    usamples  = [
+      { code: 'admin', password: 'secret', email: 'admin@test.com', role: 'M,A,D', image: 'https://user-images.githubusercontent.com/3953832/110025024-7911b480-7cf4-11eb-83ee-8dbe6e8fc96f.png'},
+      { code: 'tester', password: 'password', email: 'tester@test.com', role: 'M', image: 'https://www.manateeschools.net/cms/lib/FL02202357/Centricity/domain/2439/staff_photos/fflinststone.jpg'}
+    ]
+    usamples.each do |h|
+      code  = h[:code].to_s
+      email = h[:email].to_s
+      password = h[:password].to_s
+      role = h[:role].to_s
+      image = h[:image]
+      unless Identity.where(code: code).exists?
+        identity= Identity.create :code => code, :email => email, :password => password , :password_confirmation => password
+        User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,:email => identity.email, :role => role, :image => image
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5.5
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.1.0
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: 'Generate Rails workflow from mind map: Freemind'
 email:
 - 1.0@kul.asia
@@ -161,6 +175,7 @@ files:
 - app/assets/stylesheets/images/button_black.png
 - app/assets/stylesheets/images/button_blue.png
 - app/assets/stylesheets/images/button_red.png
+- app/assets/stylesheets/images/gears.png
 - app/assets/stylesheets/images/icons-18-black.png
 - app/assets/stylesheets/images/icons-18-white.png
 - app/assets/stylesheets/images/icons-36-black.png
@@ -212,6 +227,12 @@ files:
 - lib/generators/jinda/USAGE
 - lib/generators/jinda/config_generator.rb
 - lib/generators/jinda/install_generator.rb
+- lib/generators/jinda/installer/gemfiles-org/custom_gems.rb
+- lib/generators/jinda/installer/gemfiles-org/dev_gems.rb
+- lib/generators/jinda/installer/gemfiles-org/runtime_gems.rb
+- lib/generators/jinda/installer/gemfiles-org/todo.md
+- lib/generators/jinda/installer/gems_install.rb
+- lib/generators/jinda/installer/test.rb
 - lib/generators/jinda/minitest_generator.rb
 - lib/generators/jinda/rspec_generator.rb
 - lib/generators/jinda/templates/Dockerfile
@@ -341,6 +362,7 @@ 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/initializers/fix_mongoid_generator.rb
 - lib/generators/jinda/templates/config/mongoid.yml-docker
 - lib/generators/jinda/templates/config/mongoid.yml-localhost
 - lib/generators/jinda/templates/db/seeds.rb
@@ -367,6 +389,7 @@ files:
 - lib/generators/jinda/templates/spec/rails_helper.rb
 - lib/generators/jinda/templates/spec/spec_helper.rb
 - lib/generators/jinda/templates/spec/support/authentication_helper.rb
+- lib/generators/jinda/templates/spec/support/databasecleaner.rb
 - lib/generators/jinda/templates/spec/support/factory_bot.rb
 - lib/generators/jinda/templates/spec/support/omniauth_macros.rb
 - lib/generators/jinda/templates/spec/support/request_spec_helper.rb
@@ -466,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'Rails workflow from mind map: Freemind'