rabl 0.16.1 → 0.18.0

data/lib/rabl.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'active_support'
+require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/reverse_merge'
@@ -15,11 +18,12 @@ require 'rabl/multi_builder'
 require 'rabl/configuration'
 require 'rabl/renderer'
 require 'rabl/cache_engine'
+require 'rabl/template_cache_key'
 
 if defined?(Rails) && Rails.respond_to?(:version)
-  require 'rabl/tracker'  if Rails.version =~ /^[4567]/
-  require 'rabl/digestor' if Rails.version =~ /^[4567]/
-  require 'rabl/railtie'  if Rails.version =~ /^[34567]/
+  require 'rabl/tracker'  if Rails.version =~ /^[45678]/
+  require 'rabl/digestor' if Rails.version =~ /^[45678]/
+  require 'rabl/railtie'  if Rails.version =~ /^[345678]/
 end
 
 # Rabl.register!
@@ -54,16 +58,18 @@ module Rabl
     end
 
     # Fetches from the source_cache, stores block result in cache if nil
-    # Used to cache the contents and paths to various rabl templates
-    # source_cache("users/index", "path/to/view") { "/full/path/to/template/users/index" }
-    def source_cache(file, view_path, &block)
+    # Used to cache the contents and paths to various rabl templates, keyed by
+    # everything the lookup depends on (the file, the view path and the lookup details)
+    # source_cache("users/index", ["path/to/view"], [:json]) { "/full/path/to/template/users/index" }
+    def source_cache(file, view_path, lookup = nil)
       return yield unless Rabl.configuration.cache_sources
 
-      cache_key = [file, view_path].compact.join(":")
-
       @_source_cache ||= {}
 
-      @_source_cache[cache_key] ||= yield
+      # stores a frozen copy of the key, so later changes to the caller's strings don't reach it
+      @_source_cache.fetch([file, view_path, lookup]) do
+        @_source_cache[frozen_copy([file, view_path, lookup])] = yield
+      end
     end
 
     # Resets the RABL source cache
@@ -71,6 +77,16 @@ module Rabl
       @_source_cache = {}
     end
 
+    # Returns a copy of value whose Strings and Arrays are frozen, for cache keys that
+    # must not change when the caller's objects do
+    def frozen_copy(value)
+      case value
+      when Array  then value.map { |item| frozen_copy(item) }.freeze
+      when String then value.frozen? ? value : value.dup.freeze
+      else value
+      end
+    end
+
     # Renders an object using a specified template within an application.
     # render(@post, 'posts/show', :view_path => "/path/to/app/views")
     def render(object, source, options = {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2026-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,118 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.14
-- !ruby/object:Gem::Dependency
-  name: riot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.3
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: plist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: General ruby templating with json, bson, xml and msgpack support
 email:
 - nesquena@gmail.com
@@ -163,6 +51,7 @@ files:
 - lib/rabl/renderer.rb
 - lib/rabl/sources.rb
 - lib/rabl/template.rb
+- lib/rabl/template_cache_key.rb
 - lib/rabl/tracker.rb
 - lib/rabl/version.rb
 homepage: https://github.com/nesquena/rabl
@@ -177,14 +66,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: General ruby templating with json, bson, xml and msgpack support