rabl 0.14.3 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2ece3d41ebe4b298b5d317287bedb4e494b76b109fd953a90860c9aa989c2d
-  data.tar.gz: 87f678bdcf181af044e44778e73c9e25772c7aa22f6af027e7764fbf0098bb22
+  metadata.gz: 91c470d38efde97412e3291ae2445165daecbd06410818ad0043c8398acff5c6
+  data.tar.gz: 6dd9d32a042987020e50a05d4e164ab6d616345e0696e2d411fc74acf0b65781
 SHA512:
-  metadata.gz: decfd210daf96a6d5dc424ce2a808261bac54aff337696c13fb479ca4ea5162936adcd91dd6e6c0d88318e5bdbb8acd5501cdd86838a4431c2a04397853ce6a1
-  data.tar.gz: d5503ad9f4106bcf6ba8e964978c5ebf1b838153a1c849ab0f3254899868e80abb7e26b926d7a9670bc2e7cda13894b3972f27a01871b3484a4f21ce3105c843
+  metadata.gz: 4ecb3137c900dcf729baec44e89e9d626d108f7ac3d6ae476c64586e26aaee6b27f0a3a08a0a7232f87fe243292802c0f3c96fc9d51fb8c1faa0df5608ff2627
+  data.tar.gz: 51f138ada14f33aa10ddddf10f488a8042d9fe43a5cf3e2ab472f1c8b7487e28034ebac9953c6c33de81586464e6610b430f3cdb90d92772c3b05152300e7dbd

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # CHANGELOG
 
+## 0.16.0 (August 21, 2022)
+
+* Add "except" option to `extends` (Thanks @perryqh)
+* Fix `ArgumentError` when block given with keyword arguments (Thanks @kyoshidajp)
+* Add Ruby 3.1 to the CI matrix (Thanks @petergoldstein)
+* Document Rabl setting `oj`'s mode (Thanks @ghiculescu)
+
+## 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)

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.
@@ -51,6 +51,7 @@ or add to your Gemfile:
 # Gemfile
 gem 'rabl'
 # Also add either `oj` or `yajl-ruby` as the JSON parser
+# If using `oj`, Rabl will set the mode to :compat
 gem 'oj'
 ```
 
@@ -184,9 +185,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/builder.rb

@@ -153,6 +153,7 @@ module Rabl
       # node(:foo, :if => lambda { |m| m.foo.present? }) { "bar" }
       def node(name, options = {}, &block)
         return unless resolve_condition(options)
+        return if @options.has_key?(:except) && [@options[:except]].flatten.include?(name)
 
         result = block.call(@_object)
         if name.present?

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)
@@ -355,8 +356,8 @@ module Rabl
       end
 
       # Supports calling helpers defined for the template context_scope using method_missing hook
-      def method_missing(name, *args, &block)
-        context_scope.respond_to?(name, true) ? context_scope.__send__(name, *args, &block) : super
+      def method_missing(name, *args, **kwargs, &block)
+        context_scope.respond_to?(name, true) ? context_scope.__send__(name, *args, **kwargs, &block) : super
       end
 
       def copy_instance_variables_from(object, exclude = []) #:nodoc:
@@ -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/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.3"
+  VERSION = "0.16.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!