autoforme 1.9.1 → 1.12.0

data/lib/autoforme/models/sequel.rb

@@ -98,14 +98,26 @@ module AutoForme
         ref[:keys].zip(ref[:primary_keys].map{|k| obj.send(k)})
       end
 
+      # Array of many to many association name strings for editable
+      # many to many associations.
+      def editable_mtm_association_names
+        association_names([:many_to_many]) do |r|
+          model.method_defined?(r.add_method) && model.method_defined?(r.remove_method)
+        end
+      end
+
       # Array of many to many association name strings.
       def mtm_association_names
         association_names([:many_to_many])
       end
 
-      # Array of association name strings for given association types
+      # Array of association name strings for given association types. If a block is
+      # given, only include associations where the block returns truthy.
       def association_names(types=SUPPORTED_ASSOCIATION_TYPES)
-        model.all_association_reflections.select{|r| types.include?(r[:type])}.map{|r| r[:name]}.sort_by(&:to_s)
+        model.all_association_reflections.
+          select{|r| types.include?(r[:type]) && (!block_given? || yield(r))}.
+          map{|r| r[:name]}.
+          sort_by(&:to_s)
       end
 
       # Save the object, returning the object if successful, or nil if not.
@@ -138,7 +150,7 @@ module AutoForme
             columns[i] = reflection[:name]
           end
         end
-        columns.sort_by(&:to_s)
+        columns.sort!
       end
 
       # Add a filter restricting access to only rows where the column name
@@ -158,7 +170,7 @@ module AutoForme
         params = request.params
         ds = apply_associated_eager(:search, request, all_dataset_for(type, request))
         columns_for(:search_form, request).each do |c|
-          if (v = params[c.to_s]) && !v.empty?
+          if (v = params[c.to_s]) && !(v = v.to_s).empty?
             if association?(c)
               ref = model.association_reflection(c)
               ads = ref.associated_dataset
@@ -168,9 +180,16 @@ module AutoForme
               primary_key = S.qualify(ref.associated_class.table_name, ref.primary_key)
               ds = ds.where(S.qualify(model.table_name, ref[:key])=>ads.where(primary_key=>v).select(primary_key))
             elsif column_type(c) == :string
-              ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v.to_s)}%"))
+              ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v)}%"))
             else
-              ds = ds.where(S.qualify(model.table_name, c)=>model.db.typecast_value(column_type(c), v))
+              begin
+                typecasted_value = model.db.typecast_value(column_type(c), v)
+              rescue S::InvalidValue
+                ds = ds.where(false)
+                break
+              else
+                ds = ds.where(S.qualify(model.table_name, c)=>typecasted_value)
+              end
             end
           end
         end
@@ -293,7 +312,17 @@ module AutoForme
               ids.each do |id|
                 next if id.to_s.empty?
                 ret = assoc_class ? assoc_class.with_pk(:association, request, id) : obj.send(:_apply_association_options, ref, ref.associated_class.dataset.clone).with_pk!(id)
-                obj.send(meth, ret)
+                begin
+                  model.db.transaction(:savepoint=>true){obj.send(meth, ret)}
+                rescue S::UniqueConstraintViolation
+                  # Already added, safe to ignore
+                rescue S::ConstraintViolation
+                  # Old versions of sqlite3 and jdbc-sqlite3 can raise generic
+                  # ConstraintViolation instead of UniqueConstraintViolation
+                  # :nocov:
+                  raise unless model.db.database_type == :sqlite
+                  # :nocov:
+                end
               end
             end
           end

data/lib/autoforme/version.rb

@@ -6,11 +6,11 @@ module AutoForme
   MAJOR = 1
 
   # The minor version of AutoForme, updated for new feature releases of AutoForme.
-  MINOR = 9
+  MINOR = 12
 
   # The patch version of AutoForme, updated only for bug fixes from the last
   # feature release.
-  TINY = 1
+  TINY = 0
 
   # Version constant, use <tt>AutoForme.version</tt> instead.
   VERSION = "#{MAJOR}.#{MINOR}.#{TINY}".freeze

data/lib/autoforme.rb

@@ -1,7 +1,6 @@
 # frozen-string-literal: true
 
 require 'forme'
-require 'thread'
 require 'rack/utils'
 
 module AutoForme
@@ -50,10 +49,10 @@ module AutoForme
   end
 end
 
-require 'autoforme/opts_attributes'
-require 'autoforme/model'
-require 'autoforme/framework'
-require 'autoforme/request'
-require 'autoforme/action'
-require 'autoforme/table'
-require 'autoforme/version'
+require_relative 'autoforme/opts_attributes'
+require_relative 'autoforme/model'
+require_relative 'autoforme/framework'
+require_relative 'autoforme/request'
+require_relative 'autoforme/action'
+require_relative 'autoforme/table'
+require_relative 'autoforme/version'

data/lib/roda/plugins/autoforme.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-require 'autoforme'
+require_relative '../../autoforme'
 
 class Roda
   module RodaPlugins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,6 @@ files:
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
 - autoforme.js
 - lib/autoforme.rb
 - lib/autoforme/action.rb
@@ -229,21 +242,15 @@ files:
 - lib/autoforme/table.rb
 - lib/autoforme/version.rb
 - lib/roda/plugins/autoforme.rb
-- spec/all.rb
-- spec/associations_spec.rb
-- spec/basic_spec.rb
-- spec/mtm_spec.rb
-- spec/rails_spec_helper.rb
-- spec/roda_spec.rb
-- spec/roda_spec_helper.rb
-- spec/sequel_spec_helper.rb
-- spec/sinatra_spec_helper.rb
-- spec/spec_helper.rb
-- spec/unit_spec.rb
 homepage: http://github.com/jeremyevans/autoforme
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/jeremyevans/autoforme/issues
+  changelog_uri: http://autoforme.jeremyevans.net/files/CHANGELOG.html
+  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: 
 rdoc_options:
 - "--quiet"
@@ -259,14 +266,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model

data/Rakefile

@@ -1,69 +0,0 @@
-require "rake"
-require "rake/clean"
-
-CLEAN.include ["autoforme-*.gem", "rdoc", "coverage"]
-
-desc "Build autoforme gem"
-task :package=>[:clean] do |p|
-  sh %{#{FileUtils::RUBY} -S gem build autoforme.gemspec}
-end
-
-### Specs
-
-spec = proc do |env|
-  env.each{|k,v| ENV[k] = v}
-  sh "#{FileUtils::RUBY} spec/all.rb"
-  env.each{|k,v| ENV.delete(k)}
-end
-task :default => :roda_spec
-
-desc "Run specs for all frameworks"
-spec_tasks = [:roda_spec, :sinatra_spec]
-if RUBY_VERSION >= '1.9'
-  spec_tasks << :rails_spec
-end
-task :spec => spec_tasks
-
-%w'roda sinatra rails'.each do |framework|
-  desc "Run specs with for #{framework} with coverage"
-  task "#{framework}_spec" do
-    spec.call('FRAMEWORK'=>framework)
-  end
-
-  desc "Run specs with coverage for #{framework}"
-  task "#{framework}_spec_cov" do
-    spec.call('FRAMEWORK'=>framework, 'COVERAGE'=>'1')
-  end
-
-  desc "Run specs with -w for #{framework}, some warnings filtered"
-  task "#{framework}_spec_w" do
-    spec.call('FRAMEWORK'=>framework, 'RUBYOPT'=>'-w', 'WARNING'=>'1')
-  end
-end
-
-### RDoc
-
-RDOC_DEFAULT_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', 'AutoForme: Web Administrative Console for Sinatra/Rails and Sequel']
-
-begin
-  gem 'hanna-nouveau'
-  RDOC_DEFAULT_OPTS.concat(['-f', 'hanna'])
-rescue Gem::LoadError
-end
-
-rdoc_task_class = begin
-  require "rdoc/task"
-  RDoc::Task
-rescue LoadError
-  require "rake/rdoctask"
-  Rake::RDocTask
-end
-
-RDOC_OPTS = RDOC_DEFAULT_OPTS + ['--main', 'README.rdoc']
-
-rdoc_task_class.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.options += RDOC_OPTS
-  rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb"
-end
-

data/spec/all.rb

@@ -1,2 +0,0 @@
-puts "Running specs with #{ENV['FRAMEWORK']||'roda'} framework"
-Dir['./spec/*_spec.rb'].each{|f| require f}