diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d957f..4928e22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 0.1.2 (unreleased) * Add RablRails#render method (see README or source code) + * Fix fail when JSON engine is not found. Now fallback to MultiJson.default_adapter ## 0.1.1 diff --git a/lib/rabl-rails.rb b/lib/rabl-rails.rb index 5fbf960..fe297c2 100644 --- a/lib/rabl-rails.rb +++ b/lib/rabl-rails.rb @@ -29,15 +29,13 @@ module RablRails def self.configure yield self - post_configure end def self.cache_templates? ActionController::Base.perform_caching && @@cache_templates end - - private - def self.post_configure - MultiJson.engine = self.json_engine + + def self.set_conversion_engines! + MultiJson.use(self.json_engine) rescue nil end end diff --git a/lib/rabl-rails/railtie.rb b/lib/rabl-rails/railtie.rb index 207bd61..5201adb 100644 --- a/lib/rabl-rails/railtie.rb +++ b/lib/rabl-rails/railtie.rb @@ -3,6 +3,7 @@ module RablRails initializer "rabl.initialize" do |app| ActiveSupport.on_load(:action_view) do ActionView::Template.register_template_handler :rabl, RablRails::Handlers::Rabl + RablRails.set_conversion_engines! end end end