trusty-cms 4.1.6 → 4.2.1

data/lib/generators/trusty_cms/templates/boot.rb.erb

@@ -0,0 +1,9 @@
+require 'rubygems'
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/lib/generators/trusty_cms/templates/config.ru.erb

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run TrustyCms::Application

data/lib/generators/trusty_cms/templates/database.yml.erb

@@ -0,0 +1,28 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+
+development:
+  adapter: mysql2
+  database: <%= project_name%>_blank_dev
+  username:
+  password:
+  host: localhost
+
+test: &TEST
+  adapter: mysql2
+  database: <%= project_name%>_blank_test
+  username:
+  password:
+  host:
+
+production:
+  adapter: mysql2
+  database: <%= project_name%>_blank_live
+  username:
+  password:
+  socket: /tmp/mysql.sock
+
+cucumber:
+  <<: *TEST

data/lib/generators/trusty_cms/templates/environment.rb.erb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+TrustyCms::Application.initialize!

data/lib/generators/trusty_cms/templates/environments/development.rb.erb

@@ -0,0 +1,24 @@
+TrustyCms::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes     = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils        = true
+
+  # Show full error reports and caching is turned off
+  config.consider_all_requests_local = true
+  #config.action_view.debug_rjs                         = true
+  config.action_controller.perform_caching             = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+  config.domain = ".local"
+
+  config.after_initialize do
+    SiteController.cache_timeout = 0.minutes
+  end
+end

data/lib/generators/trusty_cms/templates/environments/production.rb.erb

@@ -0,0 +1,26 @@
+TrustyCms::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Use a different logger for distributed setups
+  # config.logger        = SyslogLogger.new
+
+
+  # Full error reports are disabled and caching is on
+  config.action_controller.consider_all_requests_local = false
+  config.action_controller.perform_caching             = true
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host                  = "http://assets.example.com"
+
+  # Disable delivery errors if you bad email addresses should just be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Cache your content for a longer time, the default is 5.minutes
+  # config.after_initialize do 
+  #   SiteController.cache_timeout = 12.hours
+  # end
+end

data/lib/generators/trusty_cms/templates/environments/test.rb.erb

@@ -0,0 +1,35 @@
+TrustyCms::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # ensure test extensions are loaded
+  # test_extension_dir = File.join(File.expand_path(RADIANT_ROOT), 'test', 'fixtures', 'extensions')
+  # config.extension_paths.unshift test_extension_dir
+  # config.extension_paths.uniq!
+  # if !config.extensions.include?(:all)
+  #   config.extensions.concat(Dir["#{test_extension_dir}/*"].sort.map {|x| File.basename(x).sub(/^\d+_/,'')})
+  #   config.extensions.uniq!
+  # end
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils    = true
+  config.domain = ".local"
+
+  # Show full error reports and disable caching
+  config.action_controller.consider_all_requests_local = true
+  config.action_controller.perform_caching             = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell ActionMailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+end
+

data/lib/generators/trusty_cms/templates/initializers/secret_token.rb.erb

@@ -0,0 +1,13 @@
+# config/initializers/secret_token.rb
+
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+TrustyCms::Application.config.secret_token = if Rails.env.development? or Rails.env.test?
+                                           ('x' * 30) # meets minimum requirement of 30 chars long
+                                         else
+                                           ENV['SECRET_TOKEN']
+                                         end

data/lib/generators/trusty_cms/templates/initializers/session_store.rb.erb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+TrustyCms::Application.config.session_store :cookie_store, :key => "_<%= project_name %>_session"
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# TestTrusty::Application.config.session_store :active_record_store

data/lib/generators/trusty_cms/templates/initializers/trusty_cms_config.rb.erb

@@ -0,0 +1,16 @@
+TrustyCms::Application.config do |config|
+  # this file can be used to set defaults, options and validation rules for local configuration settings.
+  # core settings are defined in RADIANT_ROOT/config/initializers/radiant_config.rb and by the corresponding
+  # file in each radiant extension. You probably don't need to add anything here, but in case you do:
+
+  # config.define 'site.show_footer?', :default => "true"
+  # config.define 'S3.bucket', :default => "key", :allow_change => false
+
+  # you can also use this file to set config values (by environment, for example):
+
+  # if RAILS_ENV == 'production'
+  #   config['cache.duration'] = 86400
+  # else
+  #   config['cache.duration'] = 0
+  # end
+end

data/lib/generators/trusty_cms/templates/preinitializer.rb.erb

@@ -0,0 +1,18 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+# Lessens Debians need to edit.
+require "rubygems" rescue nil
+
+# Since Bundler is not really a 'must have' for Rails development just send off
+# a warning and see if the sytem continues to load, the user can optionally use
+# RADIANT_NOWARNINGS to disable it.
+
+if File.file?(ENV['BUNDLE_GEMFILE'])
+  begin
+    require 'bundler/setup'
+  rescue LoadError
+    unless ENV['RADIANT_NOWARNINGS'] == true
+      $stderr.puts 'WARNING: It seems you do not have Bundler installed.'
+      $stderr.puts 'WARNING: You can install it by doing `gem install bundler`'
+    end
+  end
+end

data/lib/generators/trusty_cms/trusty_cms_generator.rb

@@ -0,0 +1,32 @@
+class TrustyCmsGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  argument :project_name, type: :string, default: "trusty"
+
+  def generate_config
+
+    template "Rakefile.erb", "Rakefile"
+    template "config.ru.erb", "config.ru"
+
+    template "boot.rb.erb", "config/boot.rb"
+    template "environment.rb.erb", "config/environment.rb"
+    template "application.rb.erb", "config/application.rb"
+    template "preinitializer.rb.erb", "config/preinitializer.rb"
+    template "routes.rb.erb", "config/routes.rb"
+    template "database.yml.erb", "config/database.yml"
+
+    template "environments/development.rb.erb", "config/environments/development.rb"
+    template "environments/test.rb.erb", "config/environments/test.rb"
+    template "environments/production.rb.erb", "config/environments/production.rb"
+
+    template "initializers/trusty_cms_config.rb.erb", "config/initializers/trusty_cms_config.rb"
+    template "initializers/secret_token.rb.erb", "config/initializers/secret_token.rb"
+    template "initializers/session_store.rb.erb", "config/initializers/session_store.rb"
+
+    remove_file 'app/controllers/application_controller.rb'
+    remove_file 'app/helpers/application_helper.rb'
+    remove_file 'app/assets/javascripts/application.js'
+    remove_file 'app/views/layouts/application.html.erb'
+
+  end
+
+end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.1.6'.freeze
+    VERSION = '4.2.1'.freeze
   end
 end

data/lib/trusty_cms/setup.rb

@@ -29,16 +29,16 @@ module TrustyCms
         password ||= prompt_for_admin_password
       end
       attributes = {
-        name: name,
-        login: username,
+        first_name: name,
+        email: username,
         password: password,
         password_confirmation: password,
       }
-      admin = User.find_by(login: username)
+      admin = User.find_by(email: username)
       admin ||= User.new
-      admin.update_attributes(attributes)
+      admin.update(attributes)
       admin.admin = true
-      admin.save
+      admin.save!
       admin
     end
 
@@ -98,17 +98,17 @@ module TrustyCms
     end
 
     def prompt_for_admin_username
-      username = ask('Username (admin): ', String) do |q|
+      username = ask('Username (admin@trustarts.org): ', String) do |q|
         q.validate = /^(|.{3,40})$/
         q.responses[:not_valid] = 'Invalid username. Must be at least 3 characters long.'
         q.whitespace = :strip
       end
-      username = 'admin' if username.blank?
+      username = 'admin@trustarts.org' if username.blank?
       username
     end
 
     def prompt_for_admin_password
