rabl-rails 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8ac0eda1634eb6ff41e9f4f264a73c54e9ca83403120447ab9759f821a668f
-  data.tar.gz: 6e84dd781d0de2df1300b0d92061c0433561171fab1c16430c519fe3d0d74227
+  metadata.gz: ee0aee27278d987f9cca5d2c0a1660ae9cb4e0d6ae51734fa120f09d7c66449c
+  data.tar.gz: 64d9d559ba02a59de347391031bc16bb21ace05d54d293c3b302125668b76f7e
 SHA512:
-  metadata.gz: 7143acbf87219454974205552c66c78b29065505983ea645f8df0993a0512716f26a373b3b01844b48590bc1cf6be839509a9b2f9fb7939f6da03008a92c57ed
-  data.tar.gz: f06d660507ade0b1dee990eb700cdb00bf3a7b899004def96d6e56c6190837bf0b3b2ca3487c0377fde71625d28747423333458ede69273d4cc3b492f07353db
+  metadata.gz: c5b87c14f4c3f356f00c47ea35d3506475bdfd109b4144b60194b151e8b04f180844d1e9ebf5acb6755b834d886bc4a80141a3cba240740c8aeabe2893875d59
+  data.tar.gz: 9eca1d27951909e3f309240a46d0408de07379c91f21c8366d4620ef0bc4d090b3365e61f942f5a8c076f258472edb86ed74594f0336b0ef847497a81cb4a5c2

data/.travis.yml

@@ -5,8 +5,8 @@ env:
   - "RAILS_VERSION=4.2.6"
   - "RAILS_VERSION=5.2.0"
 rvm:
-  - 2.2.7
-  - 2.4.1
+  - 2.5.3
+  - 2.6.0
   - jruby
 before_install:
   - gem update bundler

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # CHANGELOG
 
+## 0.5.5
+  * Add `lookup` node
+
 ## 0.5.4
-  * Relax concurrent-ruby version dependency
+  * Relax concurrent-ruby version dependency (javierjulio)
 
 ## 0.5.3
   * Allow `extends` to accept lambdas

data/Gemfile

@@ -8,7 +8,7 @@ rails = case rails_version
 when 'master'
   { github: 'rails/rails' }
 when "default"
-  '~> 4.2.5'
+  '~> 5.2.1'
 else
   "~> #{rails_version}"
 end

data/lib/rabl-rails/compiler.rb

@@ -107,6 +107,16 @@ module RablRails
       @template.add_node Nodes::Const.new(name, value)
     end
 
+    #
+    # Create a node `name` by looking the current resource being rendered in the
+    # `object` hash using, by default, the resource's id.
+    # Example:
+    #   lookup(:favorite, :@user_favorites, cast: true)
+    #
+    def lookup(name, object, field: :id, cast: false)
+      @template.add_node Nodes::Lookup.new(name, object, field, cast)
+    end
+
     #
     # Merge arbitrary data into json output. Given block should
     # return a hash.

data/lib/rabl-rails/nodes.rb

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

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

@@ -0,0 +1,23 @@
+module RablRails
+  module Nodes
+    class Lookup
+      attr_reader :name, :data, :field
+
+      def initialize(name, data, field, cast = false)
+        @name   = name
+        @data   = data
+        @field  = field
+        @cast   = cast
+        @is_var = @data.to_s.start_with?('@')
+      end
+
+      def instance_variable_data?
+        @is_var
+      end
+
+      def cast_to_boolean?
+        @cast
+      end
+    end
+  end
+end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

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

@@ -56,6 +56,15 @@ module Visitors
       @_result[n.name] = n.value
     end
 
+    def visit_Lookup n
+      object  = object_from_data(nil, n)
+      key     = _resource.public_send(n.field)
+      value   = object[key]
+      value   = !!value if n.cast_to_boolean?
+
+      @_result[n.name] = value
+    end
+
     def visit_Condition n
       @_result.merge!(sub_visit(_resource, n.nodes)) if instance_exec _resource, &(n.condition)
     end

data/rabl-rails.gemspec

@@ -14,7 +14,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version     = '>= 2.2.0'
 
-  s.files         = `git ls-files`.split("\n")
+  s.files = `git ls-files -z`.split("\x0").reject do |file|
+    file.start_with?('test/')
+  end
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.require_paths = ["lib"]
 

data/test/test_compiler.rb

@@ -227,6 +227,18 @@ class TestCompiler < Minitest::Test
       assert_equal 'fr_FR', const_node.value
     end
 
+    it "compiles lookup node" do
+      t = @compiler.compile_source(%{
+        lookup(:favorite, :@user_favorites, cast: true)
+      })
+
+      lookup_node = t.nodes.first
+      assert_equal :favorite, lookup_node.name
+      assert_equal :@user_favorites, lookup_node.data
+      assert_equal :id, lookup_node.field
+      assert lookup_node.cast_to_boolean?
+    end
+
     it "extends other template" do
       t = @compiler.compile_source(%{ extends 'user' })
       assert_equal([{ :id => :id }], extract_attributes(t.nodes))

data/test/test_hash_visitor.rb

@@ -141,6 +141,20 @@ class TestHashVisitor < Minitest::Test
       assert_equal({ locale: 'fr_FR' }, visitor_result)
     end
 
+    it 'renders a positive lookup node' do
+      @nodes << RablRails::Nodes::Lookup.new(:favorite, :@user_favorites, :id, true)
+      @context.assigns['user_favorites'] = { 1 => true }
+
+      assert_equal({ favorite: true }, visitor_result)
+    end
+
+    it 'renders a negative lookup node' do
+      @nodes << RablRails::Nodes::Lookup.new(:favorite, :@user_favorites, :id, false)
+      @context.assigns['user_favorites'] = { 2 => true }
+
+      assert_equal({ favorite: nil }, visitor_result)
+    end
+
     describe 'with a condition node' do
       before do
         @ns = [RablRails::Nodes::Attribute.new(name: :name)]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Christopher Cocchi-Perrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,6 +115,7 @@ files:
 - lib/rabl-rails/nodes/const.rb
 - lib/rabl-rails/nodes/extend.rb
 - lib/rabl-rails/nodes/glue.rb
+- lib/rabl-rails/nodes/lookup.rb
 - lib/rabl-rails/nodes/polymorphic.rb
 - lib/rabl-rails/railtie.rb
 - lib/rabl-rails/renderers/hash.rb