azahara_schema 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d71e803ac5710793409dda0076fd06fb9d161c27d8f535b1b7e52280013dcec9
-  data.tar.gz: 449f11f7d37861f8c052e79601969bacb8de7193133103bf446ecc8528b4a99f
+  metadata.gz: 00ad7e61106ffbc9c0d9f8a41eb52e46d416686f12a483b7751723202be602b4
+  data.tar.gz: 603c7faf533426f96a59bf8f50f5ba4e90295531c4376d276dc9158fcade2f49
 SHA512:
-  metadata.gz: edf1b6b899dd4ff988dd716d485cf85d821163570180f58f16e9272cc1da623862fad582b8f23575b45fe33dc422722cb5d3779f1eadcc8ff33a82abca456bb3
-  data.tar.gz: f16564298b872f4dbf932646a7b21aa5317dc1d6916622e6b58876d07b07d99441e867e3f404a3842769e3f4d5f2512fa3cf8621ad6159f3bbf1f7f62fd02d8c
+  metadata.gz: d0251f83ddac22902d388c021f322abab5468fb4e3400c7b67ceb9ed95e2cb01be7d27830ce81c20370407e233fff9fe4531657cc29dda9a5ef3f10abac28636
+  data.tar.gz: f4b007beed8f3e0c8d87b35109ab4971e848e6d16dd73928261d06fdf82b0e384b6216dee030f35846a194ce36f982b5a889d7b13040db32cfa00323823b8914

data/app/helpers/azahara_schema/application_helper.rb

@@ -59,7 +59,16 @@ module AzaharaSchema
         schema.model
       end
 
-      polymorphic_path(model, schema.to_param.merge(format: export_format))
+      new_params = if schema.is_a?(AzaharaSchema::ModelSchema)
+        schema.to_param
+      else
+        params
+      end
+
+      polymorphic_path(
+        model,
+        new_params.except(:controller, :action).merge(format: export_format)
+      )
     rescue NoMethodError => err
       nil
     end

data/lib/azahara_schema/schema.rb

@@ -282,17 +282,19 @@ module AzaharaSchema
     end
 
     def entities
-      scope = filtered_scope
-      columns.each do |col|
-        scope = col.add_preload(scope)
-      end
-      sort.keys.reverse.each do |name|
-        att = attribute(name)
-        scope = att.add_sort(scope, sort[name]) if att
+      @entities ||= begin
+        scope = filtered_scope
+        columns.each do |col|
+          scope = col.add_preload(scope)
+        end
+        sort.keys.reverse.each do |name|
+          att = attribute(name)
+          scope = att.add_sort(scope, sort[name]) if att
+        end
+        scope = scope.offset(offset) if offset
+        scope = scope.limit(limit) if limit
+        scope
       end
-      scope = scope.offset(offset) if offset
-      scope = scope.limit(limit) if limit
-      scope
     end
 
     def build_json_options!(options={})

data/lib/azahara_schema/version.rb

@@ -1,3 +1,3 @@
 module AzaharaSchema
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azahara_schema
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-18 00:00:00.000000000 Z
+date: 2025-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,16 +48,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Gem to support developement of rails application with schema over an entity