rabl 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5364500887b2b3da7ed0bb4d68dd5ebd0948fc27
-  data.tar.gz: 3854ce5f9c6dc02937bebfde51d8dd3dc96d4134
+  metadata.gz: b439f70f7961cc5628e6c50d459a81c90fdaee2e
+  data.tar.gz: afad5d0e094bcd451836d4259b000f9005c064a4
 SHA512:
-  metadata.gz: af825d57438c23e1e19427eb665098a077c9c7183578d597fad01a70fe75d7503519377ce5fab8f9d2b5558b6b4536df7e416ae9d9f7409ca82cb0508df8987d
-  data.tar.gz: 343dd2bc3856274826aaaaa81bfb93ffff77ee88dbf6777de0a95e4e61ade920167d64130e408a44c01951ffbf71772b3998c06d3a39788c1ea70a98ec83065f
+  metadata.gz: a36b30e99c2c4ca01fa854c3df4cffea66d7f5105605daf5a830a5a7d605d732773cf6ff4df61fb6abddad49babe85c8e7a5d000f752c05a76da6ecce36b4165
+  data.tar.gz: 2e84dd02306eb127ca1f194df81db1af946eded722ff7ff72e7385bf5556fb23dd8300a01f2b7d4edf4cd3a220170a9eb07cd9e13e94cbee4ec438481af417c8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.11.8 (January 10th, 2016)
+
+* Check that the Rails module has the .version method before invocation (@caldwecr)
+* Adds nominal rails5 support (@lsylvester)
+
 ## 0.11.7 (December 6th, 2015)
 
 * Use empty hash as default cache options (@infertux)

data/lib/rabl.rb

@@ -17,9 +17,9 @@ require 'rabl/renderer'
 require 'rabl/cache_engine'
 
 if defined?(Rails)
-  require 'rabl/tracker'  if Rails.version =~ /^[4]/
-  require 'rabl/digestor' if Rails.version =~ /^[4]/
-  require 'rabl/railtie'  if Rails.version =~ /^[34]/
+  require 'rabl/tracker'  if Rails.version =~ /^[45]/
+  require 'rabl/digestor' if Rails.version =~ /^[45]/
+  require 'rabl/railtie'  if Rails.version =~ /^[345]/
 end
 
 # Rabl.register!

data/lib/rabl/engine.rb

@@ -16,7 +16,7 @@ module Rabl
 
       @_view_path     = options[:view_path]
       @_context_scope = options[:scope]
-      
+
       @_cache_read_on_render = true
     end
 
@@ -94,7 +94,7 @@ module Rabl
     end
 
     def to_dumpable(options = {})
-      options = { 
+      options = {
         :child_root => Rabl.configuration.include_child_root
       }.merge(options)
 
@@ -132,7 +132,7 @@ module Rabl
     # to_xml(:root => true)
     def to_xml(options = {})
       options = {
-        :root       => (include_root = Rabl.configuration.include_xml_root), 
+        :root       => (include_root = Rabl.configuration.include_xml_root),
         :child_root => include_root && Rabl.configuration.include_child_root
       }.merge(options)
 
@@ -228,12 +228,12 @@ module Rabl
         attr_aliases  = args.first.except(:if, :unless)
         conditions    = args.first.slice(:if, :unless)
 
-        attr_aliases.each do |key, as| 
+        attr_aliases.each do |key, as|
           attribute(key, conditions.merge(:as => as))
         end
       else # array of attributes i.e :foo, :bar, :baz
         options = args.extract_options!
-        args.each do |name| 
+        args.each do |name|
           @_settings[:attributes] << { :name => name, :options => options }
         end
       end
@@ -389,18 +389,18 @@ module Rabl
       end
 
       def digestor_available?
-        defined?(Rails) && Rails.version =~ /^[4]/
+        defined?(Rails) && Rails.version =~ /^[45]/
       end
 
       def set_instance_variables!(context_scope, locals)
         @_context_scope = context_scope
-        @_locals        = locals
+        @_locals        = locals || {}
 
         copy_instance_variables_from(context_scope, [:@assigns, :@helpers])
 
         @_options[:format] ||= request_format
 
-        set_locals(locals)
+        set_locals(@_locals)
       end
 
       def set_locals(locals)
@@ -410,7 +410,7 @@ module Rabl
 
       def eval_source(locals, &block)
         # Note: locals and block may be used by the eval'ed source
-        
+
         return unless @_source.present?
 
         if @_options[:source_location]

data/lib/rabl/railtie.rb

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

data/lib/rabl/template.rb

@@ -20,7 +20,7 @@ if defined?(Tilt)
 end
 
 # Rails 2.X Template
-if defined?(ActionView) && defined?(Rails) && Rails.version.to_s =~ /^2/
+if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^2/
   require 'action_view/base'
   require 'action_view/template'
 
@@ -41,7 +41,7 @@ if defined?(ActionView) && defined?(Rails) && Rails.version.to_s =~ /^2/
 end
 
 # Rails 3.X / 4.X Template
-if defined?(ActionView) && defined?(Rails) && Rails.version.to_s =~ /^[34]/
+if defined?(ActionView) && defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_s =~ /^[345]/
   module ActionView
     module Template::Handlers
       class Rabl

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.11.7"
+  VERSION = "0.11.8"
 end

data/test/engine_test.rb

@@ -26,35 +26,31 @@ context "Rabl::Engine" do
   context "#request_format" do
     context "is json by default" do
       setup do
-        template = RablTemplate.new("code") { "" }
+        template = RablTemplate.new("code") { 'node(:foo) { "bar" }' }
         template.render(Object.new)
-        engine = template.instance_eval('@engine')
-        engine.instance_eval('@_options')[:format]
       end
 
-      asserts_topic.equals('json')
+      asserts_topic.equivalent_to('{"foo":"bar"}')
     end
 
     context "with a specified format" do
       setup do
-        template = RablTemplate.new("code", :format => 'xml') { "" }
+        template = RablTemplate.new("code", :format => 'xml') { 'node(:foo) { "bar" }' }
         template.render(Object.new)
-        engine = template.instance_eval('@engine')
-        engine.instance_eval('@_options')[:format]
       end
 
-      asserts_topic.equals('xml')
+      asserts_topic.includes('<foo>bar</foo>')
     end
   end
 
   context "#cache" do
     context "with cache" do
       setup do
-        template = rabl %q{
+        template = Rabl::Engine.new(%q{
           cache 'foo'
-        }
+        })
         template.render(Object.new)
-        template.instance_eval('@engine')
+        template
       end
 
       asserts_topic.assigns(:_cache_key) { 'foo' }
@@ -62,11 +58,11 @@ context "Rabl::Engine" do
 
     context "with cache and options" do
       setup do
-        template = rabl %q{
+        template = Rabl::Engine.new(%q{
           cache 'foo', :expires_in => 'bar'
-        }
+        })
         template.render(Object.new)
-        template.instance_eval('@engine')
+        template
       end
 
       asserts_topic.assigns(:_cache_key) { 'foo' }
@@ -75,9 +71,9 @@ context "Rabl::Engine" do
 
     context "without cache" do
       setup do
-        template = RablTemplate.new {}
+        template = Rabl::Engine.new("")
         template.render(Object.new)
-        template.instance_eval('@engine')
+        template
       end
 
       denies(:instance_variable_defined?, :@_cache_key)

data/test/partials_test.rb

@@ -94,7 +94,7 @@ context "Rabl::Partials" do
 
     setup do
       File.open(tmp_path + "_test.rabl", "w")
-      engine = Rabl::Engine.new('', :view_path => tmp_path)
+      Rabl::Engine.new('', :view_path => tmp_path)
     end
 
     asserts('returns new engine with given view_path') do

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !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: 0.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.5
 - !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
@@ -143,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -458,12 +458,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -496,4 +496,3 @@ test_files:
 - test/template_test.rb
 - test/teststrap.rb
 - test/xml_test.rb
-has_rdoc: