trusty-cms 4.1.7 → 4.2.2

data/LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2006-2009, John W. Long and Sean D. Cribbs.
+Copyright (c) 2006-2021, John W. Long and Sean D. Cribbs.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/app/controllers/admin/pages_controller.rb

@@ -75,7 +75,7 @@ class Admin::PagesController < Admin::ResourceController
       if request.referer =~ %r{/admin/pages/(\d+)/edit}
         page = Page.find($1).becomes(page_class)
         layout_id = page.layout_id
-        page.update_attributes(params[:page])
+        page.update(params[:page])
         page.published_at ||= Time.now
       else
         page = page_class.new(params[:page])

data/app/controllers/admin/preferences_controller.rb

@@ -11,7 +11,7 @@ class Admin::PreferencesController < ApplicationController
   end
 
   def update
-    if @user.update_attributes(preferences_params)
+    if @user.update(preferences_params)
       redirect_to admin_configuration_path
     else
       flash[:error] = t('preferences_controller.error_updating')

data/app/controllers/admin/resource_controller.rb

@@ -59,7 +59,7 @@ class Admin::ResourceController < ApplicationController
   %i[create update].each do |action|
     class_eval %{
       def #{action}                                       # def create
-        model.update_attributes!(permitted_params[model_symbol])    #   model.update_attributes!(params[model_symbol])
+        model.update!(permitted_params[model_symbol])    #   model.update!(params[model_symbol])
         response_for :#{action}                           #   response_for :create
       end                                                 # end
     }, __FILE__, __LINE__

data/app/controllers/admin/users_controller.rb

@@ -29,7 +29,7 @@ class Admin::UsersController < Admin::ResourceController
       announce_cannot_remove_self_from_admin_role
     end
     model.skip_password_validation = true unless user_params[:password_confirmation].present?
-    if model.update_attributes(user_params)
+    if model.update(user_params)
       response_for :update
     else
       flash[:error] = 'There was an error saving the user. Please try again.'

data/app/helpers/admin/node_helper.rb

@@ -10,7 +10,7 @@ module Admin::NodeHelper
 
     @rendered_html += (render partial: 'admin/pages/node',
                               locals: { level: index, index: index, parent_index: parent_index,
-                                        page: page, simple: simple, branch: (page.children.count > 0) })
+                                        page: page, simple: simple, branch: (page.children.count.positive?) })
     index
   end
 

data/app/models/asset.rb

@@ -74,12 +74,12 @@ class Asset < ActiveRecord::Base
 
   def thumbnail(style_name = 'original')
     return asset.url if style_name.to_sym == :original
-    return asset.url(style_name.to_sym) if has_style?(style_name)
+    return asset.url(style_name.to_sym) if style?(style_name)
 
     asset_type.icon(style_name)
   end
 
-  def has_style?(style_name = 'original')
+  def style?(style_name = 'original')
     style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
   end
 
@@ -110,7 +110,7 @@ class Asset < ActiveRecord::Base
   end
 
   def geometry(style_name = 'original')
-    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless has_style?(style_name)
+    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless style?(style_name)
 
     @geometry ||= {}
     begin

data/app/models/page.rb

@@ -76,16 +76,16 @@ class Page < ActiveRecord::Base
     end
   end
 
-  def has_part?(name)
+  def part?(name)
     !part(name).nil?
   end
 
   def has_or_inherits_part?(name)
-    has_part?(name) || inherits_part?(name)
+    part?(name) || inherits_part?(name)
   end
 
   def inherits_part?(name)
-    !has_part?(name) && ancestors.any? { |page| page.has_part?(name) }
+    !part?(name) && ancestors.any? { |page| page.part?(name) }
   end
 
   def field(name)

data/app/models/standard_tags.rb

@@ -312,7 +312,7 @@ module StandardTags
   }
   tag 'if_children' do |tag|
     children = tag.locals.page.children.where(children_find_options(tag)[:conditions]).count
-    tag.expand if children > 0
+    tag.expand if children.positive?
   end
 
   desc %{
@@ -327,7 +327,7 @@ module StandardTags
   }
   tag 'unless_children' do |tag|
     children = tag.locals.page.children.where(children_find_options(tag)[:conditions]).count
