autoforme 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f9fb399d144c4bfc7eed6e2a4f7497cab7bc25b8409d555c4f67fb91bad9bb7
-  data.tar.gz: bffb9114ef162400c639abb1ee17b7eb42ced481294d152e2603711c01752274
+  metadata.gz: '0198a23636933034920c066694a4acd8e58d5529fbf21ada5f542a7de444cc2c'
+  data.tar.gz: 6cf1f310f06018a91573472c7410c1dda1842b7f96593a82deaf9be5f2bdd524
 SHA512:
-  metadata.gz: 15cd700c5edc91d860dcec0209dae57dd3db48ebe2bc6cf66f19b9d786d7a51b23f909ec80a0a2333af8d9c42c165690dd6710c26ebfadfbfa93c9d17618976b
-  data.tar.gz: 0c4a42c4e34e398209f98e85303558ef95447eb6a1e8f6351a182f214a1dab7b754f86aca8d81d35ba32d5890a09fa417a28c7e8212a2284df5d265c776533e8
+  metadata.gz: 8931ddb513d806df30b8a4fe36fb20583597ac4e9f45e1144c5732cff66d09f92a14967a5ac4c35724ac339bfd23af866b454490ffabe99b327dfaff2e1aa787
+  data.tar.gz: '097239f8074dc20537dec29064f24c2e5fbb521cf3586bb828726afc2b436eed190794d2b276e9b108c60bb6a4c3116a35dc651d54e32af5ff74d34e4a6b586e'

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.11.0 (2021-11-30)
+
+* Require forme 2.0.0 (jeremyevans)
+
+* Add support for view_options framework option (nmb, jeremyevans) (#42)
+
+* Drop support for Ruby 1.8 (jeremyevans)
+
 === 1.10.0 (2021-08-27)
 
 * Do not consider read_only many_to_many associations to be editable (jeremyevans)

data/README.rdoc

@@ -174,6 +174,8 @@ page_header :: Override the default header used for pages
 show_html :: The html to use for displaying the value for an object field.  Should be a proc that takes the
              model object, column symbol, type symbol, and request and returns the html to use.
 table_class :: The html class string to use for the browse and search tables
+view_options :: Hash with options passed when rendering the view (how these options are used varies
+                in each of the supported web frameworks), e.g. <tt>view_options: {:layout => :formelayout}</tt>
 
 These hook options should be callable objects that are called with the model object and the request.
 

data/lib/autoforme/action.rb

@@ -227,10 +227,15 @@ module AutoForme
     # Options to use for the form.  If the form uses POST, automatically adds the CSRF token.
     def form_opts(action=nil)
       opts = model.form_options_for(type, request).dup
-      hidden_tags = opts[:hidden_tags] = []
-      if csrf = request.csrf_token_hash(action)
-        hidden_tags << lambda{|tag| csrf if (tag.attr[:method] || tag.attr['method']).to_s.upcase == 'POST'}
+
+      opts[:_before_post] = lambda do |form|
+        if csrf_hash = request.csrf_token_hash(action)
+          csrf_hash.each do |name, value|
+            form.tag(:input, :type=>:hidden, :name=>name, :value=>value)
+          end
+        end
       end
+
       opts
     end
 

data/lib/autoforme/frameworks/rails.rb

@@ -58,7 +58,11 @@ module AutoForme
             elsif @autoforme_action.request.xhr?
               render :html=>@autoforme_text.html_safe
             else
-              render :inline=>"<%=raw @autoforme_text %>", :layout=>true
+              opts = framework.opts[:view_options]
+              opts = opts ? opts.dup : {}
+              opts[:layout] = true unless opts.has_key?(:layout)
+              opts[:inline] = "<%=raw @autoforme_text %>"
+              render opts
             end
           else
             render :plain=>'Unhandled Request', :status=>404

data/lib/autoforme/frameworks/roda.rb

@@ -53,16 +53,18 @@ module AutoForme
         def csrf_token_hash(action=nil)
           if @controller.respond_to?(:check_csrf!)
             # Using route_csrf plugin
-            # :nocov:
             token = if @controller.use_request_specific_csrf_tokens?
               @controller.csrf_token(@controller.csrf_path(action))
+              # :nocov:
             else
               @controller.csrf_token
+              # :nocov:
             end
             {@controller.csrf_field=>token}
             # :nocov:
           elsif defined?(::Rack::Csrf)
             {::Rack::Csrf.field=>::Rack::Csrf.token(@env)}
+            # :nocov:
           end
         end
 
@@ -106,7 +108,10 @@ module AutoForme
             elsif @autoforme_action.request.xhr?
               @autoforme_text
             else
-              view(:content=>@autoforme_text)
+              opts = framework.opts[:view_options]
+              opts = opts ? opts.dup : {}
+              opts[:content] = @autoforme_text
+              view(opts)
             end
           end
         end

data/lib/autoforme/frameworks/sinatra.rb

@@ -50,7 +50,9 @@ module AutoForme
             elsif @autoforme_action.request.xhr?
               @autoforme_text
             else
-              erb "<%= @autoforme_text %>".dup
+              opts = framework.opts[:view_options]
+              opts = opts ? opts.dup : {}
+              erb("<%= @autoforme_text %>".dup, opts ? opts.dup : {})
             end
           else
             pass

data/lib/autoforme/models/sequel.rb

@@ -316,6 +316,12 @@ module AutoForme
                   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

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 = 10
+  MINOR = 11
 
   # The patch version of AutoForme, updated only for bug fixes from the last
   # feature release.

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

data/spec/all.rb

@@ -1,2 +1,2 @@
 puts "Running specs with #{ENV['FRAMEWORK']||'roda'} framework"
-Dir['./spec/*_spec.rb'].each{|f| require f}
+Dir.new(File.dirname(__FILE__)).each{|f| require_relative f if f.end_with?('_spec.rb')}

data/spec/associations_spec.rb

@@ -1,4 +1,4 @@
-require './spec/spec_helper'
+require_relative 'spec_helper'
 
 describe AutoForme do
   before(:all) do

data/spec/basic_spec.rb

@@ -1,4 +1,4 @@
-require './spec/spec_helper'
+require_relative 'spec_helper'
 
 describe AutoForme do
   before(:all) do
@@ -12,6 +12,7 @@ describe AutoForme do
   it "should have basic functionality working" do
     app_setup(Artist)
     visit("/Artist/new")
+    page.html.must_include '<!DOCTYPE html>'
     page.title.must_equal 'Artist - New'
     fill_in 'Name', :with=>'TestArtistNew'
     click_button 'Create'
@@ -607,6 +608,13 @@ describe AutoForme do
     page.html.must_match(/Name.+TestArtistUpdate/m)
     page.current_path.must_match %r{/Artist/edit/\d+}
   end
+
+  it "should support view_options" do
+    app_setup(Artist, view_options: {:layout=>false}){}
+    visit("/Artist/browse")
+    page.html.wont_include '<!DOCTYPE html>'
+    page.all('table').first['id'].must_equal 'autoforme_table'
+  end
 end
 
 describe AutoForme do

data/spec/mtm_spec.rb

@@ -1,4 +1,4 @@
-require './spec/spec_helper'
+require_relative 'spec_helper'
 
 describe AutoForme do
   before(:all) do
@@ -595,7 +595,7 @@ describe AutoForme do
     end
 
     visit("/Artist/new")
-    page.html.wont_include 'MTM'
+    page.html.wont_include 'Artist/mtm_edit'
     fill_in 'Name', :with=>'Artist1'
     click_button 'Create'
     click_link 'Edit'
@@ -607,7 +607,7 @@ describe AutoForme do
     page.html.must_include 'Unhandled Request'
 
     visit("/Album/new")
-    page.html.wont_include 'MTM'
+    page.html.wont_include 'Album/mtm_edit'
     fill_in 'Name', :with=>'Album1'
     click_button 'Create'
     click_link 'Edit'

data/spec/rails_spec_helper.rb

@@ -1,7 +1,6 @@
-require 'rubygems'
 require 'rails'
 require 'action_controller/railtie'
-require 'autoforme'
+require_relative '../lib/autoforme'
 
 class AutoFormeSpec::App
   class << self
@@ -78,12 +77,11 @@ HTML
         # Work around issue in backported openssl environments where
         # secret is 64 bytes intead of 32 bytes
         require 'active_support/message_encryptor'
-        ActiveSupport::MessageEncryptor.send :prepend, Module.new {
-          def initialize(secret, *signature_key_or_options)
-            secret = secret[0, 32]
-            super
-          end
-        }
+        def (ActiveSupport::MessageEncryptor).new(secret, *signature_key_or_options)
+          obj = allocate
+          obj.send(:initialize, secret[0, 32], *signature_key_or_options)
+          obj
+        end
       end
       if Rails.version > '4.2'
         config.action_dispatch.cookies_serializer = :json
@@ -91,6 +89,7 @@ HTML
       if Rails.version > '5'
         # Force Rails to dispatch to correct controller
         ActionDispatch::Routing::RouteSet::Dispatcher.class_eval do
+          alias controller controller
           define_method(:controller){|_| controller}
         end
         config.session_store :cookie_store, :key=>'_autoforme_test_session'

data/spec/roda_spec.rb

@@ -1,4 +1,4 @@
-require './spec/spec_helper'
+require_relative 'spec_helper'
 
 describe AutoForme do
   before(:all) do

data/spec/roda_spec_helper.rb

@@ -1,6 +1,5 @@
-require 'rubygems'
 require 'roda'
-require 'autoforme'
+require_relative '../lib/autoforme'
 require 'rack/csrf'
 
 begin

data/spec/sequel_spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sequel'
 require 'logger'
 

data/spec/sinatra_spec_helper.rb

@@ -1,6 +1,5 @@
-require 'rubygems'
 require 'sinatra/base'
-require 'autoforme'
+require_relative '../lib/autoforme'
 require 'sinatra/flash'
 require 'rack/csrf'
 

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 $: << File.expand_path(File.join(__FILE__, '../../lib'))
 ENV['FRAMEWORK'] ||= 'roda'
 
@@ -19,7 +18,7 @@ if ENV['COVERAGE']
   end
 end
 
-require "./spec/#{ENV['FRAMEWORK']}_spec_helper"
+require_relative "#{ENV['FRAMEWORK']}_spec_helper"
 
 require 'capybara'
 require 'capybara/dsl'
@@ -35,7 +34,7 @@ if ENV['WARNING']
   Warning.ignore([:missing_ivar, :fixnum, :not_reached])
 end
 
-require './spec/sequel_spec_helper'
+require_relative 'sequel_spec_helper'
 
 class Minitest::HooksSpec
   include Rack::Test::Methods

data/spec/unit_spec.rb

@@ -1,4 +1,4 @@
-require './spec/spec_helper'
+require_relative 'spec_helper'
 
 describe AutoForme do
   before(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-11-30 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
@@ -278,14 +278,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.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model