rabl-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4807b83a2eb921feedfb2b1a183c8cc2a8f27ef6
-  data.tar.gz: 511aa8bd4d1c5c9b034b695545e083dd761e31b6
+  metadata.gz: dedc8586508a3810863c0064ec79ed16bae0912c
+  data.tar.gz: c025be318058b389563a9103f5855b1085b3ffaf
 SHA512:
-  metadata.gz: d17c495e276a6344ad8e9bbf2162aebf7e056f575367bcfde60399f683fceb90a5216a3b76155e42386b017411197b80afe7eeff96e8bdb31fc55c47f83ab1fe
-  data.tar.gz: 2cc491b7e1298cb12e25bb4e365d0c86ca87fff0b73f125a1abc11caa80f575ac5d0ac1cb27ebdf42eb4fe1e3fd101a46fe23e0e4a307a3f06982fd7f355585b
+  metadata.gz: 046f7ded9881826bbbe283f160c9136b905dbadaa0eff728479f790b380747d5d4a7c6d6f379ba5d50bf8d4de440a8b7d2922d6bdef0adb10b02d576c1bd4e47
+  data.tar.gz: d0ce45379a3281561a768bc605f153a3b46b64b82bbb37a1300ed67273ea8ac09e7ea08b0687becd22eab7c73668e5eda454a3d0490487f47d3b70a2e054d81e

data/.travis.yml

@@ -3,19 +3,15 @@ cache: bundler
 dist: trusty
 env:
   - "RAILS_VERSION=4.2.6"
-  - "RAILS_VERSION=master"
+  - "RAILS_VERSION=5.2.0"
 rvm:
   - 2.2.7
-  - 2.3.4
   - 2.4.1
-  - jruby-9.1.12.0
-  - rbx-3.71
+  - jruby
+  - rbx-3
 before_install:
   - gem update bundler
 matrix:
   fast_finish: true
   allow_failures:
     - env: RAILS_VERSION=master
-  exclude:
-    - rvm: 2.1.8
-      env: "RAILS_VERSION=master"

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 0.5.3
+  * Allow `extends` to accept lambdas
+
 ## 0.5.2
   * Add `const` node
 

data/lib/rabl-rails/compiler.rb

@@ -62,7 +62,7 @@ module RablRails
     # Creates a child node to be included in the output.
     # name_or data can be an object or collection or a method to call on the data. It
     # accepts :root and :partial options.
-    # Notes that partial and blocks are not compatible
+    # Note that partial and blocks are not compatible
     # Example:
     #   child(:@posts, :root => :posts) { attribute :id }
     #   child(:posts, :partial => 'posts/base')
@@ -122,10 +122,16 @@ module RablRails
     # Extends an existing rabl template
     # Example:
     #   extends 'users/base'
+    #   extends ->(item) { "v1/#{item.class}/_core" }
     #   extends 'posts/base', locals: { hide_comments: true }
     #
-    def extends(path, options = nil)
-      other = Library.instance.compile_template_from_path(path, @view)
+    def extends(path_or_lambda, options = nil)
+      if path_or_lambda.is_a?(Proc)
+        @template.add_node Nodes::Polymorphic.new(path_or_lambda)
+        return
+      end
+
+      other = Library.instance.compile_template_from_path(path_or_lambda, @view)
 
       if options && options.is_a?(Hash)
         @template.add_node Nodes::Extend.new(other.nodes, options[:locals])

data/lib/rabl-rails/nodes.rb

@@ -5,3 +5,4 @@ require 'rabl-rails/nodes/child'
 require 'rabl-rails/nodes/code'
 require 'rabl-rails/nodes/condition'
 require 'rabl-rails/nodes/extend'
+require 'rabl-rails/nodes/polymorphic'

data/lib/rabl-rails/nodes/polymorphic.rb

@@ -0,0 +1,11 @@
+module RablRails
+  module Nodes
+    class Polymorphic
+      attr_reader :template_lambda
+
+      def initialize(template_lambda)
+        @template_lambda = template_lambda
+      end
+    end
+  end
+end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/rabl-rails/visitors/to_hash.rb

@@ -67,6 +67,12 @@ module Visitors
       @_locals = {}
     end
 
+    def visit_Polymorphic n
+      template_path = n.template_lambda.call(_resource)
+      template = RablRails::Library.instance.compile_template_from_path(template_path, @_context)
+      @_result.merge!(sub_visit(_resource, template.nodes))
+    end
+
     def result
       case RablRails.configuration.result_flags
       when 0

data/test/test_compiler.rb

@@ -232,6 +232,13 @@ class TestCompiler < Minitest::Test
       assert_equal([{ :id => :id }], extract_attributes(t.nodes))
     end
 
+    it "extends with a lambda" do
+      t = @compiler.compile_source(%{ extends -> { 'user' } })
+      node = t.nodes.first
+      assert_instance_of(RablRails::Nodes::Polymorphic, node)
+      assert_equal('user', node.template_lambda.call)
+    end
+
     it "compiles extend without overwriting nodes previously defined" do
       File.open(@@tmp_path + 'xtnd.rabl', 'w') do |f|
         f.puts %q{

data/test/test_hash_visitor.rb

@@ -185,6 +185,20 @@ class TestHashVisitor < Minitest::Test
       library.verify
     end
 
+    it 'renders partial defined in node' do
+      template = RablRails::CompiledTemplate.new
+      template.add_node(RablRails::Nodes::Attribute.new(name: :name))
+      library = MiniTest::Mock.new
+      library.expect :compile_template_from_path, template, ['users/base', @context]
+
+      @nodes << RablRails::Nodes::Polymorphic.new(->(_) { 'users/base' })
+      RablRails::Library.stub :instance, library do
+        assert_equal({ name: 'Marty' }, visitor_result)
+      end
+
+      library.verify
+    end
+
     it 'allows uses of locals variables with partials' do
       template = RablRails::CompiledTemplate.new
       template.add_node(RablRails::Nodes::Code.new(:hide_comments, ->(u) { locals[:hide_comments] }, ->(u) { locals.key?(:hide_comments) }))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,7 @@ files:
 - lib/rabl-rails/nodes/const.rb
 - lib/rabl-rails/nodes/extend.rb
 - lib/rabl-rails/nodes/glue.rb
+- lib/rabl-rails/nodes/polymorphic.rb
 - lib/rabl-rails/railtie.rb
 - lib/rabl-rails/renderers/hash.rb
 - lib/rabl-rails/renderers/json.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fast Rails 4+ templating system with JSON, XML and PList support