inertia_builder 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d326ccb567aaf8b60dd19a3ec57358008e620e575e725e0827cf9378e64bf8e7
-  data.tar.gz: 4876abe3f8910c981e628417876b88598b643564dd471f6b8bdb66bd9064e799
+  metadata.gz: c2db7cf7bc04f52285ccfb06231fcb67cca0038b80140b84ec314f2cf9f1196b
+  data.tar.gz: '02989fb26e14f25cbfe80ca52559813137c7cbf67c9983afed7f0cb23ad59451'
 SHA512:
-  metadata.gz: 64a1c8f5f14eefd54908e53b6e88f7b199e4e30a9b9ce7d8fa25932508ccc1727481d89f8b40f4f638eace0a1609bf270e98ead3931fe46a86b4969860bca38f
-  data.tar.gz: 3f4026b1fbc067905de4a5eae7f8289bfe3987d6464be4622d254b9efabf8acac319c92dc6cd6c1cf8a147ff94b9a625c5fe60c4a6b40e1446c0470cd2a2159b
+  metadata.gz: faf2b72091c7fecc1c74f51b91e3a1e2237e8878d61777b8b6f5ed9505185c8a81c5cca058b0fcc470f42d98014783cd6b28a5494125a76df4525cbaac82b537
+  data.tar.gz: 359cfcca048b25bde18ac719f9a2a3dbccb02d1081d5c3886b424afcab8ef202d3d4997323640490ab3b63d1c48fa0806da861fa13dda60c7195442c3aa05d85

data/lib/inertia_builder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InertiaBuilder
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/inertia_builder.rb

@@ -66,15 +66,19 @@ module InertiaBuilder
     end
 
     def _scope
+      has_parent_scope = @in_scope
       @in_scope = true
       super
     ensure
-      @in_scope = false
+      @in_scope = false unless has_parent_scope
     end
 
     def _merge_values(current_value, updates)
-      # Always override lazy evaluation procs.
-      if current_value.is_a?(::Proc)
+      # Always override lazy evaluation procs. For the other special prop types, InertiaRails already handles merging.
+      if current_value.is_a?(::Proc) ||
+         current_value.is_a?(::InertiaRails::OptionalProp) ||
+         current_value.is_a?(::InertiaRails::AlwaysProp) ||
+         current_value.is_a?(::InertiaRails::DeferProp)
         updates
       else
         super

data/test/inertia_builder_test.rb

@@ -8,6 +8,11 @@ class User < Struct.new(:id, :first_name, :last_name, :email)
   include ActiveModel::Conversion
 end
 
+class Item < Struct.new(:id, :title)
+  extend ActiveModel::Naming
+  include ActiveModel::Conversion
+end
+
 class InertiaBuilderTest < Minitest::Test
   USER_PARTIAL = <<~INERTIA
     prop.id user.id
@@ -16,8 +21,14 @@ class InertiaBuilderTest < Minitest::Test
     prop.email user.email
   INERTIA
 
+  ITEM_PARTIAL = <<~INERTIA
+    prop.id item.id
+    prop.title item.title
+  INERTIA
+
   PARTIALS = {
-    'users/_user.html.inertia' => USER_PARTIAL
+    'users/_user.html.inertia' => USER_PARTIAL,
+    'items/_item.html.inertia' => ITEM_PARTIAL
   }
 
   def test_basic_html_rendering
@@ -119,12 +130,23 @@ class InertiaBuilderTest < Minitest::Test
       User.new({ id: 43, first_name: 'Jane', last_name: 'Smith', email: 'jane@email.com' })
     ]
 
-    template = "prop.users @users, partial: 'users/user', as: :user"
+    items = [
+      Item.new({ id: 1, title: 'Item 1' }),
+      Item.new({ id: 2, title: 'Item 2' })
+    ]
 
-    expected_props = { users: users }
+    template = <<~INERTIA
+      prop.data do
+        prop.users @users, partial: 'users/user', as: :user
+        prop.items @items, partial: 'items/item', as: :item
+      end
+    INERTIA
 
