trusty-cms 4.1.2 → 4.1.3

data/lib/trusty_cms/task_support.rb

@@ -8,15 +8,17 @@ module TrustyCms
           ActiveRecord::Base.establish_connection(env_connection)
         end
       end
+
       def config_export(path = "#{Rails.root}/config/trusty_config.yml")
-        self.establish_connection
+        establish_connection
         FileUtils.mkdir_p(File.dirname(path))
-        if File.open(File.expand_path(path), 'w') { |f| YAML.dump(TrustyCms::Config.to_hash.to_yaml,f) }
+        if File.open(File.expand_path(path), 'w') { |f| YAML.dump(TrustyCms::Config.to_hash.to_yaml, f) }
           puts "TrustyCms::Config saved to #{path}"
         end
       end
+
       def config_import(path = "#{Rails.root}/config/trusty_config.yml", clear = nil)
-        self.establish_connection
+        establish_connection
         if File.exist?(path)
           begin
             TrustyCms::Config.transaction do
@@ -40,12 +42,13 @@ module TrustyCms
       # Write the combined content of files in dir into cache_file in the same dir.
       #
       def cache_files(dir, files, cache_file)
-        cache_content = files.collect { |f|
-          File.read(File.join(dir, f)) }.join("\n\n")
+        cache_content = files.collect do |f|
+          File.read(File.join(dir, f))
+        end .join("\n\n")
 
         cache_path = File.join(dir, cache_file)
         File.delete(cache_path) if File.exists?(cache_path)
-        File.open(cache_path, "w+") { |f| f.write(cache_content) }
+        File.open(cache_path, 'w+') { |f| f.write(cache_content) }
       end
 
       # Reads through the layout file and returns an array of JS filenames

data/public/dispatch.fcgi

@@ -18,7 +18,7 @@
 #   # Custom log path, normal GC behavior.
 #   RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log'
 #
-require File.dirname(__FILE__) + "/../config/environment"
+require File.dirname(__FILE__) + '/../config/environment'
 require 'fcgi_handler'
 
 RailsFCGIHandler.process!

data/public/dispatch.rb

@@ -1,10 +1,10 @@
 #!/home/rails/bin/ruby
 
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(Rails.root)
+require File.dirname(__FILE__) + '/../config/environment' unless defined?(Rails.root)
 
 # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
 # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
-require "dispatcher"
+require 'dispatcher'
 
 ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
 Dispatcher.dispatch

data/script/extension

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.expand_path('../../config/boot',  __FILE__)
+require File.expand_path('../config/boot', __dir__)
 require 'trusty_cms/extension/script'
 
 TrustyCms::Extension::Script.execute ARGV

data/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
+require File.expand_path('../config/boot', __dir__)
 require 'rails/commands'

data/trusty_cms.gemspec

@@ -1,26 +1,27 @@
 # -*- encoding: utf-8 -*-
+
 require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
 Gem::Specification.new do |s|
-  s.name = %q{trusty-cms}
+  s.name = 'trusty-cms'
   s.version = TrustyCms::VERSION
   s.platform = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["TrustyCms CMS dev team"]
-  s.description = %q{TrustyCms is a simple and powerful publishing system designed for small teams.
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
+  s.authors = ['TrustyCms CMS dev team']
+  s.description = 'TrustyCms is a simple and powerful publishing system designed for small teams.
 It is built with Rails and is similar to Textpattern or MovableType, but is
-a general purpose content managment system--not merely a blogging engine.}
-  s.email = %q{saalon@gmail.com}
-  s.executables = ["trusty_cms"]
-  s.extra_rdoc_files = ["README.md", "INSTALL.md", "LICENSE.md"]
-  s.files = Dir['**/*','.gitignore', 'public/.htaccess', 'log/.keep', 'vendor/extensions/.keep']
-  s.homepage = %q{https://github.com/pgharts/trusty-cms}
-  s.rdoc_options = ["--title", "TrustyCms -- Content Management You Can Trust", "--line-numbers", "--main", "README", "--exclude", "app", "--exclude", "bin", "--exclude", "config", "--exclude", "db", "--exclude", "features", "--exclude", "lib", "--exclude", "log", "--exclude", "pkg", "--exclude", "public", "--exclude", "script", "--exclude", "spec", "--exclude", "test", "--exclude", "tmp", "--exclude", "vendor"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A no-fluff content management system designed for small teams.}
-  s.license = %q{MIT}
-  s.test_files = Dir["spec/**/*"]
+a general purpose content managment system--not merely a blogging engine.'
+  s.email = 'saalon@gmail.com'
+  s.executables = ['trusty_cms']
+  s.extra_rdoc_files = ['README.md', 'INSTALL.md', 'LICENSE.md']
+  s.files = Dir['**/*', '.gitignore', 'public/.htaccess', 'log/.keep', 'vendor/extensions/.keep']
+  s.homepage = 'https://github.com/pgharts/trusty-cms'
+  s.rdoc_options = ['--title', 'TrustyCms -- Content Management You Can Trust', '--line-numbers', '--main', 'README', '--exclude', 'app', '--exclude', 'bin', '--exclude', 'config', '--exclude', 'db', '--exclude', 'features', '--exclude', 'lib', '--exclude', 'log', '--exclude', 'pkg', '--exclude', 'public', '--exclude', 'script', '--exclude', 'spec', '--exclude', 'test', '--exclude', 'tmp', '--exclude', 'vendor']
+  s.require_paths = ['lib']
+  s.rubygems_version = '1.3.7'
+  s.summary = 'A no-fluff content management system designed for small teams.'
+  s.license = 'MIT'
+  s.test_files = Dir['spec/**/*']
 
   s.add_dependency 'acts_as_list',    '>= 0.9.5', '< 1.1.0'
   s.add_dependency 'acts_as_tree',    '>= 2.6.1', '< 2.9.0'
@@ -32,22 +33,21 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'haml-rails',      '~> 1.0.0'
   s.add_dependency 'highline',        '>= 1.7.8', '< 2.1.0'
   s.add_dependency 'kraken-io'
-  s.add_dependency 'mysql2'
   s.add_dependency 'mini_racer'
+  s.add_dependency 'mysql2'
   s.add_dependency 'paperclip',       '> 5.2'
   s.add_dependency 'rack',            '~> 2.0.1'
   s.add_dependency 'rack-cache',      '~> 1.7'
-  s.add_dependency 'rails'           
-  s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
   s.add_dependency 'radius',          '~> 0.7'
-  s.add_dependency 'RedCloth',        '4.3.2'
+  s.add_dependency 'rails'
   s.add_dependency 'rake',            '< 13.0'
+  s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
+  s.add_dependency 'RedCloth',        '4.3.2'
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sassc-rails'
   s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
   s.add_dependency 'tzinfo',          '>= 1.2.3', '< 2.1.0'
   s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'
-  s.add_dependency 'uuidtools',    '~> 2.1.5'
-  s.add_dependency 'will_paginate',   '~> 3.0'
-
+  s.add_dependency 'uuidtools', '~> 2.1.5'
+  s.add_dependency 'will_paginate', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -181,7 +181,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,7 +195,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_racer
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -250,6 +250,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: radius
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -265,39 +279,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: radius
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -312,20 +326,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.3.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: roadie-rails
   requirement: !ruby/object:Gem::Requirement