rabl 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad87035852538a80f4fa99e9eef0b5bf75023ddba90b23fb5547e751bb7dc44
-  data.tar.gz: 050337e1fd66397e645bc5b4c5e9e08e97e58a518e4d4a212d32127e4ab46988
+  metadata.gz: 0fb8310726d92ea377d5be433f173207997ea6cc7e3a4a3faefe71b7de5b5df2
+  data.tar.gz: e75ceb99863c03bff3093983da87c83e79a02c8f1d74cc2ca6dd6c4755fd8404
 SHA512:
-  metadata.gz: e15a88017ad0820bf671a71d6f81b2acacf0c012caf8e597af36da4c1bd457af41cdfa833932193a746f38a1b00e86c3aab26360a9637c8c4db4fe66de10c156
-  data.tar.gz: 981a56f68a7d8faff5777f6c124fc17c3c60bf9211d7d197abf2fe3ebb224d0ff03148f3e9a4fa0527d868921a3d6cfa909a0bbc3e6c651652ebde7f53631163
+  metadata.gz: 2fc9988668325cc4dd12e75a774d14f6be984a83d2ed043712536d3753d6ae70b71d09d6784120f82b2c75809ed8d446c1965e56fcac1ddbc9c4bace259fc342
+  data.tar.gz: 58a0105a9fdf9e016ddee845ca3a4fde7fb0944a1792230f878ce380d2b9778e8d82da3722ba89d1702442e3d539c4db071ff56e201f596625d12f9ffaa90585

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## 0.15.0 (December 30, 2021)
+
+* Support for Rails 7 (@tagliala)
+* Improvements to unit testing
+* Miscellanious other bug fixes
+
+## 0.14.5 (May 29th, 2021)
+
+* Restrict and validate the `to_***` methods available within engine (Brian McFadden)
+
+## 0.14.4 (April 1st, 2021)
+
+* Test against latest Ruby versions
+* Exclude yarn lock
+* Remove non-required files from the .gem
+
+## 0.14.3 (April 22nd, 2020)
+
+* Fix regression on Rails 4.2 (@tagliala)
+
 ## 0.14.2 (September 10th, 2019)
 
 * Made Rails 6 compatible (@jpawlyn)

data/CONTRIBUTING.md

@@ -34,4 +34,4 @@ Syntax:
 
 And in case we didn't emphasize it enough: we love tests!
 
-NOTE: Adapted from https://raw.github.com/thoughtbot/factory_girl_rails/master/CONTRIBUTING.md
+NOTE: Adapted from https://raw.githubusercontent.com/thoughtbot/factory_bot_rails/main/CONTRIBUTING.md

data/README.md

@@ -1,6 +1,6 @@
 # RABL #
 
-[![Continuous Integration status](https://secure.travis-ci.org/nesquena/rabl.svg)](http://travis-ci.org/nesquena/rabl)
+[![Continuous Integration status](https://github.com/nesquena/rabl/actions/workflows/ci.yml/badge.svg)](https://github.com/nesquena/rabl/actions)
 [![Code Climate](https://codeclimate.com/github/nesquena/rabl.svg)](https://codeclimate.com/github/nesquena/rabl)
 
 RABL (Ruby API Builder Language) is a Rails and [Padrino](http://padrinorb.com) ruby templating system for generating JSON, XML, MessagePack, PList and BSON.
@@ -184,9 +184,9 @@ If `replace_nil_values_with_empty_strings` is set to `true`, all values that are
 
 If `exclude_nil_values` is set to `true`, all values that are `nil` and would normally be displayed as `null` in the response are not included in the response.
 
-if `exclude_empty_values_in_collections` is set to `true`, all vaules in a collection that are `{}` and would normally be displayed as `{}` in the response are not included in the response.
+if `exclude_empty_values_in_collections` is set to `true`, all values in a collection that are `{}` and would normally be displayed as `{}` in the response are not included in the response.
 
-If `camelize_keys` is set to `true`, all object keys will be converted to camel case. By default the first character will be lower case. The value can be set to `:upper` to set the first chracter to upper case.
+If `camelize_keys` is set to `true`, all object keys will be converted to camel case. By default the first character will be lower case. The value can be set to `:upper` to set the first character to upper case.
 
 If you wish to use [oj](https://github.com/ohler55/oj) as
 the primary JSON encoding engine simply add that to your Gemfile:

data/lib/rabl/digestor/rails3.rb

@@ -1,3 +1,5 @@
+require 'action_view'
+
 module Rabl
   class Digestor < ActionView::Digestor
     def self.digest(name, format, finder, options = {})

data/lib/rabl/digestor/rails41.rb

@@ -1,3 +1,5 @@
+require 'action_view'
+
 module Rabl
   class Digestor < ActionView::Digestor
     def self.digest(options = {})

data/lib/rabl/digestor/rails5.rb

@@ -1,3 +1,5 @@
+require 'action_view'
+
 module Rabl
   class Digestor < ActionView::Digestor
   end

data/lib/rabl/digestor.rb

@@ -1,3 +1,5 @@
+require 'action_view'
+
 module Rabl
   class Digestor < ActionView::Digestor
     # Override the original digest function to ignore partial which

data/lib/rabl/engine.rb

@@ -6,6 +6,7 @@ module Rabl
 
     # List of supported rendering formats
     FORMATS = [:json, :xml, :plist, :bson, :msgpack]
+    SAFE_FORMATS = FORMATS + [:mpac, :dumpable, :hash]
 
     # Constructs a new ejs engine based on given vars, handler and declarations
     # Rabl::Engine.new("...source...", { :format => "xml", :root => true, :view_path => "/path/to/views" })
@@ -61,7 +62,7 @@ module Rabl
           template = @_options[:template] || @virtual_path
 
           digest =
-            if Rails.version.to_s =~ /^[6]/
+            if Rails.version.to_s =~ /^[67]/
               Digestor.digest(name: template, finder: lookup_context, format: :rabl)
             elsif Gem::Version.new(Rails.version) >= Gem::Version.new('4.1')
               Digestor.digest(:name => template, :finder => lookup_context)
@@ -392,7 +393,11 @@ module Rabl
       end
 
       def digestor_available?
-        defined?(Rails) && Rails.version =~ /^[456]/
+        defined?(Rails) && Rails.version =~ /^[4567]/
+      end
+
+      def valid_format?(format)
+        SAFE_FORMATS.include?(format.to_sym) && respond_to?("to_#{format}")
       end
 
       def set_instance_variables!(context_scope, locals)
@@ -403,6 +408,9 @@ module Rabl
 
         @_options[:format] ||= request_format
 
+        # Prevent calls to inherited methods `to_yaml`, `to_enum`, etc.
+        @_options[:format] = 'json' unless valid_format?(@_options[:format])
+
         set_locals(@_locals)
       end
 

data/lib/rabl/helpers.rb

@@ -84,7 +84,7 @@ module Rabl
     def is_collection?(obj, follow_symbols = true)
       data_obj = follow_symbols ? data_object(obj) : obj
       data_obj &&
-        data_obj.is_a?(Enumerable) &&
+        data_obj.respond_to?(:map) && data_obj.respond_to?(:each) &&
         !(data_obj.is_a?(Struct) ||
           defined?(Hashie::Mash) && data_obj.is_a?(Hashie::Mash))
     end

data/lib/rabl/railtie.rb

@@ -22,7 +22,7 @@ module Rabl
         Rabl.register!
 
         # Inject dependency tracker for :rabl
-        if Rails.version =~ /^[456]/
+        if Rails.version =~ /^[4567]/
           require 'action_view/dependency_tracker'
           ActionView::DependencyTracker.register_tracker :rabl, Rabl::Tracker
         end

data/lib/rabl/template.rb

@@ -62,8 +62,8 @@ if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rai
   ActionView::Template.register_template_handler :rabl, ActionView::Template::Handlers::Rabl
 end
 
-# Rails 6.X Template
-if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[6]/
+# Rails 6.X / 7.X Template
+if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[67]/
   module ActionView
     module Template::Handlers
       class Rabl

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.14.2"
+  VERSION = "0.15.0"
 end

data/lib/rabl.rb

@@ -17,9 +17,9 @@ require 'rabl/renderer'
 require 'rabl/cache_engine'
 
 if defined?(Rails) && Rails.respond_to?(:version)
-  require 'rabl/tracker'  if Rails.version =~ /^[456]/
-  require 'rabl/digestor' if Rails.version =~ /^[456]/
-  require 'rabl/railtie'  if Rails.version =~ /^[3456]/
+  require 'rabl/tracker'  if Rails.version =~ /^[4567]/
+  require 'rabl/digestor' if Rails.version =~ /^[4567]/
+  require 'rabl/railtie'  if Rails.version =~ /^[34567]/
 end
 
 # Rabl.register!