-    assert_equal inertia_html_with_props(expected_props), render_view(template, assigns: { users: users })
-    assert_equal inertia_json_with_props(expected_props), render_view(template, assigns: { users: users }, json: true)
+    expected_props = { data: { users: users, items: items } }
+
+    assert_equal inertia_json_with_props(expected_props),
+                 render_view(template, assigns: { users: users, items: items }, json: true)
+    assert_equal inertia_html_with_props(expected_props), render_view(template, assigns: { users: users, items: items })
   end
 
   def test_nil_prop_block
@@ -144,7 +166,10 @@ class InertiaBuilderTest < Minitest::Test
     template = <<~INERTIA
       prop.id 1
       prop.optional! do
-        prop.user 'User'
+        prop.user do
+          prop.id 1
+          prop.email 'user@email.com'
+        end
         prop.calculation 'Calculation'
       end
     INERTIA
@@ -154,7 +179,7 @@ class InertiaBuilderTest < Minitest::Test
       'X-Inertia-Partial-Component' => '/'
     }
     assert_equal inertia_json_with_props({ id: 1 }), render_view(template, json: true)
-    assert_equal inertia_json_with_props({ user: 'User', calculation: 'Calculation' }),
+    assert_equal inertia_json_with_props({ user: { id: 1, email: 'user@email.com' }, calculation: 'Calculation' }),
                  render_view(template, json: true, headers: partial_headers)
   end
 
@@ -162,7 +187,10 @@ class InertiaBuilderTest < Minitest::Test
     template = <<~INERTIA
       prop.id 1
       prop.always! do
-        prop.user 'User'
+        prop.user do
+          prop.id 1
+          prop.email 'user@email.com'
+        end
       end
       prop.optional! do
         prop.calculation 'Calculation'
@@ -173,8 +201,9 @@ class InertiaBuilderTest < Minitest::Test
       'X-Inertia-Partial-Data' => 'calculation',
       'X-Inertia-Partial-Component' => '/'
     }
-    assert_equal inertia_json_with_props({ id: 1, user: 'User' }), render_view(template, json: true)
-    assert_equal inertia_json_with_props({ user: 'User', calculation: 'Calculation' }),
+    assert_equal inertia_json_with_props({ id: 1, user: { id: 1, email: 'user@email.com' } }),
+                 render_view(template, json: true)
+    assert_equal inertia_json_with_props({ user: { id: 1, email: 'user@email.com' }, calculation: 'Calculation' }),
                  render_view(template, json: true, headers: partial_headers)
   end
 
@@ -182,7 +211,10 @@ class InertiaBuilderTest < Minitest::Test
     template = <<~INERTIA
       prop.id 1
       prop.defer! do
-        prop.user 'User'
+        prop.user do
+          prop.id 1
+          prop.email 'user@email.com'
+        end
         prop.calculation 'Calculation'
       end
     INERTIA
@@ -207,10 +239,14 @@ class InertiaBuilderTest < Minitest::Test
   end
 
   def test_defer_block_fetching
+    user = User.new({ id: 1, email: 'user@email.com' })
+
     template = <<~INERTIA
       prop.id 1
       prop.defer! do
-        prop.user 'User'
+        prop.user do
+          prop.partial! @user
+        end
         prop.calculation 'Calculation'
       end
     INERTIA
@@ -220,8 +256,8 @@ class InertiaBuilderTest < Minitest::Test
       'X-Inertia-Partial-Component' => '/'
     }
 
-    assert_equal inertia_json_with_props({ user: 'User', calculation: 'Calculation' }),
-                 render_view(template, json: true, headers: partial_headers)
+    assert_equal inertia_json_with_props({ user: user, calculation: 'Calculation' }),
+                 render_view(template, assigns: { user: user }, json: true, headers: partial_headers)
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_builder
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rodrigo Lima
@@ -70,8 +70,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rodrigotavio91/inertia-builder/issues
-  changelog_uri: https://github.com/rodrigotavio91/inertia-builder/releases/tag/v0.2.0
-  source_code_uri: https://github.com/rodrigotavio91/inertia-builder/tree/v0.2.0
+  changelog_uri: https://github.com/rodrigotavio91/inertia-builder/releases/tag/v0.2.1
+  source_code_uri: https://github.com/rodrigotavio91/inertia-builder/tree/v0.2.1
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: