svelte-on-rails 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fd78748cd0a7f9c896123e31dbbccab10dc7d42bc394a14fbc66efa360a166d
-  data.tar.gz: ce14713af9654cdbeb0e2ddf5cb9e46174308d9018c668b97f1db47b083e0324
+  metadata.gz: 8888526927853e78465bc1bbda518d82a0a499c33a1d99d5ada3ea411c0baf70
+  data.tar.gz: 0c019007e8d68e48e659a47041a15af833d7bd1c1a8b0414af8a51d836a2397d
 SHA512:
-  metadata.gz: 033d0d7cb3a2147119668913978f8a8fdba37d0467b7e7c756afaf60609352ed6bb2aa3805c1640c81a78dedb325eda7e298410c3df4485ed6f0fc7d796fa33c
-  data.tar.gz: f1b1830ad7056f1dff09077ba6576c6d64db6a8f27bfbfb9cc2dad70f128d0078137b9fbb970179c6702c677f443316f69c2d4f7e32dec33cca7aa37d6a8c6f9
+  metadata.gz: 91f0eb2d62372a9a7b2337adbb209c6db8f0eade705fe50d4a1fef516cb856999cfa3753521422cab4476399769e0c43672f79d716e839f19097ae4bfa0b273a
+  data.tar.gz: f7e4e9c10f8cdcbed1e56087fc2470b4c82f575bbf730bc816656dcf03c98becacf97c6efd98936e5696c1e1625d03a2234e251cd0bc9d197888cd72a8e07f88

data/README.md

