trusty-cms 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e5ddc264335fbd890cf3212f6c6e708f580b8327360ae1b546f3d0afdbb16fa1
-  data.tar.gz: 99d7b1cdb1e1bc58711eb011122759cb6181cb996680efa1c6ca6772f64805c4
+SHA1:
+  metadata.gz: '08f5e8a4af024687fbd7b3254c2b59c20d5f33e3'
+  data.tar.gz: 89474a5f5fa76618a79704889210b170a2584be5
 SHA512:
-  metadata.gz: e057443e2a5046911cd47e598cf0d4b4470e3fb0cf35b6cad34650d51d5cf4c3ceb62b987db78f042c84a2d5affa6ee6f9291ff0b1e2cc35757dc28507665d0d
-  data.tar.gz: a1501ed9820469a30c2f7dbbd1e76d7086010d1e5a6a9dd70374f27034a8c26d355eba9ab56f57ca8e642cd834cfc8cb4a988b9d7adeb7d7c0f8c412966919a3
+  metadata.gz: 871dcea0008cb217654ade4a262dc0421b1abaaf4ea10e70523a819a45186e9ce6a6584be3f3b305208204a502879114af031cded53a026717eeaeb8d049ff4c
+  data.tar.gz: 8f3028f2224bad2539abc7f4fb9beef0838e13200e4055871a4e44f121d4b768949a3eb489aba4cebb4110b07bfadf8a0616dc0750b83b1f64400820d98d7dbc

data/Gemfile

@@ -19,9 +19,8 @@ group :development, :test do
   gem 'factory_bot_rails'
   gem 'launchy',         '~> 2.4.2'
   gem 'mysql2',          '~> 0.4.2'
-  gem 'rails-observers', :git => 'https://github.com/rails/rails-observers'
-  gem 'rspec-rails'
   gem 'poltergeist',      '~> 1.14.0'
-  gem 'protected_attributes_continued'
   gem 'pry-byebug'
+  gem 'rails-observers'
+  gem 'rspec-rails'
 end

data/Gemfile.lock

@@ -1,14 +1,7 @@
-GIT
-  remote: https://github.com/rails/rails-observers
-  revision: fb6b95509c3f1a50c973280ddc2b56648e33623f
-  specs:
-    rails-observers (0.2.0)
-      activemodel (>= 4.2)
-
 PATH
   remote: .
   specs:
-    trusty-cms (3.2.1)
+    trusty-cms (3.3.0)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (~> 2.6.1)
@@ -27,7 +20,7 @@ PATH
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.1)
+      rails (~> 5.2.0.rc2)
       rake (< 11.0)
       rdoc (~> 5.1)
       roadie-rails (~> 1.2.1)
