cms-fortress 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4461c6c112d1c0ed20b2bbc1f524e93f0f1306c
-  data.tar.gz: ae26a146869f8ebfa0b6146d379ab4062514021b
+  metadata.gz: 0eb689f4f9fd6e5e4473a2903cc30668bae360d4
+  data.tar.gz: b0c72ea1a5a3bd6da80a1c9c915f850a7663b842
 SHA512:
-  metadata.gz: 1f547081455922824e1fc305b6437c9ce64551e589d116ef05d21f9fab647d64fac2afaa2f2a8c78d046c126e6f23200eb7f3f48492e31629d4dce817fbf136a
-  data.tar.gz: 4ce3fc3e9abbc70cdff61ae6884cb3963df32f5a1527dfedc76dbb23a1667190e95ecc3ab9982dea9eca6fad898eeafc73bc2f10ccbc942bbe5f0320107fdf32
+  metadata.gz: 0ed0344771b878828f58767ddfb527d5e74b342f9a1ebc68fd6ae3116189fbea50adc1be6b28d53515e8d482bb15c286f92ca8d93495259f1454f21c054e9741
+  data.tar.gz: f0798288d4308762d422945b3617d312eb6cc2c11ff2cd0a94ea058c0b712fb6432e10bcf76cae8c0ce78e83265c2c892dedab50b81ec57ec0f5573aebc0463a

data/.travis.yml

@@ -8,4 +8,6 @@ branches:
   only:
     - master
 
-cache: bundler
+# cache: bundler
+before_install:
+  - gem install bundler

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cms-fortress (1.3.12)
+    cms-fortress (1.3.14)
       aasm (~> 4.0)
       cancancan (~> 1.9)
       comfortable_mexican_sofa (~> 1.12, >= 1.12.5)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (4.3.0)
+    aasm (4.10.1)
     actionmailer (4.0.13)
       actionpack (= 4.0.13)
       mail (~> 2.5, >= 2.5.4)
@@ -43,30 +43,29 @@ GEM
       tzinfo (~> 0.3.37)
     ansi (1.5.0)
     arel (4.0.2)
-    autoprefixer-rails (6.0.3)
+    autoprefixer-rails (6.3.6.1)
       execjs
-      json
-    bcrypt (3.1.10)
-    bootstrap-sass (3.3.5.1)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.3.0)
+    bcrypt (3.1.11)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     bootstrap_form (2.3.0)
     builder (3.1.4)
-    cancancan (1.13.1)
+    cancancan (1.14.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (5.6)
+    codemirror-rails (5.11)
       railties (>= 3.0, < 5)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    comfortable_mexican_sofa (1.12.8)
+    coffee-script-source (1.10.0)
+    comfortable_mexican_sofa (1.12.9)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -81,9 +80,10 @@ GEM
       rails (>= 4.0.0, < 5)
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
-    delayed_job (4.1.1)
-      activesupport (>= 3.0, < 5.0)
-    devise (3.5.2)
+    concurrent-ruby (1.0.2)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -92,7 +92,7 @@ GEM
       warden (~> 1.2.3)
     docile (1.1.5)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     haml (4.0.7)
       tilt
     haml-rails (0.9.0)
@@ -101,7 +101,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.4.2)
+    hashie (3.4.4)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
       haml (~> 4.0.0)
@@ -114,12 +114,14 @@ GEM
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    kramdown (1.9.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
+    kramdown (1.11.1)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (4.7.5)
     minitest-rails (1.0.1)
       minitest (~> 4.7)
@@ -130,16 +132,16 @@ GEM
       builder
       minitest (>= 2.12, < 5.0)
       powerbar
-    minitest-spec-rails (4.7.9)
+    minitest-spec-rails (4.7.10)
       minitest (~> 4.7)
       rails (>= 3.0, < 4.1)
     minitest-test (1.1.0)
       minitest (~> 4.0)
-    multi_json (1.11.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    multi_json (1.12.1)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.3.1)
+    paperclip (4.3.6)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -147,8 +149,7 @@ GEM
       mimemagic (= 0.3.0)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    powerbar (1.0.12)
-      ansi (~> 1.5.0)
+    powerbar (1.0.17)
       hashie (>= 1.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
@@ -161,50 +162,51 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.13)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.5)
-      i18n (~> 0.6)
+    rails-i18n (4.0.8)
+      i18n (~> 0.7)
       railties (~> 4.0)
     railties (4.0.13)
       actionpack (= 4.0.13)
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
+    rake (11.1.2)
+    rdoc (4.2.2)
       json (~> 1.4)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    ruby_parser (3.7.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    sass (3.4.19)
+    sass (3.4.22)
     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, < 3)
-    sexp_processor (4.6.0)
-    simplecov (0.10.0)
+    sexp_processor (4.7.0)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.4.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.1)
-    tinymce-rails (4.2.5)
+    tilt (2.0.4)
+    tinymce-rails (4.3.12)
       railties (>= 3.1.1)
-    tinymce-rails-langs (4.20140129)
-      tinymce-rails (~> 4.0)
-    tzinfo (0.3.45)
-    warden (1.2.3)
+    tinymce-rails-langs (4.20160310)
+      tinymce-rails (~> 4.1, >= 4.1.10)
+    tzinfo (0.3.49)
+    warden (1.2.6)
       rack (>= 1.0)
 
 PLATFORMS
@@ -220,3 +222,6 @@ DEPENDENCIES
   rdoc
   simplecov
   sqlite3
+
+BUNDLED WITH
+   1.10.6

data/VERSION

@@ -1 +1 @@
-1.3.14
+1.3.15

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.14"
+  s.version   = "1.3.15"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2015-10-17"
+  s.date              = "2016-05-24"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]

data/lib/cms/fortress/content_renderer.rb

@@ -5,18 +5,8 @@ module Cms
       def self.included(base)
 
         base.class_eval do
-=begin
-          def render_html(status = 200)
-            if @cms_layout = @cms_page.layout
-              app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-              render :inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => 'text/html'
-            else
-              render :text => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
-            end
-          end
-=end
 
-          def render_html(status = 200)
+          def render_page(status = 200)
             cached_timeout = @cms_page.cached_timeout.to_i
 
             if cached_timeout > 0
@@ -27,7 +17,7 @@ module Cms
             if @cms_layout = @cms_page.layout
 
               app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-              render(:inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => 'text/html') unless cached_timeout > 0 && performed?
+              render(:inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => mime_type) unless cached_timeout > 0 && performed?
             else
               render :text => I18n.t('cms.content.layout_not_found'), :status => 404
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Comfortable Mexican Sofa (CMS) - User and role management extension