svelte-on-rails 23.1.12 → 23.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0212a719af57499097f13f911ad2f2d84cad739b32b7c262a6a87d58ae9cbace
-  data.tar.gz: cf4b9c1d2b23ccf54a488848b62b10434159fda7138cc5ee5573fe9ab268fce3
+  metadata.gz: 6f04dacbd659f04a33d94aaae3d17751a7ccbbe071b0aec6d88dfac7ba9820f9
+  data.tar.gz: 70a3562c852eaad7ca76078259417a51e5d823f7bd47d6c1726574b4b34bca5a
 SHA512:
-  metadata.gz: b44f1a47e11af58647382304f6ed2a3b8d73776abc6287c9ddc499c4fb9361b0ec3d3a499e6fa06b0b89be2dbce6a58291551a292b3d12c25db45066e9155bab
-  data.tar.gz: 9881ff99797ff638dde48661f937d1b9447a08dfb96d504fde709f61e8ebf75d676e2540886eb14cf33c30d78dab4aea0214f2071591d0a46b5d32ef763d1181
+  metadata.gz: 07eae817097ddc9f94c5a39f7dfc2878fcc3ffcdd86c6d07f0d805a9e8d7cabdfd63e3a8d14867d367d54a2c1e3a4cc006d47abddc76791d554ff8ec0c3afb78
+  data.tar.gz: e8e47d44da5e38081281828d2393b2b0efe7ffd5f40ca421e8f277faf7e132261dbc3783c7aa19bbff0ad17e555ce0f642af840f2f8accdd61738dd8f04b3ff7

data/lib/svelte_on_rails/lib/to_svelte_schema.rb

@@ -39,11 +39,14 @@ module SvelteOnRails
             associations.merge!(attr)
           else
 
-            if !model.method_defined?(attr) && !model.attribute_names.include?(attr.to_s)
-              raise "ERROR: Attribute or method «#{attr}» not found in model «#{model}»"
+            attr_s = attr.to_s
+            dot_index = attr_s.index('.')
+            _at = dot_index ? attr_s[0...dot_index].delete_suffix('&') : attr_s
+            if !model.method_defined?(_at) && !model.attribute_names.include?(_at)
+              raise "ERROR: Attribute or method «#{_at}» not found in model «#{_at}»"
             end
             @labels[key] ||= {}
-            @labels[key][attr.to_s] ||= column_attributes(model, attr)
+            @labels[key][_at] ||= column_attributes(model, _at)
             @labels[key]['self'] ||= model_attributes(model)
 
           end

data/lib/svelte_on_rails/lib/to_svelte_values.rb

@@ -62,12 +62,11 @@ module SvelteOnRails
         enums = record.class.try(:defined_enums) || {}
 
         attributes.each do |attr|
-          validate_attribute!(record, attr)
 
           key_s = attr.to_s
-          value = record.send(attr)
+          value = chained_send(record, key_s)
 
-          values[key_s] = enums.key?(key_s) ? record.send(key_s) : value
+          values[key_s] = enums.key?(key_s) ? chained_send(record, key_s) : value
         end
 
         associations.each do |key, val|
@@ -119,12 +118,19 @@ module SvelteOnRails
           obj.is_a?(ActiveRecord::Associations::CollectionProxy)) rescue false
       end
 
-      def self.validate_attribute!(record, attr)
-        unless attr.is_a?(Symbol) || attr.is_a?(String)
-          raise ArgumentError, "Attribute must be Symbol or String, got #{attr.inspect}"
-        end
-        unless record.respond_to?(attr)
-          raise "[SOR] to_svelte: No method #{attr.inspect} on #{record.class}"
+      def self.chained_send(object, path)
+        calls = path.to_s.scan(/(&?\.)?([a-zA-Z_]\w*[!?=]?)/)
+
+        calls.reduce(object) do |current, (operator, method_name)|
+          return nil if operator == "&." && current.nil?
+
+          raise ArgumentError, "[SOR] Cannot call #{method_name} on nil" if current.nil?
+
+          unless current.respond_to?(method_name)
+            raise ArgumentError, "[SOR] No method #{method_name.inspect} on #{current.class}"
+          end
+
+          current.public_send(method_name)
         end
       end
     end

data/lib/tasks/cache_tasks.rake

@@ -26,8 +26,6 @@ namespace :svelte_on_rails do
       total_deleted = 0
       batches = 0
 
-      puts "Scanning Redis for keys matching «#{pattern}» ..."
-
       loop do
         cursor, keys = redis.scan(cursor, match: pattern, count: 500)
         if keys.any?
@@ -52,9 +50,11 @@ namespace :svelte_on_rails do
     desc "Show all svelte-on-rails Redis keys with their memory footprint (scoped to redis_namespace). Env: LIMIT=n, SORT=size|key, PATTERN=extra-glob"
     task show: :environment do
 
-      _entries = SvelteOnRails::Cache.redis_entries
+      _entries = SvelteOnRails::Cache.redis_entries(silent: true)
+      cnf = SvelteOnRails::Configuration.instance
 
       if _entries.empty?
+        puts "No keys found for redis namespace «#{cnf.redis_namespace}»."
         exit 0
       end
 
@@ -84,11 +84,15 @@ namespace :svelte_on_rails do
     desc "Show contents of cached keys"
     task show_contents: :environment do
 
+      entries = SvelteOnRails::Cache.redis_entries(silent: true)
+
       entries.each do |e|
+        puts
         puts '='*120
         puts "#{e[:key]} (#{human_bytes(e[:bytes])})"
         puts '-'*120
         puts SvelteOnRails::Configuration.instance.redis_instance.get(e[:key])
+        puts
       end
 
     end
@@ -96,6 +100,8 @@ namespace :svelte_on_rails do
     desc "Show only the svelte part (wrapping div stripped away) of cached keys"
     task show_svelte: :environment do
 
+      entries = SvelteOnRails::Cache.redis_entries(silent: true)
+
       entries.each do |e|
 
         ht = SvelteOnRails::Configuration.instance.redis_instance.get(e[:key])

metadata

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