@@ -42,39 +35,43 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
+    actioncable (5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
+      actionview (= 5.2.0.rc2)
+      activejob (= 5.2.0.rc2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
+    actionpack (5.2.0.rc2)
+      actionview (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
+    actionview (5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
+    activejob (5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activesupport (5.1.6)
+    activemodel (5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
+    activerecord (5.2.0.rc2)
+      activemodel (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
+      arel (>= 9.0)
+    activestorage (5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
+      activerecord (= 5.2.0.rc2)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0.rc2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -85,7 +82,7 @@ GEM
       activerecord (>= 3.0.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
+    arel (9.0.0)
     builder (3.2.3)
     byebug (10.0.2)
     capybara (2.18.0)
@@ -175,6 +172,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -201,8 +200,6 @@ GEM
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    protected_attributes_continued (1.3.0)
-      activemodel (~> 5.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -216,26 +213,29 @@ GEM
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     radius (0.7.4)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails (5.2.0.rc2)
+      actioncable (= 5.2.0.rc2)
+      actionmailer (= 5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
+      actionview (= 5.2.0.rc2)
+      activejob (= 5.2.0.rc2)
+      activemodel (= 5.2.0.rc2)
+      activerecord (= 5.2.0.rc2)
+      activestorage (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.2.0.rc2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails-observers (0.1.5)
+      activemodel (>= 4.0)
+    railties (5.2.0.rc2)
+      actionpack (= 5.2.0.rc2)
+      activesupport (= 5.2.0.rc2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -245,7 +245,7 @@ GEM
       ffi (>= 0.5.0, < 2)
     rdoc (5.1.0)
     ref (2.0.0)
-    roadie (3.3.0)
+    roadie (3.2.2)
       css_parser (~> 1.4)
       nokogiri (~> 1.5)
     roadie-rails (1.2.1)
@@ -277,7 +277,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.11.0)
+    sexp_processor (4.10.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -307,7 +307,7 @@ GEM
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     uuidtools (2.1.5)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
@@ -326,9 +326,8 @@ DEPENDENCIES
   launchy (~> 2.4.2)
   mysql2 (~> 0.4.2)
   poltergeist (~> 1.14.0)
-  protected_attributes_continued
   pry-byebug
-  rails-observers!
+  rails-observers
   rspec-rails
   trusty-cms!
   trustygems (~> 0.2.0)

data/app/models/asset.rb

@@ -10,7 +10,7 @@ class Asset < ActiveRecord::Base
 
   default_scope {order("created_at DESC")}
 
-  attr_accessible :title, :asset, :caption
+  attr_accessor :title, :asset, :caption
 
   scope :latest, lambda { |limit|
     order("created_at DESC").limit(limit)
@@ -189,7 +189,7 @@ private
   end
 
   def assign_title
-    self.title = self.asset_file_name.downcase.sub(self.original_extension, "").sub(".", "")
+    self.title = self.asset_file_name.sub(self.original_extension, "").sub(".", "")
   end
 
   def assign_uuid

data/app/models/page.rb

@@ -9,9 +9,9 @@ class Page < ActiveRecord::Base
 
   # Associations
   acts_as_tree :order => 'title ASC'
-  has_many :parts, {:class_name => 'PagePart', :dependent => :destroy}, -> {order(:id)}
+  has_many :parts, -> {order(:id)}, :class_name => 'PagePart', :dependent => :destroy
   accepts_nested_attributes_for :parts, :allow_destroy => true
-  has_many :fields, {:class_name => 'PageField', :dependent => :destroy}, -> {order(:id)}
+  has_many :fields, -> {order(:id)}, :class_name => 'PageField', :dependent => :destroy
   accepts_nested_attributes_for :fields, :allow_destroy => true
   belongs_to :layout
   belongs_to :created_by, :class_name => 'User'
@@ -282,14 +282,16 @@ class Page < ActiveRecord::Base
           $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
         end
       end
-      if ActiveRecord::Base.connection.data_sources.include?('pages') && Page.column_names.include?('class_name') # Assume that we have bootstrapped
-        Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p|
-          begin
-            p.constantize
-          rescue NameError, LoadError
-            #Rubocop: The use of eval is a serious security risk.
-            #eval(%Q{class #{p} < Page; acts_as_tree; def self.missing?; true end end}, TOPLEVEL_BINDING)
-            Rails.logger.error NameError
+      if database_exists?
+        if ActiveRecord::Base.connection.data_sources.include?('pages') && Page.column_names.include?('class_name') # Assume that we have bootstrapped
+          Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p|
+            begin
+              p.constantize
+            rescue NameError, LoadError
+              #Rubocop: The use of eval is a serious security risk.
+              #eval(%Q{class #{p} < Page; acts_as_tree; def self.missing?; true end end}, TOPLEVEL_BINDING)
+              Rails.logger.error NameError
+            end
           end
         end
       end
@@ -364,6 +366,14 @@ class Page < ActiveRecord::Base
       !parent.nil?
     end
 
+    def database_exists?
+      ActiveRecord::Base.connection
+    rescue ActiveRecord::NoDatabaseError
+      false
+    else
+      true
+    end
+
     def lazy_initialize_parser_and_context
       unless @parser and @context
         @context = PageContext.new(self)

data/app/models/trusty_cms/config.rb

@@ -76,23 +76,35 @@ module TrustyCms
 
     class << self
       def [](key)
-        if table_exists?
-          unless TrustyCms::Config.cache_file_exists?
-            TrustyCms::Config.ensure_cache_file
-            TrustyCms::Config.initialize_cache
+        if database_exists?
+          if table_exists?
+            unless TrustyCms::Config.cache_file_exists?
+              TrustyCms::Config.ensure_cache_file
+              TrustyCms::Config.initialize_cache
+            end
+            TrustyCms::Config.initialize_cache if TrustyCms::Config.stale_cache?
+            Rails.cache.read('TrustyCms::Config')[key]
           end
-          TrustyCms::Config.initialize_cache if TrustyCms::Config.stale_cache?
-          Rails.cache.read('TrustyCms::Config')[key]
         end
       end
 
       def []=(key, value)
-        if table_exists?
-          setting = where(key: key).first_or_initialize
-          setting.value = value
+        if database_exists?
+          if table_exists?
+            setting = where(key: key).first_or_initialize
+            setting.value = value
+          end
         end
       end
 
+      def database_exists?
+        ActiveRecord::Base.connection
+      rescue ActiveRecord::NoDatabaseError
+        false
+      else
+        true
+      end
+
       def to_hash
         Hash[ *all.map { |pair| [pair.key, pair.value] }.flatten ]
       end

data/lib/tasks/database.rake

@@ -65,7 +65,6 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
   desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
   task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
     ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
@@ -73,7 +72,6 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
     desc "Migrates the database through steps defined in the core trusty-cms distribution. Usual db:migrate options can apply."
     task :trusty_cms => :environment do
       ActiveRecord::Migration[5.1].verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate(File.join(TrustyCms.root, 'db', 'migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     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 = '3.2.1'
+    VERSION = '3.3.0'
   end
 end

data/spec/ci/database.mysql.yml

@@ -1,4 +1,4 @@
 test: &TEST
   adapter: mysql2
-  database: radiant_test
+  database: trusty_cms_test
   username:

data/spec/dummy/db/schema.rb

@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161027141250) do
+ActiveRecord::Schema.define(version: 2016_10_27_141250) do
 
-  create_table "assets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "caption"
     t.string "title"
     t.string "asset_file_name"
@@ -28,19 +28,19 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.string "original_extension"
   end
 
-  create_table "config", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "config", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "key", limit: 40, default: "", null: false
     t.string "value", default: ""
     t.index ["key"], name: "key", unique: true
   end
 
-  create_table "extension_meta", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "extension_meta", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name"
     t.integer "schema_version", default: 0
     t.boolean "enabled", default: true
   end
 
-  create_table "layouts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "layouts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.text "content"
     t.datetime "created_at"
@@ -52,20 +52,20 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.integer "site_id"
   end
 
-  create_table "page_attachments", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "page_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.integer "asset_id"
     t.integer "page_id"
     t.integer "position"
   end
 
-  create_table "page_fields", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "page_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.integer "page_id"
     t.string "name"
     t.string "content"
     t.index ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content"
   end
 
-  create_table "page_parts", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "page_parts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "filter_id", limit: 25
     t.text "content", limit: 16777215
@@ -73,7 +73,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.index ["page_id", "name"], name: "parts_by_page"
   end
 
-  create_table "pages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "pages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "title"
     t.string "slug", limit: 100
     t.string "breadcrumb", limit: 160
@@ -98,7 +98,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.index ["virtual", "status_id"], name: "pages_published"
   end
 
-  create_table "sessions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "sessions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "session_id"
     t.text "data"
     t.datetime "updated_at"
@@ -106,7 +106,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "sites", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "sites", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name"
     t.string "domain"
     t.integer "homepage_id"
@@ -120,7 +120,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.string "base_domain"
   end
 
-  create_table "snippets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "snippets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", limit: 100, default: "", null: false
     t.string "filter_id", limit: 25
     t.text "content"
@@ -133,7 +133,7 @@ ActiveRecord::Schema.define(version: 20161027141250) do
     t.index ["name", "site_id"], name: "name_site_id", unique: true
   end
 
-  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "email"
     t.string "login", limit: 40, default: "", null: false

data/trusty_cms.gemspec

@@ -40,7 +40,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'paperclip',       '> 5.2'
   s.add_dependency 'rack',            '~> 2.0.1'
   s.add_dependency 'rack-cache',      '~> 1.7'
-  s.add_dependency 'rails',           '~> 5.1'
+  s.add_dependency 'rails',           '~> 5.2.0.rc2'
   s.add_dependency 'rdoc',            '~> 5.1'
   s.add_dependency 'radius',          '~> 0.7'
   s.add_dependency 'RedCloth',        '4.3.2'

data/vendor/extensions/clipped-extension/clipped_extension.rb

@@ -1,5 +1,6 @@
 class ClippedExtension < TrustyCms::Extension
   migrate_from 'Paperclipped', 20100327111216
+  require 'admin/assets_helper'
 
   def activate
     if Asset.table_exists?

data/{app/helpers → vendor/extensions/clipped-extension/lib}/admin/assets_helper.rb

@@ -1,16 +1,16 @@
 module Admin::AssetsHelper
-  
+
   def automatic_size_descriptions
     Asset.thumbnail_sizes.collect{|k,v| "#{k} (#{(v.to_s).match(/\d+x\d+/)})"}.join(', ')
   end
-  
+
   def asset_insertion_link(asset)
     radius_tag = asset.asset_type.default_radius_tag || 'link';
     link_to t('clipped_extension.insert'), '#', :class => 'insert_asset', :rel => "#{radius_tag}_#{TrustyCms.config['assets.insertion_size']}_#{asset.id}"
   end
-  
+
   def asset_attachment_link(asset)
     link_to t("clipped_extension.attach"), new_admin_page_attachment_path(:asset_id => asset.id), :class => 'attach_asset', :rel => "attach_#{asset.id}"
   end
-  
-end
+
+end

data/vendor/extensions/clipped-extension/lib/page_asset_associations.rb

@@ -1,13 +1,11 @@
 module PageAssetAssociations
-  
-  #TODO: Turn page_attachments into a generic, polymorphic asset-attachment mechanism
-  
+
   def self.included(base)
     base.class_eval {
       has_many :page_attachments, -> { order 'position desc' }
-      has_many :assets,{ :through => :page_attachments},  -> { order 'page_attachments.position ASC' }
+      has_many :assets, -> { order 'page_attachments.position ASC' }, through: :page_attachments
       accepts_nested_attributes_for :page_attachments, :allow_destroy => true
     }
   end
-  
-end
+
+end

data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_validation.rb

@@ -15,16 +15,26 @@ module MultiSite::ScopedValidation
       # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
 
       def validates_uniqueness_of_with_site(*attr)
-        if table_exists? && column_names.include?('site_id')
-          configuration = attr.extract_options!
-          configuration[:scope] ||= :site_id
-          attr.push(configuration)
+        if database_exists?
+          if table_exists? && column_names.include?('site_id')
+            configuration = attr.extract_options!
+            configuration[:scope] ||= :site_id
+            attr.push(configuration)
+          end
+          validates_uniqueness_of_without_site(*attr)
         end
-        validates_uniqueness_of_without_site(*attr)
       end
 
       alias_method :validates_uniqueness_of_without_site, :validates_uniqueness_of
       alias_method :validates_uniqueness_of, :validates_uniqueness_of_with_site
+
+      def database_exists?
+        ActiveRecord::Base.connection
+      rescue ActiveRecord::NoDatabaseError
+        false
+      else
+        true
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 5.2.0.rc2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -621,7 +621,6 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/site_controller.rb
 - app/controllers/social_mailer_controller.rb
-- app/helpers/admin/assets_helper.rb
 - app/helpers/admin/configuration_helper.rb
 - app/helpers/admin/export_helper.rb
 - app/helpers/admin/extensions_helper.rb
@@ -983,11 +982,9 @@ files:
 - lib/tasks/environments.rake
 - lib/tasks/extensions.rake
 - lib/tasks/framework.rake
-- lib/tasks/instance.rake
 - lib/tasks/radiant_config.rake
 - lib/tasks/snippets_extension_tasks.rake
 - lib/tasks/translate.rake
-- lib/tasks/undefine.rake
 - lib/translation_support.rb
 - lib/trusty_cms.rb
 - lib/trusty_cms/admin_ui.rb
@@ -1052,7 +1049,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/node_modules/jquery-ui-bundle/AUTHORS.txt
 - spec/dummy/node_modules/jquery-ui-bundle/LICENSE.txt
@@ -1225,6 +1221,7 @@ files:
 - spec/support/custom_actions.rb
 - trusty_cms.gemspec
 - vendor/extensions/clipped-extension/clipped_extension.rb
+- vendor/extensions/clipped-extension/lib/admin/assets_helper.rb
 - vendor/extensions/clipped-extension/lib/asset_tags.rb
 - vendor/extensions/clipped-extension/lib/clipped/engine.rb
 - vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb
@@ -1318,7 +1315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
@@ -1352,7 +1349,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/node_modules/jquery/AUTHORS.txt
 - spec/dummy/node_modules/jquery/bower.json

data/lib/tasks/instance.rake

@@ -1,23 +0,0 @@
-# # Redefined standard Rails tasks only in instance mode
-# unless TrustyCms.app?
-#   require 'rake/testtask'
-#
-#   ENV['RADIANT_ENV_FILE'] = File.join(Rails.root, 'config', 'environment')
-#
-#   [Dir["#{Rails.Root}/vendor/rails/railties/lib/tasks/*.rake"], Dir["#{Rails.root}/vendor/plugins/rspec_on_rails/tasks/*.rake"]].flatten.each do |rake|
-#     lines = IO.readlines(rake)
-#     lines.map! do |line|
-#       line.gsub!('Rails.root', 'TRUSTY_CMS_ROOT') unless rake =~ /(misc|rspec|databases)\.rake$/
-#       case rake
-#       when /testing\.rake$/
-#         line.gsub!(/t.libs << (["'])/, 't.libs << \1#{TRUSTY_CMS_ROOT}/')
-#         line.gsub!(/t\.pattern = (["'])/, 't.pattern = \1#{TRUSTY_CMS_ROOT}/')
-#       when /databases\.rake$/
-#         line.gsub!(/(migrate|rollback)\((["'])/, '\1(\2#{TRUSTY_CMS_ROOT}/')
-#         line.gsub!(/(run|new)\((:up|:down), (["'])db/, '\1(\2, \3#{TRUSTY_CMS_ROOT}/db')
-#       end
-#       line
-#     end
-#     eval(lines.join("\n"), binding, rake)
-#   end
-# end

data/lib/tasks/undefine.rake

@@ -1,24 +0,0 @@
-# # Undefined unneeded tasks in instance mode
-# unless TrustyCms.app?
-#   def undefine_task(*names)
-#     app = Rake.application
-#     tasks = app.instance_variable_get('@tasks')
-#     names.flatten.each { |name| tasks.delete(name) }
-#   end
-#
-#   undefine_task %w(
-#     radiant:clobber_package
-#     radiant:install_gem
-#     radiant:package
-#     radiant:release
-#     radiant:repackage
-#     radiant:uninstall_gem
-#     rails:freeze:edge
-#     rails:freeze:gems
-#     rails:unfreeze
-#     rails:update
-#     rails:update:configs
-#     rails:update:javascripts
-#     rails:update:scripts
-#   )
-# end