forme 2.1.0 → 2.2.0

data/spec/rails_integration_spec.rb

@@ -23,7 +23,7 @@ begin
 
   class FormeRails < Rails::Application
     routes.append do
-      %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined noblock noblock_post safe_buffer'.each do |action|
+      %w'index inputs_block inputs_block_wrapper nest nest_sep nest_inputs nest_seq hash legend combined noblock noblock_post safe_buffer no_forgery_protection'.each do |action|
         get action, :controller=>'forme', :action=>action
       end
     end
@@ -57,6 +57,14 @@ class FormeController < ActionController::Base
 END
   end
 
+  def no_forgery_protection
+    def self.protect_against_forgery?; false end
+    render :inline => <<END
+<%= forme(:method=>'POST') do |f| %>
+<% end %>
+END
+  end
+
   def inputs_block
     render :inline => <<END
 <%= forme([:foo, :bar], :action=>'/baz') do |f| %>
@@ -270,5 +278,9 @@ describe "Forme Rails integration" do
   it "#form should handle Rails SafeBuffers" do
     sin_get('/safe_buffer').must_equal '<form action="/baz"><fieldset class="inputs"><legend><b>foo</b></legend><input id="first" name="first" type="text" value="foo"/></fieldset><input type="submit" value="xyz"/></form>'
   end
+
+  it "#form should handle case where forgery protection is disabled" do
+    sin_get('/no_forgery_protection').must_equal '<form method="POST"> </form>'
+  end
 end
 end

data/spec/roda_integration_spec.rb

@@ -172,8 +172,9 @@ end if defined?(ERUBI_CAPTURE_BLOCK)
     def _forme_set(meth, obj, orig_hash, *form_args, &block)
       hash = {}
       forme_set_block = orig_hash.delete(:forme_set_block)
+      handle_params = hash.delete(:handle_params)
       orig_hash.each{|k,v| hash[k.to_s] = v}
-      album = @ab
+      album = obj
       ret, _, data, hmac = nil
       
       @app.route do |r|
@@ -196,8 +197,9 @@ end if defined?(ERUBI_CAPTURE_BLOCK)
       data = $2
       hmac = $3
       data.gsub!(""", '"') if data
-      h = {"album"=>hash,  "_forme_set_data"=>data, "_forme_set_data_hmac"=>hmac, "_csrf"=>csrf}
+      h = {"album"=>hash,  "_forme_set_data"=>data, "_forme_set_data_hmac"=>hmac, "_csrf"=>csrf, "body"=>body}
       if data && hmac
+        h = handle_params.call(h) if handle_params
         forme_call(h)
       end
       meth == :forme_parse ? ret : h
@@ -244,6 +246,18 @@ END
       @ab.copies_sold.must_be_nil
     end
 
+    it "#forme_set handle missing csrf" do
+      h = forme_set(@ab, :name=>'Foo'){|f| f.input(:name)}
+      @ab.name = nil
+      data = JSON.parse(h["_forme_set_data"])
+      data.delete('csrf')
+      data = data.to_json
+      hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA512.new, '1'*64, data)
+      forme_call(h.merge("_forme_set_data_hmac"=>hmac, "_forme_set_data"=>data))
+      @ab.name.must_equal 'Foo'
+      @ab.copies_sold.must_be_nil
+    end
+
     it "#forme_set should handle custom form namespaces" do
       forme_set(@ab, {"album"=>{"name"=>'Foo', 'copies_sold'=>'100'}}, {}, :namespace=>'album'){|f| f.input(:name); f.input(:copies_sold)}
       @ab.name.must_equal 'Foo'
@@ -517,6 +531,10 @@ END
       @ab.forme_validations.merge!(hash[:validations])
       @ab.valid?.must_equal true
     end
+
+    it "should handle forms with objects that don't support forme_inputs" do
+      forme_set(String, {:name=>'Foo'}, {}, :inputs=>[:name])['body'].must_equal '<form><fieldset class="inputs"><input id="name" name="name" type="text" value="String"/></fieldset></form>'
+    end
   end
 end
 end

data/spec/sequel_helper.rb

@@ -1,6 +1,6 @@
 require 'sequel'
 
-db_url = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
+db_url = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
 DB = Sequel.connect(db_url, :identifier_mangling=>false)
 DB.extension(:freeze_datasets)
 Sequel.default_timezone = :utc
@@ -17,6 +17,8 @@ DB.create_table(:albums) do
   Date :release_date
   DateTime :created_at
   Integer :copies_sold
+  Float :fl
+  BigDecimal :bd
 end
 DB.create_table(:album_infos) do
   primary_key :id

data/spec/sequel_i18n_plugin_spec.rb

@@ -13,19 +13,19 @@ describe "Forme Sequel::Model forms" do
   end
 
   it "should not change the usual label input if translation is not present" do
-    @b.input(:name).to_s.must_equal '<label>Name: <input id="invoice_name" maxlength="255" name="invoice[name]" type="text" value="b"/></label>'
+    @b.input(:name).must_equal '<label>Name: <input id="invoice_name" maxlength="255" name="invoice[name]" type="text" value="b"/></label>'
   end
 
   it "should use the translation for the label if present" do
-    @b.input(:summary).to_s.must_equal '<label>Brief Description: <input id="invoice_summary" maxlength="255" name="invoice[summary]" type="text" value="a brief summary"/></label>'
+    @b.input(:summary).must_equal '<label>Brief Description: <input id="invoice_summary" maxlength="255" name="invoice[summary]" type="text" value="a brief summary"/></label>'
   end
 
   it "should not change the usual legend for the subform if the translation is not present" do
-    Forme.form(Firm[1]){|f| f.subform(:invoices){ f.input(:name) }}.to_s.must_equal '<form class="forme firm" method="post"><input id="firm_invoices_attributes_0_id" name="firm[invoices_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Invoice #1</legend><label>Name: <input id="firm_invoices_attributes_0_name" maxlength="255" name="firm[invoices_attributes][0][name]" type="text" value="b"/></label></fieldset></form>'
+    Forme.form(Firm[1]){|f| f.subform(:invoices){ f.input(:name) }}.must_equal '<form class="forme firm" method="post"><input id="firm_invoices_attributes_0_id" name="firm[invoices_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Invoice #1</legend><label>Name: <input id="firm_invoices_attributes_0_name" maxlength="255" name="firm[invoices_attributes][0][name]" type="text" value="b"/></label></fieldset></form>'
   end
 
   it "should use the translation for the legend on the subform if present" do
-    Forme.form(Firm[1]){|f| f.subform(:clients){ f.input(:name) }}.to_s.must_equal '<form class="forme firm" method="post"><input id="firm_clients_attributes_0_id" name="firm[clients_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Clientes</legend><label>Name: <input id="firm_clients_attributes_0_name" maxlength="255" name="firm[clients_attributes][0][name]" type="text" value="a great client"/></label></fieldset></form>'
+    Forme.form(Firm[1]){|f| f.subform(:clients){ f.input(:name) }}.must_equal '<form class="forme firm" method="post"><input id="firm_clients_attributes_0_id" name="firm[clients_attributes][0][id]" type="hidden" value="1"/><fieldset class="inputs"><legend>Clientes</legend><label>Name: <input id="firm_clients_attributes_0_name" maxlength="255" name="firm[clients_attributes][0][name]" type="text" value="a great client"/></label></fieldset></form>'
   end
 end
 end