trusty-cms 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a84f2bd93709b64869694e7067273bc1270bdd
-  data.tar.gz: f711721cc535cba983db9c901b61bbdd92bc43af
+  metadata.gz: 60d2fbeb659c32f7e84840f73875fe52f8babbf5
+  data.tar.gz: d7f0af94bd84f4effc97e7cd7dea2e9082ca45a0
 SHA512:
-  metadata.gz: b5b58ab4bab431abe55d905d449aaf6ba8ba1bfbe3520811db825f204a3c3049ac6503718741d788a0e6d2839d8051b141a5ca72e819b13b6c83631ffd7a2ab7
-  data.tar.gz: 42b3963bf35438c0b88620a6c416a1a2758aa9dc7c79be5821da062582afb8f8e6135d55ef44d0872692f8bf9e2970a80d70c90cf58a68deee4a0baf8fe456c7
+  metadata.gz: d47dd1277e06561bc020aa026631b1fb205211fd23dac68c802ee94465392807d7869fec0cb5f401116fc0def077c09ba32b8e254ef48e623ffaebb61deb6a91
+  data.tar.gz: 15044ee9f5e3d46a55b6f412663d06095ca19c5fbe65bfde7ce114524d207fbad1b1a2f16fc5c736b41be6ce7abbd1e0b71199de18e1bbee59ed29c273cb27cb

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.5.1)
+    trusty-cms (3.5.2)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
       bundler (~> 1.7)
-      ckeditor (>= 4.2.2, < 4.4.0)
+      ckeditor (>= 4.2.2, < 4.3.0)
       delocalize (>= 0.2, < 2.0)
       execjs (~> 2.7)
       haml (~> 5.0)
@@ -22,6 +22,7 @@ PATH
       rake (< 13.0)
       rdoc (>= 5.1, < 7.0)
       roadie-rails
+      sass-rails
       stringex (>= 2.7.1, < 2.9.0)
       therubyracer (~> 0.12.3)
       tzinfo (~> 1.2.3)
@@ -90,17 +91,19 @@ GEM
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       xpath (~> 3.1)
-    ckeditor (4.3.0)
+    ckeditor (4.2.4)
+      cocaine
       orm_adapter (~> 0.5.0)
-      terrapin
     climate_control (0.2.0)
     cliver (0.3.2)
+    cocaine (0.6.0)
+      terrapin (= 0.6.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
-    css_parser (1.6.0)
+    css_parser (1.7.0)
       addressable
     database_cleaner (1.7.0)
     delocalize (1.2.0)
@@ -133,10 +136,10 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.16.3)
+    httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.4.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kraken-io (0.1.3)
@@ -166,7 +169,7 @@ GEM
     multipart-post (2.0.0)
     mysql2 (0.5.2)
     nio4r (2.3.1)
-    nokogiri (1.9.1)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     paperclip (6.1.0)
@@ -238,7 +241,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)

data/app/models/site.rb

@@ -16,7 +16,7 @@ class Site < ActiveRecord::Base
 
     def find_for_host(hostname = '')
       return default if hostname.blank?
-      sites = where("domain IS NOT NULL")
+      sites = self.includes(:homepage).where("domain IS NOT NULL")
       site = sites.find { |site| hostname == site.base_domain || hostname =~ Regexp.compile(site.domain) }
       site || default
     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.5.1'
+    VERSION = '3.5.2'
   end
 end

data/trusty_cms.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["TrustyCms CMS dev team"]
-  s.default_executable = %q{trusty_cms}
   s.description = %q{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.}
@@ -26,7 +25,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'acts_as_list',    '~> 0.9.5'
   s.add_dependency 'acts_as_tree',    '>= 2.6.1', '< 2.9.0'
   s.add_dependency 'bundler',         '~> 1.7'
-  s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.4.0'
+  s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.3.0'
   s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
   s.add_dependency 'execjs',          '~> 2.7'
   s.add_dependency 'haml',            '~> 5.0'
@@ -43,6 +42,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'RedCloth',        '4.3.2'
   s.add_dependency 'rake',            '< 13.0'
   s.add_dependency 'roadie-rails'
+  s.add_dependency 'sass-rails'
   s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
   s.add_dependency 'therubyracer',    '~> 0.12.3'
   s.add_dependency 'tzinfo',          '~> 1.2.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -67,7 +67,7 @@ dependencies:
         version: 4.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: 4.2.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: delocalize
   requirement: !ruby/object:Gem::Requirement
@@ -320,6 +320,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement