autoforme 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08b9c95c4e096845f520e6543543f644d9fc7f558ae6c8674ac508a5a392e18a'
-  data.tar.gz: 51b362ce883daf920aaa4035d1f5cd2073b96c78f54aad0c1411308d08b794d7
+  metadata.gz: 2bff68076c7cdf213c0142df9ab3809d33ede301c99f12e5cfbe7d1e111df30d
+  data.tar.gz: d2446bc814e6a19ebb70dfd46717ac596bb0aa4915abf02dd83aded973ba8d65
 SHA512:
-  metadata.gz: b9ed3dece202d2d48cc6b65746ba979acc57d3b1f67843b4d123d531313162bbf5806c1200ce9bce932eef9dd3aefd7ba1ff6582083b99dc171c8fb90e725c16
-  data.tar.gz: 7ad255b23d6ebbf43b6ff5caf43c7772b40386451aed7cfe456a09707b05b849e41bb763fe58f7df91940987602cf11972f41e9237b7d49c2ca554d55621769d
+  metadata.gz: '048c064a080ae50bd872be8e17a96f06e6f9eece5fb095c31121810edbe2f03d1f5db7a6562fb0d33c7229b1e1a49641246186f6567435664be646da836ce251'
+  data.tar.gz: 596b1caa6bfc6a91cf8745019df9c299e9315ace558388c9c5ba4fb44b7df18fdfd0aff0c9e5a7213c71e26ffb3fa12d3afed34e91c962e1ae258254413cded4

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.13.0 (2024-07-10)
+
+* Typecast primary key values before using them for lookup (jeremyevans)
+
+* Support colon for model names to allow easier use of namespaced models (adam12) (#46)
+
 === 1.12.0 (2022-06-29)
 
 * Handle autocomplete queries with an empty query by returning empty string (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021 Jeremy Evans
+Copyright (c) 2013-2024 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/lib/autoforme/frameworks/roda.rb

@@ -23,7 +23,7 @@ module AutoForme
             # :nocov:
           end
 
-          path_id = $1 if remaining_path =~ %r{\A\/([\w-]+)\z}
+          path_id = $1 if remaining_path =~ %r{\A\/([:\w-]+)\z}
           set_id(path_id)
         end
 

data/lib/autoforme/frameworks/sinatra.rb

@@ -69,7 +69,7 @@ module AutoForme
           suffix = "\\z"
         end
         # :nocov:
-        regexp = %r{#{prefix}/([\w:]+)/(\w+)(?:/([\w-]+))?#{suffix}}
+        regexp = %r{#{prefix}/([\w:]+)/(\w+)(?:/([:\w-]+))?#{suffix}}
         @controller.get regexp, &block
         @controller.post regexp, &block
       end

data/lib/autoforme/models/sequel.rb

@@ -133,6 +133,12 @@ module AutoForme
 
       # Retrieve underlying model instance with matching primary key
       def with_pk(type, request, pk)
+        begin
+          pk = typecast_value(model.primary_key, pk)
+        rescue S::InvalidValue
+          raise S::NoMatchingRow
+        end
+
         dataset_for(type, request).with_pk!(pk)
       end
 
@@ -183,7 +189,7 @@ module AutoForme
               ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v)}%"))
             else
               begin
-                typecasted_value = model.db.typecast_value(column_type(c), v)
+                typecasted_value = typecast_value(c, v)
               rescue S::InvalidValue
                 ds = ds.where(false)
                 break
@@ -355,6 +361,10 @@ module AutoForme
 
       private
 
+      def typecast_value(column, value)
+        model.db.typecast_value(column_type(column), value)
+      end
+
       def dataset_for(type, request)
         ds = model.dataset
         if filter = filter_for

data/lib/autoforme/version.rb

@@ -6,7 +6,7 @@ module AutoForme
   MAJOR = 1
 
   # The minor version of AutoForme, updated for new feature releases of AutoForme.
-  MINOR = 12
+  MINOR = 13
 
   # The patch version of AutoForme, updated only for bug fixes from the last
   # feature release.

data/lib/roda/plugins/autoforme.rb

@@ -6,7 +6,7 @@ class Roda
   module RodaPlugins
     module AutoForme
       # Require the render plugin, since it is required.
-      def self.load_dependencies(app, opts={})
+      def self.load_dependencies(app, opts={}, &_)
         app.plugin :render
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -251,7 +251,7 @@ metadata:
   documentation_uri: http://autoforme.jeremyevans.net
   mailing_list_uri: https://github.com/jeremyevans/autoforme/discussions
   source_code_uri: https://github.com/jeremyevans/autoforme
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--line-numbers"
@@ -273,8 +273,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model
 test_files: []