svelte-on-rails 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2251e235c9c3ef4744e197e276e77ada5f0530baaf3b17ecbf9fc09a130cf98
-  data.tar.gz: b4359024b0fa5ce9ebf02b2384b1ae7931cbb4982670a2a3a000c8b2cdd20d42
+  metadata.gz: 9fd78748cd0a7f9c896123e31dbbccab10dc7d42bc394a14fbc66efa360a166d
+  data.tar.gz: ce14713af9654cdbeb0e2ddf5cb9e46174308d9018c668b97f1db47b083e0324
 SHA512:
-  metadata.gz: ab0dd3ba7377a4e485840bdddca3425ecacec267d98a37c74224450d2acffd34265dbb6021eaa443ced8e92205b70b4bfac6bc6e42d060670868730d81b7d586
-  data.tar.gz: c665f45bbe57aab35cec4601dff88160a6818ad4f7055b8163d26b470feec82c76f75c024779913fc96bfe67aa4f6cfce451f22f78165b051379adf3b6d9dcd3
+  metadata.gz: 033d0d7cb3a2147119668913978f8a8fdba37d0467b7e7c756afaf60609352ed6bb2aa3805c1640c81a78dedb325eda7e298410c3df4485ed6f0fc7d796fa33c
+  data.tar.gz: f1b1830ad7056f1dff09077ba6576c6d64db6a8f27bfbfb9cc2dad70f128d0078137b9fbb970179c6702c677f443316f69c2d4f7e32dec33cca7aa37d6a8c6f9

data/README.md

@@ -52,7 +52,7 @@ If you have issues, please open one, and contributors are welcome!
 
 **PROPS ON RUBY <= 3**
 
-On ruby <3 Arguments can be misinterpreted, see [issue-10](https://gitlab.com/sedl/svelte-on-rails/-/issues/10)
+On ruby <3 Arguments are misinterpreted, see [issue-10](https://gitlab.com/sedl/svelte-on-rails/-/issues/10)
 
 
 ## Installation

data/lib/svelte_on_rails/active_record_extensions.rb

@@ -1,11 +1,8 @@
 # lib/svelte_on_rails/active_record_extensions.rb
 module SvelteOnRails
+
+
   module ActiveRecordExtensions
-    # def self.included(base)
-    #   unless defined?(ActiveRecord::Base) && base.ancestors.include?(ActiveRecord::Base)
-    #     raise 'SvelteOnRails::ActiveRecordExtensions can only be included in ActiveRecord models'
-    #   end
-    # end
 
     # Returns a hash of attributes, methods, and associations formatted for Svelte components
     def to_svelte(*attributes, **associations)
@@ -13,29 +10,38 @@ module SvelteOnRails
 
                        cl = SvelteOnRails::Lib::SvelteAttributes
                        r = cl.new.calculate_instance(self, attributes, associations)
-                       r.first.merge({self.class.to_s.underscore => r[1]})
+                       r.first.merge({ self.class.to_s.underscore => r[1] })
 
                      end
     end
 
   end
 
+
+
   module ActiveRecordClassExtensions
+
     def to_svelte(*attributes, **associations)
+
       @to_svelte ||= begin
                        cl = SvelteOnRails::Lib::SvelteAttributes
-                       cl.new.calculate_class(self, attributes, associations)
+                         cl.new.calculate_class(self, attributes, associations)
                      end
     end
+
   end
 
+
+
   module ActiveRecordRelationExtensions
+
     def to_svelte(*attributes, **associations)
       @to_svelte ||= begin
                        cl = SvelteOnRails::Lib::SvelteAttributes
                        cl.new.calculate_relation(self, attributes, associations)
                      end
     end
+
   end
 
 end

data/lib/svelte_on_rails/railtie.rb

@@ -15,16 +15,17 @@ module SvelteOnRails
 
     initializer 'svelte_on_rails.active_record_extensions' do
       ActiveSupport.on_load(:active_record) do
-        # Include instance-level extensions
+        # Include instance-level extensions for ActiveRecord instances (e.g., @article)
         include SvelteOnRails::ActiveRecordExtensions
-        # Extend with class-level extensions
-        extend SvelteOnRails::ActiveRecordClassExtensions
+
+        # Extend ActiveRecord::Base with class-level extensions (e.g., Article)
+        ActiveRecord::Base.extend SvelteOnRails::ActiveRecordClassExtensions
+
+        # This also extends ActiveRecord::Relation (e.g., @articles)
+        ActiveRecord::Relation.include SvelteOnRails::ActiveRecordRelationExtensions
+
       end
-    end
 
-    # Extend ActiveRecord::Relation
-    ActiveSupport.on_load(:active_record_relation) do
-      include SvelteOnRails::ActiveRecordRelationExtensions
     end
 
     rake_tasks do

metadata

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