trusty-cms 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3f140dbe502e3d9232850abc0288b799b89190
-  data.tar.gz: d70dadc2a0feb66013f73da7ad59818ebc6c8dd6
+  metadata.gz: 14df7a66daefbd09533ee0b3e10d721cc01d2384
+  data.tar.gz: 3ef636603efb320d524144b2c3c7626990db835d
 SHA512:
-  metadata.gz: 4ee4c8a1da236230788d026e2f37ee9466966587719f033b1050050c0970528b04dc48d21ff44b1b8c684434977b7858bfeb175172b9ec3114cfaac1e2970f29
-  data.tar.gz: f05dc81ae9744dd1c651f16a1fe5aba045902fce8440dce542837c092c3e618aab5fa50299974282f7d51f8d69d7699d9d8ee69d5929e0d224d259db117a40d2
+  metadata.gz: e0e9797ad825bf5393b51784e6bb10d969e5894d9ea22950440e3cb76b25accc002d78115824e157566951bd6f4a3feb50fb2b6518db7e196cd2f857709dd497
+  data.tar.gz: 7aef43de7d88bad031f222480ffee2d6dc73f852a29912a9a5a93417498675128d66526bc5056affbe72d6ceaac9702527276e0cafcb8354365da2e0a557e999

data/Gemfile

@@ -28,3 +28,4 @@ group :development, :test do
 end
 
 gem 'nokogiri', '>= 1.7.1'
+gem 'puma'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/rails/rails-observers
-  revision: c569dc1525259f5ab82cddf90958777473499997
+  revision: fb6b95509c3f1a50c973280ddc2b56648e33623f
   specs:
     rails-observers (0.2.0)
       activemodel (>= 4.2)
@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-cms (3.1.3)
+    trusty-cms (3.1.5)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -118,7 +118,7 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.0.5)
-    crass (1.0.2)
+    crass (1.0.3)
     css_parser (1.6.0)
       addressable
     database_cleaner (1.5.3)
@@ -126,7 +126,7 @@ GEM
       rails (>= 3.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubi (1.6.1)
+    erubi (1.7.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.5.0)
@@ -135,7 +135,7 @@ GEM
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     ffi (1.9.18)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -146,13 +146,14 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.8)
+    highline (1.7.10)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.8.6)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -164,16 +165,17 @@ GEM
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     multi_json (1.12.2)
-    mysql2 (0.4.9)
+    mysql2 (0.4.10)
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
@@ -186,16 +188,17 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.5.0)
+    pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
+    puma (3.11.0)
     rack (2.0.3)
     rack-cache (1.7.1)
       rack (>= 0.4)
-    rack-test (0.7.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
     radius (0.7.4)
     rails (5.1.4)
@@ -233,27 +236,27 @@ GEM
     roadie-rails (1.2.1)
       railties (>= 3.0, < 5.2)
       roadie (~> 3.1)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     ruby_parser (3.10.1)
       sexp_processor (~> 4.9)
     sass (3.4.25)
-    sass-rails (5.0.6)
+    sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -283,13 +286,13 @@ GEM
     tilt (2.0.8)
     trustygems (0.2.1)
       rake
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
     will_paginate (3.1.6)
     xpath (2.1.0)
       nokogiri (~> 1.3)
@@ -309,11 +312,13 @@ DEPENDENCIES
   pry (~> 0.10.0)
   pry-byebug
   pry-rails
+  puma
   rails-observers!
   rspec-rails
   simplecov
   trusty-cms!
   trustygems (~> 0.2.0)
 
+
 BUNDLED WITH
-   1.16.0.pre.2
+   1.16.0

data/app/controllers/admin/pages_controller.rb

@@ -70,10 +70,12 @@ class Admin::PagesController < Admin::ResourceController
     end
 
     def render_preview
+      params.permit!
       Page.transaction do
         page_class = Page.descendants.include?(model_class) ? model_class : Page
         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.published_at ||= Time.now
         else

data/app/controllers/admin/users_controller.rb

@@ -12,7 +12,7 @@ class Admin::UsersController < Admin::ResourceController
   end
 
   def update
-    user_params = params[model_symbol]
+    user_params = params[model_symbol].permit!
     if user_params && user_params['admin'] == false && model == current_user
       user_params.delete('admin')
       annouce_cannot_remove_self_from_admin_role

data/app/views/layouts/application.html.haml

@@ -7,7 +7,8 @@
     - @stylesheets.uniq.each do |stylesheet|
       = stylesheet_link_tag stylesheet, media: "all"
 
-    %script{:type=>"text/javascript"}="var relative_url_root = '#{ActionController::Base.relative_url_root}';"
+    %script{:type=>"text/javascript"}
+      var relative_url_root = "#{ActionController::Base.relative_url_root}";
 
     = javascript_include_tag 'admin'
     - @javascripts.uniq.each do |javascript|

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2017-10-13T15:15:39-04:00">2017-10-13T15:15:39-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2017-11-22T09:17:07-05:00">2017-11-22T09:17:07-05:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -357,7 +357,7 @@
         <td>14</td>
         <td>14</td>
         <td>0</td>
-        <td>21.5</td>
+        <td>21.7</td>
       </tr>
       
       <tr>
@@ -569,7 +569,7 @@
       </div>
     
       <div id="footer">
-        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.13.0 
+        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.15.1 
         and simplecov-html v0.10.2<br/>
         using RSpec
       </div>
@@ -3605,7 +3605,7 @@
         <li class="missed" data-hits="0" data-linenumber="15">
           
           
-          <code class="ruby">    user_params = params[model_symbol]</code>
+          <code class="ruby">    user_params = params[model_symbol].permit!</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="16">
@@ -10892,8 +10892,8 @@
           <code class="ruby">  def current_user</code>
         </li>
       
-        <li class="covered" data-hits="7" data-linenumber="12">
-          <span class="hits">7</span>
+        <li class="covered" data-hits="8" data-linenumber="12">
+          <span class="hits">8</span>
           
           <code class="ruby">    self.class.current_user</code>
         </li>
@@ -10910,8 +10910,8 @@
           <code class="ruby">  def self.current_user</code>
         </li>
       
-        <li class="covered" data-hits="7" data-linenumber="15">
-          <span class="hits">7</span>
+        <li class="covered" data-hits="8" data-linenumber="15">
+          <span class="hits">8</span>
           
           <code class="ruby">    Thread.current[:current_user]</code>
         </li>
@@ -10934,8 +10934,8 @@
           <code class="ruby">  def before_create(model)</code>
         </li>
       
-        <li class="covered" data-hits="6" data-linenumber="19">
-          <span class="hits">6</span>
+        <li class="covered" data-hits="7" data-linenumber="19">
+          <span class="hits">7</span>
           
           <code class="ruby">    model.created_by = self.current_user</code>
         </li>

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.1.3'
+    VERSION = '3.1.5'
   end
 end