@@ -24,7 +24,7 @@ See: [Comparitions on the guide](https://svelte-on-rails.dev/about/why.html)
 
 see [issues](https://gitlab.com/sedl/svelte-on-rails/-/issues)
 
-# Description 👍
+# Description
 
 Renders Svelte components server-side and, together with [@csedl/svelte-on-rails](https://www.npmjs.com/package/@csedl/svelte-on-rails),
 hydrates the component on the frontend.
@@ -38,8 +38,9 @@ If you have issues, please open one, and contributors are welcome!
 
 - tested on
     - ruby 3.2.2 and rails 7.1
+      - Recommended: ruby 3x
     - ruby 2.7.5 and rails 6.1
-    - vite@6 (v7 not supported, see issues)
+    - vite@6 (v7 not yet supported, see issues)
     - turbolinks and hotwired/turbo
 - vite_rails (the installer will install it by option --full or --vite)
 - svelte@5, @sveltejs/vite-plugin-svelte@5 (see: [how to install svelte on rails/vite](https://dev.to/chmich/setup-inertia-and-svelte-on-rails-7-3glk))
@@ -55,7 +56,9 @@ If you have issues, please open one, and contributors are welcome!
 On ruby <3 Arguments are misinterpreted, see [issue-10](https://gitlab.com/sedl/svelte-on-rails/-/issues/10)
 
 
-## Installation
+## Installation on a existing app
+
+=> To generate a two-minute, full-featured app, refer to the [guide/installer with options](https://svelte-on-rails.dev/installation/installer_options.html).
 
 Required: `vite_rails` must be installed, it wants a `app/frontend` folder.
 
@@ -67,7 +70,7 @@ Within the app, add the gem
 bundle add svelte-on-rails
 ```
 
-and run the minimal installer (you are free to add any options from above)
+and run the installer without options
 
 ```bash
 rails g svelte_on_rails:install
@@ -89,13 +92,17 @@ Add it to the view
 <%= svelte_component('HelloWorld', {title: 'Hello World'}) %>
 ```
 
-And you will see "Svelte Hello World" on the browser! 👍  🤗
+And you will see «Svelte Hello World» on the browser! 👍  🤗
 
 # Contributors welcome
 
 see [Guide / run your first test](https://svelte-on-rails.dev/first_test.html)
 
+# Special Thanks
+
+- [vite_ruby](https://github.com/ElMassimo/vite_ruby)
+- [react_on_rails](https://github.com/shakacode/react_on_rails)
 
 ## Licence
 
-Copyright © 2025-2028 sedlmair.ch. Distributed by [MIT License](https://svelte-on-rails.dev/license.html)
+Copyright © 2025-2027 sedlmair.ch. Distributed by [MIT License](https://svelte-on-rails.dev/license.html)

data/lib/svelte_on_rails/active_record_extensions.rb

@@ -9,8 +9,12 @@ module SvelteOnRails
       @to_svelte ||= begin
 
                        cl = SvelteOnRails::Lib::SvelteAttributes
-                       r = cl.new.calculate_instance(self, attributes, associations)
-                       r.first.merge({ self.class.to_s.underscore => r[1] })
+                       lab, enums, val = cl.new.calculate_instance(self, attributes, associations)
+                       k = self.class.to_s.underscore
+                       res = lab
+                       res["#{k}_enums"] = enums if enums
+                       res[k] = val
+                       res
 
                      end
     end
@@ -25,7 +29,10 @@ module SvelteOnRails
 
       @to_svelte ||= begin
                        cl = SvelteOnRails::Lib::SvelteAttributes
-                         cl.new.calculate_class(self, attributes, associations)
+                       lab, enums = cl.new.calculate_class(self, attributes, associations)
+                       lab["#{self.to_s.underscore}_enums"] = enums if enums
+                       lab
+
                      end
     end
 
@@ -38,7 +45,11 @@ module SvelteOnRails
     def to_svelte(*attributes, **associations)
       @to_svelte ||= begin
                        cl = SvelteOnRails::Lib::SvelteAttributes
-                       cl.new.calculate_relation(self, attributes, associations)
+                       lab, enums, val = cl.new.calculate_relation(self, attributes, associations)
+                       k = self.klass.to_s.underscore
+                       lab[k.pluralize] = val
+                       lab["#{k}_enums"] = enums if enums
+                       lab
                      end
     end
 

data/lib/svelte_on_rails/lib/to_svelte.rb

@@ -26,8 +26,6 @@ module SvelteOnRails
                     record
                   end
 
-          # set_labels(record.first, attributes)
-
           values = recs2.map do |rec|
             calculate_instance(rec, attributes, associations, call_stack: next_stack)
           end
@@ -46,6 +44,8 @@ module SvelteOnRails
             _key = attr.to_s
 
             values[_key] = record.send(_key)
+
+            fetch_enum(record.class, attr)
           end
 
           associations.each do |key, val|
@@ -71,7 +71,7 @@ module SvelteOnRails
                 if recs.respond_to?(:each)
                   values[_key] = calculate_instance(
                     recs,
-                    val.reject{|v|v.is_a?(Hash)},
+                    val.reject { |v| v.is_a?(Hash) },
                     {},
                     call_stack: next_stack,
                     offset: _offset,
@@ -95,6 +95,7 @@ module SvelteOnRails
         else
           [
             @labels,
+            @enums,
             values
           ]
         end
@@ -106,6 +107,9 @@ module SvelteOnRails
         next_stack = call_stack + 1
 
         set_labels(model, attributes, associations)
+        attributes.each do |attr|
+          fetch_enum(model, attr)
+        end
 
         associations.each do |key, value|
           reflect = model.reflect_on_association(key.to_s)
@@ -120,19 +124,28 @@ module SvelteOnRails
         end
 
         if call_stack == 0
-          @labels
+          [
+            @labels,
+            @enums
+          ]
         end
+
       end
 
       def calculate_relation(relation, attributes, associations)
         set_labels(relation.klass, attributes)
+        attributes.each do |attr|
+          fetch_enum(relation.klass, attr)
+        end
         r = relation.map do |rec|
           calculate_instance(rec, attributes, associations, call_stack: 1)
         end
 
-        @labels.merge({
-                        relation.klass.to_s.underscore.pluralize => r
-                      })
+        [
+          @labels,
+          @enums,
+          r
+        ]
 
       end
 
@@ -188,6 +201,23 @@ module SvelteOnRails
         end
       end
 
+      def fetch_enum(model, attribute)
+        return unless model.respond_to?(:defined_enums)
+        raise ArgumentError, "attribute_name must be a symbol" unless attribute.is_a?(Symbol)
+
+        enums = model.defined_enums
+        return nil unless enums.key?(attribute.to_s)
+
+        @enums ||= {}
+        @enums[attribute.to_s] = enums[attribute.to_s].map do |k,v|
+          translation_key = "activerecord.attributes.#{model.model_name.i18n_key}.#{attribute}/#{k}"
+          [
+            k,
+            I18n.t(translation_key, default: k.humanize)
+          ]
+        end
+      end
+
     end
   end
 end

data/lib/svelte_on_rails/view_helpers.rb

@@ -72,7 +72,7 @@ module SvelteOnRails
       if args.length > 2
         kw_err = true
       elsif args.length >= 1
-        if args.last.keys & [:html, :options]
+        if (args.last.keys & [:html, :options]).present?
           last_is_kwargs = true
           if (args.last.keys - [:html, :options]).present?
             kw_err = true
@@ -88,8 +88,8 @@ module SvelteOnRails
 
       [
         (first_is_props ? args.first : nil),
-        (last_is_kwargs ? args[1][:html] : nil),
-        (last_is_kwargs ? args[1][:options] : nil),
+        (last_is_kwargs ? args[1][:html] || {} : {}),
+        (last_is_kwargs ? args[1][:options] : {}),
       ]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Christian Sedlmair