trusty-cms 3.6.2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24864c3e48977b8fddef8d19648397a3cc11bc00a0f89b741d894d2f73ffc415
-  data.tar.gz: '0083e090e5912e133a60aef312bdf47073a11381992872aa8e965be0e8d65c3a'
+  metadata.gz: 87d1aa29762eadcf31ca151549eb2fc9c92ca4f30d9d65a35b2cf73f5d1f2d41
+  data.tar.gz: 4eb4d1421a03c9bb20d7e894353b934495bdc7fc86d75bf8c4f4b25ce2b0c6b8
 SHA512:
-  metadata.gz: 5d63ce3ffb5eef61ba9102a45b23e65396f7c6b285fe731f17321aa3ad348dcc3a61bdf2146788aa03d3b5bfc84981693bb069479f55301a37a254cf6d033d82
-  data.tar.gz: e48758d3008942205ec5933932bf917ccc959c0f259700d232f6e3d465354979ed108b3c415d93f854ddf14ded356d72aedfbf81f7ca3c2f6c0ad59b3c5ebc63
+  metadata.gz: 2b3d8726f8da0998e568885be7e0003225f4af861bd8735b1ff0c50d76dbcd7a44a1b45516088372bbfa11786e86a8d93656f8a46db689fa4e84993f7a694d2a
+  data.tar.gz: 691acf119600c41670497c95765a83ebcc8262760657b8b6d74f1e6d3d66a1418580b5af3bb4ee458ec4f41d46750ef6c160a6bd87cc72656d7d4e44af1380c2

data/Gemfile

@@ -13,7 +13,6 @@ gemspec
 
 group :development, :test do
   gem 'acts_as_list'
-  gem 'codeclimate-test-reporter'
   gem 'database_cleaner'
   gem 'factory_bot_rails', '5.0.2'
   gem 'launchy',         '~> 2.4.2'
@@ -23,4 +22,5 @@ group :development, :test do
   gem 'rails-observers'
   gem 'rspec-rails'
   gem 'sass-rails'
+  gem 'simplecov'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.6.2)
+    trusty-cms (3.7.0)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -96,10 +96,8 @@ GEM
       orm_adapter (~> 0.5.0)
     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)
+    cocaine (0.5.8)
+      climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
@@ -109,7 +107,7 @@ GEM
     delocalize (1.2.0)
       rails (>= 2)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.2)
     erubi (1.8.0)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -149,7 +147,7 @@ GEM
       multipart-post
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (7.3.492.27.1)
+    libv8 (7.3.492.27.1-x86_64-linux)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -171,15 +169,15 @@ GEM
     multipart-post (2.1.1)
     mysql2 (0.5.2)
     nio4r (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    paperclip (6.1.0)
+    paperclip (5.2.1)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
+      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-      terrapin (~> 0.6.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -232,8 +230,8 @@ GEM
     roadie (3.5.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.1.0)
-      railties (>= 5.1, < 6.1)
+    roadie-rails (1.3.0)
+      railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
     rspec-core (3.8.1)
       rspec-support (~> 3.8.0)
@@ -266,8 +264,8 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
     sexp_processor (4.12.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
+    simplecov (0.17.0)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
@@ -280,8 +278,6 @@ GEM
       sprockets (>= 3.0.0)
     stringex (2.8.5)
     temple (0.8.1)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
@@ -304,7 +300,6 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_list
-  codeclimate-test-reporter
   database_cleaner
   factory_bot_rails (= 5.0.2)
   launchy (~> 2.4.2)
@@ -314,6 +309,7 @@ DEPENDENCIES
   rails-observers
   rspec-rails
   sass-rails
+  simplecov
   trusty-cms!
   trustygems (~> 0.2.0)
 

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.6.2'
+    VERSION = '3.7.0'
   end
 end

data/vendor/extensions/layouts-extension/layouts_extension.rb

@@ -8,7 +8,7 @@ class LayoutsExtension < TrustyCms::Extension
     ActionView::Base.send :include, ShareLayouts::Helpers::ActionView
 
     # Nested Layouts
-    # Page.send   :include, NestedLayouts::Tags::Core
+    Page.send   :include, NestedLayouts::Tags::Core
 
     # HAML Layouts
     Layout.send  :include, HamlLayouts::Models::Layout

data/vendor/extensions/layouts-extension/lib/nested_layouts/tags/core.rb

@@ -0,0 +1,149 @@
+module NestedLayouts
+    module Tags
+      module Core
+        
+        include TrustyCms::Taggable
+    
+        class TagError < StandardError; end
+  
+        desc %{
+          Renders the contents of the tag inside of a "parent" layout, which is selected via the +name+
+          attribute.  The contents of this tag are placed at a corresponding <r:content_for_layout/> tag
+          within the parent layout.  This tag is intended to be used within your layouts, and should
+          only appear once per layout.
+      
+          *Usage:*
+          <r:inside_layout name="master">
+            <div id="main-column">
+              <r:content_for_layout/>
+            </div>
+          </r:inside_layout>
+        }
+        tag 'inside_layout' do |tag|
+          if name = tag.attr['name']
+            # Prepare the stacks
+            tag.globals.nested_layouts_content_stack ||= []
+            tag.globals.nested_layouts_layout_stack ||= []
+  
+            # Remember the original layout to support the +layout+ tag
+            tag.globals.page_original_layout ||= tag.globals.page.layout # Remember the original layout
+        
+            # Find the layout
+            name.strip!
+            if layout = Layout.find_by_name(name)
+              # Track this layout on the stack
+              tag.globals.nested_layouts_layout_stack << name
+          
+              # Save contents of inside_layout for later insertion
+              tag.globals.nested_layouts_content_stack << tag.expand
+          
+              # Set the page layout that Trusty should use for rendering, which is different than the actual
+              # page's layout when layouts are nested.  The final/highest +inside_layout+ tag will set or 
+              # overwrite this value for the last time.
+              tag.globals.page.layout = layout
+              tag.globals.page.render
+            else
+              raise TagError.new(%{Error (nested_layouts): Parent layout "#{name.strip}" not found for "inside_layout" tag})
+            end
+          else
+            raise TagError.new(%{Error (nested_layouts): "inside_layout" tag must contain a "name" attribute})
+          end
+        end
+      
+        desc %{
+          Allows nested layouts to target this layout.  The contents of <r:inside_layout> tag blocks in another
+          layout will have their contents inserted at the location given by this tag (if they target this
+          layout).  This tag also behaves like a standard <r:content/> tag if this layout is specified directly
+          by a page.
+        
+          This tag is intended to be used inside layouts.
+        
+          *Usage:*
+        
+          <html>
+            <body>
+              <r:content_for_layout/>
+            </body>
+          </html>
+      
+        }
+        tag 'content_for_layout' do |tag|
+          tag.globals.nested_layouts_content_stack ||= []
+      
+          # return the saved content if any, or mimic a default +<r:content/>+ tag (render the body part)
+          tag.globals.nested_layouts_content_stack.pop || tag.globals.page.render_part('body')
+        end
+      
+        desc %{
+          Return the layout name of the current page.
+        
+          *Usage:*
+        
+          <html>
+            <body id="<r:layout/>"
+              My body tag has an id corresponding to the layout I use.  Sweet!
+            </body>
+          </html>
+        }
+        tag 'layout' do |tag|
+          current_layout_name(tag)
+        end
+      
+        desc %{
+          output the contents of tag if layout equals name (support regex)
+          
+          *Usage:*
+        
+          <pre><code><r:if_layout name="(parent|parent_of_child)">
+            one of those layouts
+          </r:if_layout></code></pre>
+        }
+        tag 'if_layout' do |tag|        
+          tag.expand if is_current_layout(tag)
+        end
+      
+        desc %{
+          Output the contents of tag unless layout equals name (support regex)
+          
+          *Usage:*
+        
+          <pre><code><r:unless_layout name="parent">
+            not the parent layotu
+          </r:unless_layout></code></pre>
+        }
+        tag 'unless_layout' do |tag|
+          tag.expand unless is_current_layout(tag)
+        end
+        
+        tag 'body' do  |tag|
+          %{<body id="#{tag.locals.page.slug.gsub('/','')}" class="#{current_layout_name(tag)}#{tag.attr['class'].present? ? " #{tag.attr['class']}" : nil}">#{tag.expand}</body>}
+        end
+        
+        protected
+        
+        def current_layout_name(tag)
+          result = ''
+          
+          if layout = tag.globals.page_original_layout
+            result = layout.name
+          elsif layout = tag.globals.page.layout
+            result = layout.name
+          end
+          
+          result
+        end
+        
+        def is_current_layout(tag)
+          if tag.attr['name'].nil?
+            raise TagError.new(%{Error (nested_layouts): "if_layout" tag must contain a "name" attribute})
+          end
+          
+          layout = tag.globals.page_original_layout || tag.globals.page.layout
+          search = %r{#{tag.attr['name']}}
+          
+          (layout.name =~ search).present?
+        end
+        
+      end
+    end
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -1009,6 +1009,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
+- spec/dummy/log/test.log
 - spec/dummy/package.json
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1047,6 +1048,7 @@ files:
 - vendor/extensions/layouts-extension/lib/haml_layouts/models/layout.rb
 - vendor/extensions/layouts-extension/lib/haml_layouts/models/page.rb
 - vendor/extensions/layouts-extension/lib/layouts/engine.rb
+- vendor/extensions/layouts-extension/lib/nested_layouts/tags/core.rb
 - vendor/extensions/layouts-extension/lib/share_layouts/controllers/action_controller.rb
 - vendor/extensions/layouts-extension/lib/share_layouts/helpers/action_view.rb
 - vendor/extensions/layouts-extension/lib/tasks/layouts_extension_tasks.rake
@@ -1128,54 +1130,55 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
+- spec/ci/database.mysql.yml
+- spec/controllers/application_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/welcome_controller_spec.rb
+- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/package.json
-- spec/dummy/bin/setup
-- spec/dummy/bin/rake
-- spec/dummy/bin/rails
 - spec/dummy/bin/bundle
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/trusty_cms_config.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/README.rdoc
+- spec/dummy/log/test.log
+- spec/dummy/package.json
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
 - spec/dummy/yarn.lock
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/welcome_controller_spec.rb
-- spec/controllers/application_controller_spec.rb
-- spec/rails_helper.rb
-- spec/routing/welcome_routing_spec.rb
-- spec/fixtures/users.yml
-- spec/spec_helper.rb
-- spec/models/layout_spec.rb
-- spec/ci/database.mysql.yml
-- spec/features/pages_spec.rb
-- spec/features/config_spec.rb
-- spec/features/admin_login_spec.rb
-- spec/features/layouts_spec.rb
+- spec/factories/layout.rb
 - spec/factories/page.rb
 - spec/factories/page_part.rb
 - spec/factories/user.rb
-- spec/factories/layout.rb
+- spec/features/admin_login_spec.rb
+- spec/features/config_spec.rb
+- spec/features/layouts_spec.rb
+- spec/features/pages_spec.rb
+- spec/fixtures/users.yml
+- spec/models/layout_spec.rb
+- spec/rails_helper.rb
+- spec/routing/welcome_routing_spec.rb
+- spec/spec_helper.rb
 - spec/support/custom_actions.rb