-      default_password = 'trusty'
+      default_password = 'Trusty123456@!'
       password = ask("Password (#{default_password}): ", String) do |q|
         q.echo = false unless defined?(::JRuby) # JRuby doesn't support stty interaction
         q.validate = /^(|.{5,40})$/

data/trusty_cms.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   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 = 'saalon@gmail.com'
+  s.email = 'webteam@trustarts.org'
   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']
@@ -29,8 +29,8 @@ a general purpose content managment system--not merely a blogging engine.'
   s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
   s.add_dependency 'devise'
   s.add_dependency 'execjs',          '~> 2.7'
-  s.add_dependency 'haml',            '~> 5.0'
-  s.add_dependency 'haml-rails',      '~> 1.0.0'
+  s.add_dependency 'haml'
+  s.add_dependency 'haml-rails'
   s.add_dependency 'highline',        '>= 1.7.8', '< 2.1.0'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mini_racer'
@@ -40,7 +40,7 @@ a general purpose content managment system--not merely a blogging engine.'
   s.add_dependency 'rack-cache',      '~> 1.7'
   s.add_dependency 'radius',          '~> 0.7'
   s.add_dependency 'rails'
-  s.add_dependency 'rake',            '< 13.0'
+  s.add_dependency 'rake',            '< 14.0'
   s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
   s.add_dependency 'RedCloth',        '4.3.2'
   s.add_dependency 'roadie-rails'

data/vendor/bundle/ruby/2.6.0/gems/actionview-6.0.3.4/lib/action_view/helpers/tags/base.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Helpers
+    module Tags # :nodoc:
+      class Base # :nodoc:
+        include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
+        include FormOptionsHelper
+
+        attr_reader :object
+
+        def initialize(object_name, method_name, template_object, options = {})
+          @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
+          @template_object = template_object
+
+          @object_name.sub!(/\[\]$/, "") || @object_name.sub!(/\[\]\]$/, "]")
+          @object = retrieve_object(options.delete(:object))
+          @skip_default_ids = options.delete(:skip_default_ids)
+          @allow_method_names_outside_object = options.delete(:allow_method_names_outside_object)
+          @options = options
+
+          if Regexp.last_match
+            @generate_indexed_names = true
+            @auto_index = retrieve_autoindex(Regexp.last_match.pre_match)
+          else
+            @generate_indexed_names = false
+            @auto_index = nil
+          end
+        end
+
+        # This is what child classes implement.
+        def render
+          raise NotImplementedError, "Subclasses must implement a render method"
+        end
+
+        private
+          def value
+            if @allow_method_names_outside_object
+              object.public_send @method_name if object && object.respond_to?(@method_name)
+            else
+              object.public_send @method_name if object
+            end
+          end
+
+          def value_before_type_cast
+            unless object.nil?
+              method_before_type_cast = @method_name + "_before_type_cast"
+
+              if value_came_from_user? && object.respond_to?(method_before_type_cast)
+                object.public_send(method_before_type_cast)
+              else
+                value
+              end
+            end
+          end
+
+          def value_came_from_user?
+            method_name = "#{@method_name}_came_from_user?"
+            !object.respond_to?(method_name) || object.public_send(method_name)
+          end
+
+          def retrieve_object(object)
+            if object
+              object
+            elsif @template_object.instance_variable_defined?("@#{@object_name}")
+              @template_object.instance_variable_get("@#{@object_name}")
+            end
+          rescue NameError
+            # As @object_name may contain the nested syntax (item[subobject]) we need to fallback to nil.
+            nil
+          end
+
+          def retrieve_autoindex(pre_match)
+            object = self.object || @template_object.instance_variable_get("@#{pre_match}")
+            if object && object.respond_to?(:to_param)
+              object.to_param
+            else
+              raise ArgumentError, "object[] naming but object param and @object var don't exist or don't respond to to_param: #{object.inspect}"
+            end
+          end
+
+          def add_default_name_and_id_for_value(tag_value, options)
+            if tag_value.nil?
+              add_default_name_and_id(options)
+            else
+              specified_id = options["id"]
+              add_default_name_and_id(options)
+
+              if specified_id.blank? && options["id"].present?
+                options["id"] += "_#{sanitized_value(tag_value)}"
+              end
+            end
+          end
+
+          def add_default_name_and_id(options)
+            index = name_and_id_index(options)
+            options["name"] = options.fetch("name") { tag_name(options["multiple"], index) }
+
+            if generate_ids?
+              options["id"] = options.fetch("id") { tag_id(index) }
+              if namespace = options.delete("namespace")
+                options["id"] = options["id"] ? "#{namespace}_#{options['id']}" : namespace
+              end
+            end
+          end
+
+          def tag_name(multiple = false, index = nil)
+            # a little duplication to construct less strings
+            case
+            when @object_name.empty?
+              "#{sanitized_method_name}#{multiple ? "[]" : ""}"
+            when index
+              "#{@object_name}[#{index}][#{sanitized_method_name}]#{multiple ? "[]" : ""}"
+            else
+              "#{@object_name}[#{sanitized_method_name}]#{multiple ? "[]" : ""}"
+            end
+          end
+
+          def tag_id(index = nil)
+            # a little duplication to construct less strings
+            case
+            when @object_name.empty?
+              sanitized_method_name.dup
+            when index
+              "#{sanitized_object_name}_#{index}_#{sanitized_method_name}"
+            else
+              "#{sanitized_object_name}_#{sanitized_method_name}"
+            end
+          end
+
+          def sanitized_object_name
+            @sanitized_object_name ||= @object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+          end
+
+          def sanitized_method_name
+            @sanitized_method_name ||= @method_name.sub(/\?$/, "")
+          end
+
+          def sanitized_value(value)
+            value.to_s.gsub(/[\s\.]/, "_").gsub(/[^-[[:word:]]]/, "").downcase
+          end
+
+          def select_content_tag(option_tags, options, html_options)
+            html_options = html_options.stringify_keys
+            add_default_name_and_id(html_options)
+
+            if placeholder_required?(html_options)
+              raise ArgumentError, "include_blank cannot be false for a required field." if options[:include_blank] == false
+              options[:include_blank] ||= true unless options[:prompt]
+            end
+
+            value = options.fetch(:selected) { value() }
+            select = content_tag("select", add_options(option_tags, options, value), html_options)
+
+            if html_options["multiple"] && options.fetch(:include_hidden, true)
+              tag("input", disabled: html_options["disabled"], name: html_options["name"], type: "hidden", value: "") + select
+            else
+              select
+            end
+          end
+
+          def placeholder_required?(html_options)
+            # See https://html.spec.whatwg.org/multipage/forms.html#attr-select-required
+            html_options["required"] && !html_options["multiple"] && html_options.fetch("size", 1).to_i == 1
+          end
+
+          def add_options(option_tags, options, value = nil)
+            if options[:include_blank]
+              option_tags = tag_builder.content_tag_string("option", options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, value: "") + "\n" + option_tags
+            end
+            if value.blank? && options[:prompt]
+              tag_options = { value: "" }.tap do |prompt_opts|
+                prompt_opts[:disabled] = true if options[:disabled] == ""
+                prompt_opts[:selected] = true if options[:selected] == ""
+              end
+              option_tags = tag_builder.content_tag_string("option", prompt_text(options[:prompt]), tag_options) + "\n" + option_tags
+            end
+            option_tags
+          end
+
+          def name_and_id_index(options)
+            if options.key?("index")
+              options.delete("index") || ""
+            elsif @generate_indexed_names
+              @auto_index || ""
+            end
+          end
+
+          def generate_ids?
+            !@skip_default_ids
+          end
+      end
+    end
+  end
+end