autoforme 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5112ef1a062e3fa4a586f605365004eb733e25c7e49c7d52d0399d2d5596a692
-  data.tar.gz: 3142feb7e88e43ec825eedb9dfa700dd2c710cdce59b7839241117ad66b6568a
+  metadata.gz: 1754f8c1e90ba00be770867d9f31f44174795d39bdba0ea4b4f042cdff18412f
+  data.tar.gz: '09cd6e1316462bdceaa7e352b846430fdc319bfcfaac0aba488ffa0b2043113c'
 SHA512:
-  metadata.gz: 937e7ced506f742fbd9ec7632cf69a6a93b1996d884a63996162a38ad949c0ef3b6022a910fe51748f9792c9d9ce3703ffa6691e321f93bcd9917e05f3f24677
-  data.tar.gz: a369fc3b50aef5cf9546fb512c0d92a63de9cc0f15b8ac16f84b5fa2291f688ea10f0a711ddf9573b3e1c6257015174c147f05af6e7f073ae37be1e392386c85
+  metadata.gz: 33b535cf2f5a8b1b40300077323b68665091fce86cadc577955986baacc1bfc65b2ee74fecb3688ee453424a29e38c60876358e5b68daa11b05539f031c2620e
+  data.tar.gz: dd05af8198487de125df170d72c3bc37c4497ebfa6d59c71d9a55285372b49fda99516640f8a4e49f06f44396ec1b731bb039350d73a9f1a7ebc320e8a10ada2

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.9.0 (2018-07-18)
+
+* Add support for using flash string keys in the Roda support, to work with Roda's sessions plugin (jeremyevans)
+
+* Show correct page title on error pages (jeremyevans)
+
 === 1.8.0 (2018-06-11)
 
 * Add support for Roda route_csrf plugin for request-specific CSRF tokens (jeremyevans)

data/lib/autoforme/action.rb

@@ -87,7 +87,7 @@ module AutoForme
       else
         return false unless model.supported_action?(normalized_type, request)
 
-        if title = TITLE_MAP[type]
+        if title = TITLE_MAP[@normalized_type]
           @title = "#{model.class_name} - #{title}"
         end
       end

data/lib/autoforme/frameworks/roda.rb

@@ -37,6 +37,18 @@ module AutoForme
           @env['HTTP_X_REQUESTED_WITH'] =~ /XMLHttpRequest/i
         end
         
+        # Set the flash at notice level when redirecting, so it shows
+        # up on the redirected page.
+        def set_flash_notice(message)
+          @controller.flash[flash_symbol_keys? ? :notice : 'notice'] = message
+        end
+
+        # Set the current flash at error level, used when displaying
+        # pages when there is an error.
+        def set_flash_now_error(message)
+          @controller.flash.now[flash_symbol_keys? ? :error : 'error'] = message
+        end
+
         # Use Rack::Csrf for csrf protection if it is defined.
         def csrf_token_hash(action=nil)
           if @controller.respond_to?(:check_csrf!)
@@ -53,6 +65,12 @@ module AutoForme
             {::Rack::Csrf.field=>::Rack::Csrf.token(@env)}
           end
         end
+
+        private
+
+        def flash_symbol_keys?
+          !@controller.opts[:sessions_convert_symbols]
+        end
       end
 
       attr_reader :route_proc

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

data/spec/basic_spec.rb

@@ -573,7 +573,7 @@ describe AutoForme do
     page.all('td').map{|s| s.text}.must_equal []
   end
 
-  it "should correct handle validation errors" do
+  it "should correctly handle validation errors" do
     app_setup(Artist)
     Artist.send(:define_method, :validate) do
       errors.add(:name, "bad name") if name == 'Foo'
@@ -583,6 +583,7 @@ describe AutoForme do
     page.title.must_equal 'Artist - New'
     fill_in 'Name', :with=>'Foo'
     click_button 'Create'
+    page.title.must_equal 'Artist - New'
     page.html.must_include 'Error Creating Artist'
     page.html.must_include 'bad name'
     fill_in 'Name', :with=>'TestArtistNew'
@@ -597,6 +598,7 @@ describe AutoForme do
     click_button 'Edit'
     fill_in 'Name', :with=>'Foo'
     click_button 'Update'
+    page.title.must_equal 'Artist - Edit'
     page.html.must_include 'Error Updating Artist'
     page.html.must_include 'bad name'
     fill_in 'Name', :with=>'TestArtistUpdate'

data/spec/roda_spec_helper.rb

@@ -4,8 +4,7 @@ require 'autoforme'
 require 'rack/csrf'
 
 begin
-  require 'erubis'
-  require 'tilt/erubis'
+  require 'tilt/erubi'
 rescue LoadError
   require 'tilt/erb'
 end
@@ -20,17 +19,31 @@ class AutoFormeSpec::App < Roda
 <html>
 <head><title><%= @autoforme_action.title if @autoforme_action %></title></head>
 <body>
-<% if flash[:notice] %>
-  <div class="alert alert-success"><p><%= flash[:notice] %></p></div>
+<% if notice = opts[:sessions_convert_symbols] ? flash['notice'] : flash[:notice] %>
+  <div class="alert alert-success"><p><%= notice %></p></div>
 <% end %>
-<% if flash[:error] %>
-  <div class="alert alert-error"><p><%= flash[:error] %></p></div>
+<% if error = opts[:sessions_convert_symbols] ? flash['error'] : flash[:error] %>
+  <div class="alert alert-error"><p><%= error %></p></div>
 <% end %>
 <%= yield %>
 </body></html>"
 HTML
 
-  use Rack::Session::Cookie, :secret => '1'
+  plugin :flash
+
+  if defined?(Roda::RodaVersionNumber) && Roda::RodaVersionNumber >= 30100
+    if ENV['RODA_ROUTE_CSRF'] == '0'
+      require 'roda/session_middleware'
+      opts[:sessions_convert_symbols] = true
+      use RodaSessionMiddleware, :secret=>SecureRandom.random_bytes(64)
+    else
+      ENV['RODA_ROUTE_CSRF'] ||= '1'
+      plugin :sessions, :secret=>SecureRandom.random_bytes(64)
+    end
+  else
+    use Rack::Session::Cookie, :secret => '1'
+  end
+
   if ENV['RODA_ROUTE_CSRF'].to_i > 0
     plugin :route_csrf, :require_request_specific_tokens=>ENV['RODA_ROUTE_CSRF'] == '1'
   else
@@ -42,7 +55,6 @@ HTML
   plugin :not_found do
     'Unhandled Request'
   end
-  plugin :flash
 
   def self.autoforme(klass=nil, opts={}, &block)
     sc = Class.new(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme