trusty-cms 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bc5cecdef6ecf91497bd8f6407f450bf248514
-  data.tar.gz: 570e24329c78c50c4201c18194204bdd33899fda
+  metadata.gz: ff714cb941dd4bafa96519238af44502f26e09bc
+  data.tar.gz: f4980e2dada78d36edf177b157321d42f32cd8e1
 SHA512:
-  metadata.gz: 555b21bf4896f724cbf73036d5153e24db1894e6aed6cee9c8816c5e3d56d1cb114b1b6b299be26326c38282ef24d828f1c00b1a341115af2c9bb06c398dc76d
-  data.tar.gz: 826f28f3dbfef19fbd7865f6d89d5787986f7d793a9f567487cc122f3b782c17bec338140649d3051d05fc10a3a8fc63e56046493664cbf94d4cb876d9a06d9f
+  metadata.gz: 12e1d7c2962ad455ed582b7f8369552181d30c8a05bea24cb2bc1bda7d84d92abe37e2ea5a59ff273023a83bbb3c6a08c149fff602af631e42c8ae691bf24608
+  data.tar.gz: e779ccae310fca4ed51976056779148f3924ba8b78537d7a4030814a8e3d106dd3353033bd6ec85c33eb64910f26f5c2d72c858427eb7fd0b9d466c1756eed9d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.13)
+    trusty-cms (2.0.14)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -30,65 +30,64 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    RedCloth (4.2.9-java)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_tree (2.3.0)
+    acts_as_tree (2.4.0)
       activerecord (>= 3.0.0)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
+    byebug (8.2.2)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.4)
-    ckeditor (4.1.3)
+    chunky_png (1.3.5)
+    ckeditor (4.1.6)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
-    columnize (0.9.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -101,9 +100,9 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (2.0.4)
+    compass-rails (2.0.5)
       compass (~> 1.0.0)
-      sass-rails (<= 5.0.1)
+      sass-rails (< 5.1)
       sprockets (< 2.13)
     daemons (1.2.3)
     database_cleaner (1.3.0)
@@ -111,8 +110,8 @@ GEM
       rails (>= 3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.8)
-    eventmachine (1.0.8-java)
+    eventmachine (1.0.9.1)
+    eventmachine (1.0.9.1-java)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -150,19 +149,19 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     libv8 (3.16.14.13)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     multi_json (1.11.2)
     mysql2 (0.4.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.2-java)
     orm_adapter (0.5.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
@@ -171,53 +170,53 @@ GEM
       websocket-driver (>= 0.2.0)
     protected_attributes (1.0.9)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.10.1-java)
+    pry (0.10.3-java)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -238,16 +237,16 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.7.2)
+    ruby_parser (3.8.0)
       sexp_processor (~> 4.1)
-    sass (3.4.16)
-    sass-rails (5.0.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-    sexp_processor (4.6.0)
+      tilt (>= 1.1, < 3)
+    sexp_processor (4.7.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
@@ -256,7 +255,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -264,9 +263,9 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -279,12 +278,12 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.6.2-java)
+    websocket-driver (0.6.3-java)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/README.md

@@ -124,6 +124,8 @@ Most of the development for TrustyCms happens on Github:
 
 https://github.com/pgharts/trusty-cms
 
+TrustyCMS is supported in part by https://www.browserstack.com/
+
 Enjoy!
 
 --

data/app/controllers/admin/users_controller.rb

@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ResourceController
   def ensure_deletable
     if current_user.id.to_s == params[:id].to_s
       announce_cannot_delete_self
-      redirect_to admin_users_url
+      redirect_to admin_users_path
     end
   end
 

data/app/controllers/admin/welcome_controller.rb

@@ -4,7 +4,7 @@ class Admin::WelcomeController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   def index
-    redirect_to admin_pages_url
+    redirect_to admin_pages_path
   end
 
   def login
@@ -18,7 +18,7 @@ class Admin::WelcomeController < ApplicationController
         current_user.remember_me
         set_session_cookie
       end
-      redirect_to(session[:return_to] || welcome_url)
+      redirect_to(session[:return_to] || welcome_path)
       session[:return_to] = nil
     end
   end
@@ -28,7 +28,7 @@ class Admin::WelcomeController < ApplicationController
     self.current_user.forget_me if self.current_user
     self.current_user = nil
     announce_logged_out
-    redirect_to login_url
+    redirect_to login_path
   end
 
   private

data/app/controllers/site_controller.rb

@@ -34,7 +34,7 @@ class SiteController < ApplicationController
       render :template => 'site/not_found', :status => 404, layout: false
     end
   rescue Page::MissingRootPageError
-    redirect_to welcome_url
+    redirect_to welcome_path
   end
 
   def cacheable_request?

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 = "2.0.13"
+    VERSION = "2.0.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo