trusty-cms 7.1.2 → 7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f28f9884a07d4a5b4c582c2e490af233fa40d9e275bf531c0e103f8a16fb1d2
-  data.tar.gz: 1296987f36ad6cdd537e654978fca42b74519b1c727474c3725d1e81afc6a662
+  metadata.gz: 2378bbe6b853e3290648de1a8a832b61a25303f3078f4903ac70581a031bb3a5
+  data.tar.gz: 3e704c6349a8bf385190cc70ee6cf0021aa8c0cc575d5e033a3c1423a32e5e20
 SHA512:
-  metadata.gz: 30e7296886c47d33276f7612b24c24a310a45c99c60c7907b52bdbf6b11c264c8ae4705ccfe4e187c7b0bd2d11cc6077d12ad7f54e9e9e3cf413a283bd7211a3
-  data.tar.gz: f41957d9f3c0e03e8e4af00eda15710e577350659aa7b41f6182c01b31d9e8db3d326c9fe791dd009b5cae6c92ef1bc564597bd5fc0815fb4c0b2c9f283e5d9a
+  metadata.gz: b4c137e5c84e08a9fc8395282986fe8a7b8b0c7c28d6e3b888b60a4e8a0c19f30d1520bc92a5580c8a3472961470e57558215ff3965546626dbb934863cd9f07
+  data.tar.gz: 42f087dbc0e78b43ffb48ad804b891992eafafe7d8e3ee5589b2d983902eaef2590f5325bb03f1df568227e52ae4a391d7ca8000432e9be82f59710c332f34b4

data/Gemfile

@@ -16,18 +16,19 @@ group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
   gem 'devise-two-factor'
-  gem 'factory_bot_rails', '6.4.4'
+  gem 'factory_bot_rails', '6.5.1'
   gem 'file_validators'
   gem 'jsbundling-rails', '~> 1.3'
   gem 'launchy', '~> 3.0.1'
   gem 'mysql2'
   gem 'paper_trail', '~> 16.0.0'
-  gem 'paper_trail-association_tracking', '~> 2.2.1'
+  gem 'paper_trail-association_tracking', '~> 2.3.0'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
-  gem 'psych', '5.2.2'
+  gem 'psych', '5.4.0'
   gem 'rails-observers'
   gem 'ransack'
+  gem 'rspec_junit_formatter'
   gem 'rspec-rails', '~> 7.1.1'
   gem 'simplecov'
   gem 'simplecov-lcov'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.1.2)
+    trusty-cms (7.2)
       RedCloth (= 4.3.4)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -24,15 +24,15 @@ PATH
       mutex_m
       mysql2
       paper_trail (~> 16.0.0)
-      paper_trail-association_tracking (~> 2.2.1)
-      psych (= 5.2.2)
+      paper_trail-association_tracking (>= 2.2.1, < 2.4.0)
+      psych (= 5.4.0)
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.8)
-      rails (~> 7.2.2.1)
+      rails (>= 7.2, < 8.0)
       rake (< 14.0)
       ransack (~> 4.2.1)
-      rdoc (>= 5.1, < 7.0)
+      rdoc (>= 5.1, < 9.0)
       roadie-rails
       rqrcode
       sass-rails
@@ -46,68 +46,70 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.4)
-    actioncable (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actioncable (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailbox (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      activejob (= 7.2.3.2)
+      activerecord (= 7.2.3.2)
+      activestorage (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionmailer (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      actionview (= 7.2.3.2)
+      activejob (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (7.2.3.2)
+      actionview (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
+      cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actiontext (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      activerecord (= 7.2.3.2)
+      activestorage (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (7.2.3.2)
+      activesupport (= 7.2.3.2)
       builder (~> 3.1)
+      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (7.2.3.2)
+      activesupport (= 7.2.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.3.2)
+      activesupport (= 7.2.3.2)
+    activerecord (7.2.3.2)
+      activemodel (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activestorage (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      activejob (= 7.2.3.2)
+      activerecord (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       marcel (~> 1.0)
     activestorage-validator (0.4.0)
       rails (>= 6.1.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.3.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -116,10 +118,10 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    acts_as_list (1.2.4)
+    acts_as_list (1.2.6)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
     acts_as_tree (2.9.1)
@@ -131,7 +133,8 @@ GEM
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     builder (3.3.0)
-    byebug (11.1.3)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
     capybara (3.40.0)
       addressable
       matrix
@@ -141,16 +144,18 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    cgi (0.5.2)
     childprocess (5.1.0)
       logger (~> 1.5)
     chunky_png (1.4.0)
     cliver (0.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
-    crass (1.0.6)
-    css_parser (1.22.0)
+    crass (1.0.7)
+    css_parser (3.0.0)
       addressable
+      ssrf_filter (~> 1.5)
     csso-rails (0.9.0)
       execjs (>= 1)
     csv (3.3.0)
@@ -178,14 +183,14 @@ GEM
     diffy (3.4.4)
     docile (1.4.1)
     drb (2.2.3)
-    erb (6.0.4)
+    erb (6.0.6)
     erubi (1.13.1)
     execjs (2.10.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.4)
+    factory_bot (6.6.0)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
-      railties (>= 5.0.0)
+      railties (>= 6.1.0)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-aarch64-linux-musl)
     ffi (1.17.0-arm-linux-gnu)
@@ -199,7 +204,7 @@ GEM
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    globalid (1.2.1)
+    globalid (1.4.0)
       activesupport (>= 6.1)
     haml (6.3.0)
       temple (>= 0.8.2)
@@ -216,7 +221,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
@@ -246,15 +251,16 @@ GEM
     libv8-node (18.19.0.0-x86_64-linux)
     libv8-node (18.19.0.0-x86_64-linux-musl)
     logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.8.1)
+    mail (2.9.1)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
+    marcel (1.2.1)
     matrix (0.4.2)
     method_source (1.1.0)
     mime-types (3.6.0)
@@ -266,15 +272,13 @@ GEM
     mini_portile2 (2.8.9)
     mini_racer (0.16.0)
       libv8-node (~> 18.19.0.0)
-    minitest (6.0.6)
-      drb (~> 2.0)
-      prism (~> 1.5)
+    minitest (5.27.0)
     multi_xml (0.9.1)
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     mysql2 (0.5.6)
-    net-imap (0.5.15)
+    net-imap (0.6.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -283,47 +287,48 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.19.3)
+    nio4r (2.7.5)
+    nokogiri (1.19.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-aarch64-linux-gnu)
+    nokogiri (1.19.4-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-aarch64-linux-musl)
+    nokogiri (1.19.4-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm-linux-gnu)
+    nokogiri (1.19.4-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm-linux-musl)
+    nokogiri (1.19.4-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-musl)
+    nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    paper_trail-association_tracking (2.2.1)
+    paper_trail-association_tracking (2.3.0)
       paper_trail (>= 12.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
-    pry (0.14.2)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    psych (5.2.2)
+      reline (>= 0.6.0)
+    pry-byebug (3.12.0)
+      byebug (~> 13.0)
+      pry (>= 0.13, < 0.17)
+    psych (5.4.0)
       date
       stringio
     public_suffix (7.0.5)
@@ -339,45 +344,52 @@ GEM
     rackup (2.3.1)
       rack (>= 3)
     radius (0.8.0)
-    rails (7.2.2.1)
-      actioncable (= 7.2.2.1)
-      actionmailbox (= 7.2.2.1)
-      actionmailer (= 7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actiontext (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activerecord (= 7.2.2.1)
-      activestorage (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    rails (7.2.3.2)
+      actioncable (= 7.2.3.2)
+      actionmailbox (= 7.2.3.2)
+      actionmailer (= 7.2.3.2)
+      actionpack (= 7.2.3.2)
+      actiontext (= 7.2.3.2)
+      actionview (= 7.2.3.2)
+      activejob (= 7.2.3.2)
+      activemodel (= 7.2.3.2)
+      activerecord (= 7.2.3.2)
+      activestorage (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.1)
+      railties (= 7.2.3.2)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    railties (7.2.3.2)
+      actionpack (= 7.2.3.2)
+      activesupport (= 7.2.3.2)
+      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rake (13.4.2)
     ransack (4.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rdoc (6.17.0)
+    rbs (4.1.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
     regexp_parser (2.9.2)
     reline (0.6.3)
@@ -387,17 +399,17 @@ GEM
     responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
-    roadie (5.2.1)
-      css_parser (~> 1.4)
+    roadie (5.3.1)
+      css_parser (>= 1.4, < 4.0)
       nokogiri (~> 1.15)
-    roadie-rails (3.3.0)
-      railties (>= 5.1, < 8.1)
+    roadie-rails (3.4.0)
+      railties (>= 5.1, < 8.2)
       roadie (~> 5.0)
     rotp (6.3.0)
-    rqrcode (3.1.0)
+    rqrcode (3.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 2.0)
-    rqrcode_core (2.0.0)
+    rqrcode_core (2.1.0)
     rspec-core (3.13.4)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
@@ -415,6 +427,8 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
@@ -443,6 +457,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
+    ssrf_filter (1.5.0)
     stringex (2.8.6)
     stringio (3.2.0)
     temple (0.10.3)
@@ -456,11 +471,11 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    uri (1.0.2)
+    uri (1.0.4)
     useragent (0.16.11)
     warden (1.2.9)
       rack (>= 2.0.9)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -486,19 +501,20 @@ DEPENDENCIES
   acts_as_list
   database_cleaner
   devise-two-factor
-  factory_bot_rails (= 6.4.4)
+  factory_bot_rails (= 6.5.1)
   file_validators
   jsbundling-rails (~> 1.3)
   launchy (~> 3.0.1)
   mysql2
   paper_trail (~> 16.0.0)
-  paper_trail-association_tracking (~> 2.2.1)
+  paper_trail-association_tracking (~> 2.3.0)
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 5.2.2)
+  psych (= 5.4.0)
   rails-observers
   ransack
   rspec-rails (~> 7.1.1)
+  rspec_junit_formatter
   simplecov
   simplecov-lcov
   trusty-cms!

data/README.md

@@ -12,6 +12,8 @@ Rails engine and is built to be installed into an existing Rails 7 application a
 
 CircleCI: [![CircleCI](https://circleci.com/gh/pgharts/trusty-cms/tree/master.svg?style=shield)](https://circleci.com/gh/pgharts/trusty-cms/tree/master)
 
+Coverage: [![Coverage](https://qlty.sh/badges/4cf4f7cc-d0e8-4559-93ec-685866f5645b/test_coverage.svg)](https://qlty.sh/gh/pgharts/projects/trusty-cms) 
+
 Qlty: [![Maintainability](https://qlty.sh/gh/pgharts/projects/trusty-cms/maintainability.svg)](https://qlty.sh/gh/pgharts/projects/trusty-cms)
 
 TrustyCMS features:

data/app/controllers/admin/resource_controller.rb

@@ -42,7 +42,7 @@ class Admin::ResourceController < ApplicationController
     r.update.publish(:xml, :json) { head :ok }
     r.update.default { redirect_to redirect_url }
 
-    r.destroy.publish(:xml, :json) { head :deleted }
+    r.destroy.publish(:xml, :json) { head :ok }
     r.destroy.default { redirect_to redirect_url }
   end
 

data/app/controllers/application_controller.rb

@@ -5,6 +5,14 @@ class ApplicationController < ActionController::Base
   prepend_view_path("#{TRUSTY_CMS_ROOT}/app/views")
 
   protect_from_forgery with: :exception
+  # Capture the request host before authentication runs so the site-scope logout
+  # telemetry (issue #1040) can compare the host's site to the (global) current
+  # site. Thread.current is per-thread and safe across concurrent requests —
+  # unlike the class-level Page.current_site the telemetry is investigating.
+  # An around_action (prepended so it wraps authenticate_user!) guarantees the
+  # value is cleared even if the request raises, so it can't leak into the next
+  # request handled by the same thread.
+  prepend_around_action :with_request_host_for_telemetry
   before_action :authenticate_user!
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :set_timezone
@@ -53,6 +61,13 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def with_request_host_for_telemetry
+    Thread.current[:trusty_request_host] = request.host
+    yield
+  ensure
+    Thread.current[:trusty_request_host] = nil
+  end
+
   def set_mailer
     ActionMailer::Base.default_url_options[:host] = request.host_with_port
   end

data/app/models/asset.rb

@@ -83,8 +83,17 @@ class Asset < ActiveRecord::Base
     self[:asset_file_size]
   end
 
-  delegate :active_storage_styles, :style_dimensions, :style_format,
-           to: :asset_type
+  def active_storage_styles
+    asset_type&.active_storage_styles || {}
+  end
+
+  def style_dimensions(style_name)
+    asset_type&.style_dimensions(style_name)
+  end
+
+  def style_format(style_name)
+    asset_type&.style_format(style_name)
+  end
 
   def pdf?
     content_type == 'application/pdf'
@@ -340,13 +349,28 @@ class Asset < ActiveRecord::Base
 
   # this is a convenience for image-pickers
   def self.thumbnail_options
-    asset_sizes = thumbnail_sizes.map do |k, v|
+    # The :original style is represented by the explicit entry prepended below,
+    # so skip it here to avoid a duplicate (and blank) "original" option.
+    asset_sizes = thumbnail_sizes.reject { |k, _| k.to_sym == :original }.map do |k, v|
       size_id = k
-      size_description = "#{k}: "
-      size_description << (v.is_a?(Array) ? v.join(' as ') : v)
+      size_description = "#{k}: #{describe_style(v)}"
       [size_description, size_id]
     end.sort_by { |pair| pair.last.to_s }
     asset_sizes.unshift ['Original (as uploaded)', 'original']
     asset_sizes
   end
+
+  # Renders a style definition into a short human-readable description for a
+  # picker. ActiveStorage styles are hashes (e.g. {geometry: '100x100#',
+  # format: :png}); older definitions may be arrays or plain strings.
+  def self.describe_style(style)
+    case style
+    when Hash
+      [style[:geometry], style[:format]].compact.join(' as ')
+    when Array
+      style.join(' as ')
+    else
+      style.to_s
+    end
+  end
 end

data/app/models/standard_tags.rb

@@ -52,8 +52,7 @@ module StandardTags
   }
   tag 'children:count' do |tag|
     options = children_find_options(tag)
-    options.delete(:order) # Order is irrelevant
-    tag.locals.children.count(options)
+    tag.locals.children.where(options[:conditions]).count
   end
 
   desc %{
@@ -66,7 +65,7 @@ module StandardTags
   }
   tag 'children:first' do |tag|
     options = children_find_options(tag)
-    children = tag.locals.children.where(options)
+    children = tag.locals.children.where(options[:conditions]).order(options[:order])
     if first = children.first
       tag.locals.page = first
       tag.expand
@@ -83,7 +82,7 @@ module StandardTags
   }
   tag 'children:last' do |tag|
     options = children_find_options(tag)
-    children = tag.locals.children.where(options)
+    children = tag.locals.children.where(options[:conditions]).order(options[:order])
     if last = children.last
       tag.locals.page = last
       tag.expand
@@ -942,7 +941,14 @@ module StandardTags
     paging = pagination_find_options(tag)
     result = []
     tag.locals.previous_headers = {}
-    displayed_children = paging ? findable.paginate(options.merge(paging)) : findable.all.where(options[:conditions]).order(options[:order])
+    scoped = findable.where(options[:conditions]).order(options[:order])
+    if paging
+      displayed_children = scoped.paginate(paging)
+    else
+      scoped = scoped.limit(options[:limit]) if options[:limit]
+      scoped = scoped.offset(options[:offset]) if options[:offset]
+      displayed_children = scoped
+    end
     displayed_children.each_with_index do |item, i|
       tag.locals.child = item
       tag.locals.page = item
@@ -989,13 +995,13 @@ module StandardTags
 
     status = attr[:status]
     if status == 'all'
-      options[:conditions] = ['virtual = ?', false]
+      options[:conditions] = ['`virtual` = ?', false]
     else
       stat = Status[status]
       if stat.nil?
         raise TagError.new(%{`status' attribute of `each' tag must be set to a valid status})
       else
-        options[:conditions] = ['(virtual = ?) and (status_id = ?)', false, stat.id]
+        options[:conditions] = ['(`virtual` = ?) and (status_id = ?)', false, stat.id]
       end
     end
     options