-    tag.expand unless children > 0
+    tag.expand unless children.positive?
   end
 
   desc %{
@@ -961,7 +961,7 @@ module StandardTags
       page_path = remove_trailing_slash(path)
       hash[:title] = title
       hash[:path] = path
-      tag.locals.first_child = i == 0
+      tag.locals.first_child = i.zero?
       tag.locals.last_child = i == pairs.length - 1
       result << case page_path
                 when compare_path

data/app/models/user.rb

@@ -19,7 +19,7 @@ class User < ActiveRecord::Base
   belongs_to :created_by, class_name: 'User'
   belongs_to :updated_by, class_name: 'User'
 
-  def has_role?(role)
+  def role?(role)
     case role
     when :admin
       admin?

data/config/database.mysql.yml

@@ -2,6 +2,9 @@
 # This is only an example configuration. Please see the Rails
 # documentation for more details.
 #
+defaults: &defaults
+  adapter:  mysql
+  db:     localhost
 
 development:
   adapter: mysql2
@@ -10,10 +13,15 @@ development:
   password:
 
 test: &TEST
-  adapter: mysql2
+  adapter:  mysql2
   database: trusty_cms_test
   username: root
-  password:
+  password: ''
+  db: '127.0.0.1'
+  port: 0
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
 
 production:
   adapter: mysql2

data/config/environments/development.rb

@@ -29,4 +29,6 @@ TrustyCms::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+  config.assets.check_precompiled_asset = false
+
 end

data/db/migrate/20210331134718_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,36 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum,     null: false
+      t.datetime :created_at,   null: false
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/lib/generators/extension/USAGE

@@ -0,0 +1,30 @@
+Description:
+    The extension generator creates stubs for a new TrustyCms extension.
+
+    The generator takes an extension name as its argument.  The extension name may be
+    given in CamelCase or under_score and should not be suffixed with 'Extension'.
+
+    The generator creates an extension directory in vendor/extensions that includes
+    <extension_name>_extension.rb, README and Rakefile files as well as db, lib, task,
+    and test directories.
+
+Example:
+    ./script/generate extension AssetManagement
+
+    This will create:
+    vendor/extensions/asset_management/app/controllers
+    vendor/extensions/asset_management/app/helpers
+    vendor/extensions/asset_management/app/models
+    vendor/extensions/asset_management/app/views
+    vendor/extensions/asset_management/db/migrate
+    vendor/extensions/asset_management/lib/tasks
+    vendor/extensions/asset_management/README
+    vendor/extensions/asset_management/asset_management_extension.rb
+    vendor/extensions/asset_management/lib/tasks/asset_management_extension_tasks.rake
+    vendor/extensions/asset_management/spec/controllers
+    vendor/extensions/asset_management/spec/models
+    vendor/extensions/asset_management/spec/views
+    vendor/extensions/asset_management/spec/helpers
+    vendor/extensions/asset_management/Rakefile
+    vendor/extensions/asset_management/spec/spec_helper.rb
+    vendor/extensions/asset_management/spec/spec.opts

data/lib/generators/extension/extension_generator.rb

@@ -0,0 +1,97 @@
+begin
+  require 'git'
+rescue LoadError
+end
+
+class ExtensionGenerator < Rails::Generator::NamedBase
+  default_options :with_test_unit => false
+
+  attr_reader :extension_path, :extension_file_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @extension_file_name = "#{file_name}_extension"
+    @extension_path = "vendor/extensions/#{file_name}"
+  end
+
+  def manifest
+    record do |m|
+      m.directory "#{extension_path}/app/controllers"
+      m.directory "#{extension_path}/app/helpers"
+      m.directory "#{extension_path}/app/models"
+      m.directory "#{extension_path}/app/views"
+      m.directory "#{extension_path}/config/locales"
+      m.directory "#{extension_path}/config/initializers"
+      m.directory "#{extension_path}/db/migrate"
+      m.directory "#{extension_path}/lib/tasks"
+
+      m.template 'README.md',           "#{extension_path}/README.md"
+      m.template 'extension.rb',        "#{extension_path}/#{extension_file_name}.rb"
+      m.template 'tasks.rake',          "#{extension_path}/lib/tasks/#{extension_file_name}_tasks.rake"
+      m.template 'en.yml',              "#{extension_path}/config/locales/en.yml"
+      m.template 'routes.rb',           "#{extension_path}/config/routes.rb"
+      m.template 'radiant_config.rb',   "#{extension_path}/config/initializers/radiant_config.rb"
+      m.template 'lib.rb',              "#{extension_path}/lib/radiant-#{file_name}-extension.rb"
+      m.template 'gemspec.rb',          "#{extension_path}/radiant-#{file_name}-extension.gemspec"
+
+      if options[:with_test_unit]
+        m.directory "#{extension_path}/test/fixtures"
+        m.directory "#{extension_path}/test/functional"
+        m.directory "#{extension_path}/test/unit"
+
+        m.template 'Rakefile',            "#{extension_path}/Rakefile"
+        m.template 'test_helper.rb',      "#{extension_path}/test/test_helper.rb"
+        m.template 'functional_test.rb',  "#{extension_path}/test/functional/#{extension_file_name}_test.rb"
+      else
+        m.directory "#{extension_path}/spec/controllers"
+        m.directory "#{extension_path}/spec/models"
+        m.directory "#{extension_path}/spec/views"
+        m.directory "#{extension_path}/spec/helpers"
+        m.directory "#{extension_path}/features/support"
+        m.directory "#{extension_path}/features/step_definitions/admin"
+
+        m.template 'RSpecRakefile',       "#{extension_path}/Rakefile"
+        m.template 'spec_helper.rb',      "#{extension_path}/spec/spec_helper.rb"
+        m.file     'spec.opts',           "#{extension_path}/spec/spec.opts"
+        m.file     'cucumber.yml',        "#{extension_path}/cucumber.yml"
+        m.template 'cucumber_env.rb',     "#{extension_path}/features/support/env.rb"
+        m.template 'cucumber_paths.rb',   "#{extension_path}/features/support/paths.rb"
+      end
+    end
+  end
+
+  def class_name
+    super.to_name.gsub(' ', '') + 'Extension'
+  end
+
+  def extension_name
+    class_name.to_name('Extension')
+  end
+
+  def author_info
+    @author_info ||= begin
+      Git.global_config
+    rescue NameError
+      {}
+    end
+  end
+
+  def homepage
+    author_info['github.user'] ? "http://github.com/#{author_info['github.user']}/radiant-#{file_name}-extension" : "http://example.com/#{file_name}"
+  end
+
+  def author_email
+    author_info['user.email'] || 'your email'
+  end
+
+  def author_name
+    author_info['user.name'] || 'Your Name'
+  end
+
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--with-test-unit",
+           "Use Test::Unit for this extension instead of RSpec") { |v| options[:with_test_unit] = v }
+  end
+end

data/lib/generators/extension/templates/README.md

@@ -0,0 +1,6 @@
+# <%= extension_name %>
+
+TrustyCms is _so_ freaking awesome, but I made it better through this extension.
+
+Created by <%= author_name %>. <%- if author_email.include?('@') -%>If I don't update this content with real details,
+please contact me at <%= author_email %> with annoying messages telling me to do it.<%- end -%>

data/lib/generators/extension/templates/RSpecRakefile

@@ -0,0 +1,109 @@
+# Determine where the RSpec plugin is by loading the boot
+unless defined? TRUSTY_CMS_ROOT
+  ENV["Rails.env"] = "test"
+  case
+  when ENV["RADIANT_ENV_FILE"]
+    require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
+  when File.dirname(__FILE__) =~ %r{vendor/trusty_cms/vendor/extensions}
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
+  else
+    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
+  end
+end
+
+require 'rake'
+require 'rdoc/task'
+require 'rake/testtask'
+
+rspec_base = File.expand_path(TRUSTY_CMS_ROOT + '/vendor/plugins/rspec/lib')
+$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+require 'spec/rake/spectask'
+require 'cucumber'
+require 'cucumber/rake/task'
+
+# Cleanup the TRUSTY_CMS_ROOT constant so specs will load the environment
+Object.send(:remove_const, :TRUSTY_CMS_ROOT)
+
+extension_root = File.expand_path(File.dirname(__FILE__))
+
+task :default => [:spec, :features]
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+task :features => 'spec:integration'
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec', '--rails']
+  end
+  
+  desc "Print Specdoc for all specs"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+  [:models, :controllers, :views, :helpers].each do |sub|
+    desc "Run the specs under spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub) do |t|
+      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+  
+  desc "Run the Cucumber features"
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
+    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
+    t.profile = "default"
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
+    ::CodeStatistics::TEST_TYPES << "Model specs"
+    ::CodeStatistics::TEST_TYPES << "View specs"
+    ::CodeStatistics::TEST_TYPES << "Controller specs"
+    ::CodeStatistics::TEST_TYPES << "Helper specs"
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+end
+
+desc 'Generate documentation for the <%= file_name %> extension.'
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = '<%= class_name %>'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+# Load any custom rakefiles for extension
+Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }