trusty-cms 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b33b311c9d9864cbef46a7bf31fb7b7be47c66
-  data.tar.gz: dd98e4217df28c031e63c78abce3f337adda3b35
+  metadata.gz: 7ff33e8c673a3a54ea713b6f1881e04e9787ec3f
+  data.tar.gz: 00989add18044cd696fa04fc3890f5fa4a424598
 SHA512:
-  metadata.gz: 40314deefc0a596893aff940dd0d946861fba6e83b5ec7eeb53412ce6b55498ee81b975429ce538763b62814abe77e70cc842e08b1d4ecb651a8dee6ea5af540
-  data.tar.gz: 7d555fe473225b40430ecd780360df36430ca29d6d5e58c528459814b9436b87bada952b670977d5ab8c4ea9d12f85c8f7fdb7042c17c3ea7bef1b240f50eca3
+  metadata.gz: c3a85ab3956913fe18aa8c8466fe2ff9655adfcf9366d7ec0ec217f4af0b662afcc9b553c5c2b011ea1aa2530e39dc584d30e846a93a3cdc325b95f5d9f7ce9c
+  data.tar.gz: f3810913c32aa8e629735a810d061c9254bc7fdc8349e6d76e00f5c47c9f570535507097a467f93e070324a8e0636f810ac32adea27222d98506544770d23b7f

data/CONTRIBUTORS.md

@@ -11,9 +11,11 @@ core:
 * Aly Fulton
 * Andrew Miller
 * Justin Reese
-* Patrick Fitzgerald
+* Patrick FitzGerald
 * Kurtis Rainbolt-Greene
 * Colin Dean
+* Brittant Martin
+* Danielle Greaves
 
 ## Radiant CMS
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (2.0.16)
+    trusty-cms (2.0.17)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -19,6 +19,7 @@ PATH
       rack-cache (~> 1.2)
       radius (~> 0.7)
       rails (~> 4.2)
+      rake (< 11.0)
       rdoc (~> 3.9)
       stringex (~> 1.3)
       therubyracer (~> 0.12)
@@ -31,36 +32,36 @@ GEM
   specs:
     RedCloth (4.2.9)
     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)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       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.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       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.5.1)
-      activesupport (= 4.2.5.1)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -87,7 +88,7 @@ GEM
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -154,11 +155,11 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (2.99.1)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     multi_json (1.11.2)
-    mysql2 (0.4.2)
+    mysql2 (0.4.3)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nokogiri (1.6.7.2-java)
@@ -188,16 +189,16 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    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)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -209,9 +210,9 @@ GEM
       loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)

data/app/controllers/admin/pages_controller.rb

@@ -47,7 +47,7 @@ class Admin::PagesController < Admin::ResourceController
 
     def model_class
       if Page.descendants.any? { |d| d.to_s == params[:page_class] }
-        params[:page_class].constantize
+        verify_page_class(params[:page_class])
       elsif params[:page_id]
         Page.find(params[:page_id]).children
       else
@@ -89,4 +89,12 @@ class Admin::PagesController < Admin::ResourceController
       @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
       @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
     end
+
+  def verify_page_class(page_class)
+    if page_class.constantize.class == Page
+      page_class.constantize
+    else
+      raise "I'm not allowed to constantize #{page_class}!"
+    end
+  end
 end

data/app/controllers/admin/references_controller.rb

@@ -1,7 +1,14 @@
 class Admin::ReferencesController < ApplicationController
   def show
     respond_to do |format|
-      format.any { render :action => params[:type], :content_type => "text/html", :layout => false }
+      render_allowed_type(params[:type])
+      format.any { render :action => @type, :content_type => "text/html", :layout => false }
     end
   end
+
+  private
+
+  def render_allowed_type(type)
+    @type = type
+  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 = "2.0.16"
+    VERSION = "2.0.17"
